From c20032140269bc860838193c1bbc40a14a67c5ec Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Wed, 30 Mar 2022 09:35:47 -0700 Subject: [PATCH] fix: export request from index.jsm (#13158) --- .../fixture-scripts/esm-playwright-chromium.mjs | 4 ++-- installation-tests/fixture-scripts/esm-playwright-firefox.mjs | 4 ++-- installation-tests/fixture-scripts/esm-playwright-test.mjs | 4 ++-- installation-tests/fixture-scripts/esm-playwright-webkit.mjs | 4 ++-- installation-tests/fixture-scripts/esm-playwright.mjs | 4 ++-- installation-tests/fixture-scripts/esm.mjs | 4 +++- packages/playwright-core/index.mjs | 1 + packages/playwright-test/index.mjs | 1 + 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/installation-tests/fixture-scripts/esm-playwright-chromium.mjs b/installation-tests/fixture-scripts/esm-playwright-chromium.mjs index 572fe40f1b..b573975f4d 100644 --- a/installation-tests/fixture-scripts/esm-playwright-chromium.mjs +++ b/installation-tests/fixture-scripts/esm-playwright-chromium.mjs @@ -14,8 +14,8 @@ * limitations under the License. */ -import { chromium, firefox, webkit, selectors, devices, errors } from 'playwright-chromium'; +import { chromium, firefox, webkit, selectors, devices, errors, request } from 'playwright-chromium'; import playwright from 'playwright-chromium'; import testESM from './esm.mjs'; -testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, [chromium]); +testESM({ chromium, firefox, webkit, selectors, devices, errors, request, playwright }, [chromium]); diff --git a/installation-tests/fixture-scripts/esm-playwright-firefox.mjs b/installation-tests/fixture-scripts/esm-playwright-firefox.mjs index 0563b567ed..0c6139a5e7 100644 --- a/installation-tests/fixture-scripts/esm-playwright-firefox.mjs +++ b/installation-tests/fixture-scripts/esm-playwright-firefox.mjs @@ -14,8 +14,8 @@ * limitations under the License. */ -import { chromium, firefox, webkit, selectors, devices, errors } from 'playwright-firefox'; +import { chromium, firefox, webkit, selectors, devices, errors, request } from 'playwright-firefox'; import playwright from 'playwright-firefox'; import testESM from './esm.mjs'; -testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, [firefox]); +testESM({ chromium, firefox, webkit, selectors, devices, errors, request, playwright }, [firefox]); diff --git a/installation-tests/fixture-scripts/esm-playwright-test.mjs b/installation-tests/fixture-scripts/esm-playwright-test.mjs index 917453f9de..b293d4947c 100644 --- a/installation-tests/fixture-scripts/esm-playwright-test.mjs +++ b/installation-tests/fixture-scripts/esm-playwright-test.mjs @@ -14,7 +14,7 @@ * limitations under the License. */ -import { chromium, firefox, webkit, selectors, devices, errors, test, expect } from '@playwright/test'; +import { chromium, firefox, webkit, selectors, devices, errors, request, test, expect } from '@playwright/test'; import * as playwright from '@playwright/test'; import defaultExport from '@playwright/test'; import testESM from './esm.mjs'; @@ -35,4 +35,4 @@ if (typeof expect !== 'function') { } expect(1).toBe(1); -testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, [chromium, firefox, webkit]); +testESM({ chromium, firefox, webkit, selectors, devices, errors, request, playwright }, [chromium, firefox, webkit]); diff --git a/installation-tests/fixture-scripts/esm-playwright-webkit.mjs b/installation-tests/fixture-scripts/esm-playwright-webkit.mjs index d04be72902..46b14eace7 100644 --- a/installation-tests/fixture-scripts/esm-playwright-webkit.mjs +++ b/installation-tests/fixture-scripts/esm-playwright-webkit.mjs @@ -14,8 +14,8 @@ * limitations under the License. */ -import { chromium, firefox, webkit, selectors, devices, errors } from 'playwright-webkit'; +import { chromium, firefox, webkit, selectors, devices, errors, request } from 'playwright-webkit'; import playwright from 'playwright-webkit'; import testESM from './esm.mjs'; -testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, [webkit]); +testESM({ chromium, firefox, webkit, selectors, devices, errors, request, playwright }, [webkit]); diff --git a/installation-tests/fixture-scripts/esm-playwright.mjs b/installation-tests/fixture-scripts/esm-playwright.mjs index c87e695819..772f9d394a 100644 --- a/installation-tests/fixture-scripts/esm-playwright.mjs +++ b/installation-tests/fixture-scripts/esm-playwright.mjs @@ -14,8 +14,8 @@ * limitations under the License. */ -import { chromium, firefox, webkit, selectors, devices, errors } from 'playwright'; +import { chromium, firefox, webkit, selectors, devices, errors, request } from 'playwright'; import playwright from 'playwright'; import testESM from './esm.mjs'; -testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, [chromium, firefox, webkit]); +testESM({ chromium, firefox, webkit, selectors, devices, errors, request, playwright }, [chromium, firefox, webkit]); diff --git a/installation-tests/fixture-scripts/esm.mjs b/installation-tests/fixture-scripts/esm.mjs index a50dfec28e..6025494566 100644 --- a/installation-tests/fixture-scripts/esm.mjs +++ b/installation-tests/fixture-scripts/esm.mjs @@ -14,7 +14,7 @@ * limitations under the License. */ -export default async function testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, browsers) { +export default async function testESM({ chromium, firefox, webkit, selectors, devices, errors, request, playwright }, browsers) { if (playwright.chromium !== chromium) process.exit(1); if (playwright.firefox !== firefox) @@ -23,6 +23,8 @@ export default async function testESM({ chromium, firefox, webkit, selectors, de process.exit(1); if (playwright.errors !== errors) process.exit(1); + if (playwright.request !== request) + process.exit(1); try { for (const browserType of browsers) { diff --git a/packages/playwright-core/index.mjs b/packages/playwright-core/index.mjs index 9d9b095ae0..3b3c75b0f7 100644 --- a/packages/playwright-core/index.mjs +++ b/packages/playwright-core/index.mjs @@ -22,6 +22,7 @@ export const webkit = playwright.webkit; export const selectors = playwright.selectors; export const devices = playwright.devices; export const errors = playwright.errors; +export const request = playwright.request; export const _electron = playwright._electron; export const _android = playwright._android; export default playwright; diff --git a/packages/playwright-test/index.mjs b/packages/playwright-test/index.mjs index 6fea6264a5..de39941fe5 100644 --- a/packages/playwright-test/index.mjs +++ b/packages/playwright-test/index.mjs @@ -21,6 +21,7 @@ export const webkit = playwright.webkit; export const selectors = playwright.selectors; export const devices = playwright.devices; export const errors = playwright.errors; +export const request = playwright.request; export const _electron = playwright._electron; export const _android = playwright._android; export const test = playwright.test;