@atlaspack/core 2.16.2-canary.136 → 2.16.2-canary.138

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaspack/core
 
+## 2.20.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/fs@2.15.16
+  - @atlaspack/profiler@2.14.18
+  - @atlaspack/types@2.15.11
+  - @atlaspack/workers@2.14.21
+  - @atlaspack/cache@3.2.16
+  - @atlaspack/graph@3.5.10
+  - @atlaspack/utils@2.17.3
+  - @atlaspack/package-manager@2.14.21
+  - @atlaspack/plugin@2.14.21
+
 ## 2.19.2
 
 ### Patch Changes

package/lib/BundleGraph.js

@@ -617,8 +617,12 @@ class BundleGraph {
       return this.getBundlesInBundleGroup(node.value, {
         includeInline: true
       }).find(b => {
-        let mainEntryId = b.entryAssetIds[b.entryAssetIds.length - 1];
-        return mainEntryId != null && node.value.entryAssetId === mainEntryId;
+        if ((0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
+          return b.entryAssetIds.some(id => id === node.value.entryAssetId);
+        } else {
+          let mainEntryId = b.entryAssetIds[b.entryAssetIds.length - 1];
+          return mainEntryId != null && node.value.entryAssetId === mainEntryId;
+        }
       });
     }
   }

package/lib/public/MutableBundleGraph.js

@@ -39,6 +39,13 @@ var _types = require("../types");
 var _BundleGroup = _interopRequireWildcard(require("./BundleGroup"));
 var _IdentifierRegistry = require("../IdentifierRegistry");
 var _EnvironmentManager = require("../EnvironmentManager");
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -143,6 +150,17 @@ class MutableBundleGraph extends _BundleGraph.default {
       (0, _assert().default)((entryAssetNode === null || entryAssetNode === void 0 ? void 0 : entryAssetNode.type) === 'asset', 'Entry asset does not exist');
       isPlaceholder = entryAssetNode.requested === false;
     }
