chore(deps): update superagent to 5.x

imhoffd · imhoffd · commit 6ecda3929a52 · 2020-01-22T13:39:05.000-08:00
diff --git a/packages/ionic/package.json b/packages/ionic/package.json
@@ -61,7 +61,7 @@
     "split2": "^3.0.0",
     "ssh-config": "^1.1.1",
     "stream-combiner2": "^1.1.1",
-    "superagent": "^4.1.0",
+    "superagent": "^5.2.1",
     "superagent-proxy": "^2.0.0",
     "tar": "^4.3.0",
     "through2": "^3.0.0",
diff --git a/packages/ionic/src/definitions.ts b/packages/ionic/src/definitions.ts
@@ -432,6 +432,7 @@ export interface SSLConfig {
 }
 
 export interface CreateRequestOptions {
+  userAgent: string;
   ssl?: SSLConfig;
   proxy?: string;
 }
diff --git a/packages/ionic/src/lib/config.ts b/packages/ionic/src/lib/config.ts
@@ -107,6 +107,7 @@ export class Config extends BaseConfig<ConfigFile> implements IConfig {
     const { c } = this;
 
     return {
+      userAgent: `node/superagent/Ionic CLI ${c.version}`,
       ssl: {
         cafile: c['ssl.cafile'],
         certfile: c['ssl.certfile'],
diff --git a/packages/ionic/src/lib/utils/http.ts b/packages/ionic/src/lib/utils/http.ts
@@ -20,7 +20,7 @@ function getGlobalProxy(): { envvar: string; envval: string; } | undefined {
   }
 }
 
-export async function createRequest(method: HttpMethod, url: string, { proxy, ssl }: CreateRequestOptions): Promise<{ req: SuperAgentRequest; }> {
+export async function createRequest(method: HttpMethod, url: string, { userAgent, proxy, ssl }: CreateRequestOptions): Promise<{ req: SuperAgentRequest; }> {
   const superagent = await import('superagent');
 
   if (!proxy) {
@@ -33,14 +33,16 @@ export async function createRequest(method: HttpMethod, url: string, { proxy, ss
 
   const req = superagent(method, url);
 
-  req.redirects(25);
+  req
+    .set('User-Agent', userAgent)
+    .redirects(25);
 
   if (proxy) {
     const superagentProxy = await import('superagent-proxy');
     superagentProxy(superagent);
 
-    if ((req as any).proxy) { // TODO: create/use `@types/superagent-proxy`
-      (req as any).proxy(proxy);
+    if (req.proxy) {
+      req.proxy(proxy);
     } else {
       debug(`Cannot install proxy--req.proxy not defined`);
     }
diff --git a/types/superagent-proxy.d.ts b/types/superagent-proxy.d.ts
@@ -1,6 +1,12 @@
 declare module "superagent-proxy" {
   import * as superagent from 'superagent';
 
+  module "superagent" {
+    interface Request {
+      proxy(url: string): this;
+    }
+  }
+
   function superagentProxy(s: typeof superagent): void;
 
   export = superagentProxy;

Original file line number	Diff line number	Diff line change
`@@ -432,6 +432,7 @@ export interface SSLConfig {`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`export interface CreateRequestOptions {`
	`435`	`+ userAgent: string;`
`435`	`436`	`ssl?: SSLConfig;`
`436`	`437`	`proxy?: string;`
`437`	`438`	`}`