Fix parcel bundling issues when asset parent & commonBundle types dif…

…fer (#380)
parcel-bundler · Dec 30, 2017 · 127c9b7 · 127c9b7
1 parent 494fafc
commit 127c9b7
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 3 deletions.
diff --git a/src/Bundler.js b/src/Bundler.js
@@ -375,10 +375,9 @@ class Bundler extends EventEmitter {
           asset.parentBundle.type === commonBundle.type
         ) {
           this.moveAssetToBundle(asset, commonBundle);
+          return;
         }
-      }
-
-      return;
+      } else return;
     }
 
     // Create the root bundle if it doesn't exist

diff --git a/test/html.js b/test/html.js
@@ -15,10 +15,20 @@ describe('html', function() {
           assets: ['index.css'],
           childBundles: []
         },
+        {
+          type: 'js',
+          assets: ['index.js'],
+          childBundles: []
+        },
         {
           type: 'html',
           assets: ['other.html'],
           childBundles: [
+            {
+              type: 'css',
+              assets: ['index.css'],
+              childBundles: []
+            },
             {
               type: 'js',
               assets: ['index.js'],
@@ -156,4 +166,33 @@ describe('html', function() {
     let html = fs.readFileSync(__dirname + '/dist/index.html', 'utf8');
     assert(/<i>hello<\/i> <i>world<\/i>/.test(html));
   });
+
+  it('should support child bundles of different types', async function() {
+    let b = await bundle(
+      __dirname + '/integration/child-bundle-different-types/index.html'
+    );
+
+    assertBundleTree(b, {
+      name: 'index.html',
+      assets: ['index.html'],
+      childBundles: [
+        {
+          type: 'js',
+          assets: ['main.js', 'util.js', 'other.js'],
+          childBundles: []
+        },
+        {
+          type: 'html',
+          assets: ['other.html'],
+          childBundles: [
+            {
+              type: 'js',
+              assets: ['index.js', 'util.js', 'other.js'],
+              childBundles: []
+            }
+          ]
+        }
+      ]
+    });
+  });
 });
diff --git a/test/integration/child-bundle-different-types/index.html b/test/integration/child-bundle-different-types/index.html
@@ -0,0 +1,17 @@
+<!-- First page -->
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+  <div id="main">
+    Hello World Main2
+  </div>
+  <div id="main1">
+    Hello World Main1
+  </div>
+  <script src="./main.js"></script>
+  <a href="./other.html">GOOO</a>
+</body>
+</html>
diff --git a/test/integration/child-bundle-different-types/index.js b/test/integration/child-bundle-different-types/index.js
@@ -0,0 +1,5 @@
+var util = require('./util');
+
+document.getElementById("main").innerHTML= util.hello();
+
+document.getElementById("main1").innerHTML= util.b();
diff --git a/test/integration/child-bundle-different-types/main.js b/test/integration/child-bundle-different-types/main.js
@@ -0,0 +1,5 @@
+var util = require('./util');
+
+document.getElementById("main").innerHTML= util.hi();
+
+document.getElementById("main1").innerHTML= util.b();
diff --git a/test/integration/child-bundle-different-types/other.html b/test/integration/child-bundle-different-types/other.html
@@ -0,0 +1,17 @@
+<!-- First page -->
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+
+</head>
+<body>
+  <div id="main">
+    Heelo
+  </div>
+  <div id="main1">
+    Heelo
+  </div>
+  <script src="./index.js"></script>
+</body>
+</html>
diff --git a/test/integration/child-bundle-different-types/other.js b/test/integration/child-bundle-different-types/other.js
@@ -0,0 +1,3 @@
+module.exports = {
+  hello: () => "HELLO",
+}
diff --git a/test/integration/child-bundle-different-types/util.js b/test/integration/child-bundle-different-types/util.js
@@ -0,0 +1,7 @@
+var test = require('./other');
+
+module.exports = {
+  hi: () => "Hi",
+  hello: () => "HELLO",
+  b: () => test.hello()
+}