thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(launcher): ensure PUPPETEER_EXECUTABLE_PATH is used if set (#4677)

Browse Source 
Without this patch, Puppeteer exits with `Error: Unsupported platform: freebsd` on FreeBSD despite `PUPPETEER_EXECUTABLE_PATH` being set.
This commit is contained in:
Mohamed Akram 2019-07-15 03:37:57 +04:00 committed by Andrey Lushnikov
parent a582c11b1b
commit bafda9fbe7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Launcher.js
View File

@ -292,7 +292,6 @@ class Launcher {
* @return {{executablePath: string, missingText: ?string}} * @return {{executablePath: string, missingText: ?string}}
*/ */
_resolveExecutablePath() { _resolveExecutablePath() {
const browserFetcher = new BrowserFetcher(this._projectRoot);
// puppeteer-core doesn't take into account PUPPETEER_* env variables. // puppeteer-core doesn't take into account PUPPETEER_* env variables.
if (!this._isPuppeteerCore) { if (!this._isPuppeteerCore) {
const executablePath = process.env.PUPPETEER_EXECUTABLE_PATH || process.env.npm_config_puppeteer_executable_path || process.env.npm_package_config_puppeteer_executable_path; const executablePath = process.env.PUPPETEER_EXECUTABLE_PATH || process.env.npm_config_puppeteer_executable_path || process.env.npm_package_config_puppeteer_executable_path;
@ -300,6 +299,9 @@ class Launcher {
const missingText = !fs.existsSync(executablePath) ? 'Tried to use PUPPETEER_EXECUTABLE_PATH env variable to launch browser but did not find any executable at: ' + executablePath : null; const missingText = !fs.existsSync(executablePath) ? 'Tried to use PUPPETEER_EXECUTABLE_PATH env variable to launch browser but did not find any executable at: ' + executablePath : null;
return { executablePath, missingText }; return { executablePath, missingText };
} }
}
const browserFetcher = new BrowserFetcher(this._projectRoot);
if (!this._isPuppeteerCore) {
const revision = process.env['PUPPETEER_CHROMIUM_REVISION']; const revision = process.env['PUPPETEER_CHROMIUM_REVISION'];
if (revision) { if (revision) {
const revisionInfo = browserFetcher.revisionInfo(revision); const revisionInfo = browserFetcher.revisionInfo(revision);