Allow parallel type change bundles to be reused by async siblings (#9504

)
parcel-bundler · Feb 10, 2024 · a93af6a · a93af6a
1 parent e0b99c2
commit a93af6a
Show file tree

Hide file tree

Showing 13 changed files with 229 additions and 396 deletions.
diff --git a/packages/bundlers/default/src/DefaultBundler.js b/packages/bundlers/default/src/DefaultBundler.js
diff --git a/packages/core/core/src/BundleGraph.js b/packages/core/core/src/BundleGraph.js
@@ -1137,6 +1137,7 @@ export default class BundleGraph {
         ? firstAsset
         : // Otherwise, find the first asset that belongs to this bundle.
           assets.find(asset => this.bundleHasAsset(bundle, asset)) ||
+          assets.find(a => a.type === bundle.type) ||
           firstAsset;
 
     // If a resolution still hasn't been found, return the first referenced asset.
@@ -1735,7 +1736,7 @@ export default class BundleGraph {
       );
       let depSymbol = symbolLookup.get(identifier);
       if (depSymbol != null) {
-        let resolved = this.getResolvedAsset(dep);
+        let resolved = this.getResolvedAsset(dep, boundary);
         if (!resolved || resolved.id === asset.id) {
           // External module or self-reference
           return {
@@ -1785,7 +1786,7 @@ export default class BundleGraph {
         depSymbols.get('*')?.local === '*' &&
         symbol !== 'default'
       ) {
-        let resolved = this.getResolvedAsset(dep);
+        let resolved = this.getResolvedAsset(dep, boundary);
         if (!resolved) {
           continue;
         }
@@ -1918,7 +1919,7 @@ export default class BundleGraph {
       if (!depSymbols) continue;
 
       if (depSymbols.get('*')?.local === '*') {
-        let resolved = this.getResolvedAsset(dep);
+        let resolved = this.getResolvedAsset(dep, boundary);
         if (!resolved) continue;
         let exported = this.getExportedSymbols(resolved, boundary)
           .filter(s => s.exportSymbol !== 'default')

diff --git a/packages/core/integration-tests/test/bundler.js b/packages/core/integration-tests/test/bundler.js
@@ -1524,7 +1524,7 @@ describe('bundler', function () {
       ]);
 
       let targetDistDir = normalizePath(path.join(__dirname, '../dist'));
-      let hashedIdWithMSB = hashString('bundle:' + 'vendorjs' + targetDistDir);
+      let hashedIdWithMSB = hashString('bundle:' + 'vendor,js' + targetDistDir);
       assert(
         b.getBundles().find(b => b.id == hashedIdWithMSB),
         'MSB id does not match expected',
@@ -1760,4 +1760,49 @@ describe('bundler', function () {
       ]);
     });
   });
+
+  it('should reuse type change bundles from parent bundle groups', async function () {
+    await fsFixture(overlayFS, __dirname)`
+      reuse-type-change-bundles
+        index.html:
+          <link rel="stylesheet" type="text/css" href="./style.css">
+          <script src="./index.js" type="module"></script>
+      
+        style.css:
+          @import "common.css";
+          body { color: red }
+        
+        common.css:
+          .common { color: green }
+
+        index.js:
+          import('./async');
+
+        async.js:
+          import './common.css';
+    `;
+
+    let b = await bundle(
+      path.join(__dirname, 'reuse-type-change-bundles', 'index.html'),
+      {
+        mode: 'production',
+        inputFS: overlayFS,
+      },
+    );
+
+    assertBundles(b, [
+      {
+        assets: ['index.html'],
+      },
+      {
+        assets: ['style.css', 'common.css'],
+      },
+      {
+        assets: ['index.js', 'bundle-manifest.js', 'esm-js-loader.js'],
+      },
+      {
+        assets: ['async.js'],
+      },
+    ]);
+  });
 });
diff --git a/packages/core/integration-tests/test/css-modules.js b/packages/core/integration-tests/test/css-modules.js
@@ -619,29 +619,19 @@ describe('css modules', () => {
       },
       {
         type: 'js',
-        assets: [
-          'page1.js',
-          'index.module.css',
-          'a.module.css',
-          'b.module.css',
-        ],
+        assets: ['page1.js'],
       },
       {
         type: 'js',
-        assets: [
-          'page2.js',
-          'index.module.css',
-          'a.module.css',
-          'b.module.css',
-        ],
+        assets: ['page2.js'],
       },
       {
         type: 'css',
-        assets: ['a.module.css', 'b.module.css'],
+        assets: ['a.module.css', 'b.module.css', 'index.module.css'],
       },
       {
-        type: 'css',
-        assets: ['index.module.css'],
+        type: 'js',
+        assets: ['a.module.css', 'b.module.css', 'index.module.css'],
       },
     ]);
   });
