react-server-dom-webpack 18.3.0-next-8b9ac8175-20230131 → 18.3.0-next-2ef24145e-20230202

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

@@ -281,11 +281,6 @@ function createErrorChunk(response, error) {
   return new Chunk(ERRORED, null, error, response);
 }
 
-function createInitializedChunk(response, value) {
-  // $FlowFixMe Flow doesn't support functions as constructors
-  return new Chunk(INITIALIZED, value, null, response);
-}
-
 function wakeChunk(listeners, value) {
   for (var i = 0; i < listeners.length; i++) {
     var listener = listeners[i];
@@ -546,55 +541,84 @@ function createModelReject(chunk) {
 }
 
 function parseModelString(response, parentObject, key, value) {
-  switch (value[0]) {
-    case '$':
-      {
-        if (value === '$') {
-          return REACT_ELEMENT_TYPE;
-        } else if (value[1] === '$' || value[1] === '@') {
+  if (value[0] === '$') {
+    if (value === '$') {
+      // A very common symbol.
+      return REACT_ELEMENT_TYPE;
+    }
+
+    switch (value[1]) {
+      case '$':
+        {
           // This was an escaped string value.
           return value.substring(1);
-        } else {
-          var id = parseInt(value.substring(1), 16);
-          var chunk = getChunk(response, id);
+        }
+
+      case 'L':
+        {
+          // Lazy node
+          var id = parseInt(value.substring(2), 16);
+          var chunk = getChunk(response, id); // We create a React.lazy wrapper around any lazy values.
+          // When passed into React, we'll know how to suspend on this.
+
+          return createLazyChunkWrapper(chunk);
+        }
+
+      case '@':
+        {
+          // Promise
+          var _id = parseInt(value.substring(2), 16);
 
-          switch (chunk.status) {
+          var _chunk = getChunk(response, _id);
+
+          return _chunk;
+        }
+
+      case 'S':
+        {
+          return Symbol.for(value.substring(2));
+        }
+
+      case 'P':
+        {
+          return getOrCreateServerContext(value.substring(2)).Provider;
+        }
+
+      default:
+        {
+          // We assume that anything else is a reference ID.
+          var _id2 = parseInt(value.substring(1), 16);
+
+          var _chunk2 = getChunk(response, _id2);
+
+          switch (_chunk2.status) {
             case RESOLVED_MODEL:
-              initializeModelChunk(chunk);
+              initializeModelChunk(_chunk2);
               break;
 
             case RESOLVED_MODULE:
-              initializeModuleChunk(chunk);
+              initializeModuleChunk(_chunk2);
               break;
           } // The status might have changed after initialization.
 
 
-          switch (chunk.status) {
+          switch (_chunk2.status) {
             case INITIALIZED:
-              return chunk.value;
+              return _chunk2.value;
 
             case PENDING:
             case BLOCKED:
               var parentChunk = initializingChunk;
-              chunk.then(createModelResolver(parentChunk, parentObject, key), createModelReject(parentChunk));
+
+              _chunk2.then(createModelResolver(parentChunk, parentObject, key), createModelReject(parentChunk));
+
               return null;
 
             default:
-              throw chunk.reason;
+              throw _chunk2.reason;
           }
         }
-      }
-
-    case '@':
-      {
-        var _id = parseInt(value.substring(1), 16);
-
-        var _chunk = getChunk(response, _id); // We create a React.lazy wrapper around any lazy values.
-        // When passed into React, we'll know how to suspend on this.
-
-
-        return createLazyChunkWrapper(_chunk);
-      }
+    }
   }
 
   return value;
@@ -628,10 +652,6 @@ function resolveModel(response, id, model) {
     resolveModelChunk(chunk, model);
   }
 }
-function resolveProvider(response, id, contextName) {
-  var chunks = response._chunks;
-  chunks.set(id, createInitializedChunk(response, getOrCreateServerContext(contextName).Provider));
-}
 function resolveModule(response, id, model) {
   var chunks = response._chunks;
   var chunk = chunks.get(id);
@@ -672,12 +692,6 @@ function resolveModule(response, id, model) {
     }
   }
 }
-function resolveSymbol(response, id, name) {
-  var chunks = response._chunks; // We assume that we'll always emit the symbol before anything references it
-  // to save a few bytes.
-
-  chunks.set(id, createInitializedChunk(response, Symbol.for(name)));
-}
 function resolveErrorDev(response, id, digest, message, stack) {
 
 
@@ -707,43 +721,23 @@ function processFullRow(response, row) {
     return;
   }
 
-  var tag = row[0]; // When tags that are not text are added, check them here before
+  var colon = row.indexOf(':', 0);
+  var id = parseInt(row.substring(0, colon), 16);
+  var tag = row[colon + 1]; // When tags that are not text are added, check them here before
   // parsing the row as text.
   // switch (tag) {
   // }
 
-  var colon = row.indexOf(':', 1);
-  var id = parseInt(row.substring(1, colon), 16);
-  var text = row.substring(colon + 1);
-
   switch (tag) {
-    case 'J':
+    case 'I':
       {
-        resolveModel(response, id, text);
-        return;
-      }
-
-    case 'M':
-      {
-        resolveModule(response, id, text);
-        return;
-      }
-
-    case 'P':
-      {
-        resolveProvider(response, id, text);
-        return;
-      }
-
-    case 'S':
-      {
-        resolveSymbol(response, id, JSON.parse(text));
+        resolveModule(response, id, row.substring(colon + 2));
         return;
       }
 
     case 'E':
       {
-        var errorInfo = JSON.parse(text);
+        var errorInfo = JSON.parse(row.substring(colon + 2));
 
         {
           resolveErrorDev(response, id, errorInfo.digest, errorInfo.message, errorInfo.stack);
@@ -754,7 +748,9 @@ function processFullRow(response, row) {
 
     default:
       {
-        throw new Error("Error parsing the data. It's probably an error code or network corruption.");
+        // We assume anything else is JSON.
+        resolveModel(response, id, row.substring(colon + 1));
+        return;
       }
   }
 }

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

@@ -7,20 +7,20 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-'use strict';var h=require("react"),k={stream:!0};function m(a,b){return a?(a=a[b.id][b.name],b.async?{id:a.id,chunks:a.chunks,name:a.name,async:!0}:a):b}var n=new Map,p=new Map;function q(){}
-function r(a){for(var b=a.chunks,c=[],d=0;d<b.length;d++){var e=b[d],f=n.get(e);if(void 0===f){f=__webpack_chunk_load__(e);c.push(f);var l=n.set.bind(n,e,null);f.then(l,q);n.set(e,f)}else null!==f&&c.push(f)}if(a.async){if(b=p.get(a.id))return"fulfilled"===b.status?null:b;var g=Promise.all(c).then(function(){return __webpack_require__(a.id)});g.then(function(a){g.status="fulfilled";g.value=a},function(a){g.status="rejected";g.reason=a});p.set(a.id,g);return g}return 0<c.length?Promise.all(c):null}
-var t=Symbol.for("react.element"),u=Symbol.for("react.lazy"),v=Symbol.for("react.default_value"),w=h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ContextRegistry;function x(a){w[a]||(w[a]=h.createServerContext(a,v));return w[a]}function y(a,b,c,d){this.status=a;this.value=b;this.reason=c;this._response=d}y.prototype=Object.create(Promise.prototype);
-y.prototype.then=function(a,b){switch(this.status){case "resolved_model":z(this);break;case "resolved_module":B(this)}switch(this.status){case "fulfilled":a(this.value);break;case "pending":case "blocked":a&&(null===this.value&&(this.value=[]),this.value.push(a));b&&(null===this.reason&&(this.reason=[]),this.reason.push(b));break;default:b(this.reason)}};
-function C(a){switch(a.status){case "resolved_model":z(a);break;case "resolved_module":B(a)}switch(a.status){case "fulfilled":return a.value;case "pending":case "blocked":throw a;default:throw a.reason;}}function D(a,b){return new y("fulfilled",b,null,a)}function E(a,b){for(var c=0;c<a.length;c++)(0,a[c])(b)}function F(a,b,c){switch(a.status){case "fulfilled":E(b,a.value);break;case "pending":case "blocked":a.value=b;a.reason=c;break;case "rejected":c&&E(c,a.reason)}}
-function G(a,b){if("pending"===a.status||"blocked"===a.status){var c=a.reason;a.status="rejected";a.reason=b;null!==c&&E(c,b)}}function H(a,b){if("pending"===a.status||"blocked"===a.status){var c=a.value,d=a.reason;a.status="resolved_module";a.value=b;null!==c&&(B(a),F(a,c,d))}}var I=null,J=null;
-function z(a){var b=I,c=J;I=a;J=null;try{var d=JSON.parse(a.value,a._response._fromJSON);null!==J&&0<J.deps?(J.value=d,a.status="blocked",a.value=null,a.reason=null):(a.status="fulfilled",a.value=d)}catch(e){a.status="rejected",a.reason=e}finally{I=b,J=c}}
-function B(a){try{var b=a.value;if(b.async){var c=p.get(b.id);if("fulfilled"===c.status)var d=c.value;else throw c.reason;}else d=__webpack_require__(b.id);var e="*"===b.name?d:""===b.name?d.__esModule?d.default:d:d[b.name];a.status="fulfilled";a.value=e}catch(f){a.status="rejected",a.reason=f}}function K(a,b){a._chunks.forEach(function(a){"pending"===a.status&&G(a,b)})}function L(a,b){var c=a._chunks,d=c.get(b);d||(d=new y("pending",null,null,a),c.set(b,d));return d}
-function N(a,b,c){if(J){var d=J;d.deps++}else d=J={deps:1,value:null};return function(e){b[c]=e;d.deps--;0===d.deps&&"blocked"===a.status&&(e=a.value,a.status="fulfilled",a.value=d.value,null!==e&&E(e,d.value))}}function O(a){return function(b){return G(a,b)}}
-function P(a,b,c,d){switch(d[0]){case "$":if("$"===d)return t;if("$"===d[1]||"@"===d[1])return d.substring(1);d=parseInt(d.substring(1),16);a=L(a,d);switch(a.status){case "resolved_model":z(a);break;case "resolved_module":B(a)}switch(a.status){case "fulfilled":return a.value;case "pending":case "blocked":return d=I,a.then(N(d,b,c),O(d)),null;default:throw a.reason;}case "@":return b=parseInt(d.substring(1),16),b=L(a,b),{$$typeof:u,_payload:b,_init:C}}return d}
-function Q(a,b,c){var d=a._chunks,e=d.get(b);c=JSON.parse(c,a._fromJSON);var f=m(a._bundlerConfig,c);if(c=r(f)){if(e){var l=e;l.status="blocked"}else l=new y("blocked",null,null,a),d.set(b,l);c.then(function(){return H(l,f)},function(a){return G(l,a)})}else e?H(e,f):d.set(b,new y("resolved_module",f,null,a))}function R(a){K(a,Error("Connection closed."))}
-function S(a,b){if(""!==b){var c=b[0],d=b.indexOf(":",1),e=parseInt(b.substring(1,d),16);b=b.substring(d+1);switch(c){case "J":d=a._chunks;(c=d.get(e))?"pending"===c.status&&(a=c.value,e=c.reason,c.status="resolved_model",c.value=b,null!==a&&(z(c),F(c,a,e))):d.set(e,new y("resolved_model",b,null,a));break;case "M":Q(a,e,b);break;case "P":a._chunks.set(e,D(a,x(b).Provider));break;case "S":b=JSON.parse(b);a._chunks.set(e,D(a,Symbol.for(b)));break;case "E":c=JSON.parse(b).digest;b=Error("An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.");
-b.stack="Error: "+b.message;b.digest=c;c=a._chunks;(d=c.get(e))?G(d,b):c.set(e,new y("rejected",null,b,a));break;default:throw Error("Error parsing the data. It's probably an error code or network corruption.");}}}function T(a){return function(b,c){return"string"===typeof c?P(a,this,b,c):"object"===typeof c&&null!==c?(b=c[0]===t?{$$typeof:t,type:c[1],key:c[2],ref:null,props:c[3],_owner:null}:c,b):c}}
-function U(a){var b=new TextDecoder,c=new Map;a={_bundlerConfig:a,_chunks:c,_partialRow:"",_stringDecoder:b};a._fromJSON=T(a);return a}function V(a,b){function c(b){var f=b.value;if(b.done)R(a);else{b=f;f=a._stringDecoder;for(var g=b.indexOf(10);-1<g;){var M=a._partialRow;var A=b.subarray(0,g);A=f.decode(A);S(a,M+A);a._partialRow="";b=b.subarray(g+1);g=b.indexOf(10)}a._partialRow+=f.decode(b,k);return e.read().then(c).catch(d)}}function d(b){K(a,b)}var e=b.getReader();e.read().then(c).catch(d)}
-exports.createFromFetch=function(a,b){var c=U(b&&b.moduleMap?b.moduleMap:null);a.then(function(a){V(c,a.body)},function(a){K(c,a)});return L(c,0)};exports.createFromReadableStream=function(a,b){b=U(b&&b.moduleMap?b.moduleMap:null);V(b,a);return L(b,0)};
-exports.createFromXHR=function(a,b){function c(){for(var b=a.responseText,c=f,d=b.indexOf("\n",c);-1<d;)c=e._partialRow+b.substring(c,d),S(e,c),e._partialRow="",c=d+1,d=b.indexOf("\n",c);e._partialRow+=b.substring(c);f=b.length}function d(){K(e,new TypeError("Network error"))}var e=U(b&&b.moduleMap?b.moduleMap:null),f=0;a.addEventListener("progress",c);a.addEventListener("load",function(){c();R(e)});a.addEventListener("error",d);a.addEventListener("abort",d);a.addEventListener("timeout",d);return L(e,
+'use strict';var h=require("react"),l={stream:!0};function m(a,b){return a?(a=a[b.id][b.name],b.async?{id:a.id,chunks:a.chunks,name:a.name,async:!0}:a):b}var n=new Map,p=new Map;function q(){}
+function r(a){for(var b=a.chunks,c=[],d=0;d<b.length;d++){var e=b[d],f=n.get(e);if(void 0===f){f=__webpack_chunk_load__(e);c.push(f);var k=n.set.bind(n,e,null);f.then(k,q);n.set(e,f)}else null!==f&&c.push(f)}if(a.async){if(b=p.get(a.id))return"fulfilled"===b.status?null:b;var g=Promise.all(c).then(function(){return __webpack_require__(a.id)});g.then(function(a){g.status="fulfilled";g.value=a},function(a){g.status="rejected";g.reason=a});p.set(a.id,g);return g}return 0<c.length?Promise.all(c):null}
+var t=Symbol.for("react.element"),u=Symbol.for("react.lazy"),v=Symbol.for("react.default_value"),w=h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ContextRegistry;function x(a,b,c,d){this.status=a;this.value=b;this.reason=c;this._response=d}x.prototype=Object.create(Promise.prototype);
+x.prototype.then=function(a,b){switch(this.status){case "resolved_model":y(this);break;case "resolved_module":z(this)}switch(this.status){case "fulfilled":a(this.value);break;case "pending":case "blocked":a&&(null===this.value&&(this.value=[]),this.value.push(a));b&&(null===this.reason&&(this.reason=[]),this.reason.push(b));break;default:b(this.reason)}};
+function B(a){switch(a.status){case "resolved_model":y(a);break;case "resolved_module":z(a)}switch(a.status){case "fulfilled":return a.value;case "pending":case "blocked":throw a;default:throw a.reason;}}function C(a,b){for(var c=0;c<a.length;c++)(0,a[c])(b)}function D(a,b,c){switch(a.status){case "fulfilled":C(b,a.value);break;case "pending":case "blocked":a.value=b;a.reason=c;break;case "rejected":c&&C(c,a.reason)}}
+function E(a,b){if("pending"===a.status||"blocked"===a.status){var c=a.reason;a.status="rejected";a.reason=b;null!==c&&C(c,b)}}function F(a,b){if("pending"===a.status||"blocked"===a.status){var c=a.value,d=a.reason;a.status="resolved_module";a.value=b;null!==c&&(z(a),D(a,c,d))}}var G=null,H=null;
+function y(a){var b=G,c=H;G=a;H=null;try{var d=JSON.parse(a.value,a._response._fromJSON);null!==H&&0<H.deps?(H.value=d,a.status="blocked",a.value=null,a.reason=null):(a.status="fulfilled",a.value=d)}catch(e){a.status="rejected",a.reason=e}finally{G=b,H=c}}
+function z(a){try{var b=a.value;if(b.async){var c=p.get(b.id);if("fulfilled"===c.status)var d=c.value;else throw c.reason;}else d=__webpack_require__(b.id);var e="*"===b.name?d:""===b.name?d.__esModule?d.default:d:d[b.name];a.status="fulfilled";a.value=e}catch(f){a.status="rejected",a.reason=f}}function I(a,b){a._chunks.forEach(function(a){"pending"===a.status&&E(a,b)})}function J(a,b){var c=a._chunks,d=c.get(b);d||(d=new x("pending",null,null,a),c.set(b,d));return d}
+function K(a,b,c){if(H){var d=H;d.deps++}else d=H={deps:1,value:null};return function(e){b[c]=e;d.deps--;0===d.deps&&"blocked"===a.status&&(e=a.value,a.status="fulfilled",a.value=d.value,null!==e&&C(e,d.value))}}function M(a){return function(b){return E(a,b)}}
+function N(a,b,c,d){if("$"===d[0]){if("$"===d)return t;switch(d[1]){case "$":return d.substring(1);case "L":return b=parseInt(d.substring(2),16),a=J(a,b),{$$typeof:u,_payload:a,_init:B};case "@":return b=parseInt(d.substring(2),16),J(a,b);case "S":return Symbol.for(d.substring(2));case "P":return a=d.substring(2),w[a]||(w[a]=h.createServerContext(a,v)),w[a].Provider;default:d=parseInt(d.substring(1),16);a=J(a,d);switch(a.status){case "resolved_model":y(a);break;case "resolved_module":z(a)}switch(a.status){case "fulfilled":return a.value;
+case "pending":case "blocked":return d=G,a.then(K(d,b,c),M(d)),null;default:throw a.reason;}}}return d}function O(a,b,c){var d=a._chunks,e=d.get(b);c=JSON.parse(c,a._fromJSON);var f=m(a._bundlerConfig,c);if(c=r(f)){if(e){var k=e;k.status="blocked"}else k=new x("blocked",null,null,a),d.set(b,k);c.then(function(){return F(k,f)},function(a){return E(k,a)})}else e?F(e,f):d.set(b,new x("resolved_module",f,null,a))}function P(a){I(a,Error("Connection closed."))}
+function Q(a,b){if(""!==b){var c=b.indexOf(":",0),d=parseInt(b.substring(0,c),16);switch(b[c+1]){case "I":O(a,d,b.substring(c+2));break;case "E":c=JSON.parse(b.substring(c+2)).digest;b=Error("An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.");b.stack="Error: "+b.message;b.digest=c;c=a._chunks;
+var e=c.get(d);e?E(e,b):c.set(d,new x("rejected",null,b,a));break;default:b=b.substring(c+1),e=a._chunks,(c=e.get(d))?"pending"===c.status&&(a=c.value,d=c.reason,c.status="resolved_model",c.value=b,null!==a&&(y(c),D(c,a,d))):e.set(d,new x("resolved_model",b,null,a))}}}function R(a){return function(b,c){return"string"===typeof c?N(a,this,b,c):"object"===typeof c&&null!==c?(b=c[0]===t?{$$typeof:t,type:c[1],key:c[2],ref:null,props:c[3],_owner:null}:c,b):c}}
+function S(a){var b=new TextDecoder,c=new Map;a={_bundlerConfig:a,_chunks:c,_partialRow:"",_stringDecoder:b};a._fromJSON=R(a);return a}function T(a,b){function c(b){var f=b.value;if(b.done)P(a);else{b=f;f=a._stringDecoder;for(var g=b.indexOf(10);-1<g;){var L=a._partialRow;var A=b.subarray(0,g);A=f.decode(A);Q(a,L+A);a._partialRow="";b=b.subarray(g+1);g=b.indexOf(10)}a._partialRow+=f.decode(b,l);return e.read().then(c).catch(d)}}function d(b){I(a,b)}var e=b.getReader();e.read().then(c).catch(d)}
+exports.createFromFetch=function(a,b){var c=S(b&&b.moduleMap?b.moduleMap:null);a.then(function(a){T(c,a.body)},function(a){I(c,a)});return J(c,0)};exports.createFromReadableStream=function(a,b){b=S(b&&b.moduleMap?b.moduleMap:null);T(b,a);return J(b,0)};
+exports.createFromXHR=function(a,b){function c(){for(var b=a.responseText,c=f,d=b.indexOf("\n",c);-1<d;)c=e._partialRow+b.substring(c,d),Q(e,c),e._partialRow="",c=d+1,d=b.indexOf("\n",c);e._partialRow+=b.substring(c);f=b.length}function d(){I(e,new TypeError("Network error"))}var e=S(b&&b.moduleMap?b.moduleMap:null),f=0;a.addEventListener("progress",c);a.addEventListener("load",function(){c();P(e)});a.addEventListener("error",d);a.addEventListener("abort",d);a.addEventListener("timeout",d);return J(e,
 0)};

package/cjs/react-server-dom-webpack-node-register.js

@@ -41,9 +41,6 @@ module.exports = function register() {
 
         case 'defaultProps':
           return undefined;
-
-        case 'getDefaultProps':
-          return undefined;
         // Avoid this attempting to be serialized.
 
         case 'toJSON':
@@ -103,9 +100,6 @@ module.exports = function register() {
 
         case 'defaultProps':
           return undefined;
-
-        case 'getDefaultProps':
-          return undefined;
         // Avoid this attempting to be serialized.
 
         case 'toJSON':
@@ -149,11 +143,8 @@ module.exports = function register() {
             // If this module is expected to return a Promise (such as an AsyncModule) then
             // we should resolve that with a client reference that unwraps the Promise on
             // the client.
-            var innerModuleId = target.filepath;
-            var clientReference = Object.defineProperties(function () {
-              throw new Error("Attempted to call the module exports of " + innerModuleId + " from the server" + "but it's on the client. It's not possible to invoke a client function from " + "the server, it can only be rendered as a Component or passed to props of a" + "Client Component.");
-            }, {
-              // Represents the whole object instead of a particular import.
+            var clientReference = Object.defineProperties({}, {
+              // Represents the whole Module object instead of a particular import.
               name: {
                 value: '*'
               },
@@ -238,10 +229,8 @@ module.exports = function register() {
 
   Module._extensions['.client.js'] = function (module, path) {
     var moduleId = url.pathToFileURL(path).href;
-    var clientReference = Object.defineProperties(function () {
-      throw new Error("Attempted to call the module exports of " + moduleId + " from the server" + "but it's on the client. It's not possible to invoke a client function from " + "the server, it can only be rendered as a Component or passed to props of a" + "Client Component.");
-    }, {
-      // Represents the whole object instead of a particular import.
+    var clientReference = Object.defineProperties({}, {
+      // Represents the whole Module object instead of a particular import.
       name: {
         value: '*'
       },

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

@@ -169,7 +169,7 @@ function closeWithError(destination, error) {
 var stringify = JSON.stringify;
 
 function serializeRowHeader(tag, id) {
-  return tag + id.toString(16) + ':';
+  return id.toString(16) + ':' + tag;
 }
 
 function processErrorChunkProd(request, id, digest) {
@@ -196,26 +196,17 @@ function processErrorChunkDev(request, id, digest, message, stack) {
 }
 function processModelChunk(request, id, model) {
   var json = stringify(model, request.toJSON);
-  var row = serializeRowHeader('J', id) + json + '\n';
+  var row = id.toString(16) + ':' + json + '\n';
   return stringToChunk(row);
 }
 function processReferenceChunk(request, id, reference) {
   var json = stringify(reference);
-  var row = serializeRowHeader('J', id) + json + '\n';
+  var row = id.toString(16) + ':' + json + '\n';
   return stringToChunk(row);
 }
 function processModuleChunk(request, id, moduleMetaData) {
   var json = stringify(moduleMetaData);
-  var row = serializeRowHeader('M', id) + json + '\n';
-  return stringToChunk(row);
-}
-function processProviderChunk(request, id, contextName) {
-  var row = serializeRowHeader('P', id) + contextName + '\n';
-  return stringToChunk(row);
-}
-function processSymbolChunk(request, id, name) {
-  var json = stringify(name);
-  var row = serializeRowHeader('S', id) + json + '\n';
+  var row = serializeRowHeader('I', id) + json + '\n';
   return stringToChunk(row);
 }
 
@@ -228,7 +219,7 @@ function isClientReference(reference) {
   return reference.$$typeof === CLIENT_REFERENCE_TAG;
 }
 function resolveModuleMetaData(config, clientReference) {
-  var resolvedModuleData = config[clientReference.filepath][clientReference.name];
+  var resolvedModuleData = config.clientManifest[clientReference.filepath][clientReference.name];
 
   if (clientReference.async) {
     return {
@@ -1231,6 +1222,81 @@ var POP = {}; // Used for DEV messages to keep track of which parent rendered so
 var jsxPropsParents = new WeakMap();
 var jsxChildrenParents = new WeakMap();
 
+function serializeThenable(request, thenable) {
+  request.pendingChunks++;
+  var newTask = createTask(request, null, getActiveContext(), request.abortableTasks);
+
+  switch (thenable.status) {
+    case 'fulfilled':
+      {
+        // We have the resolved value, we can go ahead and schedule it for serialization.
+        newTask.model = thenable.value;
+        pingTask(request, newTask);
+        return newTask.id;
+      }
+
+    case 'rejected':
+      {
+        var x = thenable.reason;
+        var digest = logRecoverableError(request, x);
+
+        {
+          var _getErrorMessageAndSt = getErrorMessageAndStackDev(x),
+              message = _getErrorMessageAndSt.message,
+              stack = _getErrorMessageAndSt.stack;
+
+          emitErrorChunkDev(request, newTask.id, digest, message, stack);
+        }
+
+        return newTask.id;
+      }
+
+    default:
+      {
+        if (typeof thenable.status === 'string') {
+          // Only instrument the thenable if the status if not defined. If
+          // it's defined, but an unknown value, assume it's been instrumented by
+          // some custom userspace implementation. We treat it as "pending".
+          break;
+        }
+
+        var pendingThenable = thenable;
+        pendingThenable.status = 'pending';
+        pendingThenable.then(function (fulfilledValue) {
+          if (thenable.status === 'pending') {
+            var fulfilledThenable = thenable;
+            fulfilledThenable.status = 'fulfilled';
+            fulfilledThenable.value = fulfilledValue;
+          }
+        }, function (error) {
+          if (thenable.status === 'pending') {
+            var rejectedThenable = thenable;
+            rejectedThenable.status = 'rejected';
+            rejectedThenable.reason = error;
+          }
+        });
+        break;
+      }
+  }
+
+  thenable.then(function (value) {
+    newTask.model = value;
+    pingTask(request, newTask);
+  }, function (reason) {
+    // TODO: Is it safe to directly emit these without being inside a retry?
+    var digest = logRecoverableError(request, reason);
+
+    {
+      var _getErrorMessageAndSt2 = getErrorMessageAndStackDev(reason),
+          _message = _getErrorMessageAndSt2.message,
+          _stack = _getErrorMessageAndSt2.stack;
+
+      emitErrorChunkDev(request, newTask.id, digest, _message, _stack);
+    }
+  });
+  return newTask.id;
+}
+
 function readThenable(thenable) {
   if (thenable.status === 'fulfilled') {
     return thenable.value;
@@ -1287,7 +1353,7 @@ function createLazyWrapperAroundWakeable(wakeable) {
   return lazyType;
 }
 
-function attemptResolveElement(type, key, ref, props, prevThenableState) {
+function attemptResolveElement(request, type, key, ref, props, prevThenableState) {
   if (ref !== null && ref !== undefined) {
     // When the ref moves to the regular props object this will implicitly
     // throw for functions. We could probably relax it to a DEV warning for other
@@ -1314,6 +1380,16 @@ function attemptResolveElement(type, key, ref, props, prevThenableState) {
     var result = type(props);
 
     if (typeof result === 'object' && result !== null && typeof result.then === 'function') {
+      // When the return value is in children position we can resolve it immediately,
+      // to its value without a wrapper if it's synchronously available.
+      var thenable = result;
+
+      if (thenable.status === 'fulfilled') {
+        return thenable.value;
+      } // TODO: Once we accept Promises as children on the client, we can just return
+      // the thenable here.
+
+
       return createLazyWrapperAroundWakeable(result);
     }
 
@@ -1345,7 +1421,7 @@ function attemptResolveElement(type, key, ref, props, prevThenableState) {
           var payload = type._payload;
           var init = type._init;
           var wrappedType = init(payload);
-          return attemptResolveElement(wrappedType, key, ref, props, prevThenableState);
+          return attemptResolveElement(request, wrappedType, key, ref, props, prevThenableState);
         }
 
       case REACT_FORWARD_REF_TYPE:
@@ -1357,7 +1433,7 @@ function attemptResolveElement(type, key, ref, props, prevThenableState) {
 
       case REACT_MEMO_TYPE:
         {
-          return attemptResolveElement(type.type, key, ref, props, prevThenableState);
+          return attemptResolveElement(request, type.type, key, ref, props, prevThenableState);
         }
 
       case REACT_PROVIDER_TYPE:
@@ -1422,8 +1498,20 @@ function serializeByValueID(id) {
   return '$' + id.toString(16);
 }
 
-function serializeByRefID(id) {
-  return '@' + id.toString(16);
+function serializeLazyID(id) {
+  return '$L' + id.toString(16);
+}
+
+function serializePromiseID(id) {
+  return '$@' + id.toString(16);
+}
+
+function serializeSymbolReference(name) {
+  return '$S' + name;
+}
+
+function serializeProviderReference(name) {
+  return '$P' + name;
 }
 
 function serializeClientReference(request, parent, key, moduleReference) {
@@ -1438,7 +1526,7 @@ function serializeClientReference(request, parent, key, moduleReference) {
       // knows how to deal with lazy values. This lets us suspend
       // on this component rather than its parent until the code has
       // loaded.
-      return serializeByRefID(existingId);
+      return serializeLazyID(existingId);
     }
 
     return serializeByValueID(existingId);
@@ -1457,7 +1545,7 @@ function serializeClientReference(request, parent, key, moduleReference) {
       // knows how to deal with lazy values. This lets us suspend
       // on this component rather than its parent until the code has
       // loaded.
-      return serializeByRefID(moduleId);
+      return serializeLazyID(moduleId);
     }
 
     return serializeByValueID(moduleId);
@@ -1467,9 +1555,9 @@ function serializeClientReference(request, parent, key, moduleReference) {
     var digest = logRecoverableError(request, x);
 
     {
-      var _getErrorMessageAndSt = getErrorMessageAndStackDev(x),
-          message = _getErrorMessageAndSt.message,
-          stack = _getErrorMessageAndSt.stack;
+      var _getErrorMessageAndSt3 = getErrorMessageAndStackDev(x),
+          message = _getErrorMessageAndSt3.message,
+          stack = _getErrorMessageAndSt3.stack;
 
       emitErrorChunkDev(request, errorId, digest, message, stack);
     }
@@ -1479,7 +1567,7 @@ function serializeClientReference(request, parent, key, moduleReference) {
 }
 
 function escapeStringValue(value) {
-  if (value[0] === '$' || value[0] === '@') {
+  if (value[0] === '$') {
     // We need to escape $ or @ prefixed strings since we use those to encode
     // references to IDs and as special symbol values.
     return '$' + value;
@@ -1851,7 +1939,7 @@ function resolveModelToJSON(request, parent, key, value) {
             // TODO: Concatenate keys of parents onto children.
             var element = value; // Attempt to render the Server Component.
 
-            value = attemptResolveElement(element.type, element.key, element.ref, element.props, null);
+            value = attemptResolveElement(request, element.type, element.key, element.ref, element.props, null);
             break;
           }
 
@@ -1878,7 +1966,7 @@ function resolveModelToJSON(request, parent, key, value) {
         var ping = newTask.ping;
         x.then(ping, ping);
         newTask.thenableState = getThenableStateAfterSuspending();
-        return serializeByRefID(newTask.id);
+        return serializeLazyID(newTask.id);
       } else {
         // Something errored. We'll still send everything we have up until this point.
         // We'll replace this element with a lazy reference that throws on the client
@@ -1888,14 +1976,14 @@ function resolveModelToJSON(request, parent, key, value) {
         var digest = logRecoverableError(request, x);
 
         {
-          var _getErrorMessageAndSt2 = getErrorMessageAndStackDev(x),
-              message = _getErrorMessageAndSt2.message,
-              stack = _getErrorMessageAndSt2.stack;
+          var _getErrorMessageAndSt4 = getErrorMessageAndStackDev(x),
+              message = _getErrorMessageAndSt4.message,
+              stack = _getErrorMessageAndSt4.stack;
 
           emitErrorChunkDev(request, errorId, digest, message, stack);
         }
 
-        return serializeByRefID(errorId);
+        return serializeLazyID(errorId);
       }
     }
   }
@@ -1907,6 +1995,11 @@ function resolveModelToJSON(request, parent, key, value) {
   if (typeof value === 'object') {
     if (isClientReference(value)) {
       return serializeClientReference(request, parent, key, value);
+    } else if (typeof value.then === 'function') {
+      // We assume that any object with a .then property is a "Thenable" type,
+      // or a Promise type. Either of which can be represented by a Promise.
+      var promiseId = serializeThenable(request, value);
+      return serializePromiseID(promiseId);
     } else if (value.$$typeof === REACT_PROVIDER_TYPE) {
       var providerKey = value._context._globalName;
       var writtenProviders = request.writtenProviders;
@@ -2066,12 +2159,14 @@ function emitModuleChunk(request, id, moduleMetaData) {
 }
 
 function emitSymbolChunk(request, id, name) {
-  var processedChunk = processSymbolChunk(request, id, name);
+  var symbolReference = serializeSymbolReference(name);
+  var processedChunk = processReferenceChunk(request, id, symbolReference);
   request.completedModuleChunks.push(processedChunk);
 }
 
 function emitProviderChunk(request, id, contextName) {
-  var processedChunk = processProviderChunk(request, id, contextName);
+  var contextReference = serializeProviderReference(contextName);
+  var processedChunk = processReferenceChunk(request, id, contextReference);
   request.completedJSONChunks.push(processedChunk);
 }
 
@@ -2096,7 +2191,7 @@ function retryTask(request, task) {
       // also suspends.
 
       task.model = value;
-      value = attemptResolveElement(element.type, element.key, element.ref, element.props, prevThenableState); // Successfully finished this component. We're going to keep rendering
+      value = attemptResolveElement(request, element.type, element.key, element.ref, element.props, prevThenableState); // Successfully finished this component. We're going to keep rendering
       // using the same task, but we reset its thenable state before continuing.
 
       task.thenableState = null; // Keep rendering and reuse the same task. This inner loop is separate
@@ -2107,7 +2202,7 @@ function retryTask(request, task) {
         // TODO: Concatenate keys of parents onto children.
         var nextElement = value;
         task.model = value;
-        value = attemptResolveElement(nextElement.type, nextElement.key, nextElement.ref, nextElement.props, null);
+        value = attemptResolveElement(request, nextElement.type, nextElement.key, nextElement.ref, nextElement.props, null);
       }
     }
 
@@ -2135,9 +2230,9 @@ function retryTask(request, task) {
       var digest = logRecoverableError(request, x);
 
       {
-        var _getErrorMessageAndSt3 = getErrorMessageAndStackDev(x),
-            message = _getErrorMessageAndSt3.message,
-            stack = _getErrorMessageAndSt3.stack;
+        var _getErrorMessageAndSt5 = getErrorMessageAndStackDev(x),
+            message = _getErrorMessageAndSt5.message,
+            stack = _getErrorMessageAndSt5.stack;
 
         emitErrorChunkDev(request, task.id, digest, message, stack);
       }
@@ -2303,9 +2398,9 @@ function abort(request, reason) {
       var errorId = request.nextChunkId++;
 
       if (true) {
-        var _getErrorMessageAndSt4 = getErrorMessageAndStackDev(error),
-            message = _getErrorMessageAndSt4.message,
-            stack = _getErrorMessageAndSt4.stack;
+        var _getErrorMessageAndSt6 = getErrorMessageAndStackDev(error),
+            message = _getErrorMessageAndSt6.message,
+            stack = _getErrorMessageAndSt6.stack;
 
         emitErrorChunkDev(request, errorId, digest, message, stack);
       } else {
@@ -2348,8 +2443,8 @@ function importServerContexts(contexts) {
   return rootContextSnapshot;
 }
 
-function renderToReadableStream(model, webpackMap, options) {
-  var request = createRequest(model, webpackMap, options ? options.onError : undefined, options ? options.context : undefined, options ? options.identifierPrefix : undefined);
+function renderToReadableStream(model, webpackMaps, options) {
+  var request = createRequest(model, webpackMaps, options ? options.onError : undefined, options ? options.context : undefined, options ? options.identifierPrefix : undefined);
 
   if (options && options.signal) {
     var signal = options.signal;