@parcel/packager-react-static 2.15.5-canary.3483 → 2.15.5-canary.3484

package/lib/ReactStaticPackager.js

@@ -353,9 +353,29 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
             skipped: true
           });
         } else {
-          deps.set(getSpecifier(dep), {
+          let resolution = {
             id: resolved.id
-          });
+          };
+
+          // Dependencies may be re-targeted to follow re-exports.
+          for (let [name, sym] of dep.symbols) {
+            var _sym$meta;
+            let rewritten = (_sym$meta = sym.meta) === null || _sym$meta === void 0 ? void 0 : _sym$meta.rewritten;
+            if (typeof rewritten === 'string') {
+              if (Array.isArray(resolution)) {
+                resolution.push([rewritten, resolved.id, name]);
+              } else {
+                resolution = [[rewritten, resolved.id, name]];
+              }
+            }
+          }
+          let specifier = getSpecifier(dep);
+          let cur = deps.get(specifier);
+          if (Array.isArray(cur) && Array.isArray(resolution)) {
+            cur.push(...resolution);
+          } else {
+            deps.set(specifier, resolution);
+          }
         }
       } else {
         deps.set(getSpecifier(dep), {
@@ -369,6 +389,50 @@ async function loadBundleUncached(bundle, bundleGraph, getInlineBundleContents)
       if (resolution !== null && resolution !== void 0 && resolution.skipped) {
         return {};
       }
+
+      // Synthesize a module to follow re-exports.
+      if (Array.isArray(resolution)) {
+        var m = {
+          __esModule: true
+        };
+        resolution.forEach(function (v) {
+          var key = v[0];
+          var id = v[1];
+          var exp = v[2];
+          var x = loadAsset(id);
+          if (key === '*') {
+            Object.keys(x).forEach(function (key) {
+              if (key === 'default' || key === '__esModule' ||
+              // $FlowFixMe
+              Object.prototype.hasOwnProperty.call(m, key)) {
+                return;
+              }
+              Object.defineProperty(m, key, {
+                enumerable: true,
+                get: function () {
+                  return x[key];
+                }
+              });
+            });
+          } else if (exp === '*') {
+            Object.defineProperty(m, key, {
+              enumerable: true,
+              value: x
+            });
+          } else {
+            Object.defineProperty(m, key, {
+              enumerable: true,
+              get: function () {
+                if (exp === 'default') {
+                  return x.__esModule ? x.default : x;
+                }
+                return x[exp];
+              }
+            });
+          }
+        });
+        return m;
+      }
       if (resolution !== null && resolution !== void 0 && resolution.id) {
         return loadAsset(resolution.id);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-react-static",
-  "version": "2.15.5-canary.3483+dadcead5e",
+  "version": "2.15.5-canary.3484+cb9de9d75",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/ReactStaticPackager.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.0.0-canary.1858+dadcead5e"
+    "parcel": "^2.0.0-canary.1859+cb9de9d75"
   },
   "dependencies": {
-    "@parcel/node-resolver-core": "3.6.5-canary.3483+dadcead5e",
-    "@parcel/plugin": "2.0.0-canary.1860+dadcead5e",
-    "@parcel/rust": "2.15.5-canary.3483+dadcead5e",
-    "@parcel/types": "2.0.0-canary.1860+dadcead5e",
-    "@parcel/utils": "2.0.0-canary.1860+dadcead5e",
+    "@parcel/node-resolver-core": "3.6.5-canary.3484+cb9de9d75",
+    "@parcel/plugin": "2.0.0-canary.1861+cb9de9d75",
+    "@parcel/rust": "2.15.5-canary.3484+cb9de9d75",
+    "@parcel/types": "2.0.0-canary.1861+cb9de9d75",
+    "@parcel/utils": "2.0.0-canary.1861+cb9de9d75",
     "nullthrows": "^1.1.1",
     "rsc-html-stream": "^0.0.6"
   },
-  "gitHead": "dadcead5ec12286a4d4115880f47cab02dbdbbf6"
+  "gitHead": "cb9de9d75c7a9c0ef11fdc52fd35c8271513cc52"
 }

package/src/ReactStaticPackager.js

@@ -375,7 +375,27 @@ async function loadBundleUncached(
         if (resolved.type !== 'js') {
           deps.set(getSpecifier(dep), {skipped: true});
         } else {
-          deps.set(getSpecifier(dep), {id: resolved.id});
+          let resolution = {id: resolved.id};
+
+          // Dependencies may be re-targeted to follow re-exports.
+          for (let [name, sym] of dep.symbols) {
+            let rewritten = sym.meta?.rewritten;
+            if (typeof rewritten === 'string') {
+              if (Array.isArray(resolution)) {
+                resolution.push([rewritten, resolved.id, name]);
+              } else {
+                resolution = [[rewritten, resolved.id, name]];
+              }
+            }
+          }
+
+          let specifier = getSpecifier(dep);
+          let cur = deps.get(specifier);
+          if (Array.isArray(cur) && Array.isArray(resolution)) {
+            cur.push(...resolution);
+          } else {
+            deps.set(specifier, resolution);
+          }
         }
       } else {
         deps.set(getSpecifier(dep), {specifier: dep.specifier});
@@ -389,6 +409,52 @@ async function loadBundleUncached(
         return {};
       }
 
+      // Synthesize a module to follow re-exports.
+      if (Array.isArray(resolution)) {
+        var m = {__esModule: true};
+        resolution.forEach(function (v) {
+          var key = v[0];
+          var id = v[1];
+          var exp = v[2];
+          var x = loadAsset(id);
+          if (key === '*') {
+            Object.keys(x).forEach(function (key) {
+              if (
+                key === 'default' ||
+                key === '__esModule' ||
+                // $FlowFixMe
+                Object.prototype.hasOwnProperty.call(m, key)
+              ) {
+                return;
+              }
+
+              Object.defineProperty(m, key, {
+                enumerable: true,
+                get: function () {
+                  return x[key];
+                },
+              });
+            });
+          } else if (exp === '*') {
+            Object.defineProperty(m, key, {
+              enumerable: true,
+              value: x,
+            });
+          } else {
+            Object.defineProperty(m, key, {
+              enumerable: true,
+              get: function () {
+                if (exp === 'default') {
+                  return x.__esModule ? x.default : x;
+                }
+                return x[exp];
+              },
+            });
+          }
+        });
+        return m;
+      }
+
       if (resolution?.id) {
         return loadAsset(resolution.id);
       }