@atlaspack/runtime-js 2.14.5-canary.136 → 2.14.5-canary.138

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaspack/runtime-js
 
+## 2.16.0
+
+### Minor Changes
+
+- [#721](https://github.com/atlassian-labs/atlaspack/pull/721) [`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd) Thanks [@benjervis](https://github.com/benjervis)! - Add support for bundle merging based on `webpackChunkName` comments.
+
+  Adding a `webpackChunkName` comment to an import will allow the bundler to merge multiple imports into a single bundle.
+
+  e.g.:
+
+  ```ts
+  import(/* webpackChunkName: "my-chunk" */ './my-module');
+  import(/* webpackChunkName: "my-chunk" */ './another-module');
+  ```
+
+  This can be enabled with the feature flag `supportWebpackChunkName`.
+
+### Patch Changes
+
+- Updated dependencies [[`069de47`](https://github.com/atlassian-labs/atlaspack/commit/069de478e64fb5889f6f2ce023eb510782767fbd)]:
+  - @atlaspack/feature-flags@2.20.0
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/plugin@2.14.21
+
 ## 2.15.2
 
 ### Patch Changes

package/lib/JSRuntime.js

@@ -375,10 +375,16 @@ function getLoaderRuntime({
     return;
   }
   let externalBundles = bundleGraph.getBundlesInBundleGroup(bundleGroup);
-  let mainBundle = (0, _nullthrows().default)(externalBundles.find(bundle => {
-    var _bundle$getMainEntry;
-    return ((_bundle$getMainEntry = bundle.getMainEntry()) === null || _bundle$getMainEntry === void 0 ? void 0 : _bundle$getMainEntry.id) === bundleGroup.entryAssetId;
-  }));
+  let potentialMainBundle;
+  if ((0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
+    potentialMainBundle = externalBundles.find(bundle => bundle.getEntryAssets().some(asset => asset.id === bundleGroup.entryAssetId));
+  } else {
+    potentialMainBundle = externalBundles.find(bundle => {
+      var _bundle$getMainEntry;
+      return ((_bundle$getMainEntry = bundle.getMainEntry()) === null || _bundle$getMainEntry === void 0 ? void 0 : _bundle$getMainEntry.id) === bundleGroup.entryAssetId;
+    });
+  }
+  let mainBundle = (0, _nullthrows().default)(potentialMainBundle);
 
   // CommonJS is a synchronous module system, so there is no need to load bundles in parallel.
   // Importing of the other bundles will be handled by the bundle group entry.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.14.5-canary.136+d90b6d22d",
+  "version": "2.14.5-canary.138+eda07caaf",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,13 +15,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.204+d90b6d22d",
-    "@atlaspack/domain-sharding": "2.14.1-canary.204+d90b6d22d",
-    "@atlaspack/feature-flags": "2.14.1-canary.204+d90b6d22d",
-    "@atlaspack/plugin": "2.14.5-canary.136+d90b6d22d",
-    "@atlaspack/utils": "2.14.5-canary.136+d90b6d22d",
+    "@atlaspack/diagnostic": "2.14.1-canary.206+eda07caaf",
+    "@atlaspack/domain-sharding": "2.14.1-canary.206+eda07caaf",
+    "@atlaspack/feature-flags": "2.14.1-canary.206+eda07caaf",
+    "@atlaspack/plugin": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/utils": "2.14.5-canary.138+eda07caaf",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "d90b6d22db4f44b6831c33933ddd31d4a77800a6"
+  "gitHead": "eda07caafd2ebb814bbdbfd0ec12fa63124e213f"
 }

package/src/JSRuntime.js

@@ -458,11 +458,21 @@ function getLoaderRuntime({
   }
 
   let externalBundles = bundleGraph.getBundlesInBundleGroup(bundleGroup);
-  let mainBundle = nullthrows(
-    externalBundles.find(
+  let potentialMainBundle;
+
+  if (getFeatureFlag('supportWebpackChunkName')) {
+    potentialMainBundle = externalBundles.find((bundle) =>
+      bundle
+        .getEntryAssets()
+        .some((asset) => asset.id === bundleGroup.entryAssetId),
+    );
+  } else {
+    potentialMainBundle = externalBundles.find(
       (bundle) => bundle.getMainEntry()?.id === bundleGroup.entryAssetId,
-    ),
-  );
+    );
+  }
+
+  let mainBundle = nullthrows(potentialMainBundle);
 
   // CommonJS is a synchronous module system, so there is no need to load bundles in parallel.
   // Importing of the other bundles will be handled by the bundle group entry.