github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(juggler): Roll Firefox to 120450a2 (#3842)

Browse Source 
This patch:
- rebaselines C++ patchset atop of [Global Firefox Reformat](https://bugzilla.mozilla.org/show_bug.cgi?id=1511181)
- rolls firefox to [120450a2](120450a2c5)
- splits out preference installation step from Puppeteer-Firefox's
  `install.js` into a separate
  `puppeteer-firefox/misc/install-preferences.js`. This script is
  re-used to install preferences when run with a custom executable path.
- fixes issue with ScrollbarManager that was re-injecting the same
  stylesheet multiple times
This commit is contained in:
Andrey Lushnikov
2019-01-25 15:25:54 -05:00
committed by GitHub
parent 1a7995558f
commit cd678fb591
8 changed files with 127 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
experimental/puppeteer-firefox/install.js
View File

@@ -15,10 +15,6 @@
*/
const os = require('os');
const fs = require('fs');
const path = require('path');
// puppeteer-core should not install anything.
if (require('./package.json').name === 'puppeteer-core')
return;
@@ -62,7 +58,10 @@ function onSuccess(localRevisions) {
localRevisions = localRevisions.filter(revision => revision !== revisionInfo.revision);
// Remove previous firefox revisions.
const cleanupOldVersions = localRevisions.map(revision => browserFetcher.remove(revision));
return Promise.all([...cleanupOldVersions, installFirefoxPreferences()]);
const installFirefoxPreferences = require('./misc/install-preferences');
return Promise.all([...cleanupOldVersions, installFirefoxPreferences(revisionInfo.executablePath)]).then(() => {
console.log('Firefox preferences installed!');
});
}
/**
@@ -95,59 +94,3 @@ function toMegabytes(bytes) {
const mb = bytes / 1024 / 1024;
return `${Math.round(mb * 10) / 10} Mb`;
}
// Install browser preferences after downloading and unpacking
// firefox instances.
// Based on: https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Enterprise_deployment_before_60#Configuration
async function installFirefoxPreferences() {
const revisionInfo = browserFetcher.revisionInfo(revision);
const firefoxFolder = path.dirname(revisionInfo.executablePath);
const {helper} = require('./lib/firefox/helper');
const mkdirAsync = helper.promisify(fs.mkdir.bind(fs));
let prefPath = '';
let configPath = '';
if (os.platform() === 'darwin') {
prefPath = path.join(firefoxFolder, '..', 'Resources', 'defaults', 'pref');
configPath = path.join(firefoxFolder, '..', 'Resources');
} else if (os.platform() === 'linux') {
await mkdirAsync(path.join(firefoxFolder, 'browser', 'defaults'));
await mkdirAsync(path.join(firefoxFolder, 'browser', 'defaults', 'preferences'));
prefPath = path.join(firefoxFolder, 'browser', 'defaults', 'preferences');
configPath = firefoxFolder;
} else if (os.platform() === 'win32') {
prefPath = path.join(firefoxFolder, 'defaults', 'pref');
configPath = firefoxFolder;
} else {
throw new Error('Unsupported platform: ' + os.platform());
}
await Promise.all([
copyFile({
from: path.join(__dirname, 'misc', '00-puppeteer-prefs.js'),
to: path.join(prefPath, '00-puppeteer-prefs.js'),
}),
copyFile({
from: path.join(__dirname, 'misc', 'puppeteer.cfg'),
to: path.join(configPath, 'puppeteer.cfg'),
}),
]).then(() => {
console.log('Firefox preferences installed!');
});
}
function copyFile({from, to}) {
var rd = fs.createReadStream(from);
var wr = fs.createWriteStream(to);
return new Promise(function(resolve, reject) {
rd.on('error', reject);
wr.on('error', reject);
wr.on('finish', resolve);
rd.pipe(wr);
}).catch(function(error) {
rd.destroy();
wr.end();
throw error;
});
}