diff --git a/package.json b/package.json index ddc08ac54096..1982e02d538d 100644 --- a/package.json +++ b/package.json @@ -194,14 +194,14 @@ "random-seed": "0.3.0", "react": "18.2.0", "react-17": "npm:react@17.0.2", - "react-builtin": "npm:react@18.3.0-canary-d6dcad6a8-20230914", + "react-builtin": "npm:react@18.3.0-canary-2807d781a-20230918", "react-dom": "18.2.0", "react-dom-17": "npm:react-dom@17.0.2", - "react-dom-builtin": "npm:react-dom@18.3.0-canary-d6dcad6a8-20230914", - "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-d6dcad6a8-20230914", - "react-experimental-builtin": "npm:react@0.0.0-experimental-d6dcad6a8-20230914", - "react-server-dom-webpack": "18.3.0-canary-d6dcad6a8-20230914", - "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-d6dcad6a8-20230914", + "react-dom-builtin": "npm:react-dom@18.3.0-canary-2807d781a-20230918", + "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-2807d781a-20230918", + "react-experimental-builtin": "npm:react@0.0.0-experimental-2807d781a-20230918", + "react-server-dom-webpack": "18.3.0-canary-2807d781a-20230918", + "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-2807d781a-20230918", "react-ssr-prepass": "1.0.8", "react-virtualized": "9.22.3", "relay-compiler": "13.0.2", @@ -211,8 +211,8 @@ "resolve-from": "5.0.0", "sass": "1.54.0", "satori": "0.10.3", - "scheduler-builtin": "npm:scheduler@0.24.0-canary-d6dcad6a8-20230914", - "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-d6dcad6a8-20230914", + "scheduler-builtin": "npm:scheduler@0.24.0-canary-2807d781a-20230918", + "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-2807d781a-20230918", "seedrandom": "3.0.5", "selenium-webdriver": "4.0.0-beta.4", "semver": "7.3.7", diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js index 38cec9357cd2..0ef439a3ab2c 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.development.js @@ -17,7 +17,7 @@ if (process.env.NODE_ENV !== "production") { var React = require("next/dist/compiled/react-experimental"); var ReactDOM = require('react-dom'); -var ReactVersion = '18.3.0-experimental-d6dcad6a8-20230914'; +var ReactVersion = '18.3.0-experimental-2807d781a-20230918'; var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; @@ -1616,7 +1616,7 @@ function createRenderState$1(resumableState, nonce, importMap) { return { placeholderPrefix: stringToPrecomputedChunk(idPrefix + 'P:'), segmentPrefix: stringToPrecomputedChunk(idPrefix + 'S:'), - boundaryPrefix: idPrefix + 'B:', + boundaryPrefix: stringToPrecomputedChunk(idPrefix + 'B:'), startInlineScript: inlineScriptWithNonce, htmlChunks: null, headChunks: null, @@ -1677,7 +1677,7 @@ function createResumableState(identifierPrefix, nonce, bootstrapScriptContent, b externalRuntimeScript: externalRuntimeScript, bootstrapChunks: bootstrapChunks, idPrefix: idPrefix, - nextSuspenseID: 0, + nextFormID: 0, streamingFormat: streamingFormat, instructions: NothingSent, hasBody: false, @@ -1854,11 +1854,6 @@ function getChildFormatContext(parentContext, type, props) { return parentContext; } -var UNINITIALIZED_SUSPENSE_BOUNDARY_ID = null; -function assignSuspenseBoundaryID(renderState, resumableState) { - var generatedID = resumableState.nextSuspenseID++; - return stringToPrecomputedChunk(renderState.boundaryPrefix + generatedID.toString(16)); -} function makeId(resumableState, treeId, localId) { var idPrefix = resumableState.idPrefix; var id = ':' + idPrefix + 'R' + treeId; // Unless this is the first id at this level, append a number at the end @@ -2009,9 +2004,7 @@ function pushStringAttribute(target, name, value) // not null or undefined } function makeFormFieldPrefix(resumableState) { - // I'm just reusing this counter. It's not really the same namespace as "name". - // It could just be its own counter. - var id = resumableState.nextSuspenseID++; + var id = resumableState.nextFormID++; return resumableState.idPrefix + id; } // Since this will likely be repeated a lot in the HTML, we use a more concise message // than on the client and hopefully it's googleable. @@ -4181,7 +4174,8 @@ function writeStartPendingSuspenseBoundary(destination, renderState, id) { throw new Error('An ID must have been assigned before we can complete the boundary.'); } - writeChunk(destination, id); + writeChunk(destination, renderState.boundaryPrefix); + writeChunk(destination, stringToChunk(id.toString(16))); return writeChunkAndReturn(destination, startPendingSuspenseBoundary2); } function writeStartClientRenderedSuspenseBoundary$1(destination, renderState, errorDigest, errorMesssage, errorComponentStack) { @@ -4416,7 +4410,7 @@ var completeBoundaryWithStylesData1 = stringToPrecomputedChunk('