@parcel/packager-react-static 2.16.1-canary.3487 → 2.16.2-canary.3489

package/lib/ReactStaticPackager.js

@@ -89,6 +89,7 @@ let packagingBundles = new Map();
 let moduleCache = new Map();
 let loadedBundles = new Map();
 let context = _vm().default.createContext();
+let bundleLookupCache = new WeakMap();
 var _default = exports.default = new (_plugin().Packager)({
   async loadConfig({
     options,
@@ -139,7 +140,9 @@ var _default = exports.default = new (_plugin().Packager)({
       includeInline: false,
       includeIsolated: false
     })) {
-      referencedBundles.push(b.getContentHash());
+      if (b.type === 'js') {
+        referencedBundles.push(b.getContentHash());
+      }
     }
     return {
       pages,
@@ -292,7 +295,7 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
           contents = `module.exports = ${contents}`;
           return [[entryBundle.id, [entryBundle, (0, _nullthrows().default)(entryBundle.getMainEntry()), contents]]];
         });
-      } else if (entryBundle) {
+      } else if ((entryBundle === null || entryBundle === void 0 ? void 0 : entryBundle.type) === 'js') {
         queue.add(async () => {
           let {
             assets: subAssets
@@ -306,12 +309,14 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
     }
   });
   for (let b of bundleGraph.getReferencedBundles(bundle)) {
-    queue.add(async () => {
-      let {
-        assets: subAssets
-      } = await loadBundle(b, bundleGraph, getInlineBundleContents);
-      return Array.from(subAssets);
-    });
+    if (b.type === 'js') {
+      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();
@@ -460,8 +465,18 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
     distDir: bundle.target.distDir,
     publicUrl
   };
+  let bundleLookup = bundleLookupCache.get(bundleGraph);
+  if (!bundleLookup) {
+    bundleLookup = new Map();
+    for (let bundle of bundleGraph.getBundles()) {
+      bundleLookup.set(bundle.publicId, bundle);
+      bundleLookup.set(bundle.name, bundle);
+    }
+    bundleLookupCache.set(bundleGraph, bundleLookup);
+  }
   parcelRequire.load = async filePath => {
-    let bundle = bundleGraph.getBundles().find(b => b.publicId === filePath || b.name === filePath);
+    var _bundleLookup;
+    let bundle = (_bundleLookup = bundleLookup) === null || _bundleLookup === void 0 ? void 0 : _bundleLookup.get(filePath);
     if (bundle) {
       let {
         assets: subAssets
@@ -478,7 +493,8 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
     }
   };
   parcelRequire.resolve = url => {
-    let bundle = bundleGraph.getBundles().find(b => b.publicId === url || b.name === url);
+    var _bundleLookup2;
+    let bundle = (_bundleLookup2 = bundleLookup) === null || _bundleLookup2 === void 0 ? void 0 : _bundleLookup2.get(url);
     if (bundle) {
       return (0, _utils().urlJoin)(bundle.target.publicUrl, bundle.name);
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-react-static",
-  "version": "2.16.1-canary.3487+4b8189162",
+  "version": "2.16.2-canary.3489+9f01c02f8",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/ReactStaticPackager.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.0.0-canary.1862+4b8189162"
+    "parcel": "^2.0.0-canary.1864+9f01c02f8"
   },
   "dependencies": {
-    "@parcel/node-resolver-core": "3.7.1-canary.3487+4b8189162",
-    "@parcel/plugin": "2.0.0-canary.1864+4b8189162",
-    "@parcel/rust": "2.16.1-canary.3487+4b8189162",
-    "@parcel/types": "2.0.0-canary.1864+4b8189162",
-    "@parcel/utils": "2.0.0-canary.1864+4b8189162",
+    "@parcel/node-resolver-core": "3.7.2-canary.3489+9f01c02f8",
+    "@parcel/plugin": "2.0.0-canary.1866+9f01c02f8",
+    "@parcel/rust": "2.16.2-canary.3489+9f01c02f8",
+    "@parcel/types": "2.0.0-canary.1866+9f01c02f8",
+    "@parcel/utils": "2.0.0-canary.1866+9f01c02f8",
     "nullthrows": "^1.1.1",
     "rsc-html-stream": "^0.0.6"
   },
-  "gitHead": "4b81891623a6ebfee8eaed3721580c04976f56bf"
+  "gitHead": "9f01c02f8d766cc8735df31f1ec96f6cf1fb9973"
 }

package/src/ReactStaticPackager.js

@@ -45,6 +45,7 @@ let packagingBundles = new Map<NamedBundle, Async<{|contents: Blob|}>>();
 let moduleCache = new Map<string, ParcelModule>();
 let loadedBundles = new Map<NamedBundle, any>();
 let context: any = vm.createContext();
+let bundleLookupCache = new WeakMap();
 
 export default (new Packager({
   async loadConfig({options, config}) {
@@ -97,7 +98,9 @@ export default (new Packager({
       includeInline: false,
       includeIsolated: false,
     })) {
-      referencedBundles.push(b.getContentHash());
+      if (b.type === 'js') {
+        referencedBundles.push(b.getContentHash());
+      }
     }
 
     return {pages, referencedBundles};
@@ -308,7 +311,7 @@ async function loadBundleUncached(
             ],
           ];
         });
-      } else if (entryBundle) {
+      } else if (entryBundle?.type === 'js') {
         queue.add(async () => {
           let {assets: subAssets} = await loadBundle(
             entryBundle,
@@ -327,14 +330,16 @@ async function loadBundleUncached(
   });
 
   for (let b of bundleGraph.getReferencedBundles(bundle)) {
-    queue.add(async () => {
-      let {assets: subAssets} = await loadBundle(
-        b,
-        bundleGraph,
-        getInlineBundleContents,
-      );
-      return Array.from(subAssets);
-    });
+    if (b.type === 'js') {
+      queue.add(async () => {
+        let {assets: subAssets} = await loadBundle(
+          b,
+          bundleGraph,
+          getInlineBundleContents,
+        );
+        return Array.from(subAssets);
+      });
+    }
   }
 
   let assets = new Map<string, [NamedBundle, Asset, string]>(
@@ -491,10 +496,18 @@ async function loadBundleUncached(
     publicUrl,
   };
 
+  let bundleLookup = bundleLookupCache.get(bundleGraph);
+  if (!bundleLookup) {
+    bundleLookup = new Map();
+    for (let bundle of bundleGraph.getBundles()) {
+      bundleLookup.set(bundle.publicId, bundle);
+      bundleLookup.set(bundle.name, bundle);
+    }
+    bundleLookupCache.set(bundleGraph, bundleLookup);
+  }
+
   parcelRequire.load = async (filePath: string) => {
-    let bundle = bundleGraph
-      .getBundles()
-      .find(b => b.publicId === filePath || b.name === filePath);
+    let bundle = bundleLookup?.get(filePath);
     if (bundle) {
       let {assets: subAssets} = await loadBundle(
         bundle,
@@ -514,9 +527,7 @@ async function loadBundleUncached(
   };
 
   parcelRequire.resolve = (url: string) => {
-    let bundle = bundleGraph
-      .getBundles()
-      .find(b => b.publicId === url || b.name === url);
+    let bundle = bundleLookup?.get(url);
     if (bundle) {
       return urlJoin(bundle.target.publicUrl, bundle.name);
     } else {