Merge 191d735 into 612cc5f

package.json

@@ -92,9 +92,9 @@
     "lint-and-test": "npm run lint && npm test",
     "update:docs": "node scripts/update-docs",
     "review:syntax-patch": "node scripts/review-syntax-patch",
-    "test": "mocha lib/__tests --reporter ${REPORTER:-progress}",
-    "test:cjs": "mocha cjs/__tests --reporter ${REPORTER:-progress}",
-    "test:dist": "mocha dist/__tests --reporter ${REPORTER:-progress}",
+    "test": "mocha lib/__tests --reporter progress",
+    "test:cjs": "mocha cjs/__tests --reporter progress",
+    "test:dist": "mocha dist/__tests --reporter progress",
     "coverage": "c8 --exclude lib/__tests --reporter=lcovonly npm test",
     "prepublishOnly": "npm run lint-and-test && npm run build-and-test",
     "hydrogen": "node --trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces --redirect-code-traces-to=code.asm --trace_hydrogen_file=code.cfg --print-opt-code bin/parse --stat -o /dev/null"

scripts/bundle.js

@@ -14,7 +14,7 @@ async function build() {
         [path.resolve('lib/version.js')]: `export const version = "${version}";`,
         [path.resolve('lib/version.cjs')]: `module.exports = "${version}";`
     };
-    const genModulesFilter = new RegExp('(' + Object.keys(genModules).join('|').replace(/\./g, '\\.') + ')$');
+    const genModulesFilter = new RegExp('(' + Object.keys(genModules).join('|').replace(/\./g, '\\.').replace(/\\/g, '/') + ')$');
     const plugins = [{
         name: 'replace',
         setup({ onLoad }) {
@@ -33,6 +33,7 @@ async function build() {
             bundle: true,
             minify: true,
             logLevel: 'info',
+            external: ['module'],
             plugins
         }),
 
@@ -43,6 +44,7 @@ async function build() {
             bundle: true,
             minify: true,
             logLevel: 'info',
+            external: ['module'],
             plugins
         })
     ]);