Merged in wbinnssmith/stop-removing-graph (pull request #4)

Stop removing subgraphs at bundle boundaries Approved-by: Maia Teegarden
atlassian · Sep 24, 2019 · de795cb · de795cb
2 parents d6cebc2 + dc2c020
commit de795cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/packages/bundlers/default/src/DefaultBundler.js b/packages/bundlers/default/src/DefaultBundler.js
@@ -141,7 +141,10 @@ export default new Bundler({
           let assets = bundleGraph.getDependencyAssets(dependency);
 
           for (let asset of assets) {
-            if (bundleGraph.isAssetInAncestorBundles(bundle, asset)) {
+            if (
+              bundle.hasAsset(asset) &&
+              bundleGraph.isAssetInAncestorBundles(bundle, asset)
+            ) {
               bundleGraph.removeAssetGraphFromBundle(asset, bundle);
             }
           }

diff --git a/packages/core/core/src/BundleGraph.js b/packages/core/core/src/BundleGraph.js
@@ -103,11 +103,14 @@ export default class BundleGraph {
 
   removeAssetGraphFromBundle(asset: Asset, bundle: Bundle) {
     this._graph.removeEdge(bundle.id, asset.id);
-    this._graph.traverse(node => {
-      if (node.type === 'asset' || node.type === 'dependency') {
+    this.traverseBundle(
+      bundle,
+      node => {
         this._graph.removeEdge(bundle.id, node.id, 'contains');
-      }
-    }, nullthrows(this._graph.getNode(asset.id)));
+      },
+      false,
+      nullthrows(this._graph.getNode(asset.id))
+    );
   }
 
   createAssetReference(dependency: Dependency, asset: Asset): void {
@@ -388,7 +391,8 @@ export default class BundleGraph {
   traverseBundle<TContext>(
     bundle: Bundle,
     visit: GraphVisitor<AssetNode | DependencyNode, TContext>,
-    includeAll: boolean = false
+    includeAll: boolean = false,
+    startNode?: BundleGraphNode
   ): ?TContext {
     return this._graph.filteredTraverse(
       (node, actions) => {
@@ -408,7 +412,7 @@ export default class BundleGraph {
         actions.skipChildren();
       },
       visit,
-      nullthrows(this._graph.getNode(bundle.id))
+      startNode ?? nullthrows(this._graph.getNode(bundle.id))
     );
   }