@@ -745,7 +735,7 @@ describe('css modules', () => {
     assert(res[0][1].includes('container') && res[0][1].includes('expand'));
   });
 
-  it('should allow css modules to be shared between targets', async function () {
+  it('should duplicate css modules between targets', async function () {
     let b = await bundle([
       path.join(__dirname, '/integration/css-module-self-references/a'),
       path.join(__dirname, '/integration/css-module-self-references/b'),
@@ -760,6 +750,14 @@ describe('css modules', () => {
         name: 'main.css',
         assets: ['bar.module.css'],
       },
+      {
+        name: 'module.css',
+        assets: ['bar.module.css'],
+      },
+      {
+        name: 'module.css',
+        assets: ['bar.module.css'],
+      },
       {
         name: 'main.js',
         assets: ['index.js', 'bar.module.css'],

diff --git a/packages/core/integration-tests/test/css.js b/packages/core/integration-tests/test/css.js
@@ -77,19 +77,12 @@ describe('css', () => {
       {
         name: 'entry.js',
         type: 'js',
-        assets: [
-          'bundle-url.js',
-          'cacheLoader.js',
-          'css-loader.js',
-          'entry.js',
-          'js-loader.js',
-        ],
+        assets: ['bundle-url.js', 'cacheLoader.js', 'entry.js', 'js-loader.js'],
       },
       {
         type: 'js',
         assets: ['esmodule-helpers.js', 'index.js'],
       },
-      {name: 'Foo.css', type: 'css', assets: ['foo.css']},
       {name: 'entry.css', type: 'css', assets: ['foo.css', 'main.css']},
     ]);
   });

diff --git a/packages/core/integration-tests/test/html.js b/packages/core/integration-tests/test/html.js
@@ -2242,39 +2242,39 @@ describe('html', function () {
 
     assertBundles(b, [
       {
-        name: 'a.html',
-        type: 'html',
+        type: 'js',
         assets: ['a.html'],
       },
       {
-        name: 'b.html',
-        type: 'html',
+        type: 'js',
         assets: ['b.html'],
       },
       {
-        name: 'c.html',
-        type: 'html',
+        type: 'js',
         assets: ['c.html'],
       },
       {
-        type: 'js',
-        assets: ['a.html', 'shared.js'],
+        name: 'a.html',
+        type: 'html',
+        assets: ['a.html'],
       },
       {
-        type: 'js',
-        assets: ['b.html', 'shared.js'],
+        name: 'b.html',
+        type: 'html',
+        assets: ['b.html'],
       },
       {
-        type: 'js',
-        assets: ['c.html', 'shared.js'],
+        name: 'c.html',
+        type: 'html',
+        assets: ['c.html'],
       },
       {
         type: 'css',
-        assets: ['other.css'],
+        assets: ['other.css', 'shared.css'],
       },
       {
-        type: 'css',
-        assets: ['shared.css'],
+        type: 'js',
+        assets: ['shared.js'],
       },
     ]);
 
@@ -2493,6 +2493,14 @@ describe('html', function () {
         type: 'css',
         assets: ['a.module.css'],
       },
+      {
+        type: 'css',
+        assets: ['a.module.css'],
+      },
+      {
+        type: 'css',
+        assets: ['a.module.css'],
+      },
       {
         type: 'html',
         assets: ['searchfield.html'],

diff --git a/packages/core/integration-tests/test/integration/css-modules-import/package.json b/packages/core/integration-tests/test/integration/css-modules-import/package.json
@@ -0,0 +1,5 @@
+{
+  "@parcel/bundler-default": {
+    "minBundleSize": 0
+  }
+}
diff --git a/...ages/core/integration-tests/test/integration/shared-sibling-entries-multiple/package.json b/...ages/core/integration-tests/test/integration/shared-sibling-entries-multiple/package.json
@@ -0,0 +1,5 @@
+{
+  "@parcel/bundler-default": {
+    "minBundleSize": 0
+  }
+}
diff --git a/packages/core/integration-tests/test/integration/shared-sibling-entries-multiple/yarn.lock b/packages/core/integration-tests/test/integration/shared-sibling-entries-multiple/yarn.lock
diff --git a/packages/core/integration-tests/test/integration/shared-sibling-entries/package.json b/packages/core/integration-tests/test/integration/shared-sibling-entries/package.json
@@ -0,0 +1,5 @@
+{
+  "@parcel/bundler-default": {
+    "minBundleSize": 0
+  }
+}
diff --git a/packages/core/integration-tests/test/integration/shared-sibling-entries/yarn.lock b/packages/core/integration-tests/test/integration/shared-sibling-entries/yarn.lock
diff --git a/packages/core/integration-tests/test/monorepos.js b/packages/core/integration-tests/test/monorepos.js
@@ -255,6 +255,10 @@ describe('monorepos', function () {
         name: 'pkg-b.cjs.css',
         assets: ['index.module.css'],
       },
+      {
+        name: 'pkg-b.module.css',
+        assets: ['index.module.css'],
+      },
     ]);
 
     let contents = await outputFS.readFile(
@@ -300,7 +304,7 @@ describe('monorepos', function () {
       ),
       'utf8',
     );
-    assert(contents.includes('import "./pkg-b.cjs.css"'));
+    assert(contents.includes('import "./pkg-b.module.css"'));
   });
 
   it('should build using root targets with a glob pointing at files inside packages and cwd at project root', async function () {
@@ -531,6 +535,10 @@ describe('monorepos', function () {
         name: 'pkg-b.cjs.css',
         assets: ['index.module.css'],
       },
+      {
+        name: 'pkg-b.module.css',
+        assets: ['index.module.css'],
+      },
     ]);
 
     let contents = await outputFS.readFile(
@@ -576,7 +584,7 @@ describe('monorepos', function () {
       ),
       'utf8',
     );
-    assert(contents.includes('import "./pkg-b.cjs.css"'));
+    assert(contents.includes('import "./pkg-b.module.css"'));
   });
 
   it('should watch glob entries and build new packages that are added', async function () {
@@ -634,6 +642,10 @@ describe('monorepos', function () {
         name: 'pkg-b.cjs.css',
         assets: ['index.module.css'],
       },
+      {
+        name: 'pkg-b.module.css',
+        assets: ['index.module.css'],
+      },
     ]);
   });
 
@@ -788,6 +800,10 @@ describe('monorepos', function () {
         name: 'pkg-a.cjs.css',
         assets: ['index.module.css'],
       },
+      {
+        name: 'pkg-a.module.css',
+        assets: ['index.module.css'],
+      },
       {
         name: 'pkg-b.cjs.js',
         assets: ['index.js', 'index.module.css'],
@@ -800,6 +816,10 @@ describe('monorepos', function () {
         name: 'pkg-b.cjs.css',
         assets: ['index.module.css'],
       },
+      {
+        name: 'pkg-b.module.css',
+        assets: ['index.module.css'],
+      },
     ]);
 
     let contents = await outputFS.readFile(
@@ -820,7 +840,7 @@ describe('monorepos', function () {
       'utf8',
     );
     assert(contents.includes('export {'));
-    assert(contents.includes('import "./pkg-a.cjs.css"'));
+    assert(contents.includes('import "./pkg-a.module.css"'));
 
     contents = await outputFS.readFile(
       path.join(
@@ -856,7 +876,7 @@ describe('monorepos', function () {
       ),
       'utf8',
     );
-    assert(contents.includes('import "./pkg-b.cjs.css"'));
+    assert(contents.includes('import "./pkg-b.module.css"'));
   });
 
   it('should search for .parcelrc at cwd in monorepos', async () => {