parcel-bundler · wbinnssmith · May 12, 2022 · Feb 9, 2022 · Feb 9, 2022 · Feb 9, 2022
diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
diff --git a/packages/core/integration-tests/test/html.js b/packages/core/integration-tests/test/html.js
@@ -2835,4 +2835,34 @@ describe('html', function () {
  },
  );
  });
+
+ it('extracts shared bundles that load referenced bundle roots across entries', async () => {
+ let b = await bundle(
+ ['index1.html', 'index2.html'].map(entry =>
+ path.join(__dirname, 'integration/html-shared-referenced', entry),
+ ),
+ {
+ mode: 'production',
+ defaultTargetOptions: {
+ shouldOptimize: false,
+ },
+ },
+ );
+
+ await run(b);
+ });
+
+ it('should not skip bundleRoots if an asset is both async required and static required', async function () {
+ let b = await bundle(
+ path.join(__dirname, 'integration/html-sync-async-asset/index.html'),
+ {
+ mode: 'production',
+ defaultTargetOptions: {
+ shouldOptimize: false,
+ },
+ },
+ );
+
+ await run(b, {output: null}, {require: false});
+ });
 });
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/async.js b/packages/core/integration-tests/test/integration/html-shared-referenced/async.js
@@ -0,0 +1,3 @@
+import './async2.js';
+
+import('./async2.js');
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/async2.js b/packages/core/integration-tests/test/integration/html-shared-referenced/async2.js
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/index1.html b/packages/core/integration-tests/test/integration/html-shared-referenced/index1.html
@@ -0,0 +1 @@
+<script type="module" src="index1.js"></script>
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/index1.js b/packages/core/integration-tests/test/integration/html-shared-referenced/index1.js
@@ -0,0 +1 @@
+import './shared';
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/index2.html b/packages/core/integration-tests/test/integration/html-shared-referenced/index2.html
@@ -0,0 +1 @@
+<script type="module" src="index2.js"></script>
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/index2.js b/packages/core/integration-tests/test/integration/html-shared-referenced/index2.js
@@ -0,0 +1,3 @@
+import './async.js';
+import './shared.js';
+
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/package.json b/packages/core/integration-tests/test/integration/html-shared-referenced/package.json
@@ -0,0 +1,5 @@
+{
+ "@parcel/bundler-default": {
+ "minBundleSize": 0
+ }
+}
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/shared.js b/packages/core/integration-tests/test/integration/html-shared-referenced/shared.js
@@ -0,0 +1 @@
+import('./async.js');
diff --git a/packages/core/integration-tests/test/integration/html-shared-referenced/yarn.lock b/packages/core/integration-tests/test/integration/html-shared-referenced/yarn.lock
diff --git a/packages/core/integration-tests/test/integration/html-sync-async-asset/index.html b/packages/core/integration-tests/test/integration/html-sync-async-asset/index.html
@@ -0,0 +1 @@
+<script type="module" src="./index.js"></script>
diff --git a/packages/core/integration-tests/test/integration/html-sync-async-asset/index.js b/packages/core/integration-tests/test/integration/html-sync-async-asset/index.js
@@ -0,0 +1,4 @@
+import t from "./test.js";
+
+import("./other.js")
+ .then((v) => v.default)
diff --git a/packages/core/integration-tests/test/integration/html-sync-async-asset/other.js b/packages/core/integration-tests/test/integration/html-sync-async-asset/other.js
@@ -0,0 +1 @@
+export default import("./test.js");
diff --git a/packages/core/integration-tests/test/integration/html-sync-async-asset/test.js b/packages/core/integration-tests/test/integration/html-sync-async-asset/test.js
@@ -0,0 +1 @@
+export default "test";
diff --git a/...ests/test/integration/scope-hoisting/es6/export-intermediate-wrapped-reexports/index.html b/...ests/test/integration/scope-hoisting/es6/export-intermediate-wrapped-reexports/index.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+ <script type="module" src="./index.mjs"></script>
+</body>
+</html>
diff --git a/packages/core/integration-tests/test/javascript.js b/packages/core/integration-tests/test/javascript.js
@@ -1020,25 +1020,43 @@ describe('javascript', function () {
  },
  );
 
- assertBundles(b, [
- {
- assets: ['dedicated-worker.js', 'index.js'],
- },
- {
- name: 'index.js',
- assets: ['index.js', 'bundle-url.js', 'get-worker-url.js'],
- },
- {
- assets: ['shared-worker.js', 'index.js'],
- },
- ]);
+ if (process.env.PARCEL_TEST_EXPERIMENTAL_BUNDLER) {
+ assertBundles(b, [
+ {
+ assets: ['dedicated-worker.js'],
+ },
+ {
+ name: 'index.js',
+ assets: ['index.js', 'bundle-url.js', 'get-worker-url.js'],
+ },
+ {
+ assets: ['shared-worker.js'],
+ },
+ {
+ assets: ['index.js'],
+ },
+ ]);
+ } else {
+ assertBundles(b, [
+ {
+ assets: ['dedicated-worker.js', 'index.js'],
+ },
+ {
+ name: 'index.js',
+ assets: ['index.js', 'bundle-url.js', 'get-worker-url.js'],
+ },
+ {
+ assets: ['shared-worker.js', 'index.js'],
+ },
+ ]);
+ }
 
  let dedicated, shared;
  b.traverseBundles((bundle, ctx, traversal) => {
- if (bundle.getMainEntry().filePath.endsWith('shared-worker.js')) {
+ if (bundle.getMainEntry()?.filePath.endsWith('shared-worker.js')) {
  shared = bundle;
  } else if (
- bundle.getMainEntry().filePath.endsWith('dedicated-worker.js')
+ bundle.getMainEntry()?.filePath.endsWith('dedicated-worker.js')
  ) {
  dedicated = bundle;
  }

diff --git a/packages/core/integration-tests/test/scope-hoisting.js b/packages/core/integration-tests/test/scope-hoisting.js
@@ -5008,7 +5008,11 @@ describe('scope hoisting', function () {
  ],
  },
  {assets: ['dep.js']},
- {assets: ['async-has-dep.js', 'dep.js', 'get-dep.js']},
+ {
+ assets: process.env.PARCEL_TEST_EXPERIMENTAL_BUNDLER
+ ? ['async-has-dep.js']
+ : ['async-has-dep.js', 'dep.js', 'get-dep.js'],
+ },
  {assets: ['get-dep.js']},
  ]);
 

diff --git a/packages/runtimes/js/src/JSRuntime.js b/packages/runtimes/js/src/JSRuntime.js
@@ -552,6 +552,11 @@ function getRegisterCode(
  idToName[bundle.publicId] = path.basename(nullthrows(bundle.name));
 
  if (bundle !== entryBundle && isNewContext(bundle, bundleGraph)) {
+ for (let referenced of bundleGraph.getReferencedBundles(bundle)) {
+ idToName[referenced.publicId] = path.basename(
+ nullthrows(referenced.name),
+ );
+ }
  // New contexts have their own manifests, so there's no need to continue.
  actions.skipChildren();
  }