From 86c28edaddab4f223a64e7234ccf4d90434510c2 Mon Sep 17 00:00:00 2001
From: jrandolf <101637635+jrandolf@users.noreply.github.com>
Date: Fri, 22 Sep 2023 04:48:31 -0700
Subject: [PATCH] chore: remove "module" from @puppeteer/browsers (#10986)

---
 .github/workflows/issue-analyzer.yml          |  2 +-
 package-lock.json                             |  1 +
 packages/browsers/package.json                |  9 ++----
 .../puppeteer/{install.js => install.mjs}     | 28 +++++++++----------
 packages/puppeteer/package.json               |  4 +--
 5 files changed, 21 insertions(+), 23 deletions(-)
 rename packages/puppeteer/{install.js => install.mjs} (66%)
 mode change 100644 => 100755

diff --git a/.github/workflows/issue-analyzer.yml b/.github/workflows/issue-analyzer.yml
index 5c433d28991..1e954bcd9ff 100644
--- a/.github/workflows/issue-analyzer.yml
+++ b/.github/workflows/issue-analyzer.yml
@@ -94,7 +94,7 @@ jobs:
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
       - name: Install dependencies Firefox
-        run: node ./node_modules/puppeteer/install.js
+        run: node ./node_modules/puppeteer/install.mjs
         env:
           PUPPETEER_PRODUCT: firefox
       - name: Verify issue
diff --git a/package-lock.json b/package-lock.json
index e4cde3f507f..4b52ffa056a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11015,6 +11015,7 @@
       "license": "Apache-2.0"
     },
     "tools/mocha-runner": {
+      "name": "@puppeteer/mocha-runner",
       "version": "0.1.0",
       "license": "Apache-2.0",
       "bin": {
diff --git a/packages/browsers/package.json b/packages/browsers/package.json
index 1d175f186a6..de50d543062 100644
--- a/packages/browsers/package.json
+++ b/packages/browsers/package.json
@@ -8,15 +8,12 @@
     "clean": "../../tools/clean.js",
     "test": "wireit"
   },
+  "type": "commonjs",
   "bin": "lib/cjs/main-cli.js",
   "main": "./lib/cjs/main.js",
-  "module": "./lib/esm/main.js",
-  "type": "commonjs",
   "exports": {
-    ".": {
-      "import": "./lib/esm/main.js",
-      "require": "./lib/cjs/main.js"
-    }
+    "import": "./lib/esm/main.js",
+    "require": "./lib/cjs/main.js"
   },
   "wireit": {
     "build": {
diff --git a/packages/puppeteer/install.js b/packages/puppeteer/install.mjs
old mode 100644
new mode 100755
similarity index 66%
rename from packages/puppeteer/install.js
rename to packages/puppeteer/install.mjs
index c00cbeb273f..f5833674afc
--- a/packages/puppeteer/install.js
+++ b/packages/puppeteer/install.mjs
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  *
@@ -24,20 +26,18 @@
  * necessary.
  */
 
-const fs = require('fs');
-const path = require('path');
-
-// Need to ensure TS is compiled before loading the installer
-if (!fs.existsSync(path.join(__dirname, 'lib'))) {
-  console.warn(
-    'Skipping browser installation because the Puppeteer build is not available. Run `npm install` again after you have re-built Puppeteer.'
-  );
-  process.exit(0);
-}
-
 try {
-  const {downloadBrowser} = require('puppeteer/internal/node/install.js');
+  const {downloadBrowser} = await (async () => {
+    try {
+      return await import('puppeteer/internal/node/install.js');
+    } catch {
+      console.warn(
+        'Skipping browser installation because the Puppeteer build is not available. Run `npm install` again after you have re-built Puppeteer.'
+      );
+      process.exit(0);
+    }
+  })();
   downloadBrowser();
-} catch (err) {
-  console.warn('Browser download failed', err);
+} catch (error) {
+  console.warn('Browser download failed', error);
 }
diff --git a/packages/puppeteer/package.json b/packages/puppeteer/package.json
index 82ad9f44c80..1cfdb200290 100644
--- a/packages/puppeteer/package.json
+++ b/packages/puppeteer/package.json
@@ -37,7 +37,7 @@
     "build:docs": "wireit",
     "build": "wireit",
     "clean": "../../tools/clean.js",
-    "postinstall": "node install.js",
+    "postinstall": "node install.mjs",
     "prepack": "wireit"
   },
   "wireit": {
@@ -111,7 +111,7 @@
   "files": [
     "lib",
     "src",
-    "install.js",
+    "install.mjs",
     "!*.test.js",
     "!*.test.d.ts",
     "!*.test.js.map",