f230722ff0
This patch removes all dynamic requires in Puppeteer. This should
make it much simpler to bundle puppeteer/puppeteer-core packages.
We used dynamic requires in a few places in lib/:
- BrowserFetcher was choosing between `http` and `https` based on some
runtime value. This was easy to fix with explicit `require`.
- BrowserFetcher and Launcher needed to know project root to store
chromium revisions and to read package name and chromium revision from
package.json. (projectRoot value would be different in node6).
Instead of doing a backwards logic to infer these
variables, we now pass them directly from `//index.js`.
With this patch, I was able to bundle Puppeteer using browserify and
the following config in `package.json`:
```json
"browser": {
"./lib/BrowserFetcher.js": false,
"ws": "./lib/BrowserWebSocket",
"fs": false,
"child_process": false,
"rimraf": false,
"readline": false
}
```
(where `lib/BrowserWebSocket.js` is a courtesy of @Janpot from
https://github.com/GoogleChrome/puppeteer/pull/2374/)
And command:
```sh
$ browserify -r puppeteer:./index.js > ppweb.js
```
References #2119
71 lines
1.9 KiB
JavaScript
71 lines
1.9 KiB
JavaScript
/**
|
|
* Copyright 2017 Google Inc. All rights reserved.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
const {helper} = require('./helper');
|
|
const Launcher = require('./Launcher');
|
|
const BrowserFetcher = require('./BrowserFetcher');
|
|
|
|
module.exports = class {
|
|
/**
|
|
* @param {string} projectRoot
|
|
* @param {string} preferredRevision
|
|
* @param {boolean} isPuppeteerCore
|
|
*/
|
|
constructor(projectRoot, preferredRevision, isPuppeteerCore) {
|
|
this._projectRoot = projectRoot;
|
|
this._launcher = new Launcher(projectRoot, preferredRevision, isPuppeteerCore);
|
|
}
|
|
|
|
/**
|
|
* @param {!Object=} options
|
|
* @return {!Promise<!Puppeteer.Browser>}
|
|
*/
|
|
launch(options) {
|
|
return this._launcher.launch(options);
|
|
}
|
|
|
|
/**
|
|
* @param {{browserWSEndpoint: string, ignoreHTTPSErrors: boolean}} options
|
|
* @return {!Promise<!Puppeteer.Browser>}
|
|
*/
|
|
connect(options) {
|
|
return this._launcher.connect(options);
|
|
}
|
|
|
|
/**
|
|
* @return {string}
|
|
*/
|
|
executablePath() {
|
|
return this._launcher.executablePath();
|
|
}
|
|
|
|
/**
|
|
* @return {!Array<string>}
|
|
*/
|
|
defaultArgs(options) {
|
|
return this._launcher.defaultArgs(options);
|
|
}
|
|
|
|
/**
|
|
* @param {!Object=} options
|
|
* @return {!BrowserFetcher}
|
|
*/
|
|
createBrowserFetcher(options) {
|
|
return new BrowserFetcher(this._projectRoot, options);
|
|
}
|
|
};
|
|
|
|
helper.tracePublicAPI(module.exports, 'Puppeteer');
|