From c8addef03a34837e30fb6f47ee05f655b5db1519 Mon Sep 17 00:00:00 2001 From: Joel Einbinder Date: Tue, 26 Oct 2021 18:41:18 -0400 Subject: [PATCH] fix(monorepo): export package.json from every package (#9803) --- installation-tests/sanity.js | 6 ++++++ packages/playwright-chromium/package.json | 3 ++- packages/playwright-core/package.json | 1 + packages/playwright-firefox/package.json | 3 ++- packages/playwright-test/package.json | 6 ++++-- packages/playwright/package.json | 4 +++- tests/config/browserTest.ts | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/installation-tests/sanity.js b/installation-tests/sanity.js index f7bf33642d..92ea51a9b6 100644 --- a/installation-tests/sanity.js +++ b/installation-tests/sanity.js @@ -31,6 +31,12 @@ else if (process.argv[3]) const playwright = require(requireName); +const packageJSON = require(requireName + '/package.json'); +if (!packageJSON || !packageJSON.version) { + console.error('Should be able to require the package.json and get the version.') + process.exit(1); +} + (async () => { for (const browserType of success) { try { diff --git a/packages/playwright-chromium/package.json b/packages/playwright-chromium/package.json index 658ae5bcf1..0b1e8768ab 100644 --- a/packages/playwright-chromium/package.json +++ b/packages/playwright-chromium/package.json @@ -16,7 +16,8 @@ "import": "./index.mjs", "require": "./index.js" }, - "./": "./" + "./cli": "./cli.js", + "./package.json": "./package.json" }, "bin": { "playwright": "./cli.js" diff --git a/packages/playwright-core/package.json b/packages/playwright-core/package.json index 36eb568f71..bc26a519bc 100644 --- a/packages/playwright-core/package.json +++ b/packages/playwright-core/package.json @@ -20,6 +20,7 @@ "require": "./index.js" }, "./cli": "./cli.js", + "./package.json": "./package.json", "./lib/grid/gridServer": "./lib/grid/gridServer.js", "./lib/grid/gridClient": "./lib/grid/gridClient.js", "./lib/grid/dockerGridFactory": "./lib/grid/dockerGridFactory.js", diff --git a/packages/playwright-firefox/package.json b/packages/playwright-firefox/package.json index 8975f0feab..eb5106a97a 100644 --- a/packages/playwright-firefox/package.json +++ b/packages/playwright-firefox/package.json @@ -16,7 +16,8 @@ "import": "./index.mjs", "require": "./index.js" }, - "./": "./" + "./cli": "./cli.js", + "./package.json": "./package.json" }, "bin": { "playwright": "./cli.js" diff --git a/packages/playwright-test/package.json b/packages/playwright-test/package.json index dad1c0c595..aa46805e53 100644 --- a/packages/playwright-test/package.json +++ b/packages/playwright-test/package.json @@ -13,8 +13,10 @@ "import": "./index.mjs", "require": "./index.js" }, - "./src/*": "./lib/*.js", - "./*": "./*.js" + "./cli": "./cli.js", + "./package.json": "./package.json", + "./lib/cli": "./lib/cli.js", + "./reporter": "./reporter.js" }, "bin": { "playwright": "./cli.js" diff --git a/packages/playwright/package.json b/packages/playwright/package.json index 5a6f18a99a..8ca30b574a 100644 --- a/packages/playwright/package.json +++ b/packages/playwright/package.json @@ -15,7 +15,9 @@ ".": { "import": "./index.mjs", "require": "./index.js" - } + }, + "./cli": "./cli.js", + "./package.json": "./package.json" }, "bin": { "playwright": "./cli.js" diff --git a/tests/config/browserTest.ts b/tests/config/browserTest.ts index ee7c1120a1..9034627b3f 100644 --- a/tests/config/browserTest.ts +++ b/tests/config/browserTest.ts @@ -17,7 +17,7 @@ import type { Fixtures, PlaywrightTestOptions, PlaywrightWorkerOptions } from '@playwright/test'; import type { Browser, BrowserContext, BrowserContextOptions, BrowserType, LaunchOptions, Page } from 'playwright-core'; import { removeFolders } from 'playwright-core/lib/utils/utils'; -import { browserOptionsWorkerFixture, browserTypeWorkerFixture, browserWorkerFixture, ReuseBrowserContextStorage } from '@playwright/test/src/index'; +import { browserOptionsWorkerFixture, browserTypeWorkerFixture, browserWorkerFixture, ReuseBrowserContextStorage } from '../../packages/playwright-test/lib/index'; import * as path from 'path'; import * as fs from 'fs'; import * as os from 'os';