diff --git a/.github/.react-version b/.github/.react-version index 330040bbe3501..bbe85eaea0cd3 100644 --- a/.github/.react-version +++ b/.github/.react-version @@ -1 +1 @@ -19.0.0-rc-187dd6a7-20240806 \ No newline at end of file +19.0.0-rc-49496d49-20240814 \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 7ff6c0f6827c7..77ff7016cc8c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6449,7 +6449,7 @@ dependencies = [ "hashbrown 0.14.5", "ptr_meta", "rustc-hash", - "triomphe", + "triomphe 0.1.13", ] [[package]] diff --git a/examples/reproduction-template/package.json b/examples/reproduction-template/package.json index 37f244089ea14..f88b10131b1f5 100644 --- a/examples/reproduction-template/package.json +++ b/examples/reproduction-template/package.json @@ -7,8 +7,8 @@ }, "dependencies": { "next": "canary", - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806" + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814" }, "devDependencies": { "@types/node": "20.12.12", diff --git a/package.json b/package.json index 1122cc0b4e509..329318e6b10e5 100644 --- a/package.json +++ b/package.json @@ -206,19 +206,19 @@ "pretty-bytes": "5.3.0", "pretty-ms": "7.0.0", "random-seed": "0.3.0", - "react": "19.0.0-rc-187dd6a7-20240806", + "react": "19.0.0-rc-49496d49-20240814", "react-17": "npm:react@17.0.2", - "react-builtin": "npm:react@19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806", + "react-builtin": "npm:react@19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814", "react-dom-17": "npm:react-dom@17.0.2", - "react-dom-builtin": "npm:react-dom@19.0.0-rc-187dd6a7-20240806", - "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-187dd6a7-20240806", - "react-experimental-builtin": "npm:react@0.0.0-experimental-187dd6a7-20240806", - "react-is-builtin": "npm:react-is@19.0.0-rc-187dd6a7-20240806", - "react-server-dom-turbopack": "19.0.0-rc-187dd6a7-20240806", - "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-187dd6a7-20240806", - "react-server-dom-webpack": "19.0.0-rc-187dd6a7-20240806", - "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-187dd6a7-20240806", + "react-dom-builtin": "npm:react-dom@19.0.0-rc-49496d49-20240814", + "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-49496d49-20240814", + "react-experimental-builtin": "npm:react@0.0.0-experimental-49496d49-20240814", + "react-is-builtin": "npm:react-is@19.0.0-rc-49496d49-20240814", + "react-server-dom-turbopack": "19.0.0-rc-49496d49-20240814", + "react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-49496d49-20240814", + "react-server-dom-webpack": "19.0.0-rc-49496d49-20240814", + "react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-49496d49-20240814", "react-ssr-prepass": "1.0.8", "react-virtualized": "9.22.3", "relay-compiler": "13.0.2", @@ -228,8 +228,8 @@ "resolve-from": "5.0.0", "sass": "1.54.0", "satori": "0.10.9", - "scheduler-builtin": "npm:scheduler@0.25.0-rc-187dd6a7-20240806", - "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-187dd6a7-20240806", + "scheduler-builtin": "npm:scheduler@0.25.0-rc-49496d49-20240814", + "scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-49496d49-20240814", "seedrandom": "3.0.5", "semver": "7.3.7", "shell-quote": "1.7.3", @@ -269,10 +269,10 @@ "@babel/traverse": "7.22.5", "@types/react": "npm:types-react@19.0.0-rc.0", "@types/react-dom": "npm:types-react-dom@19.0.0-rc.0", - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806", - "react-is": "19.0.0-rc-187dd6a7-20240806", - "scheduler": "0.25.0-rc-187dd6a7-20240806" + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814", + "react-is": "19.0.0-rc-49496d49-20240814", + "scheduler": "0.25.0-rc-49496d49-20240814" }, "patchedDependencies": { "webpack-sources@3.2.3": "patches/webpack-sources@3.2.3.patch" diff --git a/packages/create-next-app/templates/index.ts b/packages/create-next-app/templates/index.ts index 6df79c05a0fc8..8f38cb1c21dc0 100644 --- a/packages/create-next-app/templates/index.ts +++ b/packages/create-next-app/templates/index.ts @@ -184,8 +184,8 @@ export const installTemplate = async ({ * Default dependencies. */ dependencies: { - react: "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806", + react: "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814", next: version, }, devDependencies: {}, diff --git a/packages/next/package.json b/packages/next/package.json index 8ad25a740812c..af3b7106b851d 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -108,8 +108,8 @@ "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806", + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814", "sass": "^1.3.0" }, "peerDependenciesMeta": { diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js index fe68b8de0f056..15990da6bd4a6 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js @@ -24604,11 +24604,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24645,11 +24645,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-187dd6a7-20240806", + version: "19.0.0-experimental-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-187dd6a7-20240806" + reconcilerVersion: "19.0.0-experimental-49496d49-20240814" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24793,7 +24793,7 @@ listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js index c83b7464b3706..c2361f5297dbe 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.production.js @@ -14993,14 +14993,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { }; var isomorphicReactPackageVersion$jscomp$inline_1640 = React.version; if ( - "19.0.0-experimental-187dd6a7-20240806" !== + "19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_1640 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_1640, - "19.0.0-experimental-187dd6a7-20240806" + "19.0.0-experimental-49496d49-20240814" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15022,11 +15022,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { }; var internals$jscomp$inline_2039 = { bundleType: 0, - version: "19.0.0-experimental-187dd6a7-20240806", + version: "19.0.0-experimental-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-187dd6a7-20240806" + reconcilerVersion: "19.0.0-experimental-49496d49-20240814" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2040 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -15130,4 +15130,4 @@ exports.hydrateRoot = function (container, initialChildren, options) { listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js index a147165635a60..97c876bf43b08 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.development.js @@ -24661,11 +24661,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24702,11 +24702,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-187dd6a7-20240806", + version: "19.0.0-experimental-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-187dd6a7-20240806" + reconcilerVersion: "19.0.0-experimental-49496d49-20240814" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -25180,7 +25180,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js index 5ef658a064a30..0993dc834f8ea 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-profiling.profiling.js @@ -15696,14 +15696,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { }; var isomorphicReactPackageVersion$jscomp$inline_1729 = React.version; if ( - "19.0.0-experimental-187dd6a7-20240806" !== + "19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_1729 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_1729, - "19.0.0-experimental-187dd6a7-20240806" + "19.0.0-experimental-49496d49-20240814" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15725,11 +15725,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { }; var internals$jscomp$inline_1736 = { bundleType: 0, - version: "19.0.0-experimental-187dd6a7-20240806", + version: "19.0.0-experimental-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-187dd6a7-20240806", + reconcilerVersion: "19.0.0-experimental-49496d49-20240814", getLaneLabelMap: function () { for ( var map = new Map(), lane = 1, index$291 = 0; @@ -16009,7 +16009,7 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && 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 27d7b46f159f3..16bd24c61769e 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 @@ -9176,5 +9176,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js index 9841715f35ba8..9b2c480f0bb78 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.browser.production.js @@ -5971,4 +5971,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js index fc287c88e1847..463898c0fae6e 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.development.js @@ -9176,5 +9176,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js index 8b63981cdfbf0..22ebb007d3d17 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server-legacy.node.production.js @@ -6063,4 +6063,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js index f11d7d8cccbac..cd991bb45cfcf 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.development.js @@ -8050,11 +8050,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); } var React = require("next/dist/compiled/react-experimental"), @@ -9776,5 +9776,5 @@ startWork(request); }); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js index 0709d9544880e..4022ba172a1c9 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.browser.production.js @@ -6468,12 +6468,12 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion, - "19.0.0-experimental-187dd6a7-20240806" + "19.0.0-experimental-49496d49-20240814" ) ); } @@ -6678,4 +6678,4 @@ exports.resume = function (children, postponedState, options) { startWork(request); }); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js index 72452d32197db..e467a3a5b614f 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.bun.production.js @@ -5977,13 +5977,13 @@ function addToReplayParent(node, parentKeyPath, trackedPostpones) { } var isomorphicReactPackageVersion$jscomp$inline_789 = React.version; if ( - "19.0.0-experimental-187dd6a7-20240806" !== + "19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_789 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_789 + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -6071,4 +6071,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js index 62485defc0bc2..757519c9e7670 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.development.js @@ -8069,11 +8069,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); } var React = require("next/dist/compiled/react-experimental"), @@ -9791,5 +9791,5 @@ startWork(request); }); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js index 8a4d815e97d7c..c887b5acc72a5 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.edge.production.js @@ -6572,11 +6572,11 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); } ensureCorrectIsomorphicReactVersion(); @@ -6780,4 +6780,4 @@ exports.resume = function (children, postponedState, options) { startWork(request); }); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js index e13557e4576e4..65482acb380a1 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.development.js @@ -7806,11 +7806,11 @@ } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); } function createDrainHandler(destination, request) { @@ -9618,5 +9618,5 @@ } }; }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js index 69f88947eb7c4..f4e8224f6e1d1 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-server.node.production.js @@ -6336,11 +6336,11 @@ function getPostponedState(request) { } function ensureCorrectIsomorphicReactVersion() { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); } ensureCorrectIsomorphicReactVersion(); @@ -6625,4 +6625,4 @@ exports.resumeToPipeableStream = function (children, postponedState, options) { } }; }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js index ec34c6603015a..ff3ff025c4f8a 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.development.js @@ -24938,11 +24938,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-experimental-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-experimental-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-experimental-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24979,11 +24979,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-experimental-187dd6a7-20240806", + version: "19.0.0-experimental-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-187dd6a7-20240806" + reconcilerVersion: "19.0.0-experimental-49496d49-20240814" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -25293,5 +25293,5 @@ } }; }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js index c77a93e136102..2f575ee482cac 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom-unstable_testing.production.js @@ -15322,14 +15322,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { }; var isomorphicReactPackageVersion$jscomp$inline_1669 = React.version; if ( - "19.0.0-experimental-187dd6a7-20240806" !== + "19.0.0-experimental-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_1669 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_1669, - "19.0.0-experimental-187dd6a7-20240806" + "19.0.0-experimental-49496d49-20240814" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15351,11 +15351,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { }; var internals$jscomp$inline_2073 = { bundleType: 0, - version: "19.0.0-experimental-187dd6a7-20240806", + version: "19.0.0-experimental-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-experimental-187dd6a7-20240806" + reconcilerVersion: "19.0.0-experimental-49496d49-20240814" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2074 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -15610,4 +15610,4 @@ exports.observeVisibleRects = function ( } }; }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js index 8224fbc34f852..7d4e455c40536 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.development.js @@ -416,7 +416,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js index 0f5eb278824a5..7328d80501024 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.production.js @@ -207,4 +207,4 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js index d0901a809dd1e..25dda439d75c7 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.development.js @@ -336,5 +336,5 @@ })) : Internals.d.m(href)); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js index d032c4714b2e8..9eff5fc78fff8 100644 --- a/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js +++ b/packages/next/src/compiled/react-dom-experimental/cjs/react-dom.react-server.production.js @@ -149,4 +149,4 @@ exports.preloadModule = function (href, options) { }); } else Internals.d.m(href); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom-experimental/package.json b/packages/next/src/compiled/react-dom-experimental/package.json index e5cebd5f9bf3e..90f63a9845ade 100644 --- a/packages/next/src/compiled/react-dom-experimental/package.json +++ b/packages/next/src/compiled/react-dom-experimental/package.json @@ -72,10 +72,10 @@ "./package.json": "./package.json" }, "dependencies": { - "scheduler": "0.0.0-experimental-187dd6a7-20240806" + "scheduler": "0.0.0-experimental-49496d49-20240814" }, "peerDependencies": { - "react": "0.0.0-experimental-187dd6a7-20240806" + "react": "0.0.0-experimental-49496d49-20240814" }, "browser": { "./server.js": "./server.browser.js", diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js index 7ad68fc65d25b..4212b7c43c135 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-client.development.js @@ -24210,11 +24210,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24251,11 +24251,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-rc-187dd6a7-20240806", + version: "19.0.0-rc-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-187dd6a7-20240806" + reconcilerVersion: "19.0.0-rc-49496d49-20240814" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24399,7 +24399,7 @@ listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js index 21eb0a5000d5a..bf4e6c22f2922 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-client.production.js @@ -14740,14 +14740,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { }; var isomorphicReactPackageVersion$jscomp$inline_1669 = React.version; if ( - "19.0.0-rc-187dd6a7-20240806" !== + "19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_1669 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_1669, - "19.0.0-rc-187dd6a7-20240806" + "19.0.0-rc-49496d49-20240814" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -14769,11 +14769,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { }; var internals$jscomp$inline_2045 = { bundleType: 0, - version: "19.0.0-rc-187dd6a7-20240806", + version: "19.0.0-rc-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-187dd6a7-20240806" + reconcilerVersion: "19.0.0-rc-49496d49-20240814" }; if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) { var hook$jscomp$inline_2046 = __REACT_DEVTOOLS_GLOBAL_HOOK__; @@ -14877,4 +14877,4 @@ exports.hydrateRoot = function (container, initialChildren, options) { listenToAllSupportedEvents(container); return new ReactDOMHydrationRoot(initialChildren); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js index 542ed857dae8d..acad86f4469c4 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.development.js @@ -24267,11 +24267,11 @@ }; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); ("function" === typeof Map && @@ -24308,11 +24308,11 @@ !(function () { var internals = { bundleType: 1, - version: "19.0.0-rc-187dd6a7-20240806", + version: "19.0.0-rc-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-187dd6a7-20240806" + reconcilerVersion: "19.0.0-rc-49496d49-20240814" }; internals.overrideHookState = overrideHookState; internals.overrideHookStateDeletePath = overrideHookStateDeletePath; @@ -24786,7 +24786,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js index cbf2e6c507828..19ee057663e60 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-profiling.profiling.js @@ -15443,14 +15443,14 @@ ReactDOMHydrationRoot.prototype.unstable_scheduleHydration = function (target) { }; var isomorphicReactPackageVersion$jscomp$inline_1758 = React.version; if ( - "19.0.0-rc-187dd6a7-20240806" !== + "19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_1758 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_1758, - "19.0.0-rc-187dd6a7-20240806" + "19.0.0-rc-49496d49-20240814" ) ); ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { @@ -15472,11 +15472,11 @@ ReactDOMSharedInternals.findDOMNode = function (componentOrElement) { }; var internals$jscomp$inline_1765 = { bundleType: 0, - version: "19.0.0-rc-187dd6a7-20240806", + version: "19.0.0-rc-49496d49-20240814", rendererPackageName: "react-dom", currentDispatcherRef: ReactSharedInternals, findFiberByHostInstance: getClosestInstanceFromNode, - reconcilerVersion: "19.0.0-rc-187dd6a7-20240806", + reconcilerVersion: "19.0.0-rc-49496d49-20240814", getLaneLabelMap: function () { for ( var map = new Map(), lane = 1, index$287 = 0; @@ -15756,7 +15756,7 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js index 7529f66593942..754d589e52aef 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.development.js @@ -8526,5 +8526,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js index b464d228c7630..192f7de7d438b 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.browser.production.js @@ -5589,4 +5589,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToReadableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js index 5de1cafba87ae..66f59b210f0c4 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.development.js @@ -8526,5 +8526,5 @@ 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js index 04b3757769a3f..f5e77525ee927 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server-legacy.node.production.js @@ -5667,4 +5667,4 @@ exports.renderToString = function (children, options) { 'The server used "renderToString" which does not support Suspense. If you intended for this Suspense boundary to render the fallback content on the server consider throwing an Error somewhere within the Suspense boundary. If you intended to have the server wait for the suspended component please switch to "renderToPipeableStream" which supports Suspense on the server' ); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js index de71cc8983e2c..92bcc2c2ba258 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.development.js @@ -8693,11 +8693,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToReadableStream = function (children, options) { @@ -8790,5 +8790,5 @@ startWork(request$jscomp$0); }); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js index e68ac7730c761..c71a17369fac2 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.browser.production.js @@ -5858,14 +5858,14 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_742 = React.version; if ( - "19.0.0-rc-187dd6a7-20240806" !== + "19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_742 ) throw Error( formatProdErrorMessage( 527, isomorphicReactPackageVersion$jscomp$inline_742, - "19.0.0-rc-187dd6a7-20240806" + "19.0.0-rc-49496d49-20240814" ) ); exports.renderToReadableStream = function (children, options) { @@ -5954,4 +5954,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js index 3bc20e7c9efdd..3eeb5586deaea 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.bun.production.js @@ -5555,13 +5555,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_746 = React.version; if ( - "19.0.0-rc-187dd6a7-20240806" !== + "19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_746 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_746 + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -5649,4 +5649,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js index 1650d2614f111..d630758c05af3 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.development.js @@ -8708,11 +8708,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToReadableStream = function (children, options) { @@ -8805,5 +8805,5 @@ startWork(request$jscomp$0); }); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js index 85254b77fedce..4b26595389bed 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.edge.production.js @@ -5948,13 +5948,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_750 = React.version; if ( - "19.0.0-rc-187dd6a7-20240806" !== + "19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_750 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_750 + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); exports.renderToReadableStream = function (children, options) { return new Promise(function (resolve, reject) { @@ -6042,4 +6042,4 @@ exports.renderToReadableStream = function (children, options) { startWork(request); }); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js index efba32d02830b..75720c41f0fd1 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.development.js @@ -8583,11 +8583,11 @@ didWarnAboutMaps = !1; (function () { var isomorphicReactPackageVersion = React.version; - if ("19.0.0-rc-187dd6a7-20240806" !== isomorphicReactPackageVersion) + if ("19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); })(); exports.renderToPipeableStream = function (children, options) { @@ -8629,5 +8629,5 @@ } }; }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js index 7639d4aed34b1..8b5ce83de16bb 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom-server.node.production.js @@ -5614,13 +5614,13 @@ function abort(request, reason) { } var isomorphicReactPackageVersion$jscomp$inline_773 = React.version; if ( - "19.0.0-rc-187dd6a7-20240806" !== + "19.0.0-rc-49496d49-20240814" !== isomorphicReactPackageVersion$jscomp$inline_773 ) throw Error( 'Incompatible React versions: The "react" and "react-dom" packages must have the exact same version. Instead got:\n - react: ' + (isomorphicReactPackageVersion$jscomp$inline_773 + - "\n - react-dom: 19.0.0-rc-187dd6a7-20240806\nLearn more: https://react.dev/warnings/version-mismatch") + "\n - react-dom: 19.0.0-rc-49496d49-20240814\nLearn more: https://react.dev/warnings/version-mismatch") ); function createDrainHandler(destination, request) { return function () { @@ -5895,4 +5895,4 @@ exports.renderToPipeableStream = function (children, options) { } }; }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom.development.js index e369aaaf84647..68e4198bb4571 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.development.js @@ -416,7 +416,7 @@ exports.useFormStatus = function () { return resolveDispatcher().useHostTransitionStatus(); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom.production.js index d27e42d4af001..16351b2a5f9f8 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.production.js @@ -207,4 +207,4 @@ exports.useFormState = function (action, initialState, permalink) { exports.useFormStatus = function () { return ReactSharedInternals.H.useHostTransitionStatus(); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js index 44b4ef94820d3..562dce71723f3 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.development.js @@ -336,5 +336,5 @@ })) : Internals.d.m(href)); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js index e7404d3e037f5..d2645469cb3aa 100644 --- a/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js +++ b/packages/next/src/compiled/react-dom/cjs/react-dom.react-server.production.js @@ -149,4 +149,4 @@ exports.preloadModule = function (href, options) { }); } else Internals.d.m(href); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-dom/package.json b/packages/next/src/compiled/react-dom/package.json index 9a2a3be51ef6d..828d3cce38b39 100644 --- a/packages/next/src/compiled/react-dom/package.json +++ b/packages/next/src/compiled/react-dom/package.json @@ -67,10 +67,10 @@ "./package.json": "./package.json" }, "dependencies": { - "scheduler": "0.25.0-rc-187dd6a7-20240806" + "scheduler": "0.25.0-rc-49496d49-20240814" }, "peerDependencies": { - "react": "19.0.0-rc-187dd6a7-20240806" + "react": "19.0.0-rc-49496d49-20240814" }, "browser": { "./server.js": "./server.browser.js", diff --git a/packages/next/src/compiled/react-experimental/cjs/react.development.js b/packages/next/src/compiled/react-experimental/cjs/react.development.js index a4616c88f3509..e9cae47f5ef1c 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.development.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.development.js @@ -1233,7 +1233,7 @@ exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react-experimental/cjs/react.production.js b/packages/next/src/compiled/react-experimental/cjs/react.production.js index 61fda11ba5358..8132c34b11ae3 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.production.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.production.js @@ -562,4 +562,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js b/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js index c477afdbde3aa..6f2067cc66a71 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.react-server.development.js @@ -979,5 +979,5 @@ exports.useMemo = function (create, deps) { return resolveDispatcher().useMemo(create, deps); }; - exports.version = "19.0.0-experimental-187dd6a7-20240806"; + exports.version = "19.0.0-experimental-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js b/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js index b871de4a1a586..91ea802a3e49a 100644 --- a/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js +++ b/packages/next/src/compiled/react-experimental/cjs/react.react-server.production.js @@ -567,4 +567,4 @@ exports.useId = function () { exports.useMemo = function (create, deps) { return ReactSharedInternals.H.useMemo(create, deps); }; -exports.version = "19.0.0-experimental-187dd6a7-20240806"; +exports.version = "19.0.0-experimental-49496d49-20240814"; diff --git a/packages/next/src/compiled/react-is/package.json b/packages/next/src/compiled/react-is/package.json index 2008c92281cfa..e4515b5bf0a26 100644 --- a/packages/next/src/compiled/react-is/package.json +++ b/packages/next/src/compiled/react-is/package.json @@ -1,6 +1,6 @@ { "name": "react-is", - "version": "19.0.0-rc-187dd6a7-20240806", + "version": "19.0.0-rc-49496d49-20240814", "description": "Brand checking of React Elements.", "main": "index.js", "sideEffects": false, diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js index 347430b5df9f7..ce658d71d4104 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -70,6 +71,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -731,6 +735,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -769,10 +775,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1022,23 +1028,28 @@ callComponentInDEV.bind(null, Component, props, componentDebugInfo) ) : callComponentInDEV(Component, props, componentDebugInfo); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1189,10 +1200,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1201,73 +1280,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1593,7 +1605,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1665,7 +1677,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1682,7 +1694,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1851,7 +1863,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2080,7 +2092,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2198,7 +2210,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2374,7 +2386,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2502,7 +2514,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3631,7 +3643,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3725,7 +3737,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js index cebaec5eeb89d..e406b98dba70b 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.browser.production.js @@ -702,7 +702,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -799,6 +798,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -835,9 +836,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1013,13 +1014,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1110,7 +1120,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1320,7 +1330,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1384,7 +1394,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1815,7 +1825,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1910,7 +1920,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js index 1f70a94479185..82c41becc6852 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -66,6 +67,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -740,6 +744,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -778,10 +784,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1055,23 +1061,28 @@ ) ) : callComponentInDEV(Component, props, componentDebugInfo); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1246,10 +1257,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1258,73 +1337,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1650,7 +1662,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1722,7 +1734,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1739,7 +1751,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1908,7 +1920,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2159,7 +2171,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2277,7 +2289,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2453,7 +2465,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2585,7 +2597,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3722,7 +3734,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3823,7 +3835,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js index 89826b2d41ccb..6c1289e977335 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.edge.production.js @@ -699,7 +699,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -804,6 +803,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -840,9 +841,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1018,13 +1019,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1115,7 +1125,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1325,7 +1335,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1389,7 +1399,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1824,7 +1834,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1923,7 +1933,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js index 52ce31308f15f..3ef0183102e93 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -761,6 +765,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -799,10 +805,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1064,23 +1070,28 @@ props, componentDebugInfo ); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1244,10 +1255,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1256,73 +1335,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1646,7 +1658,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1718,7 +1730,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1735,7 +1747,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1904,7 +1916,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2138,7 +2150,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2256,7 +2268,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2430,7 +2442,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2571,7 +2583,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3711,7 +3723,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3814,7 +3826,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js index 85f4cd37ad7c8..aeb9846b77b76 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.production.js @@ -718,7 +718,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -820,6 +819,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -856,9 +857,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1033,13 +1034,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1130,7 +1140,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1338,7 +1348,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1402,7 +1412,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1824,7 +1834,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1955,7 +1965,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.development.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.development.js index f658be3715d93..1bb42c1c90b09 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -761,6 +765,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -799,10 +805,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1064,23 +1070,28 @@ props, componentDebugInfo ); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1244,10 +1255,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1256,73 +1335,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1646,7 +1658,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1718,7 +1730,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1735,7 +1747,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1904,7 +1916,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2138,7 +2150,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2256,7 +2268,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2430,7 +2442,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2571,7 +2583,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3677,7 +3689,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3780,7 +3792,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.production.js b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.production.js index 38993defc7c1d..1d94eefe6bea7 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/cjs/react-server-dom-turbopack-server.node.unbundled.production.js @@ -718,7 +718,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -820,6 +819,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -856,9 +857,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1033,13 +1034,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1130,7 +1140,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1338,7 +1348,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1402,7 +1412,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1824,7 +1834,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1955,7 +1965,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json b/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json index c0404734f2155..ab3a0e63b678d 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json +++ b/packages/next/src/compiled/react-server-dom-turbopack-experimental/package.json @@ -47,7 +47,7 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "0.0.0-experimental-187dd6a7-20240806", - "react-dom": "0.0.0-experimental-187dd6a7-20240806" + "react": "0.0.0-experimental-49496d49-20240814", + "react-dom": "0.0.0-experimental-49496d49-20240814" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js index 1f4f1e2c3e4ef..5041dc0fb67d6 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -70,6 +71,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -569,6 +573,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -599,9 +605,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -804,23 +810,28 @@ } prepareToUseHooksForComponent(prevThenableState, componentDebugInfo); props = callComponentInDEV(Component, props, componentDebugInfo); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -946,48 +957,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1285,7 +1296,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1354,7 +1365,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1371,7 +1382,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1526,7 +1537,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1763,7 +1774,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1874,7 +1885,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2012,7 +2023,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2139,7 +2150,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3251,7 +3262,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3326,7 +3337,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js index aada8183e8ae0..aba01d6385101 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.browser.production.js @@ -701,8 +701,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -769,6 +768,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -800,9 +801,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -960,13 +961,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1057,7 +1067,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1151,7 +1161,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1329,7 +1339,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1707,7 +1717,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1799,7 +1809,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js index 59e198f6360f1..153bbda4e2370 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -66,6 +67,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -573,6 +577,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -603,9 +609,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -816,23 +822,28 @@ componentDebugInfo ) : callComponentInDEV(Component, props, componentDebugInfo); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -958,48 +969,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1297,7 +1308,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1366,7 +1377,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1383,7 +1394,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1538,7 +1549,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1786,7 +1797,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1897,7 +1908,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2035,7 +2046,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2166,7 +2177,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3284,7 +3295,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3362,7 +3373,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js index aabb8f3d9da96..fc822ccf1e44e 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.edge.production.js @@ -698,8 +698,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -774,6 +773,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -805,9 +806,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -965,13 +966,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1062,7 +1072,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1156,7 +1166,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1334,7 +1344,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1714,7 +1724,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1810,7 +1820,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js index 247d914aa491c..3357b217fd7ce 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -597,6 +601,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -627,9 +633,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -837,23 +843,28 @@ props, componentDebugInfo ); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -979,48 +990,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1316,7 +1327,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1385,7 +1396,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1402,7 +1413,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1557,7 +1568,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1793,7 +1804,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1904,7 +1915,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2041,7 +2052,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2181,7 +2192,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3304,7 +3315,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3379,7 +3390,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js index 237312754e5e0..9eb2f011086f8 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.production.js @@ -717,8 +717,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -790,6 +789,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -821,9 +822,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -980,13 +981,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1077,7 +1087,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1171,7 +1181,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1347,7 +1357,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1718,7 +1728,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1846,7 +1856,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.development.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.development.js index 2e933776744e3..3a43467dbbe8d 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.development.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -597,6 +601,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -627,9 +633,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -837,23 +843,28 @@ props, componentDebugInfo ); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -979,48 +990,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1316,7 +1327,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1385,7 +1396,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1402,7 +1413,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1557,7 +1568,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1793,7 +1804,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1904,7 +1915,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2041,7 +2052,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2181,7 +2192,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3270,7 +3281,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3345,7 +3356,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.production.js b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.production.js index 0f4b1da4b8f0c..dd47a139aebe9 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.production.js +++ b/packages/next/src/compiled/react-server-dom-turbopack/cjs/react-server-dom-turbopack-server.node.unbundled.production.js @@ -717,8 +717,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -790,6 +789,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -821,9 +822,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -980,13 +981,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1077,7 +1087,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1171,7 +1181,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1347,7 +1357,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1718,7 +1728,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1846,7 +1856,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-turbopack/package.json b/packages/next/src/compiled/react-server-dom-turbopack/package.json index 4396164115bb6..7cfcef715914a 100644 --- a/packages/next/src/compiled/react-server-dom-turbopack/package.json +++ b/packages/next/src/compiled/react-server-dom-turbopack/package.json @@ -47,7 +47,7 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806" + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js index 6995236fcb90e..c4bdd60d1011c 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -70,6 +71,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -735,6 +739,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -773,10 +779,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1026,23 +1032,28 @@ callComponentInDEV.bind(null, Component, props, componentDebugInfo) ) : callComponentInDEV(Component, props, componentDebugInfo); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1193,10 +1204,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1205,73 +1284,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1597,7 +1609,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1669,7 +1681,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1686,7 +1698,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1855,7 +1867,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2084,7 +2096,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2202,7 +2214,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2378,7 +2390,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2506,7 +2518,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3640,7 +3652,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3734,7 +3746,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js index 573bd008062a5..57edd79c57251 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.browser.production.js @@ -702,7 +702,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -799,6 +798,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -835,9 +836,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1013,13 +1014,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1110,7 +1120,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1320,7 +1330,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1384,7 +1394,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1815,7 +1825,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1910,7 +1920,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js index 1a740e55ac6a9..8a9dd7266afaa 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -66,6 +67,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -744,6 +748,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -782,10 +788,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1059,23 +1065,28 @@ ) ) : callComponentInDEV(Component, props, componentDebugInfo); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1250,10 +1261,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1262,73 +1341,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1654,7 +1666,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1726,7 +1738,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1743,7 +1755,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1912,7 +1924,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2163,7 +2175,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2281,7 +2293,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2457,7 +2469,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2589,7 +2601,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3727,7 +3739,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3828,7 +3840,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js index d1b67906ad354..6dab94742872d 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.edge.production.js @@ -699,7 +699,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -804,6 +803,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -840,9 +841,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1018,13 +1019,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1115,7 +1125,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1325,7 +1335,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1389,7 +1399,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1824,7 +1834,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1923,7 +1933,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js index c573185a6592a..37125a3d3e5c4 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -765,6 +769,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -803,10 +809,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1068,23 +1074,28 @@ props, componentDebugInfo ); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1248,10 +1259,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1260,73 +1339,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1650,7 +1662,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1722,7 +1734,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1739,7 +1751,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1908,7 +1920,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2142,7 +2154,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2260,7 +2272,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2434,7 +2446,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2575,7 +2587,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3716,7 +3728,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3819,7 +3831,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js index 842851d122ef0..3a2198074a6a4 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.production.js @@ -718,7 +718,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -820,6 +819,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -856,9 +857,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1033,13 +1034,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1130,7 +1140,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1338,7 +1348,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1402,7 +1412,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1824,7 +1834,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1955,7 +1965,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js index 62442c071a411..00b626175af2d 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -765,6 +769,8 @@ var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); } + newTask.status = ERRORED$1; + request.abortableTasks.delete(newTask); return newTask.id; default: if (request.status === ABORTING) @@ -803,10 +809,10 @@ logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id, reason); else { - newTask.status = ERRORED$1; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); } + newTask.status = ERRORED$1; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1068,23 +1074,28 @@ props, componentDebugInfo ); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { validated = props; - validated.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + validated.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === validated.status) return validated.value; props = createLazyWrapperAroundWakeable(props); } @@ -1248,10 +1259,78 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + 2 === validated && + ((validated = { + name: "Fragment", + env: (0, request.environmentName)(), + owner: task.debugOwner, + stack: + null === task.debugStack + ? null + : filterStackTrace(request, task.debugStack, 1), + debugStack: task.debugStack, + debugTask: task.debugTask + }), + warnForMissingKey(request, key, validated, task.debugTask)), + (validated = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (request = renderModelDestructive( + request, + task, + emptyRoot, + "", + props.children + )), + (task.implicitSlot = validated), + request + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (request.status === ABORTING) throw null; + return renderElement( + request, + task, + type, + key, + ref, + props, + validated + ); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props, + validated + ); + case REACT_MEMO_TYPE: + return renderElement( + request, + task, + type.type, + key, + ref, + props, + validated + ); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent( request, task, @@ -1260,73 +1339,6 @@ props, validated ); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - 2 === validated && - ((validated = { - name: "Fragment", - env: (0, request.environmentName)(), - owner: task.debugOwner, - stack: - null === task.debugStack - ? null - : filterStackTrace(request, task.debugStack, 1), - debugStack: task.debugStack, - debugTask: task.debugTask - }), - warnForMissingKey(request, key, validated, task.debugTask)), - (validated = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (request = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = validated), - request - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (request.status === ABORTING) throw AbortSigil; - return renderElement( - request, - task, - type, - key, - ref, - props, - validated - ); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( - request, - task, - key, - type.render, - props, - validated - ); - case REACT_MEMO_TYPE: - return renderElement( - request, - task, - type.type, - key, - ref, - props, - validated - ); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } ref = task.keyPath; null === key ? (key = ref) : null !== ref && (key = ref + "," + key); request = [ @@ -1650,7 +1662,7 @@ parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (request.status === ABORTING) return ( (task.status = ABORTED), (task = request.fatalError), @@ -1722,7 +1734,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (request.status === ABORTING) throw AbortSigil; + if (request.status === ABORTING) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1739,7 +1751,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1908,7 +1920,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2142,7 +2154,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -2260,7 +2272,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2434,7 +2446,7 @@ return; } } - if (x === AbortSigil) { + if (request.status === ABORTING) { request.abortableTasks.delete(task); task.status = ABORTED; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2575,7 +2587,7 @@ } function abort(request, reason) { try { - request.status = ABORTING; + 0 === request.status && (request.status = ABORTING); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3681,7 +3693,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3784,7 +3796,6 @@ ABORTED = 3, ERRORED$1 = 4, RENDERING = 5, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js index ddf2a60e85f93..f1d7b7e72b569 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/cjs/react-server-dom-webpack-server.node.unbundled.production.js @@ -718,7 +718,6 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { } var ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, TaintRegistryObjects = ReactSharedInternalsServer.TaintRegistryObjects, TaintRegistryValues = ReactSharedInternalsServer.TaintRegistryValues, TaintRegistryByteLengths = @@ -820,6 +819,8 @@ function serializeThenable(request, task, thenable) { emitPostponeChunk(request, newTask.id)) : ((task = logRecoverableError(request, task, null)), emitErrorChunk(request, newTask.id, task)), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -856,9 +857,9 @@ function serializeThenable(request, task, thenable) { reason.$$typeof === REACT_POSTPONE_TYPE ? (logPostpone(request, reason.message, newTask), emitPostponeChunk(request, newTask.id)) - : ((newTask.status = 4), - (reason = logRecoverableError(request, reason, newTask)), + : ((reason = logRecoverableError(request, reason, newTask)), emitErrorChunk(request, newTask.id, reason)); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -1033,13 +1034,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1130,7 +1140,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1338,7 +1348,7 @@ function renderModel(request, task, parent, key, value) { parent ? serializeLazyID(value) : serializeByValueID(value) ); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1402,7 +1412,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1824,7 +1834,7 @@ function retryTask(request, task) { return; } } - if (x === AbortSigil) { + if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$23 = stringify(serializeByValueID(request.fatalError)); @@ -1955,7 +1965,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json b/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json index c148b03403d92..5114b4144ac64 100644 --- a/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json +++ b/packages/next/src/compiled/react-server-dom-webpack-experimental/package.json @@ -46,8 +46,8 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "0.0.0-experimental-187dd6a7-20240806", - "react-dom": "0.0.0-experimental-187dd6a7-20240806", + "react": "0.0.0-experimental-49496d49-20240814", + "react-dom": "0.0.0-experimental-49496d49-20240814", "webpack": "^5.59.0" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js index ab28e90567a45..aedafa422736b 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -70,6 +71,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -573,6 +577,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -603,9 +609,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -808,23 +814,28 @@ } prepareToUseHooksForComponent(prevThenableState, componentDebugInfo); props = callComponentInDEV(Component, props, componentDebugInfo); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -950,48 +961,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1289,7 +1300,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1358,7 +1369,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1375,7 +1386,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1530,7 +1541,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1767,7 +1778,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1878,7 +1889,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2016,7 +2027,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2143,7 +2154,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3260,7 +3271,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3335,7 +3346,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js index 56558079dac1c..f7994a3c905f9 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.browser.production.js @@ -701,8 +701,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -769,6 +768,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -800,9 +801,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -960,13 +961,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1057,7 +1067,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1151,7 +1161,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1329,7 +1339,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1707,7 +1717,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1799,7 +1809,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js index 4e1e4bad56d85..bc85f82863408 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -66,6 +67,9 @@ ? destination.error(error) : destination.close(); } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -577,6 +581,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -607,9 +613,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -820,23 +826,28 @@ componentDebugInfo ) : callComponentInDEV(Component, props, componentDebugInfo); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -962,48 +973,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1301,7 +1312,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1370,7 +1381,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1387,7 +1398,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1542,7 +1553,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1790,7 +1801,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1901,7 +1912,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2039,7 +2050,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2170,7 +2181,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3289,7 +3300,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3367,7 +3378,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js index 7491887699599..c9419f1d4c246 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.edge.production.js @@ -698,8 +698,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -774,6 +773,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -805,9 +806,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -965,13 +966,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1062,7 +1072,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1156,7 +1166,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1334,7 +1344,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1714,7 +1724,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1810,7 +1820,7 @@ function enqueueFlush(request) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js index 72e3cb179cb6e..3c9a8cb95d99a 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -601,6 +605,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -631,9 +637,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -841,23 +847,28 @@ props, componentDebugInfo ); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -983,48 +994,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1320,7 +1331,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1389,7 +1400,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1406,7 +1417,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1561,7 +1572,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1797,7 +1808,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1908,7 +1919,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2045,7 +2056,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2185,7 +2196,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3309,7 +3320,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3384,7 +3395,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js index 57d848a86bd2b..eb41232888863 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.production.js @@ -717,8 +717,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -790,6 +789,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -821,9 +822,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -980,13 +981,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1077,7 +1087,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1171,7 +1181,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1347,7 +1357,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1718,7 +1728,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1846,7 +1856,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js index 12b0d72bb839c..10fe6a5caca54 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.development.js @@ -11,6 +11,7 @@ "use strict"; "production" !== process.env.NODE_ENV && (function () { + function voidHandler() {} function _defineProperty(obj, key, value) { key in obj ? Object.defineProperty(obj, key, { @@ -93,6 +94,9 @@ ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength; } + function isClientReference(reference) { + return reference.$$typeof === CLIENT_REFERENCE_TAG$1; + } function registerClientReferenceImpl(proxyImplementation, id, async) { return Object.defineProperties(proxyImplementation, { $$typeof: { value: CLIENT_REFERENCE_TAG$1 }, @@ -601,6 +605,8 @@ task = thenable.reason; var digest = logRecoverableError(request, task, null); emitErrorChunk(request, newTask.id, digest, task); + newTask.status = 4; + request.abortableTasks.delete(newTask); return newTask.id; default: if (1 === request.status) @@ -631,9 +637,9 @@ pingTask(request, newTask); }, function (reason) { - newTask.status = 4; var _digest = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, _digest, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -841,23 +847,28 @@ props, componentDebugInfo ); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" !== typeof props || + null === props || + "function" !== typeof props.then || + isClientReference(props) || + props.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof props && null !== props && - props.$$typeof !== CLIENT_REFERENCE_TAG$1 + !isClientReference(props) ) { if ("function" === typeof props.then) { prevThenableState = props; - prevThenableState.then( - function (resolvedValue) { - "object" === typeof resolvedValue && - null !== resolvedValue && - resolvedValue.$$typeof === REACT_ELEMENT_TYPE && - (resolvedValue._store.validated = 1); - }, - function () {} - ); + prevThenableState.then(function (resolvedValue) { + "object" === typeof resolvedValue && + null !== resolvedValue && + resolvedValue.$$typeof === REACT_ELEMENT_TYPE && + (resolvedValue._store.validated = 1); + }, voidHandler); if ("fulfilled" === prevThenableState.status) return prevThenableState.value; props = createLazyWrapperAroundWakeable(props); @@ -983,48 +994,48 @@ null !== props.children && jsxChildrenParents.set(props.children, type); if ( - "function" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 && - type.$$typeof !== TEMPORARY_REFERENCE_TAG - ) - return renderFunctionComponent(request, task, key, type, props); - if (type === REACT_FRAGMENT_TYPE && null === key) - return ( - (type = task.implicitSlot), - null === task.keyPath && (task.implicitSlot = !0), - (props = renderModelDestructive( - request, - task, - emptyRoot, - "", - props.children - )), - (task.implicitSlot = type), - props - ); - if ( - null != type && - "object" === typeof type && - type.$$typeof !== CLIENT_REFERENCE_TAG$1 - ) - switch (type.$$typeof) { - case REACT_LAZY_TYPE: - type = callLazyInitInDEV(type); - if (1 === request.status) throw AbortSigil; - return renderElement(request, task, type, key, ref, props); - case REACT_FORWARD_REF_TYPE: - return renderFunctionComponent( + "function" !== typeof type || + isClientReference(type) || + type.$$typeof === TEMPORARY_REFERENCE_TAG + ) { + if (type === REACT_FRAGMENT_TYPE && null === key) + return ( + (type = task.implicitSlot), + null === task.keyPath && (task.implicitSlot = !0), + (props = renderModelDestructive( request, task, - key, - type.render, - props - ); - case REACT_MEMO_TYPE: - return renderElement(request, task, type.type, key, ref, props); - case REACT_ELEMENT_TYPE: - type._store.validated = 1; - } + emptyRoot, + "", + props.children + )), + (task.implicitSlot = type), + props + ); + if ( + null != type && + "object" === typeof type && + !isClientReference(type) + ) + switch (type.$$typeof) { + case REACT_LAZY_TYPE: + type = callLazyInitInDEV(type); + if (1 === request.status) throw null; + return renderElement(request, task, type, key, ref, props); + case REACT_FORWARD_REF_TYPE: + return renderFunctionComponent( + request, + task, + key, + type.render, + props + ); + case REACT_MEMO_TYPE: + return renderElement(request, task, type.type, key, ref, props); + case REACT_ELEMENT_TYPE: + type._store.validated = 1; + } + } else return renderFunctionComponent(request, task, key, type, props); request = key; key = task.keyPath; null === request @@ -1320,7 +1331,7 @@ ? serializeLazyID(request.id) : serializeByValueID(request.id); } - if (thrownValue === AbortSigil) + if (1 === request.status) return ( (task.status = 3), (task = request.fatalError), @@ -1389,7 +1400,7 @@ case REACT_LAZY_TYPE: task.thenableState = null; elementReference = callLazyInitInDEV(value); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; if ((_writtenObjects = value._debugInfo)) { if (null === debugID) return outlineTask(request, task); forwardDebugInfo(request, debugID, _writtenObjects); @@ -1406,7 +1417,7 @@ 'A React Element from an older version of React was rendered. This is not supported. It can happen if:\n- Multiple copies of the "react" package is used.\n- A library pre-bundled an old copy of "react" or "react/jsx-runtime".\n- A compiler tries to "inline" JSX instead of using the runtime.' ); } - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1561,7 +1572,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1797,7 +1808,7 @@ var originalValue = parent[parentPropertyName]; if (null === value) return null; if ("object" === typeof value) { - if (value.$$typeof === CLIENT_REFERENCE_TAG$1) + if (isClientReference(value)) return serializeClientReference( request, parent, @@ -1908,7 +1919,7 @@ if ("number" === typeof value) return serializeNumber(value); if ("undefined" === typeof value) return "$undefined"; if ("function" === typeof value) - return value.$$typeof === CLIENT_REFERENCE_TAG$1 + return isClientReference(value) ? serializeClientReference(request, parent, parentPropertyName, value) : void 0 !== request.temporaryReferences && ((request = request.temporaryReferences.get(value)), @@ -2045,7 +2056,7 @@ var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var _model = stringify(serializeByValueID(request.fatalError)); @@ -2185,7 +2196,7 @@ } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; @@ -3274,7 +3285,7 @@ } usable.$$typeof === REACT_CONTEXT_TYPE && unsupportedContext(); } - if (usable.$$typeof === CLIENT_REFERENCE_TAG$1) { + if (isClientReference(usable)) { if ( null != usable.value && usable.value.$$typeof === REACT_CONTEXT_TYPE @@ -3349,7 +3360,6 @@ CLIENT_REFERENCE_TAG = Symbol.for("react.client.reference"), ObjectPrototype = Object.prototype, stringify = JSON.stringify, - AbortSigil = {}, CLOSED = 3, currentRequest = null, debugID = null, diff --git a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js index e19d714d2ac8c..adb4cf85db574 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js +++ b/packages/next/src/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-server.node.unbundled.production.js @@ -717,8 +717,7 @@ function describeObjectForErrorMessage(objectOrArray, expandedName) { : "\n " + str; } var ObjectPrototype = Object.prototype, - stringify = JSON.stringify, - AbortSigil = {}; + stringify = JSON.stringify; function defaultErrorHandler(error) { console.error(error); } @@ -790,6 +789,8 @@ function serializeThenable(request, task, thenable) { return ( (task = logRecoverableError(request, thenable.reason, null)), emitErrorChunk(request, newTask.id, task), + (newTask.status = 4), + request.abortableTasks.delete(newTask), newTask.id ); default: @@ -821,9 +822,9 @@ function serializeThenable(request, task, thenable) { pingTask(request, newTask); }, function (reason) { - newTask.status = 4; reason = logRecoverableError(request, reason, newTask); emitErrorChunk(request, newTask.id, reason); + newTask.status = 4; request.abortableTasks.delete(newTask); enqueueFlush(request); } @@ -980,13 +981,22 @@ function createLazyWrapperAroundWakeable(wakeable) { } return { $$typeof: REACT_LAZY_TYPE, _payload: wakeable, _init: readThenable }; } +function voidHandler() {} function renderFunctionComponent(request, task, key, Component, props) { var prevThenableState = task.thenableState; task.thenableState = null; thenableIndexCounter = 0; thenableState = prevThenableState; Component = Component(props, void 0); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) + throw ( + ("object" === typeof Component && + null !== Component && + "function" === typeof Component.then && + Component.$$typeof !== CLIENT_REFERENCE_TAG$1 && + Component.then(voidHandler, voidHandler), + null) + ); if ( "object" === typeof Component && null !== Component && @@ -1077,7 +1087,7 @@ function renderElement(request, task, type, key, ref, props) { case REACT_LAZY_TYPE: var init = type._init; type = init(type._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderElement(request, task, type, key, ref, props); case REACT_FORWARD_REF_TYPE: return renderFunctionComponent(request, task, key, type.render, props); @@ -1171,7 +1181,7 @@ function createTask(request, model, keyPath, implicitSlot, abortSet) { : serializeByValueID(JSCompiler_inline_result.id); } else - thrownValue === AbortSigil + 1 === request.status ? ((task.status = 3), (prevKeyPath = request.fatalError), (JSCompiler_inline_result = parentPropertyName @@ -1347,7 +1357,7 @@ function renderModelDestructive( task.thenableState = null; parentPropertyName = value._init; value = parentPropertyName(value._payload); - if (1 === request.status) throw AbortSigil; + if (1 === request.status) throw null; return renderModelDestructive(request, task, emptyRoot, "", value); case REACT_LEGACY_ELEMENT_TYPE: throw Error( @@ -1718,7 +1728,7 @@ function retryTask(request, task) { var ping = task.ping; x.then(ping, ping); } - else if (x === AbortSigil) { + else if (1 === request.status) { request.abortableTasks.delete(task); task.status = 3; var model$19 = stringify(serializeByValueID(request.fatalError)); @@ -1846,7 +1856,7 @@ function startFlowing(request, destination) { } function abort(request, reason) { try { - request.status = 1; + 0 === request.status && (request.status = 1); var abortableTasks = request.abortableTasks; if (0 < abortableTasks.size) { request.pendingChunks++; diff --git a/packages/next/src/compiled/react-server-dom-webpack/package.json b/packages/next/src/compiled/react-server-dom-webpack/package.json index 1204bc74f418f..d0cc2a87c7490 100644 --- a/packages/next/src/compiled/react-server-dom-webpack/package.json +++ b/packages/next/src/compiled/react-server-dom-webpack/package.json @@ -46,8 +46,8 @@ "neo-async": "^2.6.1" }, "peerDependencies": { - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806", + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814", "webpack": "^5.59.0" } } \ No newline at end of file diff --git a/packages/next/src/compiled/react/cjs/react.development.js b/packages/next/src/compiled/react/cjs/react.development.js index e2ac06584bfdc..331a9e60ca342 100644 --- a/packages/next/src/compiled/react/cjs/react.development.js +++ b/packages/next/src/compiled/react/cjs/react.development.js @@ -1517,7 +1517,7 @@ exports.useTransition = function () { return resolveDispatcher().useTransition(); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; "undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ && "function" === typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop && diff --git a/packages/next/src/compiled/react/cjs/react.production.js b/packages/next/src/compiled/react/cjs/react.production.js index 536509167a2b6..4e7360c4360f2 100644 --- a/packages/next/src/compiled/react/cjs/react.production.js +++ b/packages/next/src/compiled/react/cjs/react.production.js @@ -536,4 +536,4 @@ exports.useSyncExternalStore = function ( exports.useTransition = function () { return ReactSharedInternals.H.useTransition(); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/react/cjs/react.react-server.development.js b/packages/next/src/compiled/react/cjs/react.react-server.development.js index 03f186540b6c2..c6eb2d0c0e9ac 100644 --- a/packages/next/src/compiled/react/cjs/react.react-server.development.js +++ b/packages/next/src/compiled/react/cjs/react.react-server.development.js @@ -1113,5 +1113,5 @@ exports.useMemo = function (create, deps) { return resolveDispatcher().useMemo(create, deps); }; - exports.version = "19.0.0-rc-187dd6a7-20240806"; + exports.version = "19.0.0-rc-49496d49-20240814"; })(); diff --git a/packages/next/src/compiled/react/cjs/react.react-server.production.js b/packages/next/src/compiled/react/cjs/react.react-server.production.js index 65ed31e247400..60698fe7b0687 100644 --- a/packages/next/src/compiled/react/cjs/react.react-server.production.js +++ b/packages/next/src/compiled/react/cjs/react.react-server.production.js @@ -424,4 +424,4 @@ exports.useId = function () { exports.useMemo = function (create, deps) { return ReactSharedInternals.H.useMemo(create, deps); }; -exports.version = "19.0.0-rc-187dd6a7-20240806"; +exports.version = "19.0.0-rc-49496d49-20240814"; diff --git a/packages/next/src/compiled/unistore/unistore.js b/packages/next/src/compiled/unistore/unistore.js index f796b113cceb6..2054003f3f0ef 100644 --- a/packages/next/src/compiled/unistore/unistore.js +++ b/packages/next/src/compiled/unistore/unistore.js @@ -1 +1 @@ -(()=>{var t={297:t=>{function n(t,i){for(var _ in i)t[_]=i[_];return t}t.exports=function(t){var i=[];function u(t){for(var _=[],a=0;a{var t={841:t=>{function n(t,i){for(var _ in i)t[_]=i[_];return t}t.exports=function(t){var i=[];function u(t){for(var _=[],a=0;a=18'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true @@ -10438,7 +10438,7 @@ packages: lucide-react@0.383.0: resolution: {integrity: sha512-13xlG0CQCJtzjSQYwwJ3WRqMHtRj3EXmLlorrARt7y+IHnxUCp3XyFNL1DfaGySWxHObDvnu1u1dV+0VMKHUSg==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 lz-string@1.5.0: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} @@ -12674,28 +12674,28 @@ packages: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true - react-dom@0.0.0-experimental-187dd6a7-20240806: - resolution: {integrity: sha512-WDfY8l2NCgv+GK8q27KlTFV4jML1Pc3GM970iFUkU2ZyNJgSiCP5D7ANd0TfNossw4sPNJRB0ShXP5t+5kPBbw==} + react-dom@0.0.0-experimental-49496d49-20240814: + resolution: {integrity: sha512-o6OY2GsKlobxRyqaUFaaWVhMuj6F445Z2pOFTXLJk3JBwW2c//Os2hOh9UaCv0nSY+8TJHS8JpiAyF4cxqwKqA==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 react-dom@17.0.2: resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 - react-dom@19.0.0-rc-187dd6a7-20240806: - resolution: {integrity: sha512-Lh7E4AolPf6iEBXQhSzSQoNDtwBPBG5255RLM/3lRzmWh+9jjXYpYd3YuMGQ5ZVCCaytHq5vkYtuFxWxBAfXCw==} + react-dom@19.0.0-rc-49496d49-20240814: + resolution: {integrity: sha512-Z6duEWrNFiok7cjThEOxy0a+IMDC+qN25ZZHDdj/MJ33rRuOdJ8ZUebm+yvMnX73KozqX0WYthT1RVMex5R6qg==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 react-dom@19.0.0-rc-6230622a1a-20240610: resolution: {integrity: sha512-56G4Pum5E7FeGL1rwHX5IxidSJxQnXP4yORRo0pVeOJuu5DQJvNKpUwmJoftMP/ez0AiglYTY77L2Gs8iyt1Hg==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 - react-is@19.0.0-rc-187dd6a7-20240806: - resolution: {integrity: sha512-wZJbWzTRuARc1ZOd5v8n8w28s1zSEnF640T56c6GqA7Ij49IZAuabG5vDsKGNnQAlueEDjoc4TSmF/CDkEhGJQ==} + react-is@19.0.0-rc-49496d49-20240814: + resolution: {integrity: sha512-cchiWMXEw4BedaCDmq0InzeHmI23RLOhFtGkf5dXNCiQjEiorJ1IoyrTxhSxT1w7fFI/iutwVyeb8sT8SgkvgA==} react-is@19.0.0-rc-6230622a1a-20240610: resolution: {integrity: sha512-6BH4F/xpoTJ+BTcb2AmZAzWXInEPUNKgL4u4C1BssZmFkGsvUpZmllLgCEVa105omvex85ZWwKHCy22KftGwDw==} @@ -12706,8 +12706,8 @@ packages: react-number-format@5.4.0: resolution: {integrity: sha512-NWdICrqLhI7rAS8yUeLVd6Wr4cN7UjJ9IBTS0f/a9i7UB4x4Ti70kGnksBtZ7o4Z7YRbvCMMR/jQmkoOBa/4fg==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 react-refresh@0.12.0: resolution: {integrity: sha512-suLIhrU2IHKL5JEKR/fAwJv7bbeq4kJ+pJopf77jHwuR+HmJS/HbrPIGsTBUVfw7tXPOmYv7UJ7PCaN49e8x4A==} @@ -12718,7 +12718,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true @@ -12728,58 +12728,58 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true - react-server-dom-turbopack@0.0.0-experimental-187dd6a7-20240806: - resolution: {integrity: sha512-h/N3G0O32HNDaTIx6TOU9PKnOMMU6rlpvAq6P7HJrIR2WZIM5tEth8iXQkILeT/YY77+8/FHScezyvqysQps8w==} + react-server-dom-turbopack@0.0.0-experimental-49496d49-20240814: + resolution: {integrity: sha512-gn48gAsaAUXdXt1XYYXX3Hg01431Yfz5Oc37/yn1h2H/IniIjs8tloZo74wK6P0UJZmU+JaLJl8TdRi985V46A==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 - react-server-dom-turbopack@19.0.0-rc-187dd6a7-20240806: - resolution: {integrity: sha512-ud33MoHvDh0cEvPdyjWm/ix2mAVq4I6XsHtTGW/oZFtuBpZQj2q+RcicXvFnGLMZFsPpqXGB6qgju8nFZ+rSlQ==} + react-server-dom-turbopack@19.0.0-rc-49496d49-20240814: + resolution: {integrity: sha512-Nb+n40n2XIVEvGHuAaPCNqLCSrrMaRn1BN363LDm0Tvvjn1ngffshzUDNd6Il1pfZioAJSnf2Hs+Zk+hzcZofw==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 - react-server-dom-webpack@0.0.0-experimental-187dd6a7-20240806: - resolution: {integrity: sha512-XB+8otQrWssiaIpu+hGsff+4jIXYEYS4NN9y3EyPflKL6X2IsZJsVm/V2oohfDKXjvn4QaZj1z6EGSMtJF8dfA==} + react-server-dom-webpack@0.0.0-experimental-49496d49-20240814: + resolution: {integrity: sha512-dxKiDYWcwwlHfEFiwrra7VwZLdeFJUJv60dC2FoeRYVRxdgL1GvOLakIKKAFcvzhkebxl9B22cuZmoH2nKH4qg==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 webpack: 5.90.0 - react-server-dom-webpack@19.0.0-rc-187dd6a7-20240806: - resolution: {integrity: sha512-Mz0lRLEFUx9L7qjh+uSDXQJBUzswE2M8OJUWb3VWZ0cK0oaHJOtSo/sMMDPyqugbt8grPz+QU2DXfwYuEtSkMw==} + react-server-dom-webpack@19.0.0-rc-49496d49-20240814: + resolution: {integrity: sha512-lWFbxApYplWO6PQ8cCupobO627fup+yHwJsyLDUUCzMn0yQMsGjgvQhEfm0YYfrxomVGepACngCj4WerhFmsBw==} engines: {node: '>=0.10.0'} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 webpack: 5.90.0 react-shallow-renderer@16.15.0: resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 react-ssr-prepass@1.0.8: resolution: {integrity: sha512-O0gfRA1SaK+9ITKxqfnXsej2jF+OHGP/+GxD4unROQaM/0/UczGF9fuF+wTboxaQoKdIf4FvS3h/OigWh704VA==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-is: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-is: 19.0.0-rc-49496d49-20240814 react-style-singleton@2.2.1: resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==} engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true @@ -12787,30 +12787,30 @@ packages: react-test-renderer@18.2.0: resolution: {integrity: sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 react-textarea-autosize@8.5.3: resolution: {integrity: sha512-XT1024o2pqCuZSuBt9FwHlaDeNtVrtCXu0Rnz88t1jUGheCLa3PhjE1GH8Ctm2axEtvdCl5SUHYschyQ0L5QHQ==} engines: {node: '>=10'} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 react-virtualized@9.22.3: resolution: {integrity: sha512-MKovKMxWTcwPSxE1kK1HcheQTWfuCxAuBoSTf2gwyMM21NdX/PXUhnoP8Uc5dRKd+nKm8v41R36OellhdCpkrw==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 - react@0.0.0-experimental-187dd6a7-20240806: - resolution: {integrity: sha512-9NLRXVU/FSNeqbJ+idGUc0Q0YD/hoPeeuhWeZ0G+7piituBTdbhavZt5SIbGBHbylcib9w+Hx3e8XyZh5VDrsA==} + react@0.0.0-experimental-49496d49-20240814: + resolution: {integrity: sha512-/iqhucnvuKKDMUCKp6iFkqk2bFyMUjgOSCLViE878C2wktDiwEu6vD4X9bQMEFygVhuyJ0hP3McndiWP5j0KYA==} engines: {node: '>=0.10.0'} react@17.0.2: resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} engines: {node: '>=0.10.0'} - react@19.0.0-rc-187dd6a7-20240806: - resolution: {integrity: sha512-FbbwQBNk/UVmAgt57q5ao9NC3ducJhDfwxLoSf9A5p+O4rh8Lje4ucDCPevXMPm81GrxzkEF3rIVJdIhNf9tPw==} + react@19.0.0-rc-49496d49-20240814: + resolution: {integrity: sha512-mviEqI/3kwcDoAX0hlzEberb26DD4HGCVy7lFBErqKIcgo11m1R83E8i6V3AK+kPZz1CszcAytU3+taJBcTnpA==} engines: {node: '>=0.10.0'} react@19.0.0-rc-6230622a1a-20240610: @@ -13336,11 +13336,11 @@ packages: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} engines: {node: '>=v12.22.7'} - scheduler@0.0.0-experimental-187dd6a7-20240806: - resolution: {integrity: sha512-R/A0AbrBX8sQfW8dLRBJoHiqIIXCSDGyRHantqh3Uazl4Vmzz0bF88apglKHY5DjKdIdiec5wK4jnxn9qchnRA==} + scheduler@0.0.0-experimental-49496d49-20240814: + resolution: {integrity: sha512-ljg4Uqrexq0nZFmNXa9UkV+6xKtfUCN9W5XtJ50KWeOE5olVNDNpkMsm7lUdoJSXJRFZjz8NJkOQTjj8SynSlQ==} - scheduler@0.25.0-rc-187dd6a7-20240806: - resolution: {integrity: sha512-U40NT+/QH0t7oBP0m/oQJvOC+iCNJTlugDkfPQI+vSVWrbmHGYK9fso6zJ5g5y5OwDu4pELEys5BEUrXMOdxmw==} + scheduler@0.25.0-rc-49496d49-20240814: + resolution: {integrity: sha512-CnS0z+a+x/QlIAMyqU0o3czfJkf68Q4Oryxl/4eeucuh6/c0vMg68AOa7og/O8lenjYezX87G/jodjj5TqOUAQ==} schema-utils@2.7.1: resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==} @@ -13909,8 +13909,8 @@ packages: engines: {node: '>= 16'} peerDependencies: babel-plugin-styled-components: '>= 2' - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: babel-plugin-styled-components: optional: true @@ -13924,7 +13924,7 @@ packages: peerDependencies: '@babel/core': '*' babel-plugin-macros: '*' - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@babel/core': optional: true @@ -14001,7 +14001,7 @@ packages: swr@2.2.4: resolution: {integrity: sha512-njiZ/4RiIhoOlAaLYDqwz5qH/KZXVilRLvomrx83HjzCWTfa+InyfAjv05PSFxnmLzZkNO9ZfvgoqzAaEI4sGQ==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 symbol-observable@1.0.1: resolution: {integrity: sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==} @@ -14745,7 +14745,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true @@ -14753,13 +14753,13 @@ packages: use-composed-ref@1.3.0: resolution: {integrity: sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 use-isomorphic-layout-effect@1.1.2: resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true @@ -14768,7 +14768,7 @@ packages: resolution: {integrity: sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==} peerDependencies: '@types/react': '*' - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true @@ -14778,7 +14778,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': npm:types-react@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 peerDependenciesMeta: '@types/react': optional: true @@ -14786,7 +14786,7 @@ packages: use-sync-external-store@1.2.0: resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} peerDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 use@3.1.1: resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==} @@ -17174,17 +17174,17 @@ snapshots: '@emotion/memoize@0.8.1': {} - '@emotion/react@11.11.1(react@19.0.0-rc-187dd6a7-20240806)(types-react@19.0.0-rc.0)': + '@emotion/react@11.11.1(react@19.0.0-rc-49496d49-20240814)(types-react@19.0.0-rc.0)': dependencies: '@babel/runtime': 7.22.5 '@emotion/babel-plugin': 11.11.0 '@emotion/cache': 11.11.0 '@emotion/serialize': 1.1.2 - '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@19.0.0-rc-187dd6a7-20240806) + '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@19.0.0-rc-49496d49-20240814) '@emotion/utils': 1.2.1 '@emotion/weak-memoize': 0.3.1 hoist-non-react-statics: 3.3.2 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 optionalDependencies: '@types/react': types-react@19.0.0-rc.0 @@ -17200,9 +17200,9 @@ snapshots: '@emotion/unitless@0.8.1': {} - '@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@19.0.0-rc-187dd6a7-20240806)': + '@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@19.0.0-rc-49496d49-20240814)': dependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 '@emotion/utils@1.2.1': {} @@ -18564,11 +18564,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@mdx-js/react@2.2.1(react@19.0.0-rc-187dd6a7-20240806)': + '@mdx-js/react@2.2.1(react@19.0.0-rc-49496d49-20240814)': dependencies: '@types/mdx': 2.0.3 '@types/react': types-react@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 '@mdx-js/react@2.2.1(react@19.0.0-rc-6230622a1a-20240610)': dependencies: @@ -19387,13 +19387,13 @@ snapshots: '@types/jest': 29.5.5 jest: 29.7.0(@types/node@20.12.3)(babel-plugin-macros@3.1.0) - '@testing-library/react@15.0.7(react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806))(react@19.0.0-rc-187dd6a7-20240806)(types-react@19.0.0-rc.0)': + '@testing-library/react@15.0.7(react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814))(react@19.0.0-rc-49496d49-20240814)(types-react@19.0.0-rc.0)': dependencies: '@babel/runtime': 7.22.5 '@testing-library/dom': 10.1.0 '@types/react-dom': types-react-dom@19.0.0-rc.0 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814) optionalDependencies: '@types/react': types-react@19.0.0-rc.0 @@ -24415,7 +24415,7 @@ snapshots: hoist-non-react-statics@3.3.2: dependencies: - react-is: 19.0.0-rc-187dd6a7-20240806 + react-is: 19.0.0-rc-49496d49-20240814 homedir-polyfill@1.0.3: dependencies: @@ -28854,25 +28854,25 @@ snapshots: '@jest/types': 24.9.0 ansi-regex: 4.1.0 ansi-styles: 3.2.1 - react-is: 19.0.0-rc-187dd6a7-20240806 + react-is: 19.0.0-rc-49496d49-20240814 pretty-format@27.5.1: dependencies: ansi-regex: 5.0.1 ansi-styles: 5.2.0 - react-is: 19.0.0-rc-187dd6a7-20240806 + react-is: 19.0.0-rc-49496d49-20240814 pretty-format@29.5.0: dependencies: '@jest/schemas': 29.4.3 ansi-styles: 5.2.0 - react-is: 19.0.0-rc-187dd6a7-20240806 + react-is: 19.0.0-rc-49496d49-20240814 pretty-format@29.7.0: dependencies: '@jest/schemas': 29.6.3 ansi-styles: 5.2.0 - react-is: 19.0.0-rc-187dd6a7-20240806 + react-is: 19.0.0-rc-49496d49-20240814 pretty-ms@7.0.0: dependencies: @@ -28929,7 +28929,7 @@ snapshots: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react-is: 19.0.0-rc-187dd6a7-20240806 + react-is: 19.0.0-rc-49496d49-20240814 property-information@5.6.0: dependencies: @@ -29101,29 +29101,29 @@ snapshots: minimist: 1.2.8 strip-json-comments: 2.0.1 - react-dom@0.0.0-experimental-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806): + react-dom@0.0.0-experimental-49496d49-20240814(react@19.0.0-rc-49496d49-20240814): dependencies: - react: 19.0.0-rc-187dd6a7-20240806 - scheduler: 0.25.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + scheduler: 0.25.0-rc-49496d49-20240814 - react-dom@17.0.2(react@19.0.0-rc-187dd6a7-20240806): + react-dom@17.0.2(react@19.0.0-rc-49496d49-20240814): dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react: 19.0.0-rc-187dd6a7-20240806 - scheduler: 0.25.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + scheduler: 0.25.0-rc-49496d49-20240814 - react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806): + react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814): dependencies: - react: 19.0.0-rc-187dd6a7-20240806 - scheduler: 0.25.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + scheduler: 0.25.0-rc-49496d49-20240814 react-dom@19.0.0-rc-6230622a1a-20240610(react@19.0.0-rc-6230622a1a-20240610): dependencies: react: 19.0.0-rc-6230622a1a-20240610 - scheduler: 0.25.0-rc-187dd6a7-20240806 + scheduler: 0.25.0-rc-49496d49-20240814 - react-is@19.0.0-rc-187dd6a7-20240806: {} + react-is@19.0.0-rc-49496d49-20240814: {} react-is@19.0.0-rc-6230622a1a-20240610: {} @@ -29156,46 +29156,46 @@ snapshots: optionalDependencies: '@types/react': types-react@19.0.0-rc.0 - react-server-dom-turbopack@0.0.0-experimental-187dd6a7-20240806(react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806))(react@19.0.0-rc-187dd6a7-20240806): + react-server-dom-turbopack@0.0.0-experimental-49496d49-20240814(react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814))(react@19.0.0-rc-49496d49-20240814): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814) - react-server-dom-turbopack@19.0.0-rc-187dd6a7-20240806(react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806))(react@19.0.0-rc-187dd6a7-20240806): + react-server-dom-turbopack@19.0.0-rc-49496d49-20240814(react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814))(react@19.0.0-rc-49496d49-20240814): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814) - react-server-dom-webpack@0.0.0-experimental-187dd6a7-20240806(react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806))(react@19.0.0-rc-187dd6a7-20240806)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.12))): + react-server-dom-webpack@0.0.0-experimental-49496d49-20240814(react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814))(react@19.0.0-rc-49496d49-20240814)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.12))): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814) webpack: 5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.12)) - react-server-dom-webpack@19.0.0-rc-187dd6a7-20240806(react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806))(react@19.0.0-rc-187dd6a7-20240806)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.12))): + react-server-dom-webpack@19.0.0-rc-49496d49-20240814(react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814))(react@19.0.0-rc-49496d49-20240814)(webpack@5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.12))): dependencies: acorn-loose: 8.3.0 neo-async: 2.6.1 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814) webpack: 5.90.0(@swc/core@1.6.13(@swc/helpers@0.5.12)) - react-shallow-renderer@16.15.0(react@19.0.0-rc-187dd6a7-20240806): + react-shallow-renderer@16.15.0(react@19.0.0-rc-49496d49-20240814): dependencies: object-assign: 4.1.1 - react: 19.0.0-rc-187dd6a7-20240806 - react-is: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-is: 19.0.0-rc-49496d49-20240814 - react-ssr-prepass@1.0.8(react-is@19.0.0-rc-6230622a1a-20240610)(react@19.0.0-rc-187dd6a7-20240806): + react-ssr-prepass@1.0.8(react-is@19.0.0-rc-6230622a1a-20240610)(react@19.0.0-rc-49496d49-20240814): dependencies: object-is: 1.0.2 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 react-is: 19.0.0-rc-6230622a1a-20240610 react-style-singleton@2.2.1(react@19.0.0-rc-6230622a1a-20240610)(types-react@19.0.0-rc.0): @@ -29207,12 +29207,12 @@ snapshots: optionalDependencies: '@types/react': types-react@19.0.0-rc.0 - react-test-renderer@18.2.0(react@19.0.0-rc-187dd6a7-20240806): + react-test-renderer@18.2.0(react@19.0.0-rc-49496d49-20240814): dependencies: - react: 19.0.0-rc-187dd6a7-20240806 - react-is: 19.0.0-rc-187dd6a7-20240806 - react-shallow-renderer: 16.15.0(react@19.0.0-rc-187dd6a7-20240806) - scheduler: 0.25.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 + react-is: 19.0.0-rc-49496d49-20240814 + react-shallow-renderer: 16.15.0(react@19.0.0-rc-49496d49-20240814) + scheduler: 0.25.0-rc-49496d49-20240814 react-textarea-autosize@8.5.3(react@19.0.0-rc-6230622a1a-20240610)(types-react@19.0.0-rc.0): dependencies: @@ -29223,25 +29223,25 @@ snapshots: transitivePeerDependencies: - '@types/react' - react-virtualized@9.22.3(react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806))(react@19.0.0-rc-187dd6a7-20240806): + react-virtualized@9.22.3(react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814))(react@19.0.0-rc-49496d49-20240814): dependencies: '@babel/runtime': 7.22.5 clsx: 1.1.1 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814) react-lifecycles-compat: 3.0.4 - react@0.0.0-experimental-187dd6a7-20240806: {} + react@0.0.0-experimental-49496d49-20240814: {} react@17.0.2: dependencies: loose-envify: 1.4.0 object-assign: 4.1.1 - react@19.0.0-rc-187dd6a7-20240806: {} + react@19.0.0-rc-49496d49-20240814: {} react@19.0.0-rc-6230622a1a-20240610: {} @@ -29931,9 +29931,9 @@ snapshots: dependencies: xmlchars: 2.2.0 - scheduler@0.0.0-experimental-187dd6a7-20240806: {} + scheduler@0.0.0-experimental-49496d49-20240814: {} - scheduler@0.25.0-rc-187dd6a7-20240806: {} + scheduler@0.25.0-rc-49496d49-20240814: {} schema-utils@2.7.1: dependencies: @@ -30582,7 +30582,7 @@ snapshots: dependencies: inline-style-parser: 0.1.1 - styled-components@6.0.0-rc.3(react-dom@19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806))(react@19.0.0-rc-187dd6a7-20240806): + styled-components@6.0.0-rc.3(react-dom@19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814))(react@19.0.0-rc-49496d49-20240814): dependencies: '@babel/cli': 7.21.5(@babel/core@7.22.5) '@babel/core': 7.22.5 @@ -30597,8 +30597,8 @@ snapshots: '@emotion/unitless': 0.8.1 css-to-react-native: 3.2.0 postcss: 8.4.31 - react: 19.0.0-rc-187dd6a7-20240806 - react-dom: 19.0.0-rc-187dd6a7-20240806(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + react-dom: 19.0.0-rc-49496d49-20240814(react@19.0.0-rc-49496d49-20240814) shallowequal: 1.1.0 stylis: 4.2.0 tslib: 2.5.3 @@ -30610,10 +30610,10 @@ snapshots: postcss: 7.0.32 postcss-load-plugins: 2.3.0 - styled-jsx@5.1.6(@babel/core@7.22.5)(babel-plugin-macros@3.1.0)(react@19.0.0-rc-187dd6a7-20240806): + styled-jsx@5.1.6(@babel/core@7.22.5)(babel-plugin-macros@3.1.0)(react@19.0.0-rc-49496d49-20240814): dependencies: client-only: 0.0.1 - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 optionalDependencies: '@babel/core': 7.22.5 babel-plugin-macros: 3.1.0 @@ -30703,11 +30703,11 @@ snapshots: picocolors: 1.0.1 stable: 0.1.8 - swr@2.2.4(react@19.0.0-rc-187dd6a7-20240806): + swr@2.2.4(react@19.0.0-rc-49496d49-20240814): dependencies: client-only: 0.0.1 - react: 19.0.0-rc-187dd6a7-20240806 - use-sync-external-store: 1.2.0(react@19.0.0-rc-187dd6a7-20240806) + react: 19.0.0-rc-49496d49-20240814 + use-sync-external-store: 1.2.0(react@19.0.0-rc-49496d49-20240814) symbol-observable@1.0.1: {} @@ -31396,9 +31396,9 @@ snapshots: unist-util-is: 5.2.0 unist-util-visit-parents: 5.1.3 - unistore@3.4.1(react@19.0.0-rc-187dd6a7-20240806): + unistore@3.4.1(react@19.0.0-rc-49496d49-20240814): optionalDependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 universal-github-app-jwt@1.1.1: dependencies: @@ -31523,9 +31523,9 @@ snapshots: optionalDependencies: '@types/react': types-react@19.0.0-rc.0 - use-sync-external-store@1.2.0(react@19.0.0-rc-187dd6a7-20240806): + use-sync-external-store@1.2.0(react@19.0.0-rc-49496d49-20240814): dependencies: - react: 19.0.0-rc-187dd6a7-20240806 + react: 19.0.0-rc-49496d49-20240814 use@3.1.1: {} diff --git a/run-tests.js b/run-tests.js index b90ce6be34356..75a4a1158e440 100644 --- a/run-tests.js +++ b/run-tests.js @@ -409,7 +409,7 @@ ${ENDGROUP}`) // run `pnpm install` each time. console.log(`${GROUP}Creating shared Next.js install`) const reactVersion = - process.env.NEXT_TEST_REACT_VERSION || '19.0.0-rc-187dd6a7-20240806' + process.env.NEXT_TEST_REACT_VERSION || '19.0.0-rc-49496d49-20240814' const { installDir, pkgPaths, tmpRepoDir } = await createNextInstall({ parentSpan: mockTrace(), dependencies: { diff --git a/test/.stats-app/package.json b/test/.stats-app/package.json index 9b7af0ac836db..590808a226e90 100644 --- a/test/.stats-app/package.json +++ b/test/.stats-app/package.json @@ -4,8 +4,8 @@ "license": "MIT", "dependencies": { "next": "latest", - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806" + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814" }, "engines": { "node": ">=18.18.0" diff --git a/test/e2e/next-test/first-time-setup-js/package.json b/test/e2e/next-test/first-time-setup-js/package.json index 54281314c7742..d111dcbb25e68 100644 --- a/test/e2e/next-test/first-time-setup-js/package.json +++ b/test/e2e/next-test/first-time-setup-js/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "next": "canary", - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806" + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814" } } diff --git a/test/e2e/next-test/first-time-setup-ts/package.json b/test/e2e/next-test/first-time-setup-ts/package.json index e536137e0e58e..ec2c33e2312ed 100644 --- a/test/e2e/next-test/first-time-setup-ts/package.json +++ b/test/e2e/next-test/first-time-setup-ts/package.json @@ -8,8 +8,8 @@ }, "dependencies": { "next": "canary", - "react": "19.0.0-rc-187dd6a7-20240806", - "react-dom": "19.0.0-rc-187dd6a7-20240806" + "react": "19.0.0-rc-49496d49-20240814", + "react-dom": "19.0.0-rc-49496d49-20240814" }, "devDependencies": { "@types/react": "^18", diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts index 6360c02fcc8ed..733cc731fae0a 100644 --- a/test/lib/next-modes/base.ts +++ b/test/lib/next-modes/base.ts @@ -163,7 +163,7 @@ export class NextInstance { ) const reactVersion = - process.env.NEXT_TEST_REACT_VERSION || '19.0.0-rc-187dd6a7-20240806' + process.env.NEXT_TEST_REACT_VERSION || '19.0.0-rc-49496d49-20240814' const finalDependencies = { react: reactVersion, 'react-dom': reactVersion,