From 49dcc74e2a676076efaae154e9f18d3a702df571 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Thu, 14 Sep 2023 12:33:01 -0400 Subject: [PATCH] Update React from dd480ef92 to d6dcad6a8. React upstream changes: - https://github.com/facebook/react/pull/27374 - https://github.com/facebook/react/pull/27369 - https://github.com/facebook/react/pull/27372 - https://github.com/facebook/react/pull/27371 - https://github.com/facebook/react/pull/27370 - https://github.com/facebook/react/pull/27321 - https://github.com/facebook/react/pull/27368 - https://github.com/facebook/react/pull/27367 - https://github.com/facebook/react/pull/27366 - https://github.com/facebook/react/pull/27360 - https://github.com/facebook/react/pull/27361 - https://github.com/facebook/react/pull/27357 - https://github.com/facebook/react/pull/27359 - https://github.com/facebook/react/pull/27358 - https://github.com/facebook/react/pull/27330 - https://github.com/facebook/react/pull/27347 - https://github.com/facebook/react/pull/27307 - https://github.com/facebook/react/pull/27346 - https://github.com/facebook/react/pull/27342 - https://github.com/facebook/react/pull/27340 - https://github.com/facebook/react/pull/27328 - https://github.com/facebook/react/pull/27327 - https://github.com/facebook/react/pull/27325 - https://github.com/facebook/react/pull/27337 - https://github.com/facebook/react/pull/27336 - https://github.com/facebook/react/pull/27323 - https://github.com/facebook/react/pull/27320 - https://github.com/facebook/react/pull/27317 - https://github.com/facebook/react/pull/27318 - https://github.com/facebook/react/pull/27316 - https://github.com/facebook/react/pull/27313 - https://github.com/facebook/react/pull/27309 - https://github.com/facebook/react/pull/27302 - https://github.com/facebook/react/pull/27297 - https://github.com/facebook/react/pull/27295 - https://github.com/facebook/react/pull/27305 - https://github.com/facebook/react/pull/27215 - https://github.com/facebook/react/pull/27304 - https://github.com/facebook/react/pull/27067 - https://github.com/facebook/react/pull/27179 - https://github.com/facebook/react/pull/27278 - https://github.com/facebook/react/pull/27277 - https://github.com/facebook/react/pull/27282 - https://github.com/facebook/react/pull/27230 - https://github.com/facebook/react/pull/27260 - https://github.com/facebook/react/pull/27270 - https://github.com/facebook/react/pull/27273 - https://github.com/facebook/react/pull/27268 - https://github.com/facebook/react/pull/27269 --- package.json | 16 +- ...t-dom-server-legacy.browser.development.js | 1885 +++++++++------- ...om-server-legacy.browser.production.min.js | 278 +-- ...eact-dom-server-legacy.node.development.js | 1889 +++++++++------- ...t-dom-server-legacy.node.production.min.js | 295 +-- ...t-dom-server-rendering-stub.development.js | 273 ++- ...om-server-rendering-stub.production.min.js | 10 +- .../react-dom-server.browser.development.js | 1975 ++++++++++------- ...react-dom-server.browser.production.min.js | 283 +-- .../cjs/react-dom-server.edge.development.js | 1975 ++++++++++------- .../react-dom-server.edge.production.min.js | 301 +-- .../cjs/react-dom-server.node.development.js | 1954 +++++++++------- .../react-dom-server.node.production.min.js | 301 +-- .../react-dom-unstable_testing.development.js | 1397 +++++++----- ...act-dom-unstable_testing.production.min.js | 703 +++--- .../cjs/react-dom.development.js | 1397 +++++++----- .../cjs/react-dom.production.min.js | 675 +++--- .../cjs/react-dom.profiling.min.js | 707 +++--- .../react-dom-experimental/package.json | 4 +- .../react-dom-experimental/server.browser.js | 3 + .../react-dom-experimental/server.edge.js | 3 + .../react-dom-experimental/server.node.js | 3 + .../react-dom-experimental/static.edge.js | 8 +- ...t-dom-server-legacy.browser.development.js | 1633 +++++++------- ...om-server-legacy.browser.production.min.js | 267 +-- ...eact-dom-server-legacy.node.development.js | 1637 +++++++------- ...t-dom-server-legacy.node.production.min.js | 277 +-- ...t-dom-server-rendering-stub.development.js | 258 ++- ...om-server-rendering-stub.production.min.js | 10 +- .../react-dom-server.browser.development.js | 1547 ++++++------- ...react-dom-server.browser.production.min.js | 269 +-- .../cjs/react-dom-server.edge.development.js | 1547 ++++++------- .../react-dom-server.edge.production.min.js | 282 +-- .../cjs/react-dom-server.node.development.js | 1547 ++++++------- .../react-dom-server.node.production.min.js | 278 +-- .../react-dom/cjs/react-dom.development.js | 1013 +++++---- .../react-dom/cjs/react-dom.production.min.js | 202 +- .../react-dom/cjs/react-dom.profiling.min.js | 174 +- .../next/src/compiled/react-dom/package.json | 19 +- .../src/compiled/react-dom/server.browser.js | 3 + .../src/compiled/react-dom/server.edge.js | 3 + .../src/compiled/react-dom/server.node.js | 3 + .../cjs/react.development.js | 2 +- .../cjs/react.production.min.js | 2 +- .../cjs/react.shared-subset.development.js | 2 +- .../cjs/react.shared-subset.production.min.js | 2 +- ...-dom-webpack-client.browser.development.js | 124 +- ...m-webpack-client.browser.production.min.js | 48 +- ...ver-dom-webpack-client.edge.development.js | 243 +- ...-dom-webpack-client.edge.production.min.js | 50 +- ...ver-dom-webpack-client.node.development.js | 243 +- ...-dom-webpack-client.node.production.min.js | 58 +- ...bpack-client.node.unbundled.development.js | 243 +- ...ck-client.node.unbundled.production.min.js | 54 +- ...-dom-webpack-server.browser.development.js | 377 +++- ...m-webpack-server.browser.production.min.js | 124 +- ...ver-dom-webpack-server.edge.development.js | 377 +++- ...-dom-webpack-server.edge.production.min.js | 129 +- ...ver-dom-webpack-server.node.development.js | 377 +++- ...-dom-webpack-server.node.production.min.js | 132 +- ...bpack-server.node.unbundled.development.js | 377 +++- ...ck-server.node.unbundled.production.min.js | 128 +- .../package.json | 4 +- ...-dom-webpack-client.browser.development.js | 124 +- ...m-webpack-client.browser.production.min.js | 45 +- ...ver-dom-webpack-client.edge.development.js | 243 +- ...-dom-webpack-client.edge.production.min.js | 42 +- ...ver-dom-webpack-client.node.development.js | 243 +- ...-dom-webpack-client.node.production.min.js | 47 +- ...bpack-client.node.unbundled.development.js | 243 +- ...ck-client.node.unbundled.production.min.js | 45 +- ...-dom-webpack-server.browser.development.js | 377 +++- ...m-webpack-server.browser.production.min.js | 124 +- ...ver-dom-webpack-server.edge.development.js | 377 +++- ...-dom-webpack-server.edge.production.min.js | 123 +- ...ver-dom-webpack-server.node.development.js | 377 +++- ...-dom-webpack-server.node.production.min.js | 132 +- ...bpack-server.node.unbundled.development.js | 377 +++- ...ck-server.node.unbundled.production.min.js | 128 +- .../react-server-dom-webpack/package.json | 4 +- .../compiled/react/cjs/react.development.js | 2 +- .../react/cjs/react.production.min.js | 2 +- .../cjs/react.shared-subset.development.js | 2 +- .../cjs/react.shared-subset.production.min.js | 2 +- ...cheduler-unstable_post_task.development.js | 10 +- ...duler-unstable_post_task.production.min.js | 4 +- ...cheduler-unstable_post_task.development.js | 10 +- ...duler-unstable_post_task.production.min.js | 4 +- pnpm-lock.yaml | 80 +- 89 files changed, 19478 insertions(+), 14089 deletions(-) diff --git a/package.json b/package.json index 3f94012915c174..0873d1ef98220e 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-dd480ef92-20230822", + "react-builtin": "npm:react@18.3.0-canary-d6dcad6a8-20230914", "react-dom": "18.2.0", "react-dom-17": "npm:react-dom@17.0.2", - "react-dom-builtin": "npm:react-dom@18.3.0-canary-dd480ef92-20230822", - "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-dd480ef92-20230822", - "react-experimental-builtin": "npm:react@0.0.0-experimental-dd480ef92-20230822", - "react-server-dom-webpack": "18.3.0-canary-dd480ef92-20230822", - "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-dd480ef92-20230822", + "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-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-dd480ef92-20230822", - "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-dd480ef92-20230822", + "scheduler-builtin": "npm:scheduler@0.24.0-canary-d6dcad6a8-20230914", + "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-d6dcad6a8-20230914", "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 15a3a5bd195b25..38cec9357cd237 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-dd480ef92-20230822'; +var ReactVersion = '18.3.0-experimental-d6dcad6a8-20230914'; var ReactSharedInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; @@ -1511,9 +1511,6 @@ var formReplaying = 'addEventListener("submit",function(a){if(!a.defaultPrevente function getValueDescriptorExpectingObjectForWarning(thing) { return thing === null ? '`null`' : thing === undefined ? '`undefined`' : thing === '' ? 'an empty string' : "something with type \"" + typeof thing + "\""; } -function getValueDescriptorExpectingEnumForWarning(thing) { - return thing === null ? '`null`' : thing === undefined ? '`undefined`' : thing === '' ? 'an empty string' : typeof thing === 'string' ? JSON.stringify(thing) : "something with type \"" + typeof thing + "\""; -} // same object across all transitions. @@ -1533,8 +1530,9 @@ var ReactDOMServerDispatcher = { preconnect: preconnect, preload: preload, preloadModule: preloadModule, - preinit: preinit, - preinitModule: preinitModule + preinitStyle: preinitStyle, + preinitScript: preinitScript, + preinitModuleScript: preinitModuleScript }; function prepareHostDispatcher() { ReactDOMCurrentDispatcher.current = ReactDOMServerDispatcher; @@ -1558,7 +1556,11 @@ var SentStyleInsertionFunction = 8; var SentFormReplayingRuntime /* */ -= 16; // Per response, global state that is not contextual to the rendering subtree. += 16; // Per request, global state that is not contextual to the rendering subtree. +// This cannot be resumed and therefore should only contain things that are +// temporary working state or are never used in the prerender pass. +// Per response, global state that is not contextual to the rendering subtree. +// This is resumable and therefore should be serializable. var dataElementQuotedEnd = stringToPrecomputedChunk('">'); var startInlineScript = stringToPrecomputedChunk(''); /** - * This escaping function is designed to work with bootstrapScriptContent only. + * This escaping function is designed to work with bootstrapScriptContent and importMap only. * because we know we are escaping the entire script. We can avoid for instance * escaping html comment string sequences that are valid javascript as well because * if there are no sebsequent '); * ensure that the script cannot be early terminated or never terminated state */ -function escapeBootstrapScriptContent(scriptText) { +function escapeBootstrapAndImportMapScriptContent(scriptText) { { checkHtmlStringCoercion(scriptText); } @@ -1592,20 +1594,52 @@ var scriptRegex = /(<\/|<)(s)(cript)/gi; var scriptReplacer = function (match, prefix, s, suffix) { return "" + prefix + (s === 's' ? "\\u0073" : "\\u0053") + suffix; -}; // Allows us to keep track of what we've already written so we can refer back to it. +}; + +var importMapScriptStart = stringToPrecomputedChunk(''); // Allows us to keep track of what we've already written so we can refer back to it. // if passed externalRuntimeConfig and the enableFizzExternalRuntime feature flag // is set, the server will send instructions via data attributes (instead of inline scripts) +function createRenderState$1(resumableState, nonce, importMap) { + var inlineScriptWithNonce = nonce === undefined ? startInlineScript : stringToPrecomputedChunk(''); var completeSegmentData1 = stringToPrecomputedChunk('')} -function Nb(a,b,c,d){switch(c.insertionMode){case 0:case 1:case 2:return a.push('