Merge branch 'experimental-bundler-integration' of https://github.com…

…/parcel-bundler/parcel into experimental-bundler-integration
parcel-bundler · Jun 2, 2022 · 36c647c · 36c647c
2 parents f851eb7 + 0c3a653
commit 36c647c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 50 deletions.
diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -103,7 +103,14 @@ export default (new Bundler({
   },
 
   bundle({bundleGraph, config}) {
-    decorateLegacyGraph(createIdealGraph(bundleGraph, config), bundleGraph);
+    let targetMap = getEntryByTarget(bundleGraph);
+    let graphs = [];
+    for (let entries of targetMap.values()) {
+      graphs.push(createIdealGraph(bundleGraph, config, entries));
+    }
+    for (let g of graphs) {
+      decorateLegacyGraph(g, bundleGraph);
+    }
   },
   optimize() {},
 }): Bundler);
@@ -276,6 +283,7 @@ function decorateLegacyGraph(
 function createIdealGraph(
   assetGraph: MutableBundleGraph,
   config: ResolvedBundlerConfig,
+  entries: Map<Asset, Dependency>,
 ): IdealGraph {
   // Asset to the bundle and group it's an entry of
   let bundleRoots: Map<BundleRoot, [NodeId, NodeId]> = new Map();
@@ -304,27 +312,13 @@ function createIdealGraph(
   // Models bundleRoots and the assets that require it synchronously
   let reachableRoots: ContentGraph<Asset> = new ContentGraph();
 
-  // Step Create Entry Bundles: Find and create bundles for entries from assetGraph
-  let entries: Map<Asset, Dependency> = new Map();
   let sharedToSourceBundleIds: Map<NodeId, Array<NodeId>> = new Map();
 
-  assetGraph.traverse((node, context, actions) => {
-    if (node.type !== 'asset') {
-      return node;
-    }
-
-    invariant(
-      context != null && context.type === 'dependency' && context.value.isEntry,
-    );
-    entries.set(node.value, context.value);
-    actions.skipChildren();
-  });
-
   let rootNodeId = nullthrows(asyncBundleRootGraph.addNode('root'));
   let bundleGraphRootNodeId = nullthrows(bundleGraph.addNode('root'));
   asyncBundleRootGraph.setRootNodeId(rootNodeId);
   bundleGraph.setRootNodeId(bundleGraphRootNodeId);
-
+  // Step Create Entry Bundles
   for (let [asset, dependency] of entries) {
     let bundle = createBundle({
       asset,
@@ -362,6 +356,14 @@ function createIdealGraph(
   assetGraph.traverse({
     enter(node, context, actions) {
       if (node.type === 'asset') {
+        if (
+          context?.type === 'dependency' &&
+          context?.value.isEntry &&
+          !entries.has(node.value)
+        ) {
+          actions.skipChildren();
+          return node;
+        }
         assets.push(node.value);
 
         let bundleIdTuple = bundleRoots.get(node.value);
@@ -1201,3 +1203,29 @@ function getReachableBundleRoots(asset, graph): Array<BundleRoot> {
     .getNodeIdsConnectedTo(graph.getNodeIdByContentKey(asset.id))
     .map(nodeId => nullthrows(graph.getNode(nodeId)));
 }
+
+function getEntryByTarget(
+  bundleGraph: MutableBundleGraph,
+): DefaultMap<string, Map<Asset, Dependency>> {
+  // Find entries from assetGraph per target
+  let targets: DefaultMap<string, Map<Asset, Dependency>> = new DefaultMap(
+    () => new Map(),
+  );
+  bundleGraph.traverse({
+    enter(node, context, actions) {
+      if (node.type !== 'asset') {
+        return node;
+      }
+      invariant(
+        context != null &&
+          context.type === 'dependency' &&
+          context.value.isEntry &&
+          context.value.target != null,
+      );
+      targets.get(context.value.target.distDir).set(node.value, context.value);
+      actions.skipChildren();
+      return node;
+    },
+  });
+  return targets;
+}
diff --git a/packages/core/core/src/BundleGraph.js b/packages/core/core/src/BundleGraph.js
@@ -1312,7 +1312,6 @@ export default class BundleGraph {
           nodeId,
           bundleGraphEdgeTypes.references,
         ),
-      //.reverse(),
     });
 
     return [...referencedBundles];

diff --git a/packages/core/integration-tests/test/javascript.js b/packages/core/integration-tests/test/javascript.js
@@ -1994,39 +1994,6 @@ describe('javascript', function () {
     );
   });
 
-  it('should contain duplicate assets in workers when in development', async () => {
-    if (process.env.PARCEL_TEST_EXPERIMENTAL_BUNDLER) return;
-    let b = await bundle(
-      path.join(__dirname, '/integration/worker-shared/index.js'),
-      {mode: 'development'},
-    );
-
-    assertBundles(b, [
-      {
-        name: 'index.js',
-        assets: [
-          'index.js',
-          'bundle-url.js',
-          'get-worker-url.js',
-          'lodash.js',
-          'esmodule-helpers.js',
-        ],
-      },
-      {
-        assets: [
-          'worker-a.js',
-          'bundle-url.js',
-          'esmodule-helpers.js',
-          'get-worker-url.js',
-          'lodash.js',
-        ],
-      },
-      {
-        assets: ['worker-b.js', 'lodash.js', 'esmodule-helpers.js'],
-      },
-    ]);
-  });
-
   it('should deduplicate and remove an unnecessary async bundle when it contains a cyclic reference to its entry', async () => {
     let b = await bundle(
       path.join(