Merge ec726fe into ea934d1

vercel · Jul 17, 2023 · d32818f · d32818f
2 parents ea934d1 + ec726fe
commit d32818f
Show file tree

Hide file tree

Showing 5 changed files with 180 additions and 8 deletions.
diff --git a/packages/create-turbo/package.json b/packages/create-turbo/package.json
@@ -27,6 +27,7 @@
     "commander": "^10.0.0",
     "fs-extra": "^10.1.0",
     "inquirer": "^8.0.0",
+    "proxy-agent": "^6.2.2",
     "rimraf": "^3.0.2",
     "semver": "^7.3.8",
     "update-check": "^1.5.4"

diff --git a/packages/create-turbo/src/cli.ts b/packages/create-turbo/src/cli.ts
@@ -8,6 +8,15 @@ import { logger } from "@turbo/utils";
 import { create } from "./commands";
 import cliPkg from "../package.json";
 
+import { ProxyAgent } from "proxy-agent";
+import http from "http";
+import https from "https";
+
+// Support http proxy vars
+const agent = new ProxyAgent();
+http.globalAgent = agent;
+https.globalAgent = agent;
+
 const createTurboCli = new Command();
 
 // create

diff --git a/packages/turbo-gen/package.json b/packages/turbo-gen/package.json
@@ -27,6 +27,7 @@
     "inquirer": "^8.2.4",
     "minimatch": "^9.0.0",
     "node-plop": "^0.26.3",
+    "proxy-agent": "^6.2.2",
     "semver": "^7.3.8",
     "ts-node": "^10.9.1",
     "update-check": "^1.5.4",

diff --git a/packages/turbo-gen/src/cli.ts b/packages/turbo-gen/src/cli.ts
@@ -9,6 +9,15 @@ import { workspace, run, raw } from "./commands";
 import cliPkg from "../package.json";
 import { GeneratorError } from "./utils/error";
 
+import { ProxyAgent } from "proxy-agent";
+import http from "http";
+import https from "https";
+
+// Support http proxy vars
+const agent = new ProxyAgent();
+http.globalAgent = agent;
+https.globalAgent = agent;
+
 const turboGenCli = new Command();
 
 turboGenCli