@atlaspack/core 2.13.2-canary.3695 → 2.13.2-canary.3696

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-canary.3695+eff980937",
+  "version": "2.13.2-canary.3696+43113f8f0",
   "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-canary.3695+eff980937",
-    "@atlaspack/cache": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/diagnostic": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/events": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/feature-flags": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/fs": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/graph": "3.3.2-canary.3695+eff980937",
-    "@atlaspack/logger": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/package-manager": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/plugin": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/profiler": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/rust": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/types": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/utils": "2.13.2-canary.3695+eff980937",
-    "@atlaspack/workers": "2.13.2-canary.3695+eff980937",
+    "@atlaspack/build-cache": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/cache": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/diagnostic": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/events": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/feature-flags": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/fs": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/graph": "3.3.2-canary.3696+43113f8f0",
+    "@atlaspack/logger": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/package-manager": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/plugin": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/profiler": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/rust": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/types": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/utils": "2.13.2-canary.3696+43113f8f0",
+    "@atlaspack/workers": "2.13.2-canary.3696+43113f8f0",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -67,5 +67,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "eff98093703b9999a511b87a19562f5aaccfcb53"
+  "gitHead": "43113f8f00232c5a52169a3f11f846d6e4d94b0a"
 }

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);