@atlaspack/core 2.12.1-canary.3410 → 2.12.1-canary.3412

package/lib/applyRuntimes.js

@@ -62,6 +62,13 @@ function _profiler() {
   };
   return data;
 }
+function _utils() {
+  const data = require("@atlaspack/utils");
+  _utils = 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 }; }
@@ -81,6 +88,36 @@ function nameRuntimeBundle(bundle, siblingBundle) {
   bundle.name = name;
   bundle.displayName = name.replace(hashReference, '[hash]');
 }
+
+/**
+ * The applyRuntimes function is responsible for generating all the runtimes
+ * (assets created during the build that don't actually exist on disk) and then
+ * linking them into the bundle graph.
+ *
+ * Usually, the assets returned from a runtime will go in the same bundle. It is
+ * possible though, for a runtime to return an asset with a `parallel` priority,
+ * which allows it to be moved to a separate bundle. In practice, this is
+ * usually used to generate application manifest files.
+ *
+ * When adding a manifest bundle (a whole new separate bundle) during a runtime,
+ * it needs to be added to a bundle group which will be potentially referenced
+ * by another bundle group. To avoid trying to reference a manifest entry which
+ * hasn't been created yet, we process the bundles from the bottom up, so that
+ * children will always be available when parents try to reference them.
+ *
+ * However, when merging those connections in to the bundle graph, the reversed
+ * order can create a situation where the child bundles thought they were coming
+ * first and so take responsibility for loading in shared bundles. When the
+ * parents actually load first, they're expecting bundles to be loaded which
+ * aren't yet, creating module not found errors.
+ *
+ * To fix that, we restore the forward topological order once all the
+ * connections are created.
+ *
+ * Introduction of manifest bundles: https://github.com/parcel-bundler/parcel/pull/8837
+ * Introduction of reverse topology: https://github.com/parcel-bundler/parcel/pull/8981
+ */
+
 async function applyRuntimes({
   bundleGraph,
   config,
@@ -93,17 +130,15 @@ async function applyRuntimes({
   configs
 }) {
   let runtimes = await config.getRuntimes();
-  let connections = [];
 
-  // As manifest bundles may be added during runtimes we process them in reverse topological
-  // sort order. This allows bundles to be added to their bundle groups before they are referenced
-  // by other bundle groups by loader runtimes
+  // Sort bundles into reverse topological order
   let bundles = [];
   bundleGraph.traverseBundles({
     exit(bundle) {
       bundles.push(bundle);
     }
   });
+  let connectionMap = new (_utils().DefaultMap)(() => []);
   for (let bundle of bundles) {
     for (let runtime of runtimes) {
       let measurement;
@@ -160,7 +195,7 @@ async function applyRuntimes({
               bundleGraph.createBundleReference(bundle, connectionBundle);
               nameRuntimeBundle(connectionBundle, bundle);
             }
-            connections.push({
+            connectionMap.get(connectionBundle).push({
               bundle: connectionBundle,
               assetGroup,
               dependency,
@@ -180,8 +215,13 @@ async function applyRuntimes({
     }
   }
 
-  // Correct connection order after generating runtimes in reverse order
-  connections.reverse();
+  // Sort the bundles back into forward topological order
+  let connections = [];
+  bundleGraph.traverseBundles({
+    enter(bundle) {
+      connections.push(...connectionMap.get(bundle));
+    }
+  });
 
   // Add dev deps for runtime plugins AFTER running them, to account for lazy require().
   for (let runtime of runtimes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3410+11a9679ea",
+  "version": "2.12.1-canary.3412+b617f5081",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,20 +20,20 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/cache": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/diagnostic": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/events": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/feature-flags": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/fs": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/graph": "3.2.1-canary.3410+11a9679ea",
-    "@atlaspack/logger": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/package-manager": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/plugin": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/profiler": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/rust": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/types": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/utils": "2.12.1-canary.3410+11a9679ea",
-    "@atlaspack/workers": "2.12.1-canary.3410+11a9679ea",
+    "@atlaspack/cache": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/diagnostic": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/events": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/feature-flags": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/fs": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/graph": "3.2.1-canary.3412+b617f5081",
+    "@atlaspack/logger": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/package-manager": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/plugin": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/profiler": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/rust": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/types": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/utils": "2.12.1-canary.3412+b617f5081",
+    "@atlaspack/workers": "2.12.1-canary.3412+b617f5081",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -55,5 +55,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "11a9679ea386c5e8342aa840646e41e77cbabd92"
+  "gitHead": "b617f508177b7dc3c3d3b35bc95b3fbc4e517268"
 }

package/src/applyRuntimes.js

@@ -32,6 +32,7 @@ import createAssetGraphRequest from './requests/AssetGraphRequest';
 import {createDevDependency, runDevDepRequest} from './requests/DevDepRequest';
 import {toProjectPath, fromProjectPathRelative} from './projectPath';
 import {tracer, PluginTracer} from '@atlaspack/profiler';
+import {DefaultMap} from '@atlaspack/utils';
 
 type RuntimeConnection = {|
   bundle: InternalBundle,
@@ -60,6 +61,35 @@ function nameRuntimeBundle(
   bundle.displayName = name.replace(hashReference, '[hash]');
 }
 
+/**
+ * The applyRuntimes function is responsible for generating all the runtimes
+ * (assets created during the build that don't actually exist on disk) and then
+ * linking them into the bundle graph.
+ *
+ * Usually, the assets returned from a runtime will go in the same bundle. It is
+ * possible though, for a runtime to return an asset with a `parallel` priority,
+ * which allows it to be moved to a separate bundle. In practice, this is
+ * usually used to generate application manifest files.
+ *
+ * When adding a manifest bundle (a whole new separate bundle) during a runtime,
+ * it needs to be added to a bundle group which will be potentially referenced
+ * by another bundle group. To avoid trying to reference a manifest entry which
+ * hasn't been created yet, we process the bundles from the bottom up, so that
+ * children will always be available when parents try to reference them.
+ *
+ * However, when merging those connections in to the bundle graph, the reversed
+ * order can create a situation where the child bundles thought they were coming
+ * first and so take responsibility for loading in shared bundles. When the
+ * parents actually load first, they're expecting bundles to be loaded which
+ * aren't yet, creating module not found errors.
+ *
+ * To fix that, we restore the forward topological order once all the
+ * connections are created.
+ *
+ * Introduction of manifest bundles: https://github.com/parcel-bundler/parcel/pull/8837
+ * Introduction of reverse topology: https://github.com/parcel-bundler/parcel/pull/8981
+ */
+
 export default async function applyRuntimes<TResult: RequestResult>({
   bundleGraph,
   config,
@@ -82,11 +112,8 @@ export default async function applyRuntimes<TResult: RequestResult>({
   configs: Map<string, Config>,
 |}): Promise<Map<string, Asset>> {
   let runtimes = await config.getRuntimes();
-  let connections: Array<RuntimeConnection> = [];
 
-  // As manifest bundles may be added during runtimes we process them in reverse topological
-  // sort order. This allows bundles to be added to their bundle groups before they are referenced
-  // by other bundle groups by loader runtimes
+  // Sort bundles into reverse topological order
   let bundles = [];
   bundleGraph.traverseBundles({
     exit(bundle) {
@@ -94,6 +121,8 @@ export default async function applyRuntimes<TResult: RequestResult>({
     },
   });
 
+  let connectionMap = new DefaultMap(() => []);
+
   for (let bundle of bundles) {
     for (let runtime of runtimes) {
       let measurement;
@@ -172,7 +201,7 @@ export default async function applyRuntimes<TResult: RequestResult>({
               nameRuntimeBundle(connectionBundle, bundle);
             }
 
-            connections.push({
+            connectionMap.get(connectionBundle).push({
               bundle: connectionBundle,
               assetGroup,
               dependency,
@@ -192,8 +221,14 @@ export default async function applyRuntimes<TResult: RequestResult>({
     }
   }
 
-  // Correct connection order after generating runtimes in reverse order
-  connections.reverse();
+  // Sort the bundles back into forward topological order
+  let connections: Array<RuntimeConnection> = [];
+
+  bundleGraph.traverseBundles({
+    enter(bundle) {
+      connections.push(...connectionMap.get(bundle));
+    },
+  });
 
   // Add dev deps for runtime plugins AFTER running them, to account for lazy require().
   for (let runtime of runtimes) {