fix: 修复puppeteer引用路径不正确的问题

axetroy · Oct 30, 2017 · 3fd2899 · 3fd2899
1 parent cd094e3
commit 3fd2899
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/config.js b/config.js
@@ -5,6 +5,7 @@ module.exports = {
   paths: {
     root: __dirname,
     app: path.join(__dirname, 'app'),
-    bin: path.join(__dirname, 'bin')
+    bin: path.join(__dirname, 'bin'),
+    puppeteer: path.dirname(require.resolve('puppeteer'))
   }
 };
diff --git a/index.js b/index.js
@@ -23,16 +23,16 @@ process.on('unhandledRejection', (reason, p) => {
   console.error('Unhandled Rejection at:', p, 'reason:', reason);
 });
 
-const puppeteerModulePath = path.join(config.paths.root, 'node_modules', 'puppeteer');
-const localChromiumPath = path.join(puppeteerModulePath, '.local-chromium');
-
+// 运行时检查是已运行
 const isChromiumExist = checkIsChromiumExist();
 
 if (isChromiumExist === false) {
   console.error(
-    `Please make sure ${chalk.green('chromium')} have install at ${chalk.yellow(localChromiumPath)}`
+    `Please make sure ${chalk.green('chromium')} have install at ${chalk.yellow(path.join(config.paths.puppeteer, '.local-chromium'))}`
+  );
+  console.error(
+    `Try to reinstall: ${chalk.green('node ' + config.paths.puppeteer + '/install.js')}`
   );
-  console.error(`Try to reinstall: ${chalk.green('node ' + puppeteerModulePath + '/install.js')}`);
   process.exit(1);
 }
 

diff --git a/isChromiumExist.js b/isChromiumExist.js
@@ -7,8 +7,7 @@ const config = require('./config');
  * @returns {boolean}
  */
 module.exports = function() {
-  const puppeteerModulePath = path.join(config.paths.root, 'node_modules', 'puppeteer');
-  const localChromiumPath = path.join(puppeteerModulePath, '.local-chromium');
+  const localChromiumPath = path.join(config.paths.puppeteer, '.local-chromium');
 
   let isExisted = false;
 

diff --git a/scripts/chromium-checker b/scripts/chromium-checker
@@ -13,7 +13,6 @@ console.info(`${chalk.blue('Checking Chromium')}...`);
 const path = require('path');
 const config = require('../config');
 const isChromiumExist = require('../isChromiumExist');
-const puppeteerModulePath = path.join(config.paths.root, 'node_modules', 'puppeteer');
 
 const existed = isChromiumExist();
 
@@ -23,5 +22,5 @@ if (existed) {
   console.info(`${chalk.red('Chromium not exist...')}`);
   console.info(`${chalk.blue('Chromium installing...')}`);
   // run install script
-  require(path.join(puppeteerModulePath, 'install.js'));
+  require(path.join(config.paths.puppeteer, 'install.js'));
 }