@parcel/packager-react-static 2.13.4-canary.3410 → 2.13.4-canary.3414

package/lib/ReactStaticPackager.js

@@ -160,6 +160,7 @@ var _default = exports.default = new (_plugin().Packager)({
     }
     let meta = pageMeta((0, _nullthrows().default)(bundle.getMainEntry()).meta);
     let props = {
+      key: 'page',
       pages,
       currentPage: {
         url: (0, _utils().urlJoin)(bundle.target.publicUrl, bundle.name),
@@ -171,10 +172,12 @@ var _default = exports.default = new (_plugin().Packager)({
     let bootstrapModules = [];
     let entry;
     for (let b of bundleGraph.getReferencedBundles(bundle, {
-      includeInline: false
+      includeInline: false,
+      includeIsolated: false
     })) {
       if (b.type === 'css') {
         resources.push(React.createElement('link', {
+          key: b.id,
           rel: 'stylesheet',
           href: (0, _utils().urlJoin)(b.target.publicUrl, b.name),
           precedence: 'default'
@@ -182,6 +185,7 @@ var _default = exports.default = new (_plugin().Packager)({
       } else if (b.type === 'js' && b.env.isBrowser()) {
         bootstrapModules.push((0, _utils().urlJoin)(b.target.publicUrl, b.name));
         resources.push(React.createElement('script', {
+          key: b.id,
           type: 'module',
           async: true,
           src: (0, _utils().urlJoin)(b.target.publicUrl, b.name)
@@ -248,7 +252,7 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
           let packagedBundle = await (0, _nullthrows().default)(packagingBundles.get(entryBundle));
           let contents = await (0, _utils().blobToString)(packagedBundle.contents);
           contents = `module.exports = ${contents}`;
-          return [[entryBundle.id, [(0, _nullthrows().default)(entryBundle.getMainEntry()), contents]]];
+          return [[entryBundle.id, [entryBundle, (0, _nullthrows().default)(entryBundle.getMainEntry()), contents]]];
         });
       } else if (entryBundle) {
         queue.add(async () => {
@@ -260,20 +264,28 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
       }
     } else if (node.type === 'asset') {
       let asset = node.value;
-      queue.add(async () => [[asset.id, [asset, await asset.getCode()]]]);
+      queue.add(async () => [[asset.id, [bundle, asset, await asset.getCode()]]]);
     }
   });
+  for (let b of bundleGraph.getReferencedBundles(bundle)) {
+    queue.add(async () => {
+      let {
+        assets: subAssets
+      } = await loadBundle(b, bundleGraph, getInlineBundleContents);
+      return Array.from(subAssets);
+    });
+  }
   let assets = new Map((await queue.run()).flatMap(v => v));
   let assetsByFilePath = new Map();
   let assetsByPublicId = new Map();
-  for (let [asset] of assets.values()) {
+  for (let [, asset] of assets.values()) {
     assetsByFilePath.set(getCacheKey(asset), asset.id);
     assetsByPublicId.set(bundleGraph.getAssetPublicId(asset), asset.id);
   }
 
   // Load an asset into the module system by id.
   let loadAsset = id => {
-    let [asset, code] = (0, _nullthrows().default)(assets.get(id));
+    let [bundle, asset, code] = (0, _nullthrows().default)(assets.get(id));
     let cacheKey = getCacheKey(asset);
     let cachedModule = moduleCache.get(cacheKey);
     if (cachedModule) {
@@ -348,9 +360,9 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
       let {
         assets: subAssets
       } = await loadBundle(bundle, bundleGraph, getInlineBundleContents);
-      for (let [id, [asset, code]] of subAssets) {
+      for (let [id, [bundle, asset, code]] of subAssets) {
         if (!assets.has(id)) {
-          assets.set(id, [asset, code]);
+          assets.set(id, [bundle, asset, code]);
           assetsByFilePath.set(getCacheKey(asset), asset.id);
           assetsByPublicId.set(bundleGraph.getAssetPublicId(asset), asset.id);
         }
@@ -413,7 +425,6 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
   };
 }
 function runModule(code, filename, id, require, parcelRequire) {
-  // code = code.replace(/import\((['"].*?['"])\)/g, (_, m) => `parcelRequire.load(${m[0] + m.slice(3)})`);
   let moduleFunction = _vm().default.compileFunction(code, ['exports', 'require', 'module', '__dirname', '__filename', 'parcelRequire'], {
     filename
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-react-static",
-  "version": "2.13.4-canary.3410+9d4799570",
+  "version": "2.13.4-canary.3414+ee9c3e4c3",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/ReactStaticPackager.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.0.0-canary.1785+9d4799570"
+    "parcel": "^2.0.0-canary.1789+ee9c3e4c3"
   },
   "dependencies": {
-    "@parcel/node-resolver-core": "3.4.4-canary.3410+9d4799570",
-    "@parcel/plugin": "2.0.0-canary.1787+9d4799570",
-    "@parcel/rust": "2.13.4-canary.3410+9d4799570",
-    "@parcel/types": "2.0.0-canary.1787+9d4799570",
-    "@parcel/utils": "2.0.0-canary.1787+9d4799570",
+    "@parcel/node-resolver-core": "3.4.4-canary.3414+ee9c3e4c3",
+    "@parcel/plugin": "2.0.0-canary.1791+ee9c3e4c3",
+    "@parcel/rust": "2.13.4-canary.3414+ee9c3e4c3",
+    "@parcel/types": "2.0.0-canary.1791+ee9c3e4c3",
+    "@parcel/utils": "2.0.0-canary.1791+ee9c3e4c3",
     "nullthrows": "^1.1.1",
     "rsc-html-stream": "^0.0.4"
   },
-  "gitHead": "9d4799570916170906aca646f5c55353f8e19fc5"
+  "gitHead": "ee9c3e4c3f4054e66bded33dd92c521e19da6af3"
 }

package/src/ReactStaticPackager.js

@@ -124,6 +124,7 @@ export default (new Packager({
 
     let meta = pageMeta(nullthrows(bundle.getMainEntry()).meta);
     let props: PageProps = {
+      key: 'page',
       pages,
       currentPage: {
         url: urlJoin(bundle.target.publicUrl, bundle.name),
@@ -137,10 +138,12 @@ export default (new Packager({
     let entry;
     for (let b of bundleGraph.getReferencedBundles(bundle, {
       includeInline: false,
+      includeIsolated: false,
     })) {
       if (b.type === 'css') {
         resources.push(
           React.createElement('link', {
+            key: b.id,
             rel: 'stylesheet',
             href: urlJoin(b.target.publicUrl, b.name),
             precedence: 'default',
@@ -150,6 +153,7 @@ export default (new Packager({
         bootstrapModules.push(urlJoin(b.target.publicUrl, b.name));
         resources.push(
           React.createElement('script', {
+            key: b.id,
             type: 'module',
             async: true,
             src: urlJoin(b.target.publicUrl, b.name),
@@ -235,7 +239,7 @@ async function loadBundleUncached(
   ) => Async<{|contents: Blob|}>,
 ) {
   // Load all asset contents.
-  let queue = new PromiseQueue<Array<[string, [Asset, string]]>>({
+  let queue = new PromiseQueue<Array<[string, [NamedBundle, Asset, string]]>>({
     maxConcurrent: 32,
   });
   bundle.traverse(node => {
@@ -259,7 +263,7 @@ async function loadBundleUncached(
           return [
             [
               entryBundle.id,
-              [nullthrows(entryBundle.getMainEntry()), contents],
+              [entryBundle, nullthrows(entryBundle.getMainEntry()), contents],
             ],
           ];
         });
@@ -275,23 +279,36 @@ async function loadBundleUncached(
       }
     } else if (node.type === 'asset') {
       let asset = node.value;
-      queue.add(async () => [[asset.id, [asset, await asset.getCode()]]]);
+      queue.add(async () => [
+        [asset.id, [bundle, asset, await asset.getCode()]],
+      ]);
     }
   });
 
-  let assets = new Map<string, [Asset, string]>(
+  for (let b of bundleGraph.getReferencedBundles(bundle)) {
+    queue.add(async () => {
+      let {assets: subAssets} = await loadBundle(
+        b,
+        bundleGraph,
+        getInlineBundleContents,
+      );
+      return Array.from(subAssets);
+    });
+  }
+
+  let assets = new Map<string, [NamedBundle, Asset, string]>(
     (await queue.run()).flatMap(v => v),
   );
   let assetsByFilePath = new Map<string, string>();
   let assetsByPublicId = new Map<string, string>();
-  for (let [asset] of assets.values()) {
+  for (let [, asset] of assets.values()) {
     assetsByFilePath.set(getCacheKey(asset), asset.id);
     assetsByPublicId.set(bundleGraph.getAssetPublicId(asset), asset.id);
   }
 
   // Load an asset into the module system by id.
   let loadAsset = (id: string) => {
-    let [asset, code] = nullthrows(assets.get(id));
+    let [bundle, asset, code] = nullthrows(assets.get(id));
     let cacheKey = getCacheKey(asset);
     let cachedModule = moduleCache.get(cacheKey);
     if (cachedModule) {
@@ -373,9 +390,9 @@ async function loadBundleUncached(
         bundleGraph,
         getInlineBundleContents,
       );
-      for (let [id, [asset, code]] of subAssets) {
+      for (let [id, [bundle, asset, code]] of subAssets) {
         if (!assets.has(id)) {
-          assets.set(id, [asset, code]);
+          assets.set(id, [bundle, asset, code]);
           assetsByFilePath.set(getCacheKey(asset), asset.id);
           assetsByPublicId.set(bundleGraph.getAssetPublicId(asset), asset.id);
         }
@@ -453,7 +470,6 @@ function runModule(
   require: (id: string) => any,
   parcelRequire: (id: string) => any,
 ) {
-  // code = code.replace(/import\((['"].*?['"])\)/g, (_, m) => `parcelRequire.load(${m[0] + m.slice(3)})`);
   let moduleFunction = vm.compileFunction(
     code,
     [