@atlaspack/bundler-default 3.2.1 → 3.3.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaspack/bundler-default
 
+## 3.3.0
+
+### Minor Changes
+
+- [#731](https://github.com/atlassian-labs/atlaspack/pull/731) [`23d561e`](https://github.com/atlassian-labs/atlaspack/commit/23d561e51e68b0c38fd1ff4e4fb173e5e7b01cf2) Thanks [@marcins](https://github.com/marcins)! - Implement "inline isolated" scripts
+
+### Patch Changes
+
+- Updated dependencies [[`23d561e`](https://github.com/atlassian-labs/atlaspack/commit/23d561e51e68b0c38fd1ff4e4fb173e5e7b01cf2)]:
+  - @atlaspack/feature-flags@2.21.0
+  - @atlaspack/utils@2.18.0
+  - @atlaspack/rust@3.5.0
+  - @atlaspack/graph@3.5.12
+  - @atlaspack/plugin@2.14.23
+
 ## 3.2.1
 
 ### Patch Changes

package/lib/MonolithicBundler.js

@@ -38,8 +38,8 @@ function addJSMonolithBundle(bundleGraph, entryAsset, entryDep) {
     }
     let assets = bundleGraph.getDependencyAssets(dependency);
     for (const asset of assets) {
-      if (asset.bundleBehavior === 'isolated') {
-        throw new Error('Isolated assets are not supported for single file output builds');
+      if (asset.bundleBehavior === 'isolated' || asset.bundleBehavior === 'inlineIsolated') {
+        throw new Error(`${asset.bundleBehavior === 'isolated' ? 'Isolated' : 'Inline isolated'} assets are not supported for single file output builds`);
       }
 
       // For assets marked as inline, we create new bundles and let other

package/lib/bundleMerge.js

@@ -37,9 +37,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function getBundlesForBundleGroup(bundleGraph, bundleGroupId) {
   let count = 0;
   bundleGraph.traverse(nodeId => {
-    var _bundleGraph$getNode;
-    // @ts-expect-error TS2339
-    if (((_bundleGraph$getNode = bundleGraph.getNode(nodeId)) === null || _bundleGraph$getNode === void 0 ? void 0 : _bundleGraph$getNode.bundleBehavior) !== 'inline') {
+    const node = bundleGraph.getNode(nodeId);
+    if (node && (node === 'root' || node.bundleBehavior !== 'inline' && node.bundleBehavior !== 'inlineIsolated')) {
       count++;
     }
   }, bundleGroupId);

package/lib/idealGraph.js

@@ -250,15 +250,16 @@ function createIdealGraph(assetGraph, config, entries, logger) {
           manualSharedBundleKey != null && manualSharedMap.has(manualSharedBundleKey)) {
             bundleId = (0, _nullthrows().default)(manualSharedMap.get(manualSharedBundleKey));
           }
-          if (dependency.priority === 'lazy' || (0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && node.value.priority === 'conditional' || childAsset.bundleBehavior === 'isolated' // An isolated Dependency, or Bundle must contain all assets it needs to load.
-          ) {
+          if (dependency.priority === 'lazy' || (0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && node.value.priority === 'conditional' || childAsset.bundleBehavior === 'isolated' ||
+          // An isolated Dependency, or Bundle must contain all assets it needs to load.
+          childAsset.bundleBehavior === 'inlineIsolated') {
             if (bundleId == null) {
               let firstBundleGroup = (0, _nullthrows().default)(bundleGraph.getNode(stack[0][1]));
               (0, _assert().default)(firstBundleGroup !== 'root');
               bundle = createBundle({
                 asset: childAsset,
                 bundleBehavior: dependency.bundleBehavior ?? childAsset.bundleBehavior,
-                needsStableName: dependency.bundleBehavior === 'inline' || childAsset.bundleBehavior === 'inline' ? false : dependency.isEntry || dependency.needsStableName,
+                needsStableName: dependency.bundleBehavior === 'inline' || childAsset.bundleBehavior === 'inline' || dependency.bundleBehavior === 'inlineIsolated' || childAsset.bundleBehavior === 'inlineIsolated' ? false : dependency.isEntry || dependency.needsStableName,
                 target: firstBundleGroup.target
               });
               bundleId = bundleGraph.addNode(bundle);
@@ -282,7 +283,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
               if (
               // If this dependency requests isolated, but the bundle is not,
               // make the bundle isolated for all uses.
-              dependency.bundleBehavior === 'isolated' && bundle.bundleBehavior == null) {
+              (dependency.bundleBehavior === 'isolated' || dependency.bundleBehavior === 'inlineIsolated') && bundle.bundleBehavior == null) {
                 bundle.bundleBehavior = dependency.bundleBehavior;
               }
             }
@@ -323,7 +324,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
                 env: childAsset.env,
                 bundleBehavior: dependency.bundleBehavior ?? childAsset.bundleBehavior,
                 target: referencingBundle.target,
-                needsStableName: childAsset.bundleBehavior === 'inline' || dependency.bundleBehavior === 'inline' || dependency.priority === 'parallel' && !dependency.needsStableName ? false : referencingBundle.needsStableName
+                needsStableName: childAsset.bundleBehavior === 'inline' || dependency.bundleBehavior === 'inline' || dependency.bundleBehavior === 'inlineIsolated' || dependency.priority === 'parallel' && !dependency.needsStableName ? false : referencingBundle.needsStableName
               });
               bundleId = bundleGraph.addNode(bundle);
             } else {
@@ -332,7 +333,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
               if (
               // If this dependency requests isolated, but the bundle is not,
               // make the bundle isolated for all uses.
-              dependency.bundleBehavior === 'isolated' && bundle.bundleBehavior == null) {
+              (dependency.bundleBehavior === 'isolated' || dependency.bundleBehavior === 'inlineIsolated') && bundle.bundleBehavior == null) {
                 bundle.bundleBehavior = dependency.bundleBehavior;
               }
             }
@@ -522,7 +523,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
     // not true that a bundle's available assets = all assets of all the bundleGroups
     // it belongs to. It's the intersection of those sets.
     let available;
-    if (bundleRoot.bundleBehavior === 'isolated') {
+    if (bundleRoot.bundleBehavior === 'isolated' || bundleRoot.bundleBehavior === 'inlineIsolated') {
       available = new (_graph().BitSet)(assets.length);
     } else {
       available = (0, _nullthrows().default)(ancestorAssets[nodeId]).clone();
@@ -585,7 +586,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       continue;
     }
     let parentRoots = bundleRootGraph.getNodeIdsConnectedTo(id, _graph().ALL_EDGE_TYPES);
-    let canDelete = getBundleFromBundleRoot(bundleRoot).bundleBehavior !== 'isolated';
+    let canDelete = getBundleFromBundleRoot(bundleRoot).bundleBehavior !== 'isolated' && getBundleFromBundleRoot(bundleRoot).bundleBehavior !== 'inlineIsolated';
     if (parentRoots.length === 0) continue;
     for (let parentId of parentRoots) {
       var _ancestorAssets$paren;
@@ -653,7 +654,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       let assetId = bundleRootGraph.getNode(nodeId);
       if (assetId == null) return; // deleted
       let a = assets[assetId];
-      if (entries.has(a) || !a.isBundleSplittable || bundleRoots.get(a) && (getBundleFromBundleRoot(a).needsStableName || getBundleFromBundleRoot(a).bundleBehavior === 'isolated')) {
+      if (entries.has(a) || !a.isBundleSplittable || bundleRoots.get(a) && (getBundleFromBundleRoot(a).needsStableName || getBundleFromBundleRoot(a).bundleBehavior === 'isolated' || getBundleFromBundleRoot(a).bundleBehavior === 'inlineIsolated')) {
         // Add asset to non-splittable bundles.
         addAssetToBundleRoot(asset, a);
       } else if (!((_ancestorAssets$nodeI = ancestorAssets[nodeId]) !== null && _ancestorAssets$nodeI !== void 0 && _ancestorAssets$nodeI.has(i))) {
@@ -970,8 +971,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       let numBundlesContributingToPRL = bundleIdsInGroup.reduce((count, b) => {
         let bundle = (0, _nullthrows().default)(bundleGraph.getNode(b));
         (0, _assert().default)(bundle !== 'root');
-        // @ts-expect-error TS2365
-        return count + (bundle.bundleBehavior !== 'inline');
+        return count + Number(bundle.bundleBehavior !== 'inline' && bundle.bundleBehavior !== 'inlineIsolated');
       }, 0);
       if (numBundlesContributingToPRL > config.maxParallelRequests) {
         let sharedBundleIdsInBundleGroup = bundleIdsInGroup.filter(b => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@atlaspack/diagnostic": "2.14.2",
-    "@atlaspack/feature-flags": "2.20.1",
-    "@atlaspack/graph": "3.5.11",
-    "@atlaspack/plugin": "2.14.22",
-    "@atlaspack/rust": "3.4.2",
-    "@atlaspack/utils": "2.17.4",
+    "@atlaspack/feature-flags": "2.21.0",
+    "@atlaspack/graph": "3.5.12",
+    "@atlaspack/plugin": "2.14.23",
+    "@atlaspack/rust": "3.5.0",
+    "@atlaspack/utils": "2.18.0",
     "nullthrows": "^1.1.1",
     "many-keys-map": "^1.0.3"
   },

package/src/MonolithicBundler.ts

@@ -38,9 +38,12 @@ export function addJSMonolithBundle(
       let assets = bundleGraph.getDependencyAssets(dependency);
 
       for (const asset of assets) {
-        if (asset.bundleBehavior === 'isolated') {
+        if (
+          asset.bundleBehavior === 'isolated' ||
+          asset.bundleBehavior === 'inlineIsolated'
+        ) {
           throw new Error(
-            'Isolated assets are not supported for single file output builds',
+            `${asset.bundleBehavior === 'isolated' ? 'Isolated' : 'Inline isolated'} assets are not supported for single file output builds`,
           );
         }
 

package/src/bundleMerge.ts

@@ -12,8 +12,13 @@ function getBundlesForBundleGroup(
 ): number {
   let count = 0;
   bundleGraph.traverse((nodeId) => {
-    // @ts-expect-error TS2339
-    if (bundleGraph.getNode(nodeId)?.bundleBehavior !== 'inline') {
+    const node = bundleGraph.getNode(nodeId);
+    if (
+      node &&
+      (node === 'root' ||
+        (node.bundleBehavior !== 'inline' &&
+          node.bundleBehavior !== 'inlineIsolated'))
+    ) {
       count++;
     }
   }, bundleGroupId);

package/src/idealGraph.ts

@@ -353,7 +353,8 @@ export function createIdealGraph(
               dependency.priority === 'lazy' ||
               (getFeatureFlag('conditionalBundlingApi') &&
                 node.value.priority === 'conditional') ||
-              childAsset.bundleBehavior === 'isolated' // An isolated Dependency, or Bundle must contain all assets it needs to load.
+              childAsset.bundleBehavior === 'isolated' || // An isolated Dependency, or Bundle must contain all assets it needs to load.
+              childAsset.bundleBehavior === 'inlineIsolated'
             ) {
               if (bundleId == null) {
                 let firstBundleGroup = nullthrows(
@@ -366,7 +367,9 @@ export function createIdealGraph(
                     dependency.bundleBehavior ?? childAsset.bundleBehavior,
                   needsStableName:
                     dependency.bundleBehavior === 'inline' ||
-                    childAsset.bundleBehavior === 'inline'
+                    childAsset.bundleBehavior === 'inline' ||
+                    dependency.bundleBehavior === 'inlineIsolated' ||
+                    childAsset.bundleBehavior === 'inlineIsolated'
                       ? false
                       : dependency.isEntry || dependency.needsStableName,
                   target: firstBundleGroup.target,
@@ -398,7 +401,8 @@ export function createIdealGraph(
                 if (
                   // If this dependency requests isolated, but the bundle is not,
                   // make the bundle isolated for all uses.
-                  dependency.bundleBehavior === 'isolated' &&
+                  (dependency.bundleBehavior === 'isolated' ||
+                    dependency.bundleBehavior === 'inlineIsolated') &&
                   bundle.bundleBehavior == null
                 ) {
                   bundle.bundleBehavior = dependency.bundleBehavior;
@@ -482,6 +486,7 @@ export function createIdealGraph(
                   needsStableName:
                     childAsset.bundleBehavior === 'inline' ||
                     dependency.bundleBehavior === 'inline' ||
+                    dependency.bundleBehavior === 'inlineIsolated' ||
                     (dependency.priority === 'parallel' &&
                       !dependency.needsStableName)
                       ? false
@@ -495,7 +500,8 @@ export function createIdealGraph(
                 if (
                   // If this dependency requests isolated, but the bundle is not,
                   // make the bundle isolated for all uses.
-                  dependency.bundleBehavior === 'isolated' &&
+                  (dependency.bundleBehavior === 'isolated' ||
+                    dependency.bundleBehavior === 'inlineIsolated') &&
                   bundle.bundleBehavior == null
                 ) {
                   bundle.bundleBehavior = dependency.bundleBehavior;
@@ -741,7 +747,10 @@ export function createIdealGraph(
     // not true that a bundle's available assets = all assets of all the bundleGroups
     // it belongs to. It's the intersection of those sets.
     let available;
-    if (bundleRoot.bundleBehavior === 'isolated') {
+    if (
+      bundleRoot.bundleBehavior === 'isolated' ||
+      bundleRoot.bundleBehavior === 'inlineIsolated'
+    ) {
       available = new BitSet(assets.length);
     } else {
       available = nullthrows(ancestorAssets[nodeId]).clone();
@@ -825,7 +834,8 @@ export function createIdealGraph(
 
     let parentRoots = bundleRootGraph.getNodeIdsConnectedTo(id, ALL_EDGE_TYPES);
     let canDelete =
-      getBundleFromBundleRoot(bundleRoot).bundleBehavior !== 'isolated';
+      getBundleFromBundleRoot(bundleRoot).bundleBehavior !== 'isolated' &&
+      getBundleFromBundleRoot(bundleRoot).bundleBehavior !== 'inlineIsolated';
     if (parentRoots.length === 0) continue;
     for (let parentId of parentRoots) {
       if (parentId === rootNodeId) {
@@ -905,7 +915,8 @@ export function createIdealGraph(
         !a.isBundleSplittable ||
         (bundleRoots.get(a) &&
           (getBundleFromBundleRoot(a).needsStableName ||
-            getBundleFromBundleRoot(a).bundleBehavior === 'isolated'))
+            getBundleFromBundleRoot(a).bundleBehavior === 'isolated' ||
+            getBundleFromBundleRoot(a).bundleBehavior === 'inlineIsolated'))
       ) {
         // Add asset to non-splittable bundles.
         addAssetToBundleRoot(asset, a);
@@ -1302,8 +1313,13 @@ export function createIdealGraph(
       let numBundlesContributingToPRL = bundleIdsInGroup.reduce((count, b) => {
         let bundle = nullthrows(bundleGraph.getNode(b));
         invariant(bundle !== 'root');
-        // @ts-expect-error TS2365
-        return count + (bundle.bundleBehavior !== 'inline');
+        return (
+          count +
+          Number(
+            bundle.bundleBehavior !== 'inline' &&
+              bundle.bundleBehavior !== 'inlineIsolated',
+          )
+        );
       }, 0);
 
       if (numBundlesContributingToPRL > config.maxParallelRequests) {