@atlaspack/core 2.13.2-dev.3689 → 2.14.1-canary.3710

package/CHANGELOG.md

@@ -1,5 +1,66 @@
 # @atlaspack/core
 
+## 2.14.0
+
+### Minor Changes
+
+- [#339](https://github.com/atlassian-labs/atlaspack/pull/339) [`bfe81e5`](https://github.com/atlassian-labs/atlaspack/commit/bfe81e551c4e4bb2cac7fc4745222e66962c1728) Thanks [@yamadapc](https://github.com/yamadapc)! - Update cache invalidation metrics with build type
+
+- [#383](https://github.com/atlassian-labs/atlaspack/pull/383) [`8386ca4`](https://github.com/atlassian-labs/atlaspack/commit/8386ca4dc318688fbed1af3bbebf2af3e7d24552) Thanks [@benjervis](https://github.com/benjervis)! - `loadPlugin` no longer returns a `range` field. This field was only set by looking up a package's `parcelDependencies`, which no longer exist.
+
+- [#358](https://github.com/atlassian-labs/atlaspack/pull/358) [`7e21377`](https://github.com/atlassian-labs/atlaspack/commit/7e21377914e8091d484f67cb11052a1efd2227e3) Thanks [@benjervis](https://github.com/benjervis)! - Add a step to the BundleGraphRequest that will scan for assets that have a transitive dep on `@confluence/loadable` and marks them as having side effects.
+  This allows the inline requires optimizer to be applied to projects that don't necessarily declare side effects correctly.
+
+- [#366](https://github.com/atlassian-labs/atlaspack/pull/366) [`4812d0f`](https://github.com/atlassian-labs/atlaspack/commit/4812d0f7400af0f8416f1b7175ecb87700860a68) Thanks [@alshdavid](https://github.com/alshdavid)! - Added NapiWorkerPool
+
+### Patch Changes
+
+- [#401](https://github.com/atlassian-labs/atlaspack/pull/401) [`cd964ee`](https://github.com/atlassian-labs/atlaspack/commit/cd964eed5a330ae63733656ded691d1ea3afe4e3) Thanks [@MonicaOlejniczak](https://github.com/MonicaOlejniczak)! - Fix respondToFsEvents return type
+
+- [#413](https://github.com/atlassian-labs/atlaspack/pull/413) [`1953d1b`](https://github.com/atlassian-labs/atlaspack/commit/1953d1bec266a39dc4bfce5f6c7959e77e63411e) Thanks [@pancaspe87](https://github.com/pancaspe87)! - Patch absolute paths
+
+- [#416](https://github.com/atlassian-labs/atlaspack/pull/416) [`1de1c81`](https://github.com/atlassian-labs/atlaspack/commit/1de1c8138fbe4d38a64aa1f3c22a70aad59fb5bb) Thanks [@alshdavid](https://github.com/alshdavid)! - Replace require.resolve with path.join
+
+- [#362](https://github.com/atlassian-labs/atlaspack/pull/362) [`726b0b0`](https://github.com/atlassian-labs/atlaspack/commit/726b0b02f4ba47426dd38d809036517477b8b1cd) Thanks [@alshdavid](https://github.com/alshdavid)! - Added conditional bundling config to native js transformer
+
+- [#404](https://github.com/atlassian-labs/atlaspack/pull/404) [`be88bd9`](https://github.com/atlassian-labs/atlaspack/commit/be88bd9fc4cbc1c579685bf2e5d834b4136a6c7c) Thanks [@benjervis](https://github.com/benjervis)! - Removes the dependency check within the config default `package.json`.
+
+  Any dependencies that used to be auto-installed from `parcelDependencies` should
+  now be installed in the project root.
+
+- [#415](https://github.com/atlassian-labs/atlaspack/pull/415) [`43113f8`](https://github.com/atlassian-labs/atlaspack/commit/43113f8f00232c5a52169a3f11f846d6e4d94b0a) Thanks [@yamadapc](https://github.com/yamadapc)! - Add feature-flag to fix supporting source-maps for inline bundles
+
+- [#367](https://github.com/atlassian-labs/atlaspack/pull/367) [`3650f7c`](https://github.com/atlassian-labs/atlaspack/commit/3650f7c9ab803b5ae20b223e82b2268a1b614e43) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Add basic incremental build support to V3
+
+- [#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
+
+- [#354](https://github.com/atlassian-labs/atlaspack/pull/354) [`a4990f6`](https://github.com/atlassian-labs/atlaspack/commit/a4990f6f32045b95d0e6da97f692269a38e13533) Thanks [@yamadapc](https://github.com/yamadapc)! - Log errors to load the graph including bail-out errors
+
+- [#359](https://github.com/atlassian-labs/atlaspack/pull/359) [`c2ef915`](https://github.com/atlassian-labs/atlaspack/commit/c2ef915dc54784ce4b8180025ac1b2e13b375002) Thanks [@alshdavid](https://github.com/alshdavid)! - Added support for string featureflags to native
+
+- [#340](https://github.com/atlassian-labs/atlaspack/pull/340) [`1b1ef6e`](https://github.com/atlassian-labs/atlaspack/commit/1b1ef6e64fdfcf1c1c744e90e8c6568b0fd0e072) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Ensure bundle graph request errors show up correctly
+
+- [#402](https://github.com/atlassian-labs/atlaspack/pull/402) [`cc66aaa`](https://github.com/atlassian-labs/atlaspack/commit/cc66aaa66d67dd0cb89e083f387a278e74aad3f0) Thanks [@alshdavid](https://github.com/alshdavid)! - Initialize AtlaspackNative async
+
+- [#373](https://github.com/atlassian-labs/atlaspack/pull/373) [`a1e3c87`](https://github.com/atlassian-labs/atlaspack/commit/a1e3c87f25c8d108807fb8ea0e91e8effb2c71a7) Thanks [@yamadapc](https://github.com/yamadapc)! - Add config request ID into the identifier registry
+
+- 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), [`1de1c81`](https://github.com/atlassian-labs/atlaspack/commit/1de1c8138fbe4d38a64aa1f3c22a70aad59fb5bb), [`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), [`f6dbdff`](https://github.com/atlassian-labs/atlaspack/commit/f6dbdff59d843e2a832d206205343178b33bf1f5), [`7e21377`](https://github.com/atlassian-labs/atlaspack/commit/7e21377914e8091d484f67cb11052a1efd2227e3), [`43113f8`](https://github.com/atlassian-labs/atlaspack/commit/43113f8f00232c5a52169a3f11f846d6e4d94b0a), [`e962cd7`](https://github.com/atlassian-labs/atlaspack/commit/e962cd735877f7f16163e60868d70d9c10054ebe), [`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), [`3005307`](https://github.com/atlassian-labs/atlaspack/commit/30053076dfd20ca62ddbc682f58adb994029ac55), [`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/fs@2.14.0
+  - @atlaspack/graph@3.4.0
+  - @atlaspack/logger@2.14.0
+  - @atlaspack/package-manager@2.14.0
+  - @atlaspack/plugin@2.14.0
+  - @atlaspack/profiler@2.14.0
+  - @atlaspack/rust@3.0.0
+  - @atlaspack/types@2.14.0
+  - @atlaspack/utils@2.14.0
+  - @atlaspack/workers@2.14.0
+  - @atlaspack/events@2.14.0
+  - @atlaspack/build-cache@2.13.2
+  - @atlaspack/cache@2.13.2
+
 ## 2.13.1
 
 ### Patch Changes

package/lib/Atlaspack.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.INTERNAL_TRANSFORM = exports.INTERNAL_RESOLVE = exports.BuildError = void 0;
+exports.WORKER_PATH = exports.INTERNAL_TRANSFORM = exports.INTERNAL_RESOLVE = exports.BuildError = void 0;
 exports.createWorkerFarm = createWorkerFarm;
 exports.default = void 0;
 function _path() {
@@ -125,6 +125,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 (0, _registerCoreWithSerializer.registerCoreWithSerializer)();
 const INTERNAL_TRANSFORM = exports.INTERNAL_TRANSFORM = Symbol('internal_transform');
 const INTERNAL_RESOLVE = exports.INTERNAL_RESOLVE = Symbol('internal_resolve');
+const WORKER_PATH = exports.WORKER_PATH = _path().default.join(__dirname, 'worker.js');
 class Atlaspack {
   #requestTracker /*: RequestTracker*/;
   #config /*: AtlaspackConfig*/;
@@ -204,7 +205,7 @@ class Atlaspack {
       // $FlowFixMe
       const version = require('../package.json').version;
       await lmdb.put('current_session_version', Buffer.from(version));
-      rustAtlaspack = new _atlaspackV.AtlaspackV3({
+      rustAtlaspack = await _atlaspackV.AtlaspackV3.create({
         ...options,
         corePath: _path().default.join(__dirname, '..'),
         threads: process.env.NODE_ENV === 'test' ? 2 : undefined,
@@ -671,6 +672,6 @@ exports.BuildError = BuildError;
 function createWorkerFarm(options = {}) {
   return new (_workers().default)({
     ...options,
-    workerPath: require.resolve('./worker')
+    workerPath: WORKER_PATH
   });
 }

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -21,7 +21,10 @@ function _diagnostic() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class AtlaspackV3 {
-  constructor({
+  constructor(atlaspack_napi) {
+    this._atlaspack_napi = atlaspack_napi;
+  }
+  static async create({
     fs,
     packageManager,
     threads,
@@ -33,16 +36,22 @@ class AtlaspackV3 {
     options.defaultTargetOptions = options.defaultTargetOptions || {};
     // $FlowFixMe "engines" are readonly
     options.defaultTargetOptions.engines = options.defaultTargetOptions.engines || {};
-    this._internal = _rust().AtlaspackNapi.create({
+    const [internal, error] = await (0, _rust().atlaspackNapiCreate)({
       fs,
       packageManager,
       threads,
       options,
       napiWorkerPool
     }, lmdb);
+    if (error !== null) {
+      throw new (_diagnostic().default)({
+        diagnostic: error
+      });
+    }
+    return new AtlaspackV3(internal);
   }
   async buildAssetGraph() {
-    let [graph, error] = await this._internal.buildAssetGraph();
+    let [graph, error] = await (0, _rust().atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
     if (error !== null) {
       throw new (_diagnostic().default)({
         diagnostic: error
@@ -51,7 +60,7 @@ class AtlaspackV3 {
     return graph;
   }
   respondToFsEvents(events) {
-    return this._internal.respondToFsEvents(events);
+    return (0, _rust().atlaspackNapiRespondToFsEvents)(this._atlaspack_napi, events);
   }
 }
 exports.AtlaspackV3 = AtlaspackV3;

package/lib/requests/WriteBundlesRequest.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = createWriteBundlesRequest;
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 var _RequestTracker = require("../RequestTracker");
 var _constants = require("../constants");
 var _projectPath = require("../projectPath");
@@ -54,7 +61,13 @@ async function run({
   let bundleInfoMap = {};
   let writeEarlyPromises = {};
   let hashRefToNameHash = new Map();
-  let bundles = bundleGraph.getBundles().filter(bundle => {
+
+  // Include inline bundles so that non-inline bundles referenced from inline bundles are written to
+  // separate files. This ensures that source maps are written and work.
+  const allBundles = bundleGraph.getBundles({
+    includeInline: (0, _featureFlags().getFeatureFlag)('inlineBundlesSourceMapFixes')
+  });
+  const bundles = allBundles.filter(bundle => bundle.bundleBehavior !== 'inline').filter(bundle => {
     // Do not package and write placeholder bundles to disk. We just
     // need to update the name so other bundles can reference it.
     if (bundle.isPlaceholder) {
@@ -140,7 +153,8 @@ function assignComplexNameHashes(hashRefToNameHash, bundles, bundleInfoMap, opti
 }
 function getBundlesIncludedInHash(bundleId, bundleInfoMap, included = new Set()) {
   included.add(bundleId);
-  for (let hashRef of bundleInfoMap[bundleId].hashReferences) {
+  for (let hashRef of ((_bundleInfoMap$bundle = bundleInfoMap[bundleId]) === null || _bundleInfoMap$bundle === void 0 ? void 0 : _bundleInfoMap$bundle.hashReferences) ?? []) {
+    var _bundleInfoMap$bundle;
     let referencedId = getIdFromHashRef(hashRef);
     if (!included.has(referencedId)) {
       getBundlesIncludedInHash(referencedId, bundleInfoMap, included);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.13.2-dev.3689+7a2e6e783",
+  "version": "2.14.1-canary.3710+d874396ab",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/cache": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/diagnostic": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/events": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/feature-flags": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/fs": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/graph": "3.3.2-dev.3689+7a2e6e783",
-    "@atlaspack/logger": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/package-manager": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/plugin": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/profiler": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/rust": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/types": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/utils": "2.13.2-dev.3689+7a2e6e783",
-    "@atlaspack/workers": "2.13.2-dev.3689+7a2e6e783",
+    "@atlaspack/build-cache": "2.13.3-canary.3710+d874396ab",
+    "@atlaspack/cache": "2.13.3-canary.3710+d874396ab",
+    "@atlaspack/diagnostic": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/events": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/feature-flags": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/fs": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/graph": "3.4.1-canary.3710+d874396ab",
+    "@atlaspack/logger": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/package-manager": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/plugin": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/profiler": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/rust": "3.0.1-canary.3710+d874396ab",
+    "@atlaspack/types": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/utils": "2.14.1-canary.3710+d874396ab",
+    "@atlaspack/workers": "2.14.1-canary.3710+d874396ab",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -48,7 +48,7 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.13.1",
+    "@atlaspack/babel-register": "2.14.0",
     "@types/node": ">= 18",
     "graphviz": "^0.0.9",
     "jest-diff": "*",
@@ -66,5 +66,6 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "7a2e6e7835fa846b27021b374097c6a4f37541ba"
+  "type": "commonjs",
+  "gitHead": "d874396ab648d0d5505d66c7eb73e1748f1eaf68"
 }

package/src/Atlaspack.js

@@ -68,6 +68,7 @@ registerCoreWithSerializer();
 
 export const INTERNAL_TRANSFORM: symbol = Symbol('internal_transform');
 export const INTERNAL_RESOLVE: symbol = Symbol('internal_resolve');
+export const WORKER_PATH: string = path.join(__dirname, 'worker.js');
 
 export default class Atlaspack {
   #requestTracker /*: RequestTracker*/;
@@ -161,7 +162,7 @@ export default class Atlaspack {
       const version = require('../package.json').version;
       await lmdb.put('current_session_version', Buffer.from(version));
 
-      rustAtlaspack = new AtlaspackV3({
+      rustAtlaspack = await AtlaspackV3.create({
         ...options,
         corePath: path.join(__dirname, '..'),
         threads: process.env.NODE_ENV === 'test' ? 2 : undefined,
@@ -728,6 +729,6 @@ export function createWorkerFarm(
 ): WorkerFarm {
   return new WorkerFarm({
     ...options,
-    workerPath: require.resolve('./worker'),
+    workerPath: WORKER_PATH,
   });
 }

package/src/atlaspack-v3/AtlaspackV3.js

@@ -1,7 +1,10 @@
 // @flow
 
 import {
-  AtlaspackNapi,
+  atlaspackNapiCreate,
+  atlaspackNapiBuildAssetGraph,
+  atlaspackNapiRespondToFsEvents,
+  type AtlaspackNapi,
   type Lmdb,
   type AtlaspackNapiOptions,
 } from '@atlaspack/rust';
@@ -24,24 +27,27 @@ export type AtlaspackV3Options = {|
 |};
 
 export class AtlaspackV3 {
-  _internal: AtlaspackNapi;
-  _workerIds: any[];
+  _atlaspack_napi: AtlaspackNapi;
 
-  constructor({
+  constructor(atlaspack_napi: AtlaspackNapi) {
+    this._atlaspack_napi = atlaspack_napi;
+  }
+
+  static async create({
     fs,
     packageManager,
     threads,
     lmdb,
     napiWorkerPool = new NapiWorkerPool(),
     ...options
-  }: AtlaspackV3Options) {
+  }: AtlaspackV3Options): Promise<AtlaspackV3> {
     options.logLevel = options.logLevel || 'error';
     options.defaultTargetOptions = options.defaultTargetOptions || {};
     // $FlowFixMe "engines" are readonly
     options.defaultTargetOptions.engines =
       options.defaultTargetOptions.engines || {};
 
-    this._internal = AtlaspackNapi.create(
+    const [internal, error] = await atlaspackNapiCreate(
       {
         fs,
         packageManager,
@@ -51,10 +57,20 @@ export class AtlaspackV3 {
       },
       lmdb,
     );
+
+    if (error !== null) {
+      throw new ThrowableDiagnostic({
+        diagnostic: error,
+      });
+    }
+
+    return new AtlaspackV3(internal);
   }
 
   async buildAssetGraph(): Promise<any> {
-    let [graph, error] = await this._internal.buildAssetGraph();
+    let [graph, error] = await atlaspackNapiBuildAssetGraph(
+      this._atlaspack_napi,
+    );
 
     if (error !== null) {
       throw new ThrowableDiagnostic({
@@ -65,7 +81,7 @@ export class AtlaspackV3 {
     return graph;
   }
 
-  respondToFsEvents(events: Array<Event>): Promise<boolean> {
-    return this._internal.respondToFsEvents(events);
+  respondToFsEvents(events: Array<Event>): boolean {
+    return atlaspackNapiRespondToFsEvents(this._atlaspack_napi, events);
   }
 }

package/src/requests/WriteBundlesRequest.js

@@ -2,6 +2,7 @@
 
 import type {ContentKey} from '@atlaspack/graph';
 import type {Async} from '@atlaspack/types';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import type {SharedReference} from '@atlaspack/workers';
 import type {StaticRunOpts} from '../RequestTracker';
 import {requestTypes} from '../RequestTracker';
@@ -63,29 +64,37 @@ async function run({input, api, farm, options}) {
   |} = {};
   let writeEarlyPromises = {};
   let hashRefToNameHash = new Map();
-  let bundles = bundleGraph.getBundles().filter((bundle) => {
-    // Do not package and write placeholder bundles to disk. We just
-    // need to update the name so other bundles can reference it.
-    if (bundle.isPlaceholder) {
-      let hash = bundle.id.slice(-8);
-      hashRefToNameHash.set(bundle.hashReference, hash);
-      let name = nullthrows(
-        bundle.name,
-        `Expected ${bundle.type} bundle to have a name`,
-      ).replace(bundle.hashReference, hash);
-      res.set(bundle.id, {
-        filePath: joinProjectPath(bundle.target.distDir, name),
-        type: bundle.type, // FIXME: this is wrong if the packager changes the type...
-        stats: {
-          time: 0,
-          size: 0,
-        },
-      });
-      return false;
-    }
 
-    return true;
+  // Include inline bundles so that non-inline bundles referenced from inline bundles are written to
+  // separate files. This ensures that source maps are written and work.
+  const allBundles = bundleGraph.getBundles({
+    includeInline: getFeatureFlag('inlineBundlesSourceMapFixes'),
   });
+  const bundles = allBundles
+    .filter((bundle) => bundle.bundleBehavior !== 'inline')
+    .filter((bundle) => {
+      // Do not package and write placeholder bundles to disk. We just
+      // need to update the name so other bundles can reference it.
+      if (bundle.isPlaceholder) {
+        let hash = bundle.id.slice(-8);
+        hashRefToNameHash.set(bundle.hashReference, hash);
+        let name = nullthrows(
+          bundle.name,
+          `Expected ${bundle.type} bundle to have a name`,
+        ).replace(bundle.hashReference, hash);
+        res.set(bundle.id, {
+          filePath: joinProjectPath(bundle.target.distDir, name),
+          type: bundle.type, // FIXME: this is wrong if the packager changes the type...
+          stats: {
+            time: 0,
+            size: 0,
+          },
+        });
+        return false;
+      }
+
+      return true;
+    });
 
   // Package on the main thread if there is only one bundle to package.
   // This avoids the cost of serializing the bundle graph for single file change builds.
@@ -194,7 +203,7 @@ function getBundlesIncludedInHash(
   included = new Set(),
 ) {
   included.add(bundleId);
-  for (let hashRef of bundleInfoMap[bundleId].hashReferences) {
+  for (let hashRef of bundleInfoMap[bundleId]?.hashReferences ?? []) {
     let referencedId = getIdFromHashRef(hashRef);
     if (!included.has(referencedId)) {
       getBundlesIncludedInHash(referencedId, bundleInfoMap, included);