Convert E2E infrastructure to ESM (#33846)

Playwright uses a Nodejs loader hook, and the combination of that hook and changes in Node 20 results in several bugs when it comes to loading CommonJS files. It's not even clear whether the bugs are in Playwright or Node. On the other hand, we can avoid all the bugs (whoever they belong to) by converting everything over to ESM syntax. So let's do that.
Automattic · Nov 7, 2023 · 278ba7f · 278ba7f
1 parent de675f8
commit 278ba7f
Show file tree

Hide file tree

Showing 100 changed files with 216 additions and 195 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -250,7 +250,7 @@ jobs:
           echo "TEST_SITE=${SITE}" >> $GITHUB_ENV
 
           # Wait for the site to pick up latest tag version (DISPATCH_REF_NAME)
-          TEST_SITE="${SITE}" node "$GITHUB_WORKSPACE/tools/e2e-commons/bin/update-beta-version.cjs" $DISPATCH_REF_TYPE $DISPATCH_REF_NAME
+          TEST_SITE="${SITE}" node "$GITHUB_WORKSPACE/tools/e2e-commons/bin/update-beta-version.js" $DISPATCH_REF_TYPE $DISPATCH_REF_NAME
 
       - name: Set up VIP site
         if: ${{ matrix.suite == 'vip' }}

diff --git a/projects/github-actions/test-results-to-slack/changelog/update-convert-e2e-tests-to-esm b/projects/github-actions/test-results-to-slack/changelog/update-convert-e2e-tests-to-esm
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Convert E2E configs to ESM. No change to the plugin itself.
+
+
diff --git a/projects/github-actions/test-results-to-slack/tests/resources/playwright/1-37-failed.json b/projects/github-actions/test-results-to-slack/tests/resources/playwright/1-37-failed.json
@@ -34,7 +34,7 @@
 				"/home/runner/work/jetpack/jetpack/node_modules/.pnpm/[email protected]/node_modules/allure-playwright/dist/index.js",
 				null
 			],
-			[ "/home/runner/work/jetpack/jetpack/tools/e2e-commons/reporters/reporter.cjs", null ],
+			[ "/home/runner/work/jetpack/jetpack/tools/e2e-commons/reporters/reporter.js", null ],
 			[ "github", null ]
 		],
 		"reportSlowTests": null,

diff --git a/projects/github-actions/test-results-to-slack/tests/resources/playwright/1-4-failed.json b/projects/github-actions/test-results-to-slack/tests/resources/playwright/1-4-failed.json
@@ -34,7 +34,7 @@
 				"/home/runner/work/jetpack/jetpack/node_modules/.pnpm/[email protected]/node_modules/allure-playwright/dist/index.js",
 				null
 			],
-			[ "/home/runner/work/jetpack/jetpack/tools/e2e-commons/reporters/reporter.cjs", null ],
+			[ "/home/runner/work/jetpack/jetpack/tools/e2e-commons/reporters/reporter.js", null ],
 			[ "github", null ]
 		],
 		"reportSlowTests": null,

diff --git a/projects/github-actions/test-results-to-slack/tests/resources/playwright/all-passed.json b/projects/github-actions/test-results-to-slack/tests/resources/playwright/all-passed.json
@@ -34,7 +34,7 @@
 				"/home/runner/work/jetpack/jetpack/node_modules/.pnpm/[email protected]/node_modules/allure-playwright/dist/index.js",
 				null
 			],
-			[ "/home/runner/work/jetpack/jetpack/tools/e2e-commons/reporters/reporter.cjs", null ],
+			[ "/home/runner/work/jetpack/jetpack/tools/e2e-commons/reporters/reporter.js", null ],
 			[ "github", null ]
 		],
 		"reportSlowTests": null,

