@atlaspack/bundler-default 2.13.2-dev.3674 → 2.13.2-dev.3689

package/lib/MonolithicBundler.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addJSMonolithBundle = addJSMonolithBundle;
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+  _assert = function () {
+    return data;
+  };
+  return data;
+}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -20,16 +27,54 @@ function addJSMonolithBundle(bundleGraph, entryAsset, entryDep) {
     entryAsset,
     target
   });
-  bundleGraph.traverse(node => {
+  bundleGraph.traverse((node, _, actions) => {
     // JS assets can be added to the bundle, but the rest are ignored
     if (node.type === 'asset' && node.value.type === 'js') {
       bundleGraph.addAssetToBundle(node.value, bundle);
       return;
     }
-    if (node.type === 'dependency' && node.value.priority === 'lazy') {
+    if (node.type !== 'dependency') {
+      return;
+    }
+    let dependency = node.value;
+    if (dependency.priority === 'lazy') {
       // Any async dependencies need to be internalized into the bundle, and will
       // be included by the asset check above
-      bundleGraph.internalizeAsyncDependency(bundle, node.value);
+      bundleGraph.internalizeAsyncDependency(bundle, dependency);
+      return;
+    }
+    let assets = bundleGraph.getDependencyAssets(dependency);
+    (0, _assert().default)(assets.length === 1, 'Expected dependency to have exactly one asset');
+    let asset = assets[0];
+
+    // For assets marked as isolated, we create new bundles and let other
+    // plugins like optimizers include them in the primary bundle
+    if (asset.bundleBehavior === 'isolated') {
+      // Create a new bundle to hold the isolated asset
+      let isolatedBundle = bundleGraph.createBundle({
+        entryAsset: asset,
+        target,
+        bundleBehavior: 'isolated'
+      });
+      bundleGraph.addAssetToBundle(asset, isolatedBundle);
+
+      // Add the new bundle to the bundle graph, in its own bundle group
+      bundleGraph.createBundleReference(bundle, isolatedBundle);
+      bundleGraph.addBundleToBundleGroup(isolatedBundle, bundleGraph.createBundleGroup(dependency, target));
+
+      // Nothing below the isolated asset needs to go in the main bundle, so
+      // we can stop traversal here
+      actions.skipChildren();
+
+      // To be properly isolated, all of this asset's dependencies need to go
+      // in this new bundle
+      bundleGraph.traverse(subNode => {
+        if (subNode.type === 'asset' && subNode.value.type === 'js') {
+          bundleGraph.addAssetToBundle(subNode.value, isolatedBundle);
+        }
+      }, asset, {
+        skipUnusedDependencies: true
+      });
     }
   }, entryAsset, {
     skipUnusedDependencies: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.13.2-dev.3674+d7732a10a",
+  "version": "2.13.2-dev.3689+7a2e6e783",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -12,17 +12,17 @@
   "main": "lib/DefaultBundler.js",
   "source": "src/DefaultBundler.js",
   "engines": {
-    "atlaspack": "^2.13.2-dev.3674+d7732a10a",
+    "atlaspack": "^2.13.2-dev.3689+7a2e6e783",
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.13.2-dev.3674+d7732a10a",
-    "@atlaspack/feature-flags": "2.13.2-dev.3674+d7732a10a",
-    "@atlaspack/graph": "3.3.2-dev.3674+d7732a10a",
-    "@atlaspack/plugin": "2.13.2-dev.3674+d7732a10a",
-    "@atlaspack/rust": "2.13.2-dev.3674+d7732a10a",
-    "@atlaspack/utils": "2.13.2-dev.3674+d7732a10a",
+    "@atlaspack/diagnostic": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/feature-flags": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/graph": "3.3.2-dev.3689+7a2e6e783",
+    "@atlaspack/plugin": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/rust": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/utils": "2.13.2-dev.3689+7a2e6e783",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "d7732a10a9a123de06d5eedcf9800d621e740229"
+  "gitHead": "7a2e6e7835fa846b27021b374097c6a4f37541ba"
 }

package/src/MonolithicBundler.js

@@ -1,5 +1,6 @@
 // @flow strict-local
 import type {Asset, Dependency, MutableBundleGraph} from '@atlaspack/types';
+import invariant from 'assert';
 import nullthrows from 'nullthrows';
 
 export function addJSMonolithBundle(
@@ -16,17 +17,69 @@ export function addJSMonolithBundle(
   let bundle = bundleGraph.createBundle({entryAsset, target});
 
   bundleGraph.traverse(
-    (node) => {
+    (node, _, actions) => {
       // JS assets can be added to the bundle, but the rest are ignored
       if (node.type === 'asset' && node.value.type === 'js') {
         bundleGraph.addAssetToBundle(node.value, bundle);
         return;
       }
 
-      if (node.type === 'dependency' && node.value.priority === 'lazy') {
+      if (node.type !== 'dependency') {
+        return;
+      }
+
+      let dependency = node.value;
+
+      if (dependency.priority === 'lazy') {
         // Any async dependencies need to be internalized into the bundle, and will
         // be included by the asset check above
-        bundleGraph.internalizeAsyncDependency(bundle, node.value);
+        bundleGraph.internalizeAsyncDependency(bundle, dependency);
+        return;
+      }
+
+      let assets = bundleGraph.getDependencyAssets(dependency);
+      invariant(
+        assets.length === 1,
+        'Expected dependency to have exactly one asset',
+      );
+
+      let asset = assets[0];
+
+      // For assets marked as isolated, we create new bundles and let other
+      // plugins like optimizers include them in the primary bundle
+      if (asset.bundleBehavior === 'isolated') {
+        // Create a new bundle to hold the isolated asset
+        let isolatedBundle = bundleGraph.createBundle({
+          entryAsset: asset,
+          target,
+          bundleBehavior: 'isolated',
+        });
+
+        bundleGraph.addAssetToBundle(asset, isolatedBundle);
+
+        // Add the new bundle to the bundle graph, in its own bundle group
+        bundleGraph.createBundleReference(bundle, isolatedBundle);
+        bundleGraph.addBundleToBundleGroup(
+          isolatedBundle,
+          bundleGraph.createBundleGroup(dependency, target),
+        );
+
+        // Nothing below the isolated asset needs to go in the main bundle, so
+        // we can stop traversal here
+        actions.skipChildren();
+
+        // To be properly isolated, all of this asset's dependencies need to go
+        // in this new bundle
+        bundleGraph.traverse(
+          (subNode) => {
+            if (subNode.type === 'asset' && subNode.value.type === 'js') {
+              bundleGraph.addAssetToBundle(subNode.value, isolatedBundle);
+              return;
+            }
+          },
+          asset,
+          {skipUnusedDependencies: true},
+        );
       }
     },
     entryAsset,