+    let entryAssetIds = [];
+    if (entryAsset) {
+      entryAssetIds = [entryAsset.id];
+      if ((0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
+        let bundleRoots = opts.bundleRoots ?? [entryAsset];
+        let bundleRootIds = bundleRoots.map(({
+          id
+        }) => id).filter(assetId => assetId !== entryAsset.id);
+        entryAssetIds.push(...bundleRootIds);
+      }
+    }
     let bundleNode = {
       type: 'bundle',
       id: bundleId,
@@ -151,7 +169,7 @@ class MutableBundleGraph extends _BundleGraph.default {
         hashReference: this.#options.shouldContentHash ? _constants.HASH_REF_PREFIX + bundleId : bundleId.slice(-8),
         type: opts.entryAsset ? opts.entryAsset.type : opts.type,
         env: opts.env ? (0, _EnvironmentManager.toEnvironmentRef)((0, _Environment.environmentToInternalEnvironment)(opts.env)) : (0, _nullthrows().default)(entryAsset).env,
-        entryAssetIds: entryAsset ? [entryAsset.id] : [],
+        entryAssetIds,
         mainEntryId: entryAsset === null || entryAsset === void 0 ? void 0 : entryAsset.id,
         pipeline: opts.entryAsset ? opts.entryAsset.pipeline : opts.pipeline,
         needsStableName: opts.needsStableName,
@@ -166,8 +184,8 @@ class MutableBundleGraph extends _BundleGraph.default {
       }
     };
     let bundleNodeId = this.#graph._graph.addNodeByContentKey(bundleId, bundleNode);
-    if (opts.entryAsset) {
-      this.#graph._graph.addEdge(bundleNodeId, this.#graph._graph.getNodeIdByContentKey(opts.entryAsset.id));
+    for (let assetId of entryAssetIds) {
+      this.#graph._graph.addEdge(bundleNodeId, this.#graph._graph.getNodeIdByContentKey(assetId));
     }
     return _Bundle.Bundle.get(bundleNode.value, this.#graph, this.#options);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.136+d90b6d22d",
+  "version": "2.16.2-canary.138+eda07caaf",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -21,21 +21,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.204+d90b6d22d",
-    "@atlaspack/cache": "3.1.1-canary.136+d90b6d22d",
-    "@atlaspack/diagnostic": "2.14.1-canary.204+d90b6d22d",
-    "@atlaspack/events": "2.14.1-canary.204+d90b6d22d",
-    "@atlaspack/feature-flags": "2.14.1-canary.204+d90b6d22d",
-    "@atlaspack/fs": "2.14.5-canary.136+d90b6d22d",
-    "@atlaspack/graph": "3.4.1-canary.204+d90b6d22d",
-    "@atlaspack/logger": "2.14.5-canary.136+d90b6d22d",
-    "@atlaspack/package-manager": "2.14.5-canary.136+d90b6d22d",
-    "@atlaspack/plugin": "2.14.5-canary.136+d90b6d22d",
-    "@atlaspack/profiler": "2.14.1-canary.204+d90b6d22d",
-    "@atlaspack/rust": "3.2.1-canary.136+d90b6d22d",
-    "@atlaspack/types": "2.14.5-canary.136+d90b6d22d",
-    "@atlaspack/utils": "2.14.5-canary.136+d90b6d22d",
-    "@atlaspack/workers": "2.14.5-canary.136+d90b6d22d",
+    "@atlaspack/build-cache": "2.13.3-canary.206+eda07caaf",
+    "@atlaspack/cache": "3.1.1-canary.138+eda07caaf",
+    "@atlaspack/diagnostic": "2.14.1-canary.206+eda07caaf",
+    "@atlaspack/events": "2.14.1-canary.206+eda07caaf",
+    "@atlaspack/feature-flags": "2.14.1-canary.206+eda07caaf",
+    "@atlaspack/fs": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/graph": "3.4.1-canary.206+eda07caaf",
+    "@atlaspack/logger": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/package-manager": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/plugin": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/profiler": "2.14.1-canary.206+eda07caaf",
+    "@atlaspack/rust": "3.2.1-canary.138+eda07caaf",
+    "@atlaspack/types": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/utils": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/workers": "2.14.5-canary.138+eda07caaf",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -60,5 +60,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "d90b6d22db4f44b6831c33933ddd31d4a77800a6"
+  "gitHead": "eda07caafd2ebb814bbdbfd0ec12fa63124e213f"
 }

package/src/BundleGraph.js

@@ -552,6 +552,7 @@ export default class BundleGraph {
     opts:
       | {|
           +entryAsset: Asset,
+          +bundleRoots?: Array<Asset>,
           +target: Target,
           +needsStableName?: ?boolean,
           +bundleBehavior?: ?IBundleBehavior,
@@ -932,8 +933,12 @@ export default class BundleGraph {
       return this.getBundlesInBundleGroup(node.value, {
         includeInline: true,
       }).find((b) => {
-        let mainEntryId = b.entryAssetIds[b.entryAssetIds.length - 1];
-        return mainEntryId != null && node.value.entryAssetId === mainEntryId;
+        if (getFeatureFlag('supportWebpackChunkName')) {
+          return b.entryAssetIds.some((id) => id === node.value.entryAssetId);
+        } else {
+          let mainEntryId = b.entryAssetIds[b.entryAssetIds.length - 1];
+          return mainEntryId != null && node.value.entryAssetId === mainEntryId;
+        }
       });
     }
   }

package/src/public/MutableBundleGraph.js

@@ -34,6 +34,7 @@ import BundleGroup, {bundleGroupToInternalBundleGroup} from './BundleGroup';
 import type {ProjectPath} from '../projectPath';
 import {identifierRegistry} from '../IdentifierRegistry';
 import {toEnvironmentRef} from '../EnvironmentManager';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 function createBundleId(data: {|
   entryAssetId: string | null,
@@ -229,6 +230,17 @@ export default class MutableBundleGraph
       isPlaceholder = entryAssetNode.requested === false;
     }
 
+    let entryAssetIds = [];
+    if (entryAsset) {
+      entryAssetIds = [entryAsset.id];
+      if (getFeatureFlag('supportWebpackChunkName')) {
+        let bundleRoots = opts.bundleRoots ?? [entryAsset];
+        let bundleRootIds = bundleRoots
+          .map(({id}) => id)
+          .filter((assetId) => assetId !== entryAsset.id);
+        entryAssetIds.push(...bundleRootIds);
+      }
+    }
     let bundleNode: BundleNode = {
       type: 'bundle',
       id: bundleId,
@@ -241,7 +253,7 @@ export default class MutableBundleGraph
         env: opts.env
           ? toEnvironmentRef(environmentToInternalEnvironment(opts.env))
           : nullthrows(entryAsset).env,
-        entryAssetIds: entryAsset ? [entryAsset.id] : [],
+        entryAssetIds,
         mainEntryId: entryAsset?.id,
         pipeline: opts.entryAsset ? opts.entryAsset.pipeline : opts.pipeline,
         needsStableName: opts.needsStableName,
@@ -266,10 +278,10 @@ export default class MutableBundleGraph
       bundleNode,
     );
 
-    if (opts.entryAsset) {
+    for (let assetId of entryAssetIds) {
       this.#graph._graph.addEdge(
         bundleNodeId,
-        this.#graph._graph.getNodeIdByContentKey(opts.entryAsset.id),
+        this.#graph._graph.getNodeIdByContentKey(assetId),
       );
     }
     return Bundle.get(bundleNode.value, this.#graph, this.#options);