Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(monorepo): explicitly list package.json exports instead of using glob patterns (#9584)

Browse source
This commit is contained in:
Joel Einbinder 2021-10-19 12:28:02 -04:00 committed by GitHub
parent fc6a93d24e
commit 53c866c0f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 45 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
install-from-github.js
View file

@ -31,7 +31,7 @@ try {
}
console.log(`Downloading browsers...`);
const { installDefaultBrowsersForNpmInstall } = require('./packages/playwright-core/lib/utils/registry');
const { installDefaultBrowsersForNpmInstall } = require('playwright-core/src/utils/registry');
installDefaultBrowsersForNpmInstall().catch(e => {
console.error(`Failed to install browsers, caused by\n${e.stack}`);
process.exit(1);

2
installation-tests/driver-client.js
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
const { start } = require('playwright-core/lib/outofprocess');
const { start } = require('node_modules/playwright-core/lib/outofprocess');
(async () => {
const playwright = await start();

3
installation-tests/esm-playwright-chromium.mjs
View file

@ -16,7 +16,6 @@
import { chromium, firefox, webkit, selectors, devices, errors } from 'playwright-chromium';
import playwright from 'playwright-chromium';
import errorsFile from 'playwright-core/lib/utils/errors';
import testESM from './esm.mjs';
testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright, errorsFile }, [chromium]);
testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, [chromium]);

4
installation-tests/esm.mjs
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
export default async function testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright, errorsFile }, browsers) {
export default async function testESM({ chromium, firefox, webkit, selectors, devices, errors, playwright }, browsers) {
if (playwright.chromium !== chromium)
process.exit(1);
if (playwright.firefox !== firefox)
@ -23,8 +23,6 @@ export default async function testESM({ chromium, firefox, webkit, selectors, de
process.exit(1);
if (playwright.errors !== errors)
process.exit(1);
if (errors.TimeoutError !== errorsFile.TimeoutError)
process.exit(1);
try {
for (const browserType of browsers) {

4
installation-tests/sanity.js
View file

@ -31,10 +31,6 @@ else if (process.argv[3])
const playwright = require(requireName);
// Requiring internals should work.
const errors = require('playwright-core/lib/utils/errors');
const registry = require('playwright-core/lib/utils/registry');
(async () => {
for (const browserType of success) {
try {

2
packages/playwright-chromium/install.js
View file

@ -14,6 +14,6 @@
* limitations under the License.
*/
const { installBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
const { installBrowsersForNpmInstall } = require('playwright-core/src/utils/registry');
installBrowsersForNpmInstall(['chromium', 'ffmpeg']);

8
packages/playwright-core/package.json
View file

@ -19,8 +19,12 @@
"import": "./index.mjs",
"require": "./index.js"
},
"./src/*": "./lib/*.js",
"./*": "./*.js"
"./src/grid/gridClient": "./lib/grid/gridClient.js",
"./src/utils/async": "./lib/utils/async.js",
"./src/utils/httpServer": "./lib/utils/httpServer.js",
"./src/utils/processLauncher": "./lib/utils/processLauncher.js",
"./src/utils/registry": "./lib/utils/registry.js",
"./src/utils/utils": "./lib/utils/utils.js"
},
"types": "types/types.d.ts",
"bin": {

2
packages/playwright-firefox/install.js
View file

@ -14,6 +14,6 @@
* limitations under the License.
*/
const { installBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
const { installBrowsersForNpmInstall } = require('playwright-core/src/utils/registry');
installBrowsersForNpmInstall(['firefox']);

2
packages/playwright-test/index.js
View file

@ -15,7 +15,7 @@
*/
const pwt = require('./lib/index');
const playwright = require('playwright-core/lib/inprocess');
const playwright = require('playwright-core');
const combinedExports = {
...playwright,
...pwt,

2
packages/playwright-test/src/index.ts
View file

@ -127,7 +127,7 @@ export const test = _baseTest.extend<TestFixtures, WorkerAndFileFixtures>({
await use(gridClient.playwright() as any);
await gridClient.close();
} else {
await use(require('playwright-core/lib/inprocess'));
await use(require('playwright-core'));
}
}, { scope: 'worker' } ],
headless: [ undefined, { scope: 'worker' } ],

2
packages/playwright-webkit/install.js
View file

@ -14,6 +14,6 @@
* limitations under the License.
*/
const { installBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
const { installBrowsersForNpmInstall } = require('playwright-core/src/utils/registry');
installBrowsersForNpmInstall(['webkit']);

2
packages/playwright/install.js
View file

@ -14,6 +14,6 @@
* limitations under the License.
*/
const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');
const { installDefaultBrowsersForNpmInstall } = require('playwright-core/src/utils/registry');
installDefaultBrowsersForNpmInstall();

3
packages/playwright/package.json
View file

@ -15,8 +15,7 @@
".": {
"import": "./index.mjs",
"require": "./index.js"
},
"./": "./"
}
},
"scripts": {
"install": "node install.js"

2
tests/browsertype-connect.spec.ts
View file

@ -18,7 +18,7 @@
import { playwrightTest as test, expect } from './config/browserTest';
import fs from 'fs';
import * as path from 'path';
import { getUserAgent } from 'playwright-core/lib/utils/utils';
import { getUserAgent } from 'playwright-core/src/utils/utils';
import WebSocket from 'ws';
import { suppressCertificateWarning } from './config/utils';

2
tests/browsertype-launch-selenium.spec.ts
View file

@ -18,7 +18,7 @@ import { playwrightTest as test, expect } from './config/browserTest';
import type { TestInfo } from '@playwright/test';
import path from 'path';
import fs from 'fs';
import { start } from 'playwright-core/lib/outofprocess';
import { start } from '../packages/playwright-core/lib/outofprocess';
const chromeDriver = require('chromedriver').path;
const brokenDriver = path.join(__dirname, 'assets', 'selenium-grid', 'broken-selenium-driver.js');

2
tests/chromium/chromium.spec.ts
View file

@ -18,7 +18,7 @@
import { contextTest as test, expect } from '../config/browserTest';
import { playwrightTest } from '../config/browserTest';
import http from 'http';
import { getUserAgent } from 'playwright-core/lib/utils/utils';
import { getUserAgent } from 'playwright-core/src/utils/utils';
import { suppressCertificateWarning } from '../config/utils';
test('should create a worker from a service worker', async ({ page, server }) => {

3
tests/component-parser.spec.ts
View file

@ -15,7 +15,8 @@
*/
import { playwrightTest as it, expect } from './config/browserTest';
import { parseComponentSelector, ParsedComponentSelector } from 'playwright-core/lib/server/common/componentUtils';
import type { ParsedComponentSelector } from '../packages/playwright-core/src/server/common/componentUtils';
import { parseComponentSelector } from '../packages/playwright-core/lib/server/common/componentUtils';
const parse = parseComponentSelector;
const serialize = (parsed: ParsedComponentSelector) => {

4
tests/config/baseTest.ts
View file

@ -18,7 +18,7 @@ import { Fixtures, _baseTest } from '@playwright/test';
import * as path from 'path';
import * as fs from 'fs';
import { installCoverageHooks } from './coverage';
import { start } from 'playwright-core/lib/outofprocess';
import { start } from '../../packages/playwright-core/lib/outofprocess';
import { GridClient } from 'playwright-core/src/grid/gridClient';
import type { LaunchOptions } from 'playwright-core';
import { commonFixtures, CommonFixtures, serverFixtures, ServerFixtures, ServerOptions } from './commonFixtures';
@ -91,7 +91,7 @@ const baseFixtures: Fixtures<{}, BaseOptions & BaseFixtures> = {
service: new ServiceMode(),
driver: new DriverMode(),
}[mode];
require('playwright-core/lib/utils/utils').setUnderTest();
require('playwright-core/src/utils/utils').setUnderTest();
const playwright = await modeImpl.setup(workerInfo.workerIndex);
await run(playwright);
await modeImpl.teardown();

4
tests/config/browserTest.ts
View file

@ -16,7 +16,7 @@
import type { Fixtures } from '@playwright/test';
import type { Browser, BrowserContext, BrowserContextOptions, BrowserType, LaunchOptions, Page } from 'playwright-core';
import { removeFolders } from 'playwright-core/lib/utils/utils';
import { removeFolders } from 'playwright-core/src/utils/utils';
import { ReuseBrowserContextStorage } from '@playwright/test/src/index';
import * as path from 'path';
import * as fs from 'fs';
@ -24,7 +24,7 @@ import * as os from 'os';
import { RemoteServer, RemoteServerOptions } from './remoteServer';
import { baseTest, CommonWorkerFixtures } from './baseTest';
import { CommonFixtures } from './commonFixtures';
import { ParsedStackTrace } from 'playwright-core/src/utils/stackTrace';
import type { ParsedStackTrace } from 'playwright-core/src/utils/stackTrace';
type PlaywrightWorkerOptions = {
executablePath: LaunchOptions['executablePath'];

4
tests/config/coverage.js
View file

@ -63,8 +63,8 @@ function traceAPICoverage(apiCoverage, api, events) {
* @param {string} browserName
*/
function apiForBrowser(browserName) {
const events = require('playwright-core/lib/client/events').Events;
const api = require('playwright-core/lib/client/api');
const events = require('../../packages/playwright-core/lib/client/events').Events;
const api = require('../../packages/playwright-core/lib/client/api');
const otherBrowsers = ['chromium', 'webkit', 'firefox'].filter(name => name.toLowerCase() !== browserName.toLowerCase());
const filteredKeys = Object.keys(api).filter(apiName => {
if (apiName.toLowerCase().startsWith('android'))

2
tests/css-parser.spec.ts
View file

@ -15,7 +15,7 @@
*/
import { playwrightTest as it, expect } from './config/browserTest';
import { parseCSS, serializeSelector as serialize } from 'playwright-core/lib/server/common/cssParser';
import { parseCSS, serializeSelector as serialize } from '../packages/playwright-core/lib/server/common/cssParser';
const parse = (selector: string) => {
return parseCSS(selector, new Set(['text', 'not', 'has', 'react', 'scope', 'right-of', 'is'])).selector;

2
tests/global-fetch.spec.ts
View file

@ -15,7 +15,7 @@
*/
import http from 'http';
import { getPlaywrightVersion } from 'playwright-core/lib/utils/utils';
import { getPlaywrightVersion } from 'playwright-core/src/utils/utils';
import { expect, playwrightTest as it } from './config/browserTest';
it.skip(({ mode }) => mode !== 'default');

2
tests/inspector/inspectorTest.ts
View file

@ -28,7 +28,7 @@ type CLITestArgs = {
runCLI: (args: string[]) => CLIMock;
};
const playwrightToAutomateInspector = require('playwright-core/lib/inProcessFactory').createInProcessPlaywright();
const playwrightToAutomateInspector = require('../../packages/playwright-core/lib/inProcessFactory').createInProcessPlaywright();
export const test = contextTest.extend<CLITestArgs>({
recorderPageGetter: async ({ context, toImpl, mode }, run, testInfo) => {

11
tests/launcher.spec.ts
View file

@ -17,15 +17,12 @@
import { playwrightTest as it, expect } from './config/browserTest';
it('should require top-level Errors', async ({}) => {
const Errors = require('playwright-core/lib/utils/errors');
expect(String(Errors.TimeoutError)).toContain('TimeoutError');
it('should have an errors object', async ({ playwright }) => {
expect(String(playwright.errors.TimeoutError)).toContain('TimeoutError');
});
it('should require top-level DeviceDescriptors', async ({ playwright }) => {
const Devices = require('playwright-core/lib/server/deviceDescriptors');
expect(Devices['iPhone 6']).toBeTruthy();
expect(Devices['iPhone 6']).toEqual(playwright.devices['iPhone 6']);
it('should have a devices object', async ({ playwright }) => {
expect(playwright.devices['iPhone 6']).toBeTruthy();
expect(playwright.devices['iPhone 6'].defaultBrowserType).toBe('webkit');
});

2
tests/page/interception.spec.ts
View file

@ -16,7 +16,7 @@
*/
import { test as it, expect } from './pageTest';
import { globToRegex } from 'playwright-core/lib/client/clientHelper';
import { globToRegex } from '../../packages/playwright-core/lib/client/clientHelper';
import vm from 'vm';
it('should work with navigation', async ({ page, server }) => {

2
tests/playwright-test/playwright.spec.ts
View file

@ -18,7 +18,7 @@ import { test, expect, stripAscii } from './playwright-test-fixtures';
import fs from 'fs';
import path from 'path';
import { spawnSync } from 'child_process';
import { registry } from 'playwright-core/lib/utils/registry';
import { registry } from 'playwright-core/src/utils/registry';
const ffmpeg = registry.findExecutable('ffmpeg')!.executablePath();

2
tests/port-forwarding-server.spec.ts
View file

@ -20,7 +20,7 @@ import path from 'path';
import net from 'net';
import { contextTest, expect } from './config/browserTest';
import { PlaywrightClient } from 'playwright-core/lib/remote/playwrightClient';
import { PlaywrightClient } from '../packages/playwright-core/lib/remote/playwrightClient';
import type { Page } from 'playwright-core';
class OutOfProcessPlaywrightServer {

2
tests/snapshotter.spec.ts
View file

@ -15,7 +15,7 @@
*/
import { contextTest, expect } from './config/browserTest';
import { InMemorySnapshotter } from 'playwright-core/lib/web/traceViewer/inMemorySnapshotter';
import { InMemorySnapshotter } from '../packages/playwright-core/lib/web/traceViewer/inMemorySnapshotter';
const it = contextTest.extend<{ snapshotter: InMemorySnapshotter }>({
snapshotter: async ({ mode, toImpl, context }, run, testInfo) => {

2
tests/trace-viewer/trace-viewer.spec.ts
View file

@ -16,7 +16,7 @@
import path from 'path';
import type { Browser, Frame, Locator, Page } from 'playwright-core';
import { showTraceViewer } from 'playwright-core/lib/server/trace/viewer/traceViewer';
import { showTraceViewer } from '../../packages/playwright-core/lib/server/trace/viewer/traceViewer';
import { playwrightTest, expect } from '../config/browserTest';
class TraceViewerPage {

2
tests/tracing.spec.ts
View file

@ -15,7 +15,7 @@
*/
import { expect, contextTest as test, browserTest } from './config/browserTest';
import { ZipFileSystem } from 'playwright-core/lib/utils/vfs';
import { ZipFileSystem } from '../packages/playwright-core/lib/utils/vfs';
import jpeg from 'jpeg-js';
test.skip(({ trace }) => !!trace);

2
tests/video.spec.ts
View file

@ -19,7 +19,7 @@ import fs from 'fs';
import path from 'path';
import { spawnSync } from 'child_process';
import { PNG } from 'pngjs';
import { registry } from 'playwright-core/lib/utils/registry';
import { registry } from 'playwright-core/src/utils/registry';
const ffmpeg = registry.findExecutable('ffmpeg')!.executablePath();

2
utils/generate_types/index.js
View file

@ -18,7 +18,7 @@
const path = require('path');
const os = require('os');
const toKebabCase = require('lodash/kebabCase')
const devices = require('playwright-core/lib/server/deviceDescriptors');
const devices = require('../../packages/playwright-core/lib/server/deviceDescriptors');
const Documentation = require('../doclint/documentation');
const PROJECT_DIR = path.join(__dirname, '..', '..');
const fs = require('fs');

2
utils/linux-browser-dependencies/inside_docker/list_dependencies.js
View file

@ -4,7 +4,7 @@ const fs = require('fs');
const util = require('util');
const path = require('path');
const {spawn} = require('child_process');
const {registryDirectory} = require('playwright-core/lib/utils/registry.js');
const {registryDirectory} = require('playwright-core/src/utils/registry.js');
const readdirAsync = util.promisify(fs.readdir.bind(fs));
const readFileAsync = util.promisify(fs.readFile.bind(fs));

2
utils/roll_browser.js
View file

@ -17,7 +17,7 @@
*/
const path = require('path');
const {Registry} = require('../packages/playwright-core/lib/utils/registry');
const {Registry} = require('../packages/playwright-core/src/utils/registry');
const fs = require('fs');
const protocolGenerator = require('./protocol-types-generator');
const {execSync} = require('child_process');