@atlaspack/bundler-default 2.13.2-dev.3689 → 2.14.1-canary.10

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @atlaspack/bundler-default
 
+## 2.14.0
+
+### Minor Changes
+
+- [#405](https://github.com/atlassian-labs/atlaspack/pull/405) [`306246e`](https://github.com/atlassian-labs/atlaspack/commit/306246ee5a492583059b028ee5d0d1b49ce42223) Thanks [@benjervis](https://github.com/benjervis)! - Adds additional support for asset types when using the `singleFileOutput` option.
+
+  When the single file output option was first defined, it was a very quick and naive
+  implementation that only added JS assets to a single bundle, primarily to support
+  SSR runtimes that only allow a single file.
+
+  This falls apart when attempting to server render something like an SVG, because
+  the existing implementation would ignore them entirely.
+
+  This is fixed by adding support for "isolated" bundles, of which SVGs are one but
+  not the only use case.
+  The content itself is not included in the primary bundle, but the references between
+  them (like an SVG URL) will now be inserted.
+
+### Patch Changes
+
+- [#379](https://github.com/atlassian-labs/atlaspack/pull/379) [`8bc3db9`](https://github.com/atlassian-labs/atlaspack/commit/8bc3db94cc7382b22ca8207c92af8f6389c17e2e) Thanks [@JakeLane](https://github.com/JakeLane)! - Support nested conditional imports in runtime for dynamic import edges in graph. Introduces a new feature flag `conditionalBundlingNestedRuntime`
+
+- [#414](https://github.com/atlassian-labs/atlaspack/pull/414) [`eff9809`](https://github.com/atlassian-labs/atlaspack/commit/eff98093703b9999a511b87a19562f5aaccfcb53) Thanks [@alshdavid](https://github.com/alshdavid)! - Added type:commonjs to package.json files
+
+- [#408](https://github.com/atlassian-labs/atlaspack/pull/408) [`f6afae7`](https://github.com/atlassian-labs/atlaspack/commit/f6afae7a168c85341f9f41aa70c2cd2491a9ff17) Thanks [@benjervis](https://github.com/benjervis)! - In the first attempt to support isolated bundles, there was a check on the number of assets that wasn't really correct.
+  That check has been removed, so we can bundle even where there are special cases.
+
+- [#381](https://github.com/atlassian-labs/atlaspack/pull/381) [`91ffa66`](https://github.com/atlassian-labs/atlaspack/commit/91ffa662ea3af48f1ca0c4f0d976db9c48995f4f) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Fix re-used bundles for async imports with circular dependencies
+
+- [#411](https://github.com/atlassian-labs/atlaspack/pull/411) [`50265fd`](https://github.com/atlassian-labs/atlaspack/commit/50265fdf4024ec18439e85b472aa77a7952e2e08) Thanks [@benjervis](https://github.com/benjervis)! - Switches the isolated behaviour in single file output mode to be for inline bundles instead. Also makes isolated bundles an error.
+
+- Updated dependencies [[`bfe81e5`](https://github.com/atlassian-labs/atlaspack/commit/bfe81e551c4e4bb2cac7fc4745222e66962c1728), [`fa4fcf6`](https://github.com/atlassian-labs/atlaspack/commit/fa4fcf69a82b0a3727066ada6e93a149b259936e), [`cd964ee`](https://github.com/atlassian-labs/atlaspack/commit/cd964eed5a330ae63733656ded691d1ea3afe4e3), [`1953d1b`](https://github.com/atlassian-labs/atlaspack/commit/1953d1bec266a39dc4bfce5f6c7959e77e63411e), [`ce4ce95`](https://github.com/atlassian-labs/atlaspack/commit/ce4ce953914e08991cf58c70c98f758690e5ee21), [`28dee1d`](https://github.com/atlassian-labs/atlaspack/commit/28dee1db7d9a995161b45f76c1a03b80ccaeab4b), [`a317453`](https://github.com/atlassian-labs/atlaspack/commit/a317453432b7f30e98f2a4cbcafdaa5601bcde63), [`2055adb`](https://github.com/atlassian-labs/atlaspack/commit/2055adbe31de792e2a2a591b94d2f33f50735879), [`8bc3db9`](https://github.com/atlassian-labs/atlaspack/commit/8bc3db94cc7382b22ca8207c92af8f6389c17e2e), [`cfa1c63`](https://github.com/atlassian-labs/atlaspack/commit/cfa1c63d710c5f9c9abc55f34220b70fb517c3b8), [`17427a2`](https://github.com/atlassian-labs/atlaspack/commit/17427a2b2fc9c34ef0b941907c2868edef6d1507), [`e962cd7`](https://github.com/atlassian-labs/atlaspack/commit/e962cd735877f7f16163e60868d70d9c10054ebe), [`104a46a`](https://github.com/atlassian-labs/atlaspack/commit/104a46a5ee1fae176d29fcc6420d6bd9c01b35b1), [`9572aca`](https://github.com/atlassian-labs/atlaspack/commit/9572aca2a2313a3c05551f73e556128e77a37732), [`34b740d`](https://github.com/atlassian-labs/atlaspack/commit/34b740d4e2449fba7b50cb9708c56d8033dca5b9), [`4837b69`](https://github.com/atlassian-labs/atlaspack/commit/4837b6988e56ca842a24797b796160964d3696ce), [`e5fa92d`](https://github.com/atlassian-labs/atlaspack/commit/e5fa92de26c87fb5d4d681af1931451749ba970a), [`7e21377`](https://github.com/atlassian-labs/atlaspack/commit/7e21377914e8091d484f67cb11052a1efd2227e3), [`43113f8`](https://github.com/atlassian-labs/atlaspack/commit/43113f8f00232c5a52169a3f11f846d6e4d94b0a), [`3650f7c`](https://github.com/atlassian-labs/atlaspack/commit/3650f7c9ab803b5ae20b223e82b2268a1b614e43), [`eff9809`](https://github.com/atlassian-labs/atlaspack/commit/eff98093703b9999a511b87a19562f5aaccfcb53), [`c2ef915`](https://github.com/atlassian-labs/atlaspack/commit/c2ef915dc54784ce4b8180025ac1b2e13b375002), [`f635123`](https://github.com/atlassian-labs/atlaspack/commit/f635123f9a06961bc5e053e237f1023f10800ea3), [`4812d0f`](https://github.com/atlassian-labs/atlaspack/commit/4812d0f7400af0f8416f1b7175ecb87700860a68), [`80d963e`](https://github.com/atlassian-labs/atlaspack/commit/80d963ed950f5d742ebd78014cf74f3c65cd4474), [`8fae5f3`](https://github.com/atlassian-labs/atlaspack/commit/8fae5f3005bd7c806b175b4df1754abf58922591), [`cc66aaa`](https://github.com/atlassian-labs/atlaspack/commit/cc66aaa66d67dd0cb89e083f387a278e74aad3f0), [`67df3f1`](https://github.com/atlassian-labs/atlaspack/commit/67df3f1af1432d77ee6b8850010d976d3313693a), [`0c3ad7a`](https://github.com/atlassian-labs/atlaspack/commit/0c3ad7a302330da1d5e3c025963cc583eb5c28ed)]:
+  - @atlaspack/diagnostic@2.14.0
+  - @atlaspack/feature-flags@2.14.0
+  - @atlaspack/graph@3.4.0
+  - @atlaspack/plugin@2.14.0
+  - @atlaspack/rust@3.0.0
+  - @atlaspack/utils@2.14.0
+
 ## 2.13.1
 
 ### Patch Changes

package/lib/MonolithicBundler.js

@@ -4,13 +4,6 @@ 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 () {
@@ -44,37 +37,41 @@ function addJSMonolithBundle(bundleGraph, entryAsset, entryDep) {
       return;
     }
     let assets = bundleGraph.getDependencyAssets(dependency);
-    (0, _assert().default)(assets.length === 1, 'Expected dependency to have exactly one asset');
-    let asset = assets[0];
+    for (const asset of assets) {
+      if (asset.bundleBehavior === 'isolated') {
+        throw new Error('Isolated assets are not supported for single file output builds');
+      }
 
-    // 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);
+      // For assets marked as inline, we create new bundles and let other
+      // plugins like optimizers include them in the primary bundle
+      if (asset.bundleBehavior === 'inline') {
+        // Create a new bundle to hold the isolated asset
+        let isolatedBundle = bundleGraph.createBundle({
+          entryAsset: asset,
+          target,
+          bundleBehavior: asset.bundleBehavior
+        });
+        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));
+        // 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();
+        // 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
-      });
+        // 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, {
     skipUnusedDependencies: true

package/lib/idealGraph.js

@@ -274,8 +274,8 @@ function createIdealGraph(assetGraph, config, entries, logger) {
             if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && dependency.priority === 'conditional') {
               let [referencingBundleRoot, bundleGroupNodeId] = (0, _nullthrows().default)(stack[stack.length - 1]);
               let referencingBundleId = (0, _nullthrows().default)(bundleRoots.get(referencingBundleRoot))[0];
-              if (config.loadConditionalBundlesInParallel ?? !bundle.env.shouldScopeHoist) {
-                // When configured (or serving code in development), serve conditional bundles in parallel so we don't get module not found errors
+              if (config.loadConditionalBundlesInParallel) {
+                // When configured, serve conditional bundles in parallel so we don't get module not found errors
                 bundleRoots.set(childAsset, [bundleId, bundleGroupNodeId]);
                 bundleGraph.addEdge(referencingBundleId, bundleId);
               }
@@ -438,7 +438,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
           let bundleRoot = assets[0];
           let bundle = (0, _nullthrows().default)(bundleGraph.getNode((0, _nullthrows().default)(bundles.get(bundleRoot.id))));
           if (bundle !== 'root' && bundle.bundleBehavior == null && !bundle.env.isIsolated() && bundle.env.context === root.env.context) {
-            bundleRootGraph.addEdge(bundleRootId, (0, _nullthrows().default)(assetToBundleRootNodeId.get(bundleRoot)), dependency.priority === 'parallel' || (config.loadConditionalBundlesInParallel ?? !bundle.env.shouldScopeHoist) && dependency.priority === 'conditional' ? bundleRootEdgeTypes.parallel : bundleRootEdgeTypes.lazy);
+            bundleRootGraph.addEdge(bundleRootId, (0, _nullthrows().default)(assetToBundleRootNodeId.get(bundleRoot)), dependency.priority === 'parallel' || config.loadConditionalBundlesInParallel && dependency.priority === 'conditional' ? bundleRootEdgeTypes.parallel : bundleRootEdgeTypes.lazy);
           }
         }
         if (dependency.priority !== 'sync') {

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.13.2-dev.3689+7a2e6e783",
+  "version": "2.14.1-canary.10+3b66d6b4b",
   "license": "(MIT OR Apache-2.0)",
+  "type": "commonjs",
   "publishConfig": {
     "access": "public"
   },
@@ -12,17 +13,16 @@
   "main": "lib/DefaultBundler.js",
   "source": "src/DefaultBundler.js",
   "engines": {
-    "atlaspack": "^2.13.2-dev.3689+7a2e6e783",
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@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",
+    "@atlaspack/diagnostic": "2.14.1-canary.10+3b66d6b4b",
+    "@atlaspack/feature-flags": "2.14.1-canary.10+3b66d6b4b",
+    "@atlaspack/graph": "3.4.1-canary.10+3b66d6b4b",
+    "@atlaspack/plugin": "2.14.1-canary.10+3b66d6b4b",
+    "@atlaspack/rust": "3.0.1-canary.10+3b66d6b4b",
+    "@atlaspack/utils": "2.14.1-canary.10+3b66d6b4b",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "7a2e6e7835fa846b27021b374097c6a4f37541ba"
+  "gitHead": "3b66d6b4bfd652ab3b41e86aacf3e47d39cd5a70"
 }

package/src/MonolithicBundler.js

@@ -1,6 +1,5 @@
 // @flow strict-local
 import type {Asset, Dependency, MutableBundleGraph} from '@atlaspack/types';
-import invariant from 'assert';
 import nullthrows from 'nullthrows';
 
 export function addJSMonolithBundle(
@@ -38,48 +37,50 @@ export function addJSMonolithBundle(
       }
 
       let assets = bundleGraph.getDependencyAssets(dependency);
-      invariant(
-        assets.length === 1,
-        'Expected dependency to have exactly one asset',
-      );
 
-      let asset = assets[0];
+      for (const asset of assets) {
+        if (asset.bundleBehavior === 'isolated') {
+          throw new Error(
+            'Isolated assets are not supported for single file output builds',
+          );
+        }
 
-      // 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',
-        });
+        // For assets marked as inline, we create new bundles and let other
+        // plugins like optimizers include them in the primary bundle
+        if (asset.bundleBehavior === 'inline') {
+          // Create a new bundle to hold the isolated asset
+          let isolatedBundle = bundleGraph.createBundle({
+            entryAsset: asset,
+            target,
+            bundleBehavior: asset.bundleBehavior,
+          });
 
-        bundleGraph.addAssetToBundle(asset, isolatedBundle);
+          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),
-        );
+          // 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();
+          // 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},
-        );
+          // 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,

package/src/idealGraph.js

@@ -385,11 +385,8 @@ export function createIdealGraph(
                   bundleRoots.get(referencingBundleRoot),
                 )[0];
 
-                if (
-                  config.loadConditionalBundlesInParallel ??
-                  !bundle.env.shouldScopeHoist
-                ) {
-                  // When configured (or serving code in development), serve conditional bundles in parallel so we don't get module not found errors
+                if (config.loadConditionalBundlesInParallel) {
+                  // When configured, serve conditional bundles in parallel so we don't get module not found errors
                   bundleRoots.set(childAsset, [bundleId, bundleGroupNodeId]);
                   bundleGraph.addEdge(referencingBundleId, bundleId);
                 }
@@ -622,8 +619,7 @@ export function createIdealGraph(
                 bundleRootId,
                 nullthrows(assetToBundleRootNodeId.get(bundleRoot)),
                 dependency.priority === 'parallel' ||
-                  ((config.loadConditionalBundlesInParallel ??
-                    !bundle.env.shouldScopeHoist) &&
+                  (config.loadConditionalBundlesInParallel &&
                     dependency.priority === 'conditional')
                   ? bundleRootEdgeTypes.parallel
                   : bundleRootEdgeTypes.lazy,