Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(agnostify): Create Node and Web initializer. #6477

Merged
merged 2 commits into from
Oct 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/common/Puppeteer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ import { PUPPETEER_REVISIONS } from '../revisions.js';
* @public
*/
export class Puppeteer {
private _projectRoot: string;
// Will be undefined in a browser environment
private _projectRoot?: string;
private _isPuppeteerCore: boolean;
private _changedProduct = false;
private __productName: string;
Expand Down
9 changes: 7 additions & 2 deletions src/index-core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
* limitations under the License.
*/

import { initializePuppeteer } from './initialize.js';
import { initializePuppeteerNode } from './initialize-node.js';
import { isNode } from './environment.js';
import { initializePuppeteerWeb } from './initialize-web.js';

const puppeteer = initializePuppeteer('puppeteer-core');
const initializeFunc = isNode
? initializePuppeteerNode
: initializePuppeteerWeb;
const puppeteer = initializeFunc('puppeteer-core');
export default puppeteer;
9 changes: 7 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
* limitations under the License.
*/

import { initializePuppeteer } from './initialize.js';
import { initializePuppeteerNode } from './initialize-node.js';
import { isNode } from './environment.js';
import { initializePuppeteerWeb } from './initialize-web.js';

const puppeteer = initializePuppeteer('puppeteer');
const initializeFunc = isNode
? initializePuppeteerNode
: initializePuppeteerWeb;
const puppeteer = initializeFunc('puppeteer');
export default puppeteer;
2 changes: 1 addition & 1 deletion src/initialize.ts → src/initialize-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { Puppeteer } from './common/Puppeteer.js';
import { PUPPETEER_REVISIONS } from './revisions.js';
import pkgDir from 'pkg-dir';

export const initializePuppeteer = (packageName: string): Puppeteer => {
export const initializePuppeteerNode = (packageName: string): Puppeteer => {
const puppeteerRootDirectory = pkgDir.sync(__dirname);

let preferredRevision = PUPPETEER_REVISIONS.chromium;
Expand Down
34 changes: 34 additions & 0 deletions src/initialize-web.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/**
* Copyright 2020 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.
*/

import { Puppeteer } from './common/Puppeteer.js';

export const initializePuppeteerWeb = (packageName: string): Puppeteer => {
const isPuppeteerCore = packageName === 'puppeteer-core';

// puppeteer-core ignores environment variables
return new Puppeteer(
// Product root directory is undefined as we're not concerned about
// downloading and installing browsers in the web environment.
undefined,
// Preferred revision is undefined as we use the browser we are running in.
undefined,
isPuppeteerCore,
// Preferred product is undefined as we use the browser we are
// running in.
undefined
);
};