diff --git a/projects/plugins/boost/changelog/update-convert-e2e-tests-to-esm b/projects/plugins/boost/changelog/update-convert-e2e-tests-to-esm
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Convert E2E configs to ESM. No change to the plugin itself.
+
+
diff --git a/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js b/projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
@@ -1,5 +1,5 @@
-import logger from 'jetpack-e2e-commons/logger.cjs';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import logger from 'jetpack-e2e-commons/logger.js';
+import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 
 import { expect } from '@playwright/test';
 import { JetpackBoostPage } from '../pages/index.js';

diff --git a/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js b/projects/plugins/boost/tests/e2e/lib/pages/wp-admin/JetpackBoostPage.js
@@ -1,5 +1,5 @@
 import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 
 const apiEndpointsRegex = {
 	'modules-state': /jetpack-boost-ds\/modules-state\/merge/,

diff --git a/projects/plugins/boost/tests/e2e/playwright.config.mjs b/projects/plugins/boost/tests/e2e/playwright.config.mjs
@@ -1,4 +1,4 @@
-import config from 'jetpack-e2e-commons/config/playwright.config.default.cjs';
+import config from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
 
 config.globalSetup = './lib/setupTests.js';
 

diff --git a/projects/plugins/boost/tests/e2e/specs/base/common.test.js b/projects/plugins/boost/tests/e2e/specs/base/common.test.js
@@ -1,10 +1,10 @@
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
 import { DashboardPage, PluginsPage, Sidebar } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
 import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
 import { JetpackBoostPage } from '../../lib/pages/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.cjs';
+import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
 
 test.afterAll( async ( { browser } ) => {
 	const page = await browser.newPage( playwrightConfig.use );

diff --git a/projects/plugins/boost/tests/e2e/specs/base/get-started.test.ts b/projects/plugins/boost/tests/e2e/specs/base/get-started.test.ts
@@ -1,5 +1,5 @@
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.cjs';
+import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
 import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
 import { JetpackBoostPage } from '../../lib/pages/index.js';
 

diff --git a/projects/plugins/boost/tests/e2e/specs/critical-css/critical-css.test.js b/projects/plugins/boost/tests/e2e/specs/critical-css/critical-css.test.js
@@ -3,7 +3,7 @@ import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
 import { JetpackBoostPage } from '../../lib/pages/index.js';
 import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
 import { DashboardPage, ThemesPage, Sidebar } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.cjs';
+import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
 
 test.describe( 'Critical CSS module', () => {
 	let page;

diff --git a/projects/plugins/boost/tests/e2e/specs/modules/modules-common.test.js b/projects/plugins/boost/tests/e2e/specs/modules/modules-common.test.js
@@ -1,7 +1,7 @@
 import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
 import { JetpackBoostPage } from '../../lib/pages/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.cjs';
+import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
 
 const modules = [
 	// ['MODULE_NAME', 'DEFAULT STATE'],

diff --git a/projects/plugins/boost/tests/e2e/specs/modules/render-blocking-js.test.js b/projects/plugins/boost/tests/e2e/specs/modules/render-blocking-js.test.js
@@ -1,7 +1,7 @@
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
 import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
 import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.cjs';
+import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
 
 const testPostTitle = 'Hello World with JavaScript';
 

diff --git a/projects/plugins/boost/tests/e2e/specs/modules/score-auto-refresh.test.js b/projects/plugins/boost/tests/e2e/specs/modules/score-auto-refresh.test.js
@@ -1,6 +1,6 @@
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
 import { boostPrerequisitesBuilder } from '../../lib/env/prerequisites.js';
-import playwrightConfig from 'jetpack-e2e-commons/playwright.config.cjs';
+import playwrightConfig from 'jetpack-e2e-commons/playwright.config.mjs';
 import { JetpackBoostPage } from '../../lib/pages/index.js';
 
 test.describe( 'Auto refresh of speed scores', () => {

diff --git a/projects/plugins/jetpack/changelog/update-convert-e2e-tests-to-esm b/projects/plugins/jetpack/changelog/update-convert-e2e-tests-to-esm
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Convert E2E configs to ESM. No change to the plugin itself.
+
+
diff --git a/projects/plugins/jetpack/tests/e2e/helpers/sync-helper.js b/projects/plugins/jetpack/tests/e2e/helpers/sync-helper.js
@@ -1,5 +1,5 @@
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
-import logger from 'jetpack-e2e-commons/logger.cjs';
+import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from 'jetpack-e2e-commons/logger.js';
 
 export async function enableSync() {
 	logger.sync( 'Enabling sync' );

diff --git a/projects/plugins/jetpack/tests/e2e/helpers/waf-helper.js b/projects/plugins/jetpack/tests/e2e/helpers/waf-helper.js
@@ -1,5 +1,5 @@
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
-import logger from 'jetpack-e2e-commons/logger.cjs';
+import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from 'jetpack-e2e-commons/logger.js';
 
 export async function enableAutomaticRules() {
 	logger.sync( 'Enabling automatic firewall rules' );

diff --git a/projects/plugins/jetpack/tests/e2e/package.json b/projects/plugins/jetpack/tests/e2e/package.json
@@ -27,7 +27,7 @@
 		"tunnel:reset": "tunnel reset",
 		"tunnel:down": "tunnel down",
 		"pretest:run": "pnpm run clean",
-		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.cjs",
+		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.mjs",
 		"test-decrypt-default-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./node_modules/jetpack-e2e-commons/config/local.cjs",
 		"test-decrypt-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./config/encrypted.enc -out config/local.cjs",
 		"test-decrypt-all-config": "pnpm test-decrypt-default-config && pnpm test-decrypt-config",

diff --git a/projects/plugins/jetpack/tests/e2e/playwright.config.cjs b/projects/plugins/jetpack/tests/e2e/playwright.config.cjs
diff --git a/projects/plugins/jetpack/tests/e2e/playwright.config.mjs b/projects/plugins/jetpack/tests/e2e/playwright.config.mjs
@@ -0,0 +1 @@
+export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/jetpack/tests/e2e/specs/blocks/free-blocks.test.js b/projects/plugins/jetpack/tests/e2e/specs/blocks/free-blocks.test.js
@@ -11,7 +11,7 @@ import {
 import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
 import config from 'config';
 import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import playwrightConfig from '../../playwright.config.cjs';
+import playwrightConfig from '../../playwright.config.mjs';
 
 test.beforeAll( async ( { browser } ) => {
 	const page = await browser.newPage( playwrightConfig.use );

diff --git a/projects/plugins/jetpack/tests/e2e/specs/blocks/pro-blocks.test.js b/projects/plugins/jetpack/tests/e2e/specs/blocks/pro-blocks.test.js
@@ -7,7 +7,7 @@ import {
 } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
 import { PostFrontendPage } from 'jetpack-e2e-commons/pages/index.js';
 import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import playwrightConfig from '../../playwright.config.cjs';
+import playwrightConfig from '../../playwright.config.mjs';
 
 let blockEditor;
 test.beforeAll( async ( { browser } ) => {

diff --git a/projects/plugins/jetpack/tests/e2e/specs/post-connection/recommendations.test.js b/projects/plugins/jetpack/tests/e2e/specs/post-connection/recommendations.test.js
@@ -1,7 +1,7 @@
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
 import { RecommendationsPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
 import { Plans, prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import playwrightConfig from '../../playwright.config.cjs';
+import playwrightConfig from '../../playwright.config.mjs';
 
 test.beforeAll( async ( { browser } ) => {
 	const page = await browser.newPage( playwrightConfig.use );

diff --git a/projects/plugins/jetpack/tests/e2e/specs/post-connection/waf-blocking.test.js b/projects/plugins/jetpack/tests/e2e/specs/post-connection/waf-blocking.test.js
@@ -1,8 +1,8 @@
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
 import { WpPage } from 'jetpack-e2e-commons/pages/index.js';
-import playwrightConfig from '../../playwright.config.cjs';
+import playwrightConfig from '../../playwright.config.mjs';
 import { Plans, prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 import { enableAutomaticRules, generateRules } from '../../helpers/waf-helper.js';
 
 test.describe.parallel( 'WAF Blocking', () => {

diff --git a/projects/plugins/jetpack/tests/e2e/specs/pre-connection/pre-connection.test.js b/projects/plugins/jetpack/tests/e2e/specs/pre-connection/pre-connection.test.js
@@ -4,10 +4,10 @@ import {
 	DashboardPage,
 	JetpackPage,
 } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import playwrightConfig from '../../playwright.config.cjs';
+import playwrightConfig from '../../playwright.config.mjs';
 
 test.beforeAll( async ( { browser } ) => {
 	const page = await browser.newPage( playwrightConfig.use );

diff --git a/projects/plugins/jetpack/tests/e2e/specs/sync/sync.test.js b/projects/plugins/jetpack/tests/e2e/specs/sync/sync.test.js
@@ -1,5 +1,5 @@
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 import {
 	enableSync,
 	disableSync,
@@ -10,8 +10,8 @@ import {
 } from '../../helpers/sync-helper.js';
 import { BlockEditorPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
 import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';
-import playwrightConfig from '../../playwright.config.cjs';
-import logger from 'jetpack-e2e-commons/logger.cjs';
+import playwrightConfig from '../../playwright.config.mjs';
+import logger from 'jetpack-e2e-commons/logger.js';
 
 test.describe( 'Sync', () => {
 	const wpcomRestAPIBase = 'https://public-api.wordpress.com/rest/';

diff --git a/projects/plugins/jetpack/tests/e2e/specs/update/plugin-update.test.js b/projects/plugins/jetpack/tests/e2e/specs/update/plugin-update.test.js
@@ -2,7 +2,7 @@ import {
 	execShellCommand,
 	resolveSiteUrl,
 	execContainerShellCommand,
-} from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+} from 'jetpack-e2e-commons/helpers/utils-helper.js';
 import { PluginsPage, JetpackDashboardPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
 import { test, expect } from 'jetpack-e2e-commons/fixtures/base-test.js';
 import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/index.js';

diff --git a/projects/plugins/migration/changelog/update-convert-e2e-tests-to-esm b/projects/plugins/migration/changelog/update-convert-e2e-tests-to-esm
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Convert E2E configs to ESM. No change to the plugin itself.
+
+
diff --git a/projects/plugins/migration/tests/e2e/package.json b/projects/plugins/migration/tests/e2e/package.json
@@ -26,7 +26,7 @@
 		"tunnel:reset": "tunnel reset",
 		"tunnel:down": "tunnel down",
 		"pretest:run": "pnpm run clean",
-		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.cjs"
+		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
 	},
 	"devDependencies": {
 		"@playwright/test": "1.39.0",

diff --git a/projects/plugins/migration/tests/e2e/playwright.config.cjs b/projects/plugins/migration/tests/e2e/playwright.config.cjs
diff --git a/projects/plugins/migration/tests/e2e/playwright.config.mjs b/projects/plugins/migration/tests/e2e/playwright.config.mjs
@@ -0,0 +1 @@
+export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/migration/tests/e2e/specs/start.test.js b/projects/plugins/migration/tests/e2e/specs/start.test.js
@@ -1,7 +1,7 @@
 import { test } from '@playwright/test';
 import { Sidebar, DashboardPage } from 'jetpack-e2e-commons/pages/wp-admin/index.js';
 import { prerequisitesBuilder } from 'jetpack-e2e-commons/env/prerequisites.js';
-import playwrightConfig from '../playwright.config.cjs';
+import playwrightConfig from '../playwright.config.mjs';
 
 test.describe( 'Starter plugin!', () => {
 	test.beforeEach( async ( { browser } ) => {

diff --git a/projects/plugins/search/changelog/update-convert-e2e-tests-to-esm b/projects/plugins/search/changelog/update-convert-e2e-tests-to-esm
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Convert E2E configs to ESM. No change to the plugin itself.
+
+
diff --git a/projects/plugins/search/tests/e2e/helpers/search-helper.js b/projects/plugins/search/tests/e2e/helpers/search-helper.js
@@ -1,5 +1,5 @@
-import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
-import logger from 'jetpack-e2e-commons/logger.cjs';
+import { execWpCommand } from 'jetpack-e2e-commons/helpers/utils-helper.js';
+import logger from 'jetpack-e2e-commons/logger.js';
 import { SearchHomepage } from '../pages/index.js';
 
 export async function enableInstantSearch() {

diff --git a/projects/plugins/search/tests/e2e/package.json b/projects/plugins/search/tests/e2e/package.json
@@ -24,7 +24,7 @@
 		"tunnel:reset": "tunnel reset",
 		"tunnel:down": "tunnel down",
 		"pretest:run": "pnpm run clean",
-		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.cjs"
+		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=playwright.config.mjs"
 	},
 	"devDependencies": {
 		"@playwright/test": "1.39.0",

diff --git a/projects/plugins/search/tests/e2e/pages/search-homepage.js b/projects/plugins/search/tests/e2e/pages/search-homepage.js
@@ -1,8 +1,9 @@
 import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 
 export default class SearchHomepage extends WpPage {
-	static SEARCH_API_PATTERN = /^https:\/\/public-api\.wordpress.com\/rest\/v1.3\/sites\/\d+\/search.*/;
+	static SEARCH_API_PATTERN =
+		/^https:\/\/public-api\.wordpress.com\/rest\/v1.3\/sites\/\d+\/search.*/;
 
 	constructor( page ) {
 		const url = `${ resolveSiteUrl() }/?result_format=expanded`;

diff --git a/projects/plugins/search/tests/e2e/pages/wp-admin/search-configure.js b/projects/plugins/search/tests/e2e/pages/wp-admin/search-configure.js
@@ -1,5 +1,5 @@
 import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 
 export default class SearchConfigure extends WpPage {
 	static SEARCH_SETTING_API_PATTERN = /^https?:\/\/.*%2Fwp%2Fv2%2Fsettings/;

diff --git a/projects/plugins/search/tests/e2e/pages/wp-admin/search-dashboard.js b/projects/plugins/search/tests/e2e/pages/wp-admin/search-dashboard.js
@@ -1,5 +1,5 @@
 import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 
 export default class SearchDashboard extends WpPage {
 	static SEARCH_SETTING_API_PATTERN = /^https?:\/\/.*jetpack\/v4\/search\/settings/;

diff --git a/projects/plugins/search/tests/e2e/playwright.config.cjs b/projects/plugins/search/tests/e2e/playwright.config.cjs
diff --git a/projects/plugins/search/tests/e2e/playwright.config.mjs b/projects/plugins/search/tests/e2e/playwright.config.mjs
@@ -0,0 +1 @@
+export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/search/tests/e2e/specs/search-configure.test.js b/projects/plugins/search/tests/e2e/specs/search-configure.test.js
@@ -11,7 +11,7 @@ import {
 	clearSearchPlanInfo,
 } from '../helpers/search-helper.js';
 import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import playwrightConfig from '../playwright.config.cjs';
+import playwrightConfig from '../playwright.config.mjs';
 
 test.describe( 'Search Configure', () => {
 	let searchConfigure;

diff --git a/projects/plugins/search/tests/e2e/specs/search-dashboard.test.js b/projects/plugins/search/tests/e2e/specs/search-dashboard.test.js
@@ -6,7 +6,7 @@ import {
 	clearSearchPlanInfo,
 } from '../helpers/search-helper.js';
 import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import playwrightConfig from '../playwright.config.cjs';
+import playwrightConfig from '../playwright.config.mjs';
 
 test.describe( 'Search Dashboard', () => {
 	let searchDashboard;

diff --git a/projects/plugins/search/tests/e2e/specs/search.test.js b/projects/plugins/search/tests/e2e/specs/search.test.js
@@ -8,8 +8,8 @@ import {
 	clearSearchPlanInfo,
 } from '../helpers/search-helper.js';
 import { prerequisitesBuilder, Plans } from 'jetpack-e2e-commons/env/index.js';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
-import playwrightConfig from '../playwright.config.cjs';
+import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
+import playwrightConfig from '../playwright.config.mjs';
 
 test.describe( 'Instant Search', () => {
 	let homepage;

diff --git a/projects/plugins/social/changelog/update-convert-e2e-tests-to-esm b/projects/plugins/social/changelog/update-convert-e2e-tests-to-esm
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Convert E2E configs to ESM. No change to the plugin itself.
+
+
diff --git a/projects/plugins/social/tests/e2e/flows/connection.js b/projects/plugins/social/tests/e2e/flows/connection.js
@@ -1,5 +1,5 @@
 import { AuthorizePage } from 'jetpack-e2e-commons/pages/wpcom/index.js';
-import logger from 'jetpack-e2e-commons/logger.cjs';
+import logger from 'jetpack-e2e-commons/logger.js';
 import { JetpackSocialPage } from '../pages/index.js';
 
 export async function connect( page, premium = false ) {

diff --git a/projects/plugins/social/tests/e2e/package.json b/projects/plugins/social/tests/e2e/package.json
@@ -28,7 +28,7 @@
 		"tunnel:reset": "tunnel reset",
 		"tunnel:down": "tunnel down",
 		"pretest:run": "pnpm run clean",
-		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.cjs"
+		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
 	},
 	"devDependencies": {
 		"@playwright/test": "1.39.0",

diff --git a/projects/plugins/social/tests/e2e/pages/wp-admin/jetpack-social.js b/projects/plugins/social/tests/e2e/pages/wp-admin/jetpack-social.js
@@ -1,6 +1,6 @@
 import WpPage from 'jetpack-e2e-commons/pages/wp-page.js';
-import logger from 'jetpack-e2e-commons/logger.cjs';
-import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.cjs';
+import logger from 'jetpack-e2e-commons/logger.js';
+import { resolveSiteUrl } from 'jetpack-e2e-commons/helpers/utils-helper.js';
 
 export default class JetpackSocialPage extends WpPage {
 	constructor( page ) {

diff --git a/projects/plugins/social/tests/e2e/playwright.config.cjs b/projects/plugins/social/tests/e2e/playwright.config.cjs
diff --git a/projects/plugins/social/tests/e2e/playwright.config.mjs b/projects/plugins/social/tests/e2e/playwright.config.mjs
@@ -0,0 +1 @@
+export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';
diff --git a/projects/plugins/starter-plugin/changelog/update-convert-e2e-tests-to-esm b/projects/plugins/starter-plugin/changelog/update-convert-e2e-tests-to-esm
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Convert E2E configs to ESM. No change to the plugin itself.
+
+
diff --git a/projects/plugins/starter-plugin/tests/e2e/package.json b/projects/plugins/starter-plugin/tests/e2e/package.json
@@ -26,7 +26,7 @@
 		"tunnel:reset": "tunnel reset",
 		"tunnel:down": "tunnel down",
 		"pretest:run": "pnpm run clean",
-		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.cjs"
+		"test:run": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && playwright install && NODE_CONFIG_DIR='./config' ALLURE_RESULTS_DIR=./output/allure-results NODE_PATH=\"$PWD/node_modules\" playwright test --config=./playwright.config.mjs"
 	},
 	"devDependencies": {
 		"@playwright/test": "1.39.0",

diff --git a/projects/plugins/starter-plugin/tests/e2e/playwright.config.cjs b/projects/plugins/starter-plugin/tests/e2e/playwright.config.cjs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default } from 'jetpack-e2e-commons/config/playwright.config.default.mjs';