react-server-dom-webpack 19.0.0-canary-4c12339ce-20240408 → 19.0.0-canary-96c584661-20240412

package/cjs/react-server-dom-webpack-client.browser.development.js

@@ -244,19 +244,21 @@ function loadChunk(chunkId, filename) {
   return __webpack_chunk_load__(chunkId);
 }
 
-var ReactDOMSharedInternals = ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+var ReactDOMSharedInternals = ReactDOM.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
 
 // This client file is in the shared folder because it applies to both SSR and browser contexts.
-var ReactDOMCurrentDispatcher = ReactDOMSharedInternals.ReactDOMCurrentDispatcher;
 function dispatchHint(code, model) {
-  var dispatcher = ReactDOMCurrentDispatcher.current;
+  var dispatcher = ReactDOMSharedInternals.d;
+  /* ReactDOMCurrentDispatcher */
 
   switch (code) {
     case 'D':
       {
         var refined = refineModel(code, model);
         var href = refined;
-        dispatcher.prefetchDNS(href);
+        dispatcher.D(
+        /* prefetchDNS */
+        href);
         return;
       }
 
@@ -266,11 +268,15 @@ function dispatchHint(code, model) {
 
         if (typeof _refined === 'string') {
           var _href = _refined;
-          dispatcher.preconnect(_href);
+          dispatcher.C(
+          /* preconnect */
+          _href);
         } else {
           var _href2 = _refined[0];
           var crossOrigin = _refined[1];
-          dispatcher.preconnect(_href2, crossOrigin);
+          dispatcher.C(
+          /* preconnect */
+          _href2, crossOrigin);
         }
 
         return;
@@ -285,9 +291,13 @@ function dispatchHint(code, model) {
 
         if (_refined2.length === 3) {
           var options = _refined2[2];
-          dispatcher.preload(_href3, as, options);
+          dispatcher.L(
+          /* preload */
+          _href3, as, options);
         } else {
-          dispatcher.preload(_href3, as);
+          dispatcher.L(
+          /* preload */
+          _href3, as);
         }
 
         return;
@@ -299,46 +309,58 @@ function dispatchHint(code, model) {
 
         if (typeof _refined3 === 'string') {
           var _href4 = _refined3;
-          dispatcher.preloadModule(_href4);
+          dispatcher.m(
+          /* preloadModule */
+          _href4);
         } else {
           var _href5 = _refined3[0];
           var _options = _refined3[1];
-          dispatcher.preloadModule(_href5, _options);
+          dispatcher.m(
+          /* preloadModule */
+          _href5, _options);
         }
 
         return;
       }
 
-    case 'S':
+    case 'X':
       {
         var _refined4 = refineModel(code, model);
 
         if (typeof _refined4 === 'string') {
           var _href6 = _refined4;
-          dispatcher.preinitStyle(_href6);
+          dispatcher.X(
+          /* preinitScript */
+          _href6);
         } else {
           var _href7 = _refined4[0];
-          var precedence = _refined4[1] === 0 ? undefined : _refined4[1];
-
-          var _options2 = _refined4.length === 3 ? _refined4[2] : undefined;
-
-          dispatcher.preinitStyle(_href7, precedence, _options2);
+          var _options2 = _refined4[1];
+          dispatcher.X(
+          /* preinitScript */
+          _href7, _options2);
         }
 
         return;
       }
 
-    case 'X':
+    case 'S':
       {
         var _refined5 = refineModel(code, model);
 
         if (typeof _refined5 === 'string') {
           var _href8 = _refined5;
-          dispatcher.preinitScript(_href8);
+          dispatcher.S(
+          /* preinitStyle */
+          _href8);
         } else {
           var _href9 = _refined5[0];
-          var _options3 = _refined5[1];
-          dispatcher.preinitScript(_href9, _options3);
+          var precedence = _refined5[1] === 0 ? undefined : _refined5[1];
+
+          var _options3 = _refined5.length === 3 ? _refined5[2] : undefined;
+
+          dispatcher.S(
+          /* preinitStyle */
+          _href9, precedence, _options3);
         }
 
         return;
@@ -350,11 +372,15 @@ function dispatchHint(code, model) {
 
         if (typeof _refined6 === 'string') {
           var _href10 = _refined6;
-          dispatcher.preinitModuleScript(_href10);
+          dispatcher.M(
+          /* preinitModuleScript */
+          _href10);
         } else {
           var _href11 = _refined6[0];
           var _options4 = _refined6[1];
-          dispatcher.preinitModuleScript(_href11, _options4);
+          dispatcher.M(
+          /* preinitModuleScript */
+          _href11, _options4);
         }
 
         return;
@@ -367,7 +393,7 @@ function refineModel(code, model) {
   return model;
 }
 
-var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+var ReactSharedInternals = React.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
 
 function error(format) {
   {
@@ -385,8 +411,7 @@ function printWarning(level, format, args) {
   // When changing this logic, you might want to also
   // update consoleWithStackDev.www.js as well.
   {
-    var ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;
-    var stack = ReactDebugCurrentFrame.getStackAddendum();
+    var stack = ReactSharedInternals.getStackAddendum();
 
     if (stack !== '') {
       format += '%s';
@@ -1574,7 +1599,7 @@ function getChunk(response, id) {
   return chunk;
 }
 
-function createModelResolver(chunk, parentObject, key, cyclic) {
+function createModelResolver(chunk, parentObject, key, cyclic, response, map) {
   var blocked;
 
   if (initializingChunkBlockedModel) {
@@ -1591,11 +1616,11 @@ function createModelResolver(chunk, parentObject, key, cyclic) {
   }
 
   return function (value) {
-    parentObject[key] = value; // If this is the root object for a model reference, where `blocked.value`
+    parentObject[key] = map(response, value); // If this is the root object for a model reference, where `blocked.value`
     // is a stale `null`, the resolved value can be used directly.
 
     if (key === '' && blocked.value === null) {
-      blocked.value = value;
+      blocked.value = parentObject[key];
     }
 
     blocked.deps--;
@@ -1651,28 +1676,80 @@ function createServerReferenceProxy(response, metaData) {
   return proxy;
 }
 
-function getOutlinedModel(response, id) {
+function getOutlinedModel(response, id, parentObject, key, map) {
   var chunk = getChunk(response, id);
 
   switch (chunk.status) {
     case RESOLVED_MODEL:
       initializeModelChunk(chunk);
       break;
+
+    case RESOLVED_MODULE:
+      initializeModuleChunk(chunk);
+      break;
   } // The status might have changed after initialization.
 
 
   switch (chunk.status) {
     case INITIALIZED:
-      {
-        return chunk.value;
+      var chunkValue = map(response, chunk.value);
+
+      if (chunk._debugInfo) {
+        // If we have a direct reference to an object that was rendered by a synchronous
+        // server component, it might have some debug info about how it was rendered.
+        // We forward this to the underlying object. This might be a React Element or
+        // an Array fragment.
+        // If this was a string / number return value we lose the debug info. We choose
+        // that tradeoff to allow sync server components to return plain values and not
+        // use them as React Nodes necessarily. We could otherwise wrap them in a Lazy.
+        if (typeof chunkValue === 'object' && chunkValue !== null && (Array.isArray(chunkValue) || chunkValue.$$typeof === REACT_ELEMENT_TYPE) && !chunkValue._debugInfo) {
+          // We should maybe use a unique symbol for arrays but this is a React owned array.
+          // $FlowFixMe[prop-missing]: This should be added to elements.
+          Object.defineProperty(chunkValue, '_debugInfo', {
+            configurable: false,
+            enumerable: false,
+            writable: true,
+            value: chunk._debugInfo
+          });
+        }
       }
-    // We always encode it first in the stream so it won't be pending.
+
+      return chunkValue;
+
+    case PENDING:
+    case BLOCKED:
+    case CYCLIC:
+      var parentChunk = initializingChunk;
+      chunk.then(createModelResolver(parentChunk, parentObject, key, chunk.status === CYCLIC, response, map), createModelReject(parentChunk));
+      return null;
 
     default:
       throw chunk.reason;
   }
 }
 
+function createMap(response, model) {
+  return new Map(model);
+}
+
+function createSet(response, model) {
+  return new Set(model);
+}
+
+function createFormData(response, model) {
+  var formData = new FormData();
+
+  for (var i = 0; i < model.length; i++) {
+    formData.append(model[i][0], model[i][1]);
+  }
+
+  return formData;
+}
+
+function createModel(response, model) {
+  return model;
+}
+
 function parseModelString(response, parentObject, key, value) {
   if (value[0] === '$') {
     if (value === '$') {
@@ -1723,8 +1800,7 @@ function parseModelString(response, parentObject, key, value) {
           // Server Reference
           var _id2 = parseInt(value.slice(2), 16);
 
-          var metadata = getOutlinedModel(response, _id2);
-          return createServerReferenceProxy(response, metadata);
+          return getOutlinedModel(response, _id2, parentObject, key, createServerReferenceProxy);
         }
 
       case 'T':
@@ -1746,8 +1822,7 @@ function parseModelString(response, parentObject, key, value) {
           // Map
           var _id4 = parseInt(value.slice(2), 16);
 
-          var data = getOutlinedModel(response, _id4);
-          return new Map(data);
+          return getOutlinedModel(response, _id4, parentObject, key, createMap);
         }
 
       case 'W':
@@ -1755,9 +1830,7 @@ function parseModelString(response, parentObject, key, value) {
           // Set
           var _id5 = parseInt(value.slice(2), 16);
 
-          var _data = getOutlinedModel(response, _id5);
-
-          return new Set(_data);
+          return getOutlinedModel(response, _id5, parentObject, key, createSet);
         }
 
       case 'B':
@@ -1771,15 +1844,7 @@ function parseModelString(response, parentObject, key, value) {
           // FormData
           var _id7 = parseInt(value.slice(2), 16);
 
-          var _data3 = getOutlinedModel(response, _id7);
-
-          var formData = new FormData();
-
-          for (var i = 0; i < _data3.length; i++) {
-            formData.append(_data3[i][0], _data3[i][1]);
-          }
-
-          return formData;
+          return getOutlinedModel(response, _id7, parentObject, key, createFormData);
         }
 
       case 'I':
@@ -1845,57 +1910,7 @@ function parseModelString(response, parentObject, key, value) {
           // We assume that anything else is a reference ID.
           var _id8 = parseInt(value.slice(1), 16);
 
-          var _chunk2 = getChunk(response, _id8);
-
-          switch (_chunk2.status) {
-            case RESOLVED_MODEL:
-              initializeModelChunk(_chunk2);
-              break;
-
-            case RESOLVED_MODULE:
-              initializeModuleChunk(_chunk2);
-              break;
-          } // The status might have changed after initialization.
-
-
-          switch (_chunk2.status) {
-            case INITIALIZED:
-              var chunkValue = _chunk2.value;
-
-              if (_chunk2._debugInfo) {
-                // If we have a direct reference to an object that was rendered by a synchronous
-                // server component, it might have some debug info about how it was rendered.
-                // We forward this to the underlying object. This might be a React Element or
-                // an Array fragment.
-                // If this was a string / number return value we lose the debug info. We choose
-                // that tradeoff to allow sync server components to return plain values and not
-                // use them as React Nodes necessarily. We could otherwise wrap them in a Lazy.
-                if (typeof chunkValue === 'object' && chunkValue !== null && (Array.isArray(chunkValue) || chunkValue.$$typeof === REACT_ELEMENT_TYPE) && !chunkValue._debugInfo) {
-                  // We should maybe use a unique symbol for arrays but this is a React owned array.
-                  // $FlowFixMe[prop-missing]: This should be added to elements.
-                  Object.defineProperty(chunkValue, '_debugInfo', {
-                    configurable: false,
-                    enumerable: false,
-                    writable: true,
-                    value: _chunk2._debugInfo
-                  });
-                }
-              }
-
-              return chunkValue;
-
-            case PENDING:
-            case BLOCKED:
-            case CYCLIC:
-              var parentChunk = initializingChunk;
-
-              _chunk2.then(createModelResolver(parentChunk, parentObject, key, _chunk2.status === CYCLIC), createModelReject(parentChunk));
-
-              return null;
-
-            default:
-              throw _chunk2.reason;
-          }
+          return getOutlinedModel(response, _id8, parentObject, key, createModel);
         }
     }
   }

package/cjs/react-server-dom-webpack-client.browser.production.js

@@ -197,19 +197,21 @@ function loadChunk(chunkId, filename) {
   return __webpack_chunk_load__(chunkId);
 }
 
-const ReactDOMSharedInternals = ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+const ReactDOMSharedInternals = ReactDOM.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
 
 // This client file is in the shared folder because it applies to both SSR and browser contexts.
-const ReactDOMCurrentDispatcher = ReactDOMSharedInternals.ReactDOMCurrentDispatcher;
 function dispatchHint(code, model) {
-  const dispatcher = ReactDOMCurrentDispatcher.current;
+  const dispatcher = ReactDOMSharedInternals.d;
+  /* ReactDOMCurrentDispatcher */
 
   switch (code) {
     case 'D':
       {
         const refined = refineModel(code, model);
         const href = refined;
-        dispatcher.prefetchDNS(href);
+        dispatcher.D(
+        /* prefetchDNS */
+        href);
         return;
       }
 
@@ -219,11 +221,15 @@ function dispatchHint(code, model) {
 
         if (typeof refined === 'string') {
           const href = refined;
-          dispatcher.preconnect(href);
+          dispatcher.C(
+          /* preconnect */
+          href);
         } else {
           const href = refined[0];
           const crossOrigin = refined[1];
-          dispatcher.preconnect(href, crossOrigin);
+          dispatcher.C(
+          /* preconnect */
+          href, crossOrigin);
         }
 
         return;
@@ -237,9 +243,13 @@ function dispatchHint(code, model) {
 
         if (refined.length === 3) {
           const options = refined[2];
-          dispatcher.preload(href, as, options);
+          dispatcher.L(
+          /* preload */
+          href, as, options);
         } else {
-          dispatcher.preload(href, as);
+          dispatcher.L(
+          /* preload */
+          href, as);
         }
 
         return;
@@ -251,44 +261,56 @@ function dispatchHint(code, model) {
 
         if (typeof refined === 'string') {
           const href = refined;
-          dispatcher.preloadModule(href);
+          dispatcher.m(
+          /* preloadModule */
+          href);
         } else {
           const href = refined[0];
           const options = refined[1];
-          dispatcher.preloadModule(href, options);
+          dispatcher.m(
+          /* preloadModule */
+          href, options);
         }
 
         return;
       }
 
-    case 'S':
+    case 'X':
       {
         const refined = refineModel(code, model);
 
         if (typeof refined === 'string') {
           const href = refined;
-          dispatcher.preinitStyle(href);
+          dispatcher.X(
+          /* preinitScript */
+          href);
         } else {
           const href = refined[0];
-          const precedence = refined[1] === 0 ? undefined : refined[1];
-          const options = refined.length === 3 ? refined[2] : undefined;
-          dispatcher.preinitStyle(href, precedence, options);
+          const options = refined[1];
+          dispatcher.X(
+          /* preinitScript */
+          href, options);
         }
 
         return;
       }
 
-    case 'X':
+    case 'S':
       {
         const refined = refineModel(code, model);
 
         if (typeof refined === 'string') {
           const href = refined;
-          dispatcher.preinitScript(href);
+          dispatcher.S(
+          /* preinitStyle */
+          href);
         } else {
           const href = refined[0];
-          const options = refined[1];
-          dispatcher.preinitScript(href, options);
+          const precedence = refined[1] === 0 ? undefined : refined[1];
+          const options = refined.length === 3 ? refined[2] : undefined;
+          dispatcher.S(
+          /* preinitStyle */
+          href, precedence, options);
         }
 
         return;
@@ -300,11 +322,15 @@ function dispatchHint(code, model) {
 
         if (typeof refined === 'string') {
           const href = refined;
-          dispatcher.preinitModuleScript(href);
+          dispatcher.M(
+          /* preinitModuleScript */
+          href);
         } else {
           const href = refined[0];
           const options = refined[1];
-          dispatcher.preinitModuleScript(href, options);
+          dispatcher.M(
+          /* preinitModuleScript */
+          href, options);
         }
 
         return;
@@ -1071,7 +1097,7 @@ function getChunk(response, id) {
   return chunk;
 }
 
-function createModelResolver(chunk, parentObject, key, cyclic) {
+function createModelResolver(chunk, parentObject, key, cyclic, response, map) {
   let blocked;
 
   if (initializingChunkBlockedModel) {
@@ -1088,11 +1114,11 @@ function createModelResolver(chunk, parentObject, key, cyclic) {
   }
 
   return value => {
-    parentObject[key] = value; // If this is the root object for a model reference, where `blocked.value`
+    parentObject[key] = map(response, value); // If this is the root object for a model reference, where `blocked.value`
     // is a stale `null`, the resolved value can be used directly.
 
     if (key === '' && blocked.value === null) {
-      blocked.value = value;
+      blocked.value = parentObject[key];
     }
 
     blocked.deps--;
@@ -1146,28 +1172,60 @@ function createServerReferenceProxy(response, metaData) {
   return proxy;
 }
 
-function getOutlinedModel(response, id) {
+function getOutlinedModel(response, id, parentObject, key, map) {
   const chunk = getChunk(response, id);
 
   switch (chunk.status) {
     case RESOLVED_MODEL:
       initializeModelChunk(chunk);
       break;
+
+    case RESOLVED_MODULE:
+      initializeModuleChunk(chunk);
+      break;
   } // The status might have changed after initialization.
 
 
   switch (chunk.status) {
     case INITIALIZED:
-      {
-        return chunk.value;
-      }
-    // We always encode it first in the stream so it won't be pending.
+      const chunkValue = map(response, chunk.value);
+
+      return chunkValue;
+
+    case PENDING:
+    case BLOCKED:
+    case CYCLIC:
+      const parentChunk = initializingChunk;
+      chunk.then(createModelResolver(parentChunk, parentObject, key, chunk.status === CYCLIC, response, map), createModelReject(parentChunk));
+      return null;
 
     default:
       throw chunk.reason;
   }
 }
 
+function createMap(response, model) {
+  return new Map(model);
+}
+
+function createSet(response, model) {
+  return new Set(model);
+}
+
+function createFormData(response, model) {
+  const formData = new FormData();
+
+  for (let i = 0; i < model.length; i++) {
+    formData.append(model[i][0], model[i][1]);
+  }
+
+  return formData;
+}
+
+function createModel(response, model) {
+  return model;
+}
+
 function parseModelString(response, parentObject, key, value) {
   if (value[0] === '$') {
     if (value === '$') {
@@ -1215,8 +1273,7 @@ function parseModelString(response, parentObject, key, value) {
         {
           // Server Reference
           const id = parseInt(value.slice(2), 16);
-          const metadata = getOutlinedModel(response, id);
-          return createServerReferenceProxy(response, metadata);
+          return getOutlinedModel(response, id, parentObject, key, createServerReferenceProxy);
         }
 
       case 'T':
@@ -1236,16 +1293,14 @@ function parseModelString(response, parentObject, key, value) {
         {
           // Map
           const id = parseInt(value.slice(2), 16);
-          const data = getOutlinedModel(response, id);
-          return new Map(data);
+          return getOutlinedModel(response, id, parentObject, key, createMap);
         }
 
       case 'W':
         {
           // Set
           const id = parseInt(value.slice(2), 16);
-          const data = getOutlinedModel(response, id);
-          return new Set(data);
+          return getOutlinedModel(response, id, parentObject, key, createSet);
         }
 
       case 'B':
@@ -1258,14 +1313,7 @@ function parseModelString(response, parentObject, key, value) {
         {
           // FormData
           const id = parseInt(value.slice(2), 16);
-          const data = getOutlinedModel(response, id);
-          const formData = new FormData();
-
-          for (let i = 0; i < data.length; i++) {
-            formData.append(data[i][0], data[i][1]);
-          }
-
-          return formData;
+          return getOutlinedModel(response, id, parentObject, key, createFormData);
         }
 
       case 'I':
@@ -1315,35 +1363,7 @@ function parseModelString(response, parentObject, key, value) {
         {
           // We assume that anything else is a reference ID.
           const id = parseInt(value.slice(1), 16);
-          const chunk = getChunk(response, id);
-
-          switch (chunk.status) {
-            case RESOLVED_MODEL:
-              initializeModelChunk(chunk);
-              break;
-
-            case RESOLVED_MODULE:
-              initializeModuleChunk(chunk);
-              break;
-          } // The status might have changed after initialization.
-
-
-          switch (chunk.status) {
-            case INITIALIZED:
-              const chunkValue = chunk.value;
-
-              return chunkValue;
-
-            case PENDING:
-            case BLOCKED:
-            case CYCLIC:
-              const parentChunk = initializingChunk;
-              chunk.then(createModelResolver(parentChunk, parentObject, key, chunk.status === CYCLIC), createModelReject(parentChunk));
-              return null;
-
-            default:
-              throw chunk.reason;
-          }
+          return getOutlinedModel(response, id, parentObject, key, createModel);
         }
     }
   }