metro-runtime 0.82.3 → 0.82.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-runtime",
-  "version": "0.82.3",
+  "version": "0.82.5",
   "description": "🚇 Module required for evaluating Metro bundles.",
   "exports": {
     "./package.json": "./package.json",

package/src/polyfills/require.js

@@ -9,8 +9,8 @@ const EMPTY = {};
 const CYCLE_DETECTED = {};
 const { hasOwnProperty } = {};
 if (__DEV__) {
-  global.$RefreshReg$ = () => {};
-  global.$RefreshSig$ = () => (type) => type;
+  global.$RefreshReg$ = global.$RefreshReg$ ?? (() => {});
+  global.$RefreshSig$ = global.$RefreshSig$ ?? (() => (type) => type);
 }
 function clear() {
   modules = new Map();
@@ -58,7 +58,13 @@ function define(factory, moduleId, dependencyMap) {
     }
   }
 }
-function metroRequire(moduleId) {
+function metroRequire(moduleId, maybeNameForDev) {
+  if (moduleId === null) {
+    if (__DEV__ && typeof maybeNameForDev === "string") {
+      throw new Error("Cannot find module '" + maybeNameForDev + "'");
+    }
+    throw new Error("Cannot find module");
+  }
   if (__DEV__ && typeof moduleId === "string") {
     const verboseName = moduleId;
     moduleId = getModuleIdForVerboseName(verboseName);
@@ -267,7 +273,9 @@ function loadModuleImplementation(moduleId, module) {
       if (Refresh != null) {
         const RefreshRuntime = Refresh;
         global.$RefreshReg$ = (type, id) => {
-          RefreshRuntime.register(type, moduleId + " " + id);
+          const prefixedModuleId =
+            __METRO_GLOBAL_PREFIX__ + " " + moduleId + " " + id;
+          RefreshRuntime.register(type, prefixedModuleId);
         };
         global.$RefreshSig$ =
           RefreshRuntime.createSignatureFunctionForTransform;
@@ -290,7 +298,12 @@ function loadModuleImplementation(moduleId, module) {
     if (__DEV__) {
       Systrace.endEvent();
       if (Refresh != null) {
-        registerExportsForReactRefresh(Refresh, moduleObject.exports, moduleId);
+        const prefixedModuleId = __METRO_GLOBAL_PREFIX__ + " " + moduleId;
+        registerExportsForReactRefresh(
+          Refresh,
+          moduleObject.exports,
+          prefixedModuleId
+        );
       }
     }
     return moduleObject.exports;
@@ -689,7 +702,9 @@ if (__DEV__) {
   };
   var requireRefresh = function requireRefresh() {
     return (
-      global[__METRO_GLOBAL_PREFIX__ + "__ReactRefresh"] || metroRequire.Refresh
+      global[__METRO_GLOBAL_PREFIX__ + "__ReactRefresh"] ||
+      global[global.__METRO_GLOBAL_PREFIX__ + "__ReactRefresh"] ||
+      metroRequire.Refresh
     );
   };
 }

package/src/polyfills/require.js.flow

@@ -94,8 +94,8 @@ const CYCLE_DETECTED = {};
 const {hasOwnProperty} = {};
 
 if (__DEV__) {
-  global.$RefreshReg$ = () => {};
-  global.$RefreshSig$ = () => type => type;
+  global.$RefreshReg$ = global.$RefreshReg$ ?? (() => {});
+  global.$RefreshSig$ = global.$RefreshSig$ ?? (() => type => type);
 }
 
 function clear(): ModuleList {
@@ -169,7 +169,19 @@ function define(
   }
 }
 
-function metroRequire(moduleId: ModuleID | VerboseModuleNameForDev): Exports {
+function metroRequire(
+  moduleId: ModuleID | VerboseModuleNameForDev | null,
+  maybeNameForDev?: string,
+): Exports {
+  // Unresolved optional dependencies are nulls in dependency maps
+  // eslint-disable-next-line lint/strictly-null
+  if (moduleId === null) {
+    if (__DEV__ && typeof maybeNameForDev === 'string') {
+      throw new Error("Cannot find module '" + maybeNameForDev + "'");
+    }
+    throw new Error('Cannot find module');
+  }
+
   if (__DEV__ && typeof moduleId === 'string') {
     const verboseName = moduleId;
     moduleId = getModuleIdForVerboseName(verboseName);
@@ -459,7 +471,10 @@ function loadModuleImplementation(
       if (Refresh != null) {
         const RefreshRuntime = Refresh;
         global.$RefreshReg$ = (type, id) => {
-          RefreshRuntime.register(type, moduleId + ' ' + id);
+          // prefix the id with global prefix to enable multiple HMR clients
+          const prefixedModuleId =
+            __METRO_GLOBAL_PREFIX__ + ' ' + moduleId + ' ' + id;
+          RefreshRuntime.register(type, prefixedModuleId);
         };
         global.$RefreshSig$ =
           RefreshRuntime.createSignatureFunctionForTransform;
@@ -492,7 +507,13 @@ function loadModuleImplementation(
       Systrace.endEvent();
 
       if (Refresh != null) {
-        registerExportsForReactRefresh(Refresh, moduleObject.exports, moduleId);
+        // prefix the id with global prefix to enable multiple HMR clients
+        const prefixedModuleId = __METRO_GLOBAL_PREFIX__ + ' ' + moduleId;
+        registerExportsForReactRefresh(
+          Refresh,
+          moduleObject.exports,
+          prefixedModuleId,
+        );
       }
     }
 
@@ -986,7 +1007,7 @@ if (__DEV__) {
   var registerExportsForReactRefresh = (
     Refresh: any,
     moduleExports: Exports,
-    moduleID: ModuleID,
+    moduleID: string,
   ) => {
     Refresh.register(moduleExports, moduleID + ' %exports%');
     if (moduleExports == null || typeof moduleExports !== 'object') {
@@ -1024,9 +1045,16 @@ if (__DEV__) {
   };
 
   var requireRefresh = function requireRefresh() {
+    // __METRO_GLOBAL_PREFIX__ and global.__METRO_GLOBAL_PREFIX__ differ from
+    // each other when multiple module systems are used - e.g, in the context
+    // of Module Federation, the first one would refer to the local prefix
+    // defined at the top of the bundle, while the other always refers to the
+    // one coming from the Host
     return (
+      global[__METRO_GLOBAL_PREFIX__ + '__ReactRefresh'] ||
+      global[global.__METRO_GLOBAL_PREFIX__ + '__ReactRefresh'] ||
       // $FlowFixMe[prop-missing]
-      global[__METRO_GLOBAL_PREFIX__ + '__ReactRefresh'] || metroRequire.Refresh
+      metroRequire.Refresh
     );
   };
 }