chore: create node
directory for Node-only files (#6041)
This is another step towards making Puppeteer agnostic of environment and being able to run in Node or a browser. The files in the `node` directory are ones that would only be needed in the Node build - e.g. the code that downloads and launches a local browser instance. The long term vision here is to have three folders: * node - Node only code * web - Web only code * common - code that is shared But rather than do that in one PR I'm going to split it up to make it easier to review and deal with.
This commit is contained in:
parent
ce34c0a4ff
commit
90b0934f85
@ -54,7 +54,6 @@ export class Browser extends EventEmitter {
|
|||||||
_closeCallback: BrowserCloseCallback;
|
_closeCallback: BrowserCloseCallback;
|
||||||
_defaultContext: BrowserContext;
|
_defaultContext: BrowserContext;
|
||||||
_contexts: Map<string, BrowserContext>;
|
_contexts: Map<string, BrowserContext>;
|
||||||
// TODO: once Target is in TypeScript we can type this properly.
|
|
||||||
_targets: Map<string, Target>;
|
_targets: Map<string, Target>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
@ -13,14 +13,14 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
import Launcher from './Launcher';
|
import Launcher from './node/Launcher';
|
||||||
import {
|
import {
|
||||||
LaunchOptions,
|
LaunchOptions,
|
||||||
ChromeArgOptions,
|
ChromeArgOptions,
|
||||||
BrowserOptions,
|
BrowserOptions,
|
||||||
} from './launcher/LaunchOptions';
|
} from './node/LaunchOptions';
|
||||||
import { ProductLauncher } from './Launcher';
|
import { ProductLauncher } from './node/Launcher';
|
||||||
import { BrowserFetcher, BrowserFetcherOptions } from './BrowserFetcher';
|
import { BrowserFetcher, BrowserFetcherOptions } from './node/BrowserFetcher';
|
||||||
import { puppeteerErrors, PuppeteerErrors } from './Errors';
|
import { puppeteerErrors, PuppeteerErrors } from './Errors';
|
||||||
import { ConnectionTransport } from './ConnectionTransport';
|
import { ConnectionTransport } from './ConnectionTransport';
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
*/
|
*/
|
||||||
export * from './Accessibility';
|
export * from './Accessibility';
|
||||||
export * from './Browser';
|
export * from './Browser';
|
||||||
export * from './BrowserFetcher';
|
export * from './node/BrowserFetcher';
|
||||||
export * from './Connection';
|
export * from './Connection';
|
||||||
export * from './ConsoleMessage';
|
export * from './ConsoleMessage';
|
||||||
export * from './Coverage';
|
export * from './Coverage';
|
||||||
|
@ -22,7 +22,7 @@ module.exports = {
|
|||||||
Accessibility: require('./Accessibility').Accessibility,
|
Accessibility: require('./Accessibility').Accessibility,
|
||||||
Browser: require('./Browser').Browser,
|
Browser: require('./Browser').Browser,
|
||||||
BrowserContext: require('./Browser').BrowserContext,
|
BrowserContext: require('./Browser').BrowserContext,
|
||||||
BrowserFetcher: require('./BrowserFetcher').BrowserFetcher,
|
BrowserFetcher: require('./node/BrowserFetcher').BrowserFetcher,
|
||||||
CDPSession: require('./Connection').CDPSession,
|
CDPSession: require('./Connection').CDPSession,
|
||||||
ConsoleMessage: require('./ConsoleMessage').ConsoleMessage,
|
ConsoleMessage: require('./ConsoleMessage').ConsoleMessage,
|
||||||
Coverage: require('./Coverage').Coverage,
|
Coverage: require('./Coverage').Coverage,
|
||||||
|
@ -23,13 +23,13 @@ import * as https from 'https';
|
|||||||
import * as http from 'http';
|
import * as http from 'http';
|
||||||
|
|
||||||
import extractZip from 'extract-zip';
|
import extractZip from 'extract-zip';
|
||||||
import { debug } from './Debug';
|
import { debug } from '../Debug';
|
||||||
import removeRecursive from 'rimraf';
|
import removeRecursive from 'rimraf';
|
||||||
import * as URL from 'url';
|
import * as URL from 'url';
|
||||||
import ProxyAgent from 'https-proxy-agent';
|
import ProxyAgent from 'https-proxy-agent';
|
||||||
import { getProxyForUrl } from 'proxy-from-env';
|
import { getProxyForUrl } from 'proxy-from-env';
|
||||||
import { assert } from './assert';
|
import { assert } from '../assert';
|
||||||
import { helper } from './helper';
|
import { helper } from '../helper';
|
||||||
const debugFetcher = debug(`puppeteer:fetcher`);
|
const debugFetcher = debug(`puppeteer:fetcher`);
|
||||||
|
|
||||||
const downloadURLs = {
|
const downloadURLs = {
|
@ -23,7 +23,7 @@ import { helper, debugError } from '../helper';
|
|||||||
import { LaunchOptions } from './LaunchOptions';
|
import { LaunchOptions } from './LaunchOptions';
|
||||||
import { Connection } from '../Connection';
|
import { Connection } from '../Connection';
|
||||||
import { WebSocketTransport } from '../WebSocketTransport';
|
import { WebSocketTransport } from '../WebSocketTransport';
|
||||||
import { PipeTransport } from '../PipeTransport';
|
import { PipeTransport } from './PipeTransport';
|
||||||
import * as readline from 'readline';
|
import * as readline from 'readline';
|
||||||
import { TimeoutError } from '../Errors';
|
import { TimeoutError } from '../Errors';
|
||||||
|
|
@ -21,13 +21,13 @@ import * as URL from 'url';
|
|||||||
import * as fs from 'fs';
|
import * as fs from 'fs';
|
||||||
|
|
||||||
import { BrowserFetcher } from './BrowserFetcher';
|
import { BrowserFetcher } from './BrowserFetcher';
|
||||||
import { Connection } from './Connection';
|
import { Connection } from '../Connection';
|
||||||
import { Browser } from './Browser';
|
import { Browser } from '../Browser';
|
||||||
import { assert } from './assert';
|
import { assert } from '../assert';
|
||||||
import { helper, debugError } from './helper';
|
import { helper, debugError } from '../helper';
|
||||||
import { ConnectionTransport } from './ConnectionTransport';
|
import { ConnectionTransport } from '../ConnectionTransport';
|
||||||
import { WebSocketTransport } from './WebSocketTransport';
|
import { WebSocketTransport } from '../WebSocketTransport';
|
||||||
import { BrowserRunner } from './launcher/BrowserRunner';
|
import { BrowserRunner } from './BrowserRunner';
|
||||||
|
|
||||||
const mkdtempAsync = helper.promisify(fs.mkdtemp);
|
const mkdtempAsync = helper.promisify(fs.mkdtemp);
|
||||||
const writeFileAsync = helper.promisify(fs.writeFile);
|
const writeFileAsync = helper.promisify(fs.writeFile);
|
||||||
@ -36,7 +36,7 @@ import {
|
|||||||
ChromeArgOptions,
|
ChromeArgOptions,
|
||||||
LaunchOptions,
|
LaunchOptions,
|
||||||
BrowserOptions,
|
BrowserOptions,
|
||||||
} from './launcher/LaunchOptions';
|
} from './LaunchOptions';
|
||||||
|
|
||||||
export interface ProductLauncher {
|
export interface ProductLauncher {
|
||||||
launch(object);
|
launch(object);
|
@ -13,8 +13,8 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
import { helper, debugError, PuppeteerEventListener } from './helper';
|
import { helper, debugError, PuppeteerEventListener } from '../helper';
|
||||||
import { ConnectionTransport } from './ConnectionTransport';
|
import { ConnectionTransport } from '../ConnectionTransport';
|
||||||
|
|
||||||
export class PipeTransport implements ConnectionTransport {
|
export class PipeTransport implements ConnectionTransport {
|
||||||
_pipeWrite: NodeJS.WritableStream;
|
_pipeWrite: NodeJS.WritableStream;
|
@ -61,7 +61,7 @@ async function run() {
|
|||||||
* we'll just list the directories manually.
|
* we'll just list the directories manually.
|
||||||
*/
|
*/
|
||||||
...(await Source.readdir(path.join(PROJECT_DIR, 'src'), 'ts')),
|
...(await Source.readdir(path.join(PROJECT_DIR, 'src'), 'ts')),
|
||||||
...(await Source.readdir(path.join(PROJECT_DIR, 'src', 'launcher'), 'ts')),
|
...(await Source.readdir(path.join(PROJECT_DIR, 'src', 'node'), 'ts')),
|
||||||
];
|
];
|
||||||
|
|
||||||
const tsSourcesNoDefinitions = tsSources.filter(
|
const tsSourcesNoDefinitions = tsSources.filter(
|
||||||
|
Loading…
Reference in New Issue
Block a user