Allow library bundles to be shared between targets in the same package (

#9591)
parcel-bundler · Mar 20, 2024 · b6281c7 · b6281c7
1 parent 9f08a86
commit b6281c7
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 5 deletions.
diff --git a/packages/bundlers/library/src/LibraryBundler.js b/packages/bundlers/library/src/LibraryBundler.js
@@ -76,5 +76,7 @@ export default (new Bundler({
 function getBundleKey(asset, target) {
   // Group by type and file path so CSS generated by macros is combined together by parent JS file.
   // Also group by environment/target to ensure bundles cannot be shared between packages.
-  return `${asset.type}:${asset.filePath}:${asset.env.id}:${target.distDir}`;
+  return `${asset.type}:${asset.filePath}:${asset.env.id}:${
+    target.loc?.filePath ?? target.distDir
+  }`;
 }
diff --git a/packages/core/core/src/requests/TargetRequest.js b/packages/core/core/src/requests/TargetRequest.js
@@ -935,6 +935,15 @@ export class TargetResolver {
         if (customTargets.length >= 2) {
           distDir = path.join(distDir, targetName);
         }
+        invariant(pkgMap != null);
+        invariant(typeof pkgFilePath === 'string');
+        loc = {
+          filePath: pkgFilePath,
+          ...getJSONSourceLocation(
+            pkgMap.pointers[`/targets/${targetName}`],
+            'key',
+          ),
+        };
       } else {
         if (typeof distPath !== 'string') {
           let contents: string =

diff --git a/packages/core/core/test/TargetRequest.test.js b/packages/core/core/test/TargetRequest.test.js
@@ -579,7 +579,19 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
           },
-          loc: undefined,
+          loc: {
+            filePath: relative(
+              path.join(CUSTOM_TARGETS_DISTDIR_FIXTURE_PATH, 'package.json'),
+            ),
+            start: {
+              line: 3,
+              column: 5,
+            },
+            end: {
+              line: 3,
+              column: 10,
+            },
+          },
         },
       ],
     );
@@ -1317,7 +1329,19 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
           },
-          loc: undefined,
+          loc: {
+            filePath: relative(
+              path.join(DEFAULT_DISTPATH_FIXTURE_PATHS.one, 'package.json'),
+            ),
+            start: {
+              line: 3,
+              column: 5,
+            },
+            end: {
+              line: 3,
+              column: 20,
+            },
+          },
         },
       ],
     );
@@ -1355,7 +1379,19 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
           },
-          loc: undefined,
+          loc: {
+            filePath: relative(
+              path.join(DEFAULT_DISTPATH_FIXTURE_PATHS.two, 'package.json'),
+            ),
+            start: {
+              line: 3,
+              column: 5,
+            },
+            end: {
+              line: 3,
+              column: 20,
+            },
+          },
         },
         {
           name: 'browserLegacy',
@@ -1383,7 +1419,19 @@ describe('TargetResolver', () => {
             loc: undefined,
             sourceType: 'module',
           },
-          loc: undefined,
+          loc: {
+            filePath: relative(
+              path.join(DEFAULT_DISTPATH_FIXTURE_PATHS.two, 'package.json'),
+            ),
+            start: {
+              line: 10,
+              column: 5,
+            },
+            end: {
+              line: 10,
+              column: 20,
+            },
+          },
         },
       ],
     );

diff --git a/packages/core/integration-tests/test/library-bundler.js b/packages/core/integration-tests/test/library-bundler.js
@@ -418,4 +418,77 @@ describe('library bundler', function () {
     assert.deepEqual(Object.keys(foo), ['default']);
     assert.deepEqual(foo.default, {'foo-bar': 'foo'});
   });
+
+  it('should allow bundles to be reused between targets in the same package', async function () {
+    await fsFixture(overlayFS, dir)`
+      yarn.lock:
+
+      .parcelrc:
+        {
+          "extends": "@parcel/config-default",
+          "bundler": "@parcel/bundler-library"
+        }
+
+      package.json:
+        {
+          "engines": { "node": "*" },
+          "targets": {
+            "a": {
+              "source": "src/a.js",
+              "distDir": "a",
+              "outputFormat": "esmodule",
+              "isLibrary": true
+            },
+            "b": {
+              "source": "src/b.js",
+              "distDir": "b",
+              "outputFormat": "esmodule",
+              "isLibrary": true
+            }
+          }
+        }
+
+      src/a.js:
+        import shared from './shared';
+        export default shared + '-a';
+
+      src/b.js:
+        import shared from './shared';
+        export default shared + '-b';
+
+      src/shared.js:
+        export default 'shared';
+    `;
+
+    let b = await bundle(dir, {
+      inputFS: overlayFS,
+      mode: 'production',
+    });
+
+    assertBundles(b, [
+      {
+        assets: ['a.js'],
+      },
+      {
+        assets: ['b.js'],
+      },
+      {
+        assets: ['shared.js'],
+      },
+    ]);
+
+    let res: any = await runBundle(
+      b,
+      nullthrows(b.getBundles().find(b => b.name === 'a.js')),
+    );
+
+    assert.equal(res.default, 'shared-a');
+
+    let res2: any = await runBundle(
+      b,
+      nullthrows(b.getBundles().find(b => b.name === 'b.js')),
+    );
+
+    assert.equal(res2.default, 'shared-b');
+  });
 });