Fix nested async imports from a shared module (#1724)

parcel-bundler · Jul 13, 2018 · e0d8821 · e0d8821
1 parent 52f9766
commit e0d8821
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 2 deletions.
diff --git a/src/packagers/JSConcatPackager.js b/src/packagers/JSConcatPackager.js
@@ -151,7 +151,7 @@ class JSConcatPackager extends Packager {
     }
 
     for (let [dep, mod] of asset.depAssets) {
-      if (dep.dynamic && this.bundle.childBundles.has(mod.parentBundle)) {
+      if (dep.dynamic) {
         for (let child of mod.parentBundle.siblingBundles) {
           if (!child.isEmpty) {
             await this.addBundleLoader(child.type, asset);

diff --git a/src/packagers/JSPackager.js b/src/packagers/JSPackager.js
@@ -49,7 +49,7 @@ class JSPackager extends Packager {
     let deps = {};
     for (let [dep, mod] of asset.depAssets) {
       // For dynamic dependencies, list the child bundles to load along with the module id
-      if (dep.dynamic && this.bundle.childBundles.has(mod.parentBundle)) {
+      if (dep.dynamic) {
         let bundles = [this.getBundleSpecifier(mod.parentBundle)];
         for (let child of mod.parentBundle.siblingBundles) {
           if (!child.isEmpty) {

diff --git a/test/integration/dynamic-hoist-deep/1.js b/test/integration/dynamic-hoist-deep/1.js
diff --git a/test/integration/dynamic-hoist-deep/a.js b/test/integration/dynamic-hoist-deep/a.js
@@ -0,0 +1 @@
+import './c';
diff --git a/test/integration/dynamic-hoist-deep/b.js b/test/integration/dynamic-hoist-deep/b.js
@@ -0,0 +1 @@
+import './c';
diff --git a/test/integration/dynamic-hoist-deep/c.js b/test/integration/dynamic-hoist-deep/c.js
@@ -0,0 +1 @@
+import('./1');
diff --git a/test/integration/dynamic-hoist-deep/index.js b/test/integration/dynamic-hoist-deep/index.js
@@ -0,0 +1,6 @@
+import('./a');
+import('./b');
+
+export default {
+  asdf: 1,
+};
diff --git a/test/javascript.js b/test/javascript.js
@@ -396,6 +396,44 @@ describe('javascript', function() {
     assert.equal(await output(), 5);
   });
 
+  it('should support hoisting shared modules with async imports up multiple levels', async function() {
+    let b = await bundle(
+      __dirname + '/integration/dynamic-hoist-deep/index.js',
+      {
+        sourceMaps: false
+      }
+    );
+
+    await assertBundleTree(b, {
+      name: 'index.js',
+      assets: [
+        'index.js',
+        'c.js',
+        'bundle-loader.js',
+        'bundle-url.js',
+        'js-loader.js'
+      ],
+      childBundles: [
+        {
+          assets: ['a.js'],
+          childBundles: [
+            {
+              assets: ['1.js'],
+              childBundles: []
+            }
+          ]
+        },
+        {
+          assets: ['b.js'],
+          childBundles: []
+        }
+      ]
+    });
+
+    let output = await run(b);
+    assert.deepEqual(output, {default: {asdf: 1}});
+  });
+
   it('should support requiring JSON files', async function() {
     let b = await bundle(__dirname + '/integration/json/index.js');