Use puppeteer-core in all places

WordPress · Sep 14, 2021 · a78030a · a78030a
1 parent cd51ffa
commit a78030a
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 377 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
@@ -39,7 +39,12 @@
 	},
 	"peerDependencies": {
 		"jest": ">=26",
-		"puppeteer": ">=1.19.0"
+		"puppeteer-core": ">=10.0.0"
+	},
+	"peerDependenciesMeta": {
+		"puppeteer-core": {
+			"optional": true
+		}
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/e2e-test-utils/src/enable-page-dialog-accept.js b/packages/e2e-test-utils/src/enable-page-dialog-accept.js
@@ -1,4 +1,4 @@
-/** @typedef {import('puppeteer').Dialog} Dialog */
+/** @typedef {import('puppeteer-core').Dialog} Dialog */
 
 /**
  * Callback which automatically accepts dialog.

diff --git a/packages/e2e-test-utils/src/find-sidebar-panel-toggle-button-with-title.js b/packages/e2e-test-utils/src/find-sidebar-panel-toggle-button-with-title.js
@@ -3,7 +3,7 @@
  */
 import { first } from 'lodash';
 
-/** @typedef {import('puppeteer').ElementHandle} ElementHandle */
+/** @typedef {import('puppeteer-core').ElementHandle} ElementHandle */
 
 /**
  * Finds a sidebar panel with the provided title.

diff --git a/packages/e2e-test-utils/src/find-sidebar-panel-with-title.js b/packages/e2e-test-utils/src/find-sidebar-panel-with-title.js
@@ -1,4 +1,4 @@
-/** @typedef {import('puppeteer').ElementHandle} ElementHandle */
+/** @typedef {import('puppeteer-core').ElementHandle} ElementHandle */
 
 /**
  * Finds the button responsible for toggling the sidebar panel with the provided title.

diff --git a/packages/e2e-test-utils/src/preview.js b/packages/e2e-test-utils/src/preview.js
@@ -3,7 +3,7 @@
  */
 import { last } from 'lodash';
 
-/** @typedef {import('puppeteer').Page} Page */
+/** @typedef {import('puppeteer-core').Page} Page */
 
 /**
  * Opens the preview page of an edited post.

diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
@@ -38,7 +38,12 @@
 	"peerDependencies": {
 		"jest": ">=26",
 		"jest-snapshot": ">=26",
-		"puppeteer": ">=1.19.0"
+		"puppeteer-core": ">=10.0.0"
+	},
+	"peerDependenciesMeta": {
+		"puppeteer-core": {
+			"optional": true
+		}
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/e2e-tests/specs/editor/various/adding-patterns.test.js b/packages/e2e-tests/specs/editor/various/adding-patterns.test.js
@@ -7,7 +7,7 @@ import {
 	getEditedPostContent,
 } from '@wordpress/e2e-test-utils';
 
-/** @typedef {import('puppeteer').ElementHandle} ElementHandle */
+/** @typedef {import('puppeteer-core').ElementHandle} ElementHandle */
 
 describe( 'adding patterns', () => {
 	beforeEach( async () => {

diff --git a/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js b/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js
@@ -13,7 +13,7 @@ import {
 	showBlockToolbar,
 } from '@wordpress/e2e-test-utils';
 
-/** @typedef {import('puppeteer').ElementHandle} ElementHandle */
+/** @typedef {import('puppeteer-core').ElementHandle} ElementHandle */
 
 /**
  * Waits for all patterns in the inserter to have a height, which should

diff --git a/packages/e2e-tests/specs/editor/various/preview.test.js b/packages/e2e-tests/specs/editor/various/preview.test.js
@@ -14,7 +14,7 @@ import {
 	pressKeyWithModifier,
 } from '@wordpress/e2e-test-utils';
 
-/** @typedef {import('puppeteer').Page} Page */
+/** @typedef {import('puppeteer-core').Page} Page */
 
 /**
  * Given the Page instance for the editor, opens preview drodpdown, and

diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
@@ -36,7 +36,12 @@
 	},
 	"peerDependencies": {
 		"jest": ">=26",
-		"puppeteer": ">=1.19.0"
+		"puppeteer-core": ">=10.0.0"
+	},
+	"peerDependenciesMeta": {
+		"puppeteer-core": {
+			"optional": true
+		}
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/jest-puppeteer-axe/src/index.js b/packages/jest-puppeteer-axe/src/index.js
@@ -3,7 +3,7 @@
  */
 import AxePuppeteer from '@axe-core/puppeteer';
 
-/** @typedef {import('puppeteer').Page} Page */
+/** @typedef {import('puppeteer-core').Page} Page */
 
 /** @typedef {import('axe-core').RunOptions} RunOptions */
 

diff --git a/packages/scripts/config/jest-environment-puppeteer/config.js b/packages/scripts/config/jest-environment-puppeteer/config.js
@@ -69,12 +69,7 @@ async function readConfig() {
 function getPuppeteer( { browser } ) {
 	switch ( browser.toLowerCase() ) {
 		case 'chromium':
-			try {
-				// eslint-disable-next-line import/no-extraneous-dependencies
-				return require( 'puppeteer' );
-			} catch ( e ) {
-				return require( 'puppeteer-core' );
-			}
+			return require( 'puppeteer-core' );
 		case 'firefox':
 			return require( 'puppeteer-firefox' );
 		default: