chore(gulp): fix gulp->installWithPuppeteer: now set puppeteer_downlo…

…ad_host and download puppeteer with chrome
Wonder-Technology · May 31, 2019 · b7c3422 · b7c3422
1 parent 2658dd8
commit b7c3422
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 73 deletions.
diff --git a/build/gulp_task/install/installWithPuppeteer.js b/build/gulp_task/install/installWithPuppeteer.js
@@ -1,83 +1,16 @@
 var gulp = require("gulp");
-var path = require("path");
-var fs = require("fs");
 var exec = require("child_process").exec;
 
 function _installWithPuppeteer(handleSuccessFunc, handleErrorFunc) {
-    var packageFilePath = path.join(process.cwd(), "./package.json");
+    console.log("reinstall node_modules...");
 
-
-
-    console.log("specific puppeteer version in package.json...");
-
-    var packageContent = JSON.parse(fs.readFileSync(packageFilePath));
-
-    var originPuppeteer = packageContent.devDependencies.puppeteer;
-
-
-
-    packageContent.devDependencies.puppeteer = "1.17.0";
-
-
-
-    fs.writeFileSync(packageFilePath,
-        JSON.stringify(packageContent, null, "\t")
-    );
-
-
-
-    console.log("reinstall node_modules without download puppeteer->chrome...");
-
-
-
-
-    exec("sudo rm -rf node_modules/ yarn.lock && sudo env PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn install", { maxBuffer: 8192 * 4000 }, function (err, stdout, stderr) {
+    exec("sudo npm config set puppeteer_download_host=https://npm.taobao.org/mirrors && sudo rm -rf node_modules/ yarn.lock && sudo cyarn install", { maxBuffer: 8192 * 4000 }, function (err, stdout, stderr) {
         if (err) {
             handleErrorFunc(err);
             return;
         }
 
-
-        console.log("copy downloaded chrome");
-
-        exec("sudo mkdir ./node_modules/puppeteer/.local-chromum && sudo mkdir ./node_modules/puppeteer/.local-chromum/mac-662092 && sudo mkdir ./node_modules/puppeteer/.local-chromum/mac-662092/chrome-mac", { maxBuffer: 8192 * 4000 }, function (err, stdout, stderr) {
-            if (err) {
-                handleErrorFunc(err);
-                return;
-            }
-
-
-            exec("sudo cp -rf ../File/chrome-mac/ ./node_modules/puppeteer/.local-chromum/mac-662092/chrome-mac", { maxBuffer: 8192 * 4000 }, function (err, stdout, stderr) {
-                if (err) {
-                    handleErrorFunc(err);
-                    return;
-                }
-
-
-                console.log("make ~/.bash_profile work(already have set process.env.PUPPETEER_EXECUTABLE_PATH in it)");
-
-
-                exec("source ~/.bash_profile", { cwd: __dirname }, function (err, stdout, stderr) {
-
-                    console.log("restore puppeteer version package.json");
-
-
-                    packageContent.devDependencies.puppeteer = originPuppeteer;
-
-
-
-                    fs.writeFileSync(packageFilePath,
-                        JSON.stringify(packageContent, null, "\t")
-                    );
-
-                    handleSuccessFunc();
-                });
-
-
-
-            });
-        });
-
+        handleSuccessFunc();
     });
 
 }

diff --git a/package.json b/package.json
@@ -19,12 +19,12 @@
 		"test": "jest --config jest.json",
 		"test:coverage": "npm run build && jest --config jest_coverage.json",
 		"test:ci": "npm run buildAll:ci && jest --maxWorkers=4 --config jest_coverage.json",
-		"test:fastRender": "PUPPETEER_EXECUTABLE_PATH=/Users/y/Github/Wonder.js/node_modules/puppeteer/.local-chromum/mac-662092/chrome-mac/Chromium.app/Contents/MacOS/Chromium gulp testFastRender",
+		"test:fastRender": "gulp testFastRender",
 		"test:fastPf": "gulp testFastPerformance",
 		"test:fastPfOneCount": "gulp testFastPerformanceOneCount",
 		"test:generatePfBenchmark": "gulp generatePerformanceBenchmark",
-		"test:render": "npm run build && PUPPETEER_EXECUTABLE_PATH=/Users/y/Github/Wonder.js/node_modules/puppeteer/.local-chromum/mac-662092/chrome-mac/Chromium.app/Contents/MacOS/Chromium gulp testRenderInLocal",
-		"test:renderCI": "npm run build && PUPPETEER_EXECUTABLE_PATH=/Users/y/Github/Wonder.js/node_modules/puppeteer/.local-chromum/mac-662092/chrome-mac/Chromium.app/Contents/MacOS/Chromium gulp testRenderInCI",
+		"test:render": "npm run build && gulp testRenderInLocal",
+		"test:renderCI": "npm run build && gulp testRenderInCI",
 		"test:pf": "npm run build && gulp testPerformanceInLocal",
 		"test:pfCI": "npm run build && gulp testPerformanceInCI",
 		"test:watch": "jest --watch --verbose false --config jest.json",