From 499f6920112473af4a66c2f132b295ada883f0ea Mon Sep 17 00:00:00 2001 From: Alex Rudenko Date: Thu, 10 Feb 2022 14:11:35 +0100 Subject: [PATCH] Revert "fix(puppeteer): export internals (#7991)" This reverts commit 448118cbdbbcbc92900eeb0b88691351f506d05f. --- package.json | 10 ++-------- scripts/test-install.sh | 9 ++------- utils/prepare_puppeteer_core.js | 3 +-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 3699a17afe6d2..25c7ce6b1ab99 100644 --- a/package.json +++ b/package.json @@ -5,14 +5,8 @@ "type": "commonjs", "main": "./cjs-entry.js", "exports": { - ".": { - "import": "./lib/esm/puppeteer/node.js", - "require": "./cjs-entry.js" - }, - "./*": { - "import": "./*", - "require": "./*" - } + "import": "./lib/esm/puppeteer/node.js", + "require": "./cjs-entry.js" }, "types": "lib/types.d.ts", "repository": "github:puppeteer/puppeteer", diff --git a/scripts/test-install.sh b/scripts/test-install.sh index 25ab3fef7c098..ea42f4d7ee5eb 100755 --- a/scripts/test-install.sh +++ b/scripts/test-install.sh @@ -14,9 +14,6 @@ cd $TMPDIR # 3. Requiring Puppeteer from Node works. npm install --loglevel silent "${tarball}" node --eval="require('puppeteer')" -node --eval=" -require('puppeteer/lib/cjs/puppeteer/revisions.js'); -" ls $TMPDIR/node_modules/puppeteer/.local-chromium/ # Testing ES module features @@ -25,9 +22,8 @@ cd $TMPDIR echo '{"type":"module"}' >>$TMPDIR/package.json npm install --loglevel silent "${tarball}" node --input-type="module" --eval="import puppeteer from 'puppeteer'" -node --input-type="module" --eval=" -import 'puppeteer/lib/esm/puppeteer/revisions.js'; -" +ls $TMPDIR/node_modules/puppeteer/.local-chromium/ + node --input-type="module" --eval=" import puppeteer from 'puppeteer'; @@ -39,7 +35,6 @@ import puppeteer from 'puppeteer'; await browser.close(); })(); " -ls $TMPDIR/node_modules/puppeteer/.local-chromium/ # Again for Firefox TMPDIR="$(mktemp -d)" diff --git a/utils/prepare_puppeteer_core.js b/utils/prepare_puppeteer_core.js index be4644eea1efc..7b42cd3f58a6e 100755 --- a/utils/prepare_puppeteer_core.js +++ b/utils/prepare_puppeteer_core.js @@ -25,6 +25,5 @@ delete json.scripts.install; json.name = 'puppeteer-core'; json.main = './cjs-entry-core.js'; -json.exports['.'].imports = './lib/esm/puppeteer/node-puppeteer-core.js'; -json.exports['.'].require = './cjs-entry-core.js'; +json.exports.import = './lib/esm/puppeteer/node-puppeteer-core.js'; fs.writeFileSync(packagePath, JSON.stringify(json, null, ' '));