Unverified Commit 3211b3f6 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Upgrade react@experimental (#40885)

parent f6e37fd3
......@@ -181,8 +181,8 @@
"react-17": "npm:react@17.0.2",
"react-dom": "18.2.0",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-exp": "npm:react-dom@0.0.0-experimental-8951c5fc9-20220915",
"react-exp": "npm:react@0.0.0-experimental-8951c5fc9-20220915",
"react-dom-exp": "npm:react-dom@0.0.0-experimental-cb5084d1c-20220924",
"react-exp": "npm:react@0.0.0-experimental-cb5084d1c-20220924",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
......
// @ts-expect-error createServerContext exists on experimental channel
import { createServerContext } from 'react'
// createServerContext exists in react@experimental + react-dom@experimental
if (typeof createServerContext === 'undefined') {
throw new Error(
'"app" directory requires React.createServerContext which is not available in the version of React you are using. Please update to react@experimental and react-dom@experimental.'
)
}
export const DYNAMIC_ERROR_CODE = 'DYNAMIC_SERVER_USAGE'
export class DynamicServerError extends Error {
digest: typeof DYNAMIC_ERROR_CODE = DYNAMIC_ERROR_CODE
constructor(type: string) {
super(`Dynamic server usage: ${type}`)
}
......
......@@ -309,7 +309,7 @@ class RedirectErrorBoundary extends React.Component<
}
static getDerivedStateFromError(error: any) {
if (error.code === 'NEXT_REDIRECT') {
if (error.digest === 'NEXT_REDIRECT') {
return { redirect: error.url }
}
// Re-throw if error is not for 404
......
......@@ -4,6 +4,6 @@ export function redirect(url: string) {
// eslint-disable-next-line no-throw-literal
const error = new Error(REDIRECT_ERROR_CODE)
;(error as any).url = url
;(error as any).code = REDIRECT_ERROR_CODE
;(error as any).digest = REDIRECT_ERROR_CODE
throw error
}
......@@ -153,8 +153,22 @@ function serializeRowHeader(tag, id) {
return tag + id.toString(16) + ':';
}
function processErrorChunk(request, id, message, stack) {
function processErrorChunkProd(request, id, digest) {
{
// These errors should never make it into a build so we don't need to encode them in codes.json
// eslint-disable-next-line react-internal/prod-error-codes
throw new Error('processErrorChunkProd should never be called while in development mode. Use processErrorChunkDev instead. This is a bug in React.');
}
var errorInfo = {
digest: digest
};
var row = serializeRowHeader('E', id) + stringify(errorInfo) + '\n';
}
function processErrorChunkDev(request, id, digest, message, stack) {
var errorInfo = {
digest: digest,
message: message,
stack: stack
};
......@@ -1388,7 +1402,16 @@ function serializeModuleReference(request, parent, key, moduleReference) {
} catch (x) {
request.pendingChunks++;
var errorId = request.nextChunkId++;
emitErrorChunk(request, errorId, x);
var digest = logRecoverableError(request, x);
{
var _getErrorMessageAndSt = getErrorMessageAndStackDev(x),
message = _getErrorMessageAndSt.message,
stack = _getErrorMessageAndSt.stack;
emitErrorChunkDev(request, errorId, digest, message, stack);
}
return serializeByValueID(errorId);
}
}
......@@ -1633,7 +1656,16 @@ function resolveModelToJSON(request, parent, key, value) {
request.pendingChunks++;
var errorId = request.nextChunkId++;
emitErrorChunk(request, errorId, x);
var digest = logRecoverableError(request, x);
{
var _getErrorMessageAndSt2 = getErrorMessageAndStackDev(x),
message = _getErrorMessageAndSt2.message,
stack = _getErrorMessageAndSt2.stack;
emitErrorChunkDev(request, errorId, digest, message, stack);
}
return serializeByRefID(errorId);
}
}
......@@ -1744,7 +1776,39 @@ function resolveModelToJSON(request, parent, key, value) {
function logRecoverableError(request, error) {
var onError = request.onError;
onError(error);
var errorDigest = onError(error);
if (errorDigest != null && typeof errorDigest !== 'string') {
// eslint-disable-next-line react-internal/prod-error-codes
throw new Error("onError returned something with a type other than \"string\". onError should return a string and may return null or undefined but must not return anything else. It received something of type \"" + typeof errorDigest + "\" instead");
}
return errorDigest || '';
}
function getErrorMessageAndStackDev(error) {
{
var message;
var stack = '';
try {
if (error instanceof Error) {
// eslint-disable-next-line react-internal/safe-string-coercion
message = String(error.message); // eslint-disable-next-line react-internal/safe-string-coercion
stack = String(error.stack);
} else {
message = 'Error: ' + error;
}
} catch (x) {
message = 'An error occurred but serializing the error message failed.';
}
return {
message: message,
stack: stack
};
}
}
function fatalError(request, error) {
......@@ -1758,27 +1822,13 @@ function fatalError(request, error) {
}
}
function emitErrorChunk(request, id, error) {
// TODO: We should not leak error messages to the client in prod.
// Give this an error code instead and log on the server.
// We can serialize the error in DEV as a convenience.
var message;
var stack = '';
try {
if (error instanceof Error) {
// eslint-disable-next-line react-internal/safe-string-coercion
message = String(error.message); // eslint-disable-next-line react-internal/safe-string-coercion
stack = String(error.stack);
} else {
message = 'Error: ' + error;
}
} catch (x) {
message = 'An error occurred but serializing the error message failed.';
}
function emitErrorChunkProd(request, id, digest) {
var processedChunk = processErrorChunkProd(request, id, digest);
request.completedErrorChunks.push(processedChunk);
}
var processedChunk = processErrorChunk(request, id, message, stack);
function emitErrorChunkDev(request, id, digest, message, stack) {
var processedChunk = processErrorChunkDev(request, id, digest, message, stack);
request.completedErrorChunks.push(processedChunk);
}
......@@ -1850,9 +1900,15 @@ function retryTask(request, task) {
} else {
request.abortableTasks.delete(task);
task.status = ERRORED;
logRecoverableError(request, x); // This errored, we need to serialize this error to the
var digest = logRecoverableError(request, x);
{
var _getErrorMessageAndSt3 = getErrorMessageAndStackDev(x),
message = _getErrorMessageAndSt3.message,
stack = _getErrorMessageAndSt3.stack;
emitErrorChunk(request, task.id, x);
emitErrorChunkDev(request, task.id, digest, message, stack);
}
}
}
}
......@@ -2005,10 +2061,20 @@ function abort(request, reason) {
// to that row from every row that's still remaining.
var _error = reason === undefined ? new Error('The render was aborted by the server without a reason.') : reason;
logRecoverableError(request, _error);
var digest = logRecoverableError(request, _error);
request.pendingChunks++;
var errorId = request.nextChunkId++;
emitErrorChunk(request, errorId, _error);
if (true) {
var _getErrorMessageAndSt4 = getErrorMessageAndStackDev(_error),
message = _getErrorMessageAndSt4.message,
stack = _getErrorMessageAndSt4.stack;
emitErrorChunkDev(request, errorId, digest, message, stack);
} else {
emitErrorChunkProd(request, errorId, digest);
}
abortableTasks.forEach(function (task) {
return abortTask(task, request, errorId);
});
......
......@@ -677,17 +677,20 @@ function resolveSymbol(response, id, name) {
chunks.set(id, createInitializedChunk(response, Symbol.for(name)));
}
function resolveError(response, id, message, stack) {
// eslint-disable-next-line react-internal/prod-error-codes
var error = new Error(message);
function resolveErrorDev(response, id, digest, message, stack) {
var error = new Error(message || 'An error occurred in the Server Components render but no message was provided');
error.stack = stack;
error.digest = digest;
var errorWithDigest = error;
var chunks = response._chunks;
var chunk = chunks.get(id);
if (!chunk) {
chunks.set(id, createErrorChunk(response, error));
chunks.set(id, createErrorChunk(response, errorWithDigest));
} else {
triggerErrorOnChunk(chunk, error);
triggerErrorOnChunk(chunk, errorWithDigest);
}
}
function close(response) {
......@@ -740,7 +743,11 @@ function processFullRow(response, row) {
case 'E':
{
var errorInfo = JSON.parse(text);
resolveError(response, id, errorInfo.message, errorInfo.stack);
{
resolveErrorDev(response, id, errorInfo.digest, errorInfo.message, errorInfo.stack);
}
return;
}
......
......@@ -18,8 +18,8 @@ function B(a){try{var b=a.value;if(b.async){var c=p.get(b.id);if("fulfilled"===c
function N(a,b,c){if(J){var d=J;d.deps++}else d=J={deps:1,value:null};return function(e){b[c]=e;d.deps--;0===d.deps&&"blocked"===a.status&&(e=a.value,a.status="fulfilled",a.value=d.value,null!==e&&E(e,d.value))}}function O(a){return function(b){return G(a,b)}}
function P(a,b,c,d){switch(d[0]){case "$":if("$"===d)return t;if("$"===d[1]||"@"===d[1])return d.substring(1);d=parseInt(d.substring(1),16);a=L(a,d);switch(a.status){case "resolved_model":z(a);break;case "resolved_module":B(a)}switch(a.status){case "fulfilled":return a.value;case "pending":case "blocked":return d=I,a.then(N(d,b,c),O(d)),null;default:throw a.reason;}case "@":return b=parseInt(d.substring(1),16),b=L(a,b),{$$typeof:u,_payload:b,_init:C}}return d}
function Q(a,b,c){var d=a._chunks,e=d.get(b);c=JSON.parse(c,a._fromJSON);var f=m(a._bundlerConfig,c);if(c=r(f)){if(e){var l=e;l.status="blocked"}else l=new y("blocked",null,null,a),d.set(b,l);c.then(function(){return H(l,f)},function(a){return G(l,a)})}else e?H(e,f):d.set(b,new y("resolved_module",f,null,a))}function R(a){K(a,Error("Connection closed."))}
function S(a,b){if(""!==b){var c=b[0],d=b.indexOf(":",1),e=parseInt(b.substring(1,d),16);b=b.substring(d+1);switch(c){case "J":d=a._chunks;(c=d.get(e))?"pending"===c.status&&(a=c.value,e=c.reason,c.status="resolved_model",c.value=b,null!==a&&(z(c),F(c,a,e))):d.set(e,new y("resolved_model",b,null,a));break;case "M":Q(a,e,b);break;case "P":a._chunks.set(e,D(a,x(b).Provider));break;case "S":b=JSON.parse(b);a._chunks.set(e,D(a,Symbol.for(b)));break;case "E":c=JSON.parse(b);b=Error(c.message);b.stack=
c.stack;c=a._chunks;(d=c.get(e))?G(d,b):c.set(e,new y("rejected",null,b,a));break;default:throw Error("Error parsing the data. It's probably an error code or network corruption.");}}}function T(a){return function(b,c){return"string"===typeof c?P(a,this,b,c):"object"===typeof c&&null!==c?(b=c[0]===t?{$$typeof:t,type:c[1],key:c[2],ref:null,props:c[3],_owner:null}:c,b):c}}
function S(a,b){if(""!==b){var c=b[0],d=b.indexOf(":",1),e=parseInt(b.substring(1,d),16);b=b.substring(d+1);switch(c){case "J":d=a._chunks;(c=d.get(e))?"pending"===c.status&&(a=c.value,e=c.reason,c.status="resolved_model",c.value=b,null!==a&&(z(c),F(c,a,e))):d.set(e,new y("resolved_model",b,null,a));break;case "M":Q(a,e,b);break;case "P":a._chunks.set(e,D(a,x(b).Provider));break;case "S":b=JSON.parse(b);a._chunks.set(e,D(a,Symbol.for(b)));break;case "E":c=JSON.parse(b).digest;b=Error("An error occurred in the Server Components render. The specific message is omitted in production builds to avoid leaking sensitive details. A digest property is included on this error instance which may provide additional details about the nature of the error.");
b.stack="";b.digest=c;c=a._chunks;(d=c.get(e))?G(d,b):c.set(e,new y("rejected",null,b,a));break;default:throw Error("Error parsing the data. It's probably an error code or network corruption.");}}}function T(a){return function(b,c){return"string"===typeof c?P(a,this,b,c):"object"===typeof c&&null!==c?(b=c[0]===t?{$$typeof:t,type:c[1],key:c[2],ref:null,props:c[3],_owner:null}:c,b):c}}
function U(a){var b=new TextDecoder,c=new Map;a={_bundlerConfig:a,_chunks:c,_partialRow:"",_stringDecoder:b};a._fromJSON=T(a);return a}function V(a,b){function c(b){var f=b.value;if(b.done)R(a);else{b=f;f=a._stringDecoder;for(var g=b.indexOf(10);-1<g;){var M=a._partialRow;var A=b.subarray(0,g);A=f.decode(A);S(a,M+A);a._partialRow="";b=b.subarray(g+1);g=b.indexOf(10)}a._partialRow+=f.decode(b,k);return e.read().then(c).catch(d)}}function d(b){K(a,b)}var e=b.getReader();e.read().then(c).catch(d)}
exports.createFromFetch=function(a,b){var c=U(b&&b.moduleMap?b.moduleMap:null);a.then(function(a){V(c,a.body)},function(a){K(c,a)});return L(c,0)};exports.createFromReadableStream=function(a,b){b=U(b&&b.moduleMap?b.moduleMap:null);V(b,a);return L(b,0)};
exports.createFromXHR=function(a,b){function c(){for(var b=a.responseText,c=f,d=b.indexOf("\n",c);-1<d;)c=e._partialRow+b.substring(c,d),S(e,c),e._partialRow="",c=d+1,d=b.indexOf("\n",c);e._partialRow+=b.substring(c);f=b.length}function d(){K(e,new TypeError("Network error"))}var e=U(b&&b.moduleMap?b.moduleMap:null),f=0;a.addEventListener("progress",c);a.addEventListener("load",function(){c();R(e)});a.addEventListener("error",d);a.addEventListener("abort",d);a.addEventListener("timeout",d);return L(e,
......
......@@ -29,6 +29,7 @@ import isError from '../lib/is-error'
import { addRequestMeta } from '../server/request-meta'
import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
import { REDIRECT_ERROR_CODE } from '../client/components/redirect'
import { DYNAMIC_ERROR_CODE } from '../client/components/hooks-server-context'
loadRequireHook()
const envConfig = require('../shared/lib/runtime-config')
......@@ -388,8 +389,6 @@ export default async function exportPage({
// and bail when dynamic dependencies are detected
// only fully static paths are fully generated here
if (isAppDir) {
const { DynamicServerError } = components.ComponentMod.serverHooks
const { renderToHTMLOrFlight } =
require('../server/app-render') as typeof import('../server/app-render')
......@@ -417,10 +416,10 @@ export default async function exportPage({
flightData
)
}
} catch (err) {
} catch (err: any) {
if (
!(err instanceof DynamicServerError) &&
(err as any).code !== REDIRECT_ERROR_CODE
err.digest !== DYNAMIC_ERROR_CODE &&
err.digest !== REDIRECT_ERROR_CODE
) {
throw err
}
......
......@@ -242,7 +242,7 @@
"raw-body": "2.4.1",
"react-is": "17.0.2",
"react-refresh": "0.12.0",
"react-server-dom-webpack": "0.0.0-experimental-8951c5fc9-20220915",
"react-server-dom-webpack": "0.0.0-experimental-cb5084d1c-20220924",
"regenerator-runtime": "0.13.4",
"sass-loader": "12.4.0",
"schema-utils2": "npm:schema-utils@2.7.1",
......
......@@ -30,6 +30,7 @@ import { stripInternalQueries } from './internal-utils'
import type { ComponentsType } from '../build/webpack/loaders/next-app-loader'
import { REDIRECT_ERROR_CODE } from '../client/components/redirect'
import { NextCookies } from './web/spec-extension/cookies'
import { DYNAMIC_ERROR_CODE } from '../client/components/hooks-server-context'
const INTERNAL_HEADERS_INSTANCE = Symbol('internal for headers readonly')
......@@ -170,19 +171,18 @@ function createErrorHandler(
) {
return (err: any) => {
if (
// Use error message instead of type because HTML renderer uses Flight data which is serialized so it's not the same object instance.
err.message &&
!err.message.includes('Dynamic server usage') &&
// TODO-APP: Handle redirect throw
err.code !== REDIRECT_ERROR_CODE &&
err.message !== REDIRECT_ERROR_CODE
err.digest !== DYNAMIC_ERROR_CODE &&
err.digest !== REDIRECT_ERROR_CODE
) {
// Used for debugging error source
// console.error(_source, err)
console.error(err)
capturedErrors.push(err)
return err.digest || err.message
}
return null
return err.digest
}
}
......@@ -1299,7 +1299,7 @@ export async function renderToHTMLOrFlight(
flushEffectsToHead: true,
})
} catch (err: any) {
if (err.code === REDIRECT_ERROR_CODE) {
if (err.digest === REDIRECT_ERROR_CODE) {
throw err
}
......@@ -1361,7 +1361,7 @@ export async function renderToHTMLOrFlight(
try {
return new RenderResult(await bodyResult())
} catch (err: any) {
if (err.code === REDIRECT_ERROR_CODE) {
if (err.digest === REDIRECT_ERROR_CODE) {
;(renderOpts as any).pageData = {
pageProps: {
__N_REDIRECT: err.url,
......
......@@ -142,8 +142,8 @@ importers:
react-17: npm:react@17.0.2
react-dom: 18.2.0
react-dom-17: npm:react-dom@17.0.2
react-dom-exp: npm:react-dom@0.0.0-experimental-8951c5fc9-20220915
react-exp: npm:react@0.0.0-experimental-8951c5fc9-20220915
react-dom-exp: npm:react-dom@0.0.0-experimental-cb5084d1c-20220924
react-exp: npm:react@0.0.0-experimental-cb5084d1c-20220924
react-ssr-prepass: 1.0.8
react-virtualized: 9.22.3
relay-compiler: 13.0.2
......@@ -299,8 +299,8 @@ importers:
react-17: /react/17.0.2
react-dom: 18.2.0_react@18.2.0
react-dom-17: /react-dom/17.0.2_react@18.2.0
react-dom-exp: /react-dom/0.0.0-experimental-8951c5fc9-20220915_react@18.2.0
react-exp: /react/0.0.0-experimental-8951c5fc9-20220915
react-dom-exp: /react-dom/0.0.0-experimental-cb5084d1c-20220924_react@18.2.0
react-exp: /react/0.0.0-experimental-cb5084d1c-20220924
react-ssr-prepass: 1.0.8_qncsgtzehe3fgiqp6tr7lwq6fm
react-virtualized: 9.22.3_biqbaboplfbrettd7655fr4n2y
relay-compiler: 13.0.2
......@@ -555,7 +555,7 @@ importers:
raw-body: 2.4.1
react-is: 17.0.2
react-refresh: 0.12.0
react-server-dom-webpack: 0.0.0-experimental-8951c5fc9-20220915
react-server-dom-webpack: 0.0.0-experimental-cb5084d1c-20220924
regenerator-runtime: 0.13.4
sass-loader: 12.4.0
schema-utils2: npm:schema-utils@2.7.1
......@@ -744,7 +744,7 @@ importers:
raw-body: 2.4.1
react-is: 17.0.2
react-refresh: 0.12.0
react-server-dom-webpack: 0.0.0-experimental-8951c5fc9-20220915_webpack@5.74.0
react-server-dom-webpack: 0.0.0-experimental-cb5084d1c-20220924_webpack@5.74.0
regenerator-runtime: 0.13.4
sass-loader: 12.4.0_webpack@5.74.0
schema-utils2: /schema-utils/2.7.1
......@@ -24392,17 +24392,17 @@ packages:
strip-json-comments: 2.0.1
dev: true
/react-dom/0.0.0-experimental-8951c5fc9-20220915_react@18.2.0:
/react-dom/0.0.0-experimental-cb5084d1c-20220924_react@18.2.0:
resolution:
{
integrity: sha512-zRK9YAhohnYYJ4WhtZ1MyfR1w2XA+yiaAJAqx5Zg6Wyi0tHE1tQfhmoF7wdI4k3ZTvPjQO+IxkI+/sfOcu6OTA==,
integrity: sha512-0IHzPGHESn3uu8nI1w5596GX8bCGCE94DpaHkKSGWOlB6uhoVecU0fyOCkkNuB4cMc9WeOWiH2gsM100EWZDPQ==,
}
peerDependencies:
react: 0.0.0-experimental-8951c5fc9-20220915
react: 0.0.0-experimental-cb5084d1c-20220924
dependencies:
loose-envify: 1.4.0
react: 18.2.0
scheduler: 0.0.0-experimental-8951c5fc9-20220915
scheduler: 0.0.0-experimental-cb5084d1c-20220924
dev: true
/react-dom/17.0.2_react@18.2.0:
......@@ -24467,14 +24467,14 @@ packages:
engines: { node: '>=0.10.0' }
dev: true
/react-server-dom-webpack/0.0.0-experimental-8951c5fc9-20220915_webpack@5.74.0:
/react-server-dom-webpack/0.0.0-experimental-cb5084d1c-20220924_webpack@5.74.0:
resolution:
{
integrity: sha512-gIz7hb0Sp8v3y66K5sETigHSC1VS2k/w2UvJ5vuIr+oXsp30M3QzINxHKVuausgIP+2X8c5J9BZukh3fMutiyw==,
integrity: sha512-7dywHsO5GV8FJiTnEvL7N1ArRLemxEmt10Ear15b7gNcxf+DMAraffj4O1j9uH+v6/ssbaeR8470yXCx0c76Gw==,
}
engines: { node: '>=0.10.0' }
peerDependencies:
react: 0.0.0-experimental-8951c5fc9-20220915
react: 0.0.0-experimental-cb5084d1c-20220924
webpack: ^5.59.0
dependencies:
acorn: 6.4.2
......@@ -24516,10 +24516,10 @@ packages:
react-lifecycles-compat: 3.0.4
dev: true
/react/0.0.0-experimental-8951c5fc9-20220915:
/react/0.0.0-experimental-cb5084d1c-20220924:
resolution:
{
integrity: sha512-/pGYDqlIZAF4UMSTvlTU1Gd9etFqsUAT51vebc9Az13tE0hV0dmFdHa4T79Qx1JJ6Bd146X2RjScBhbx/ROmQA==,
integrity: sha512-66AdfxkJrwCaCEKT0LQRd9J9GQ9T+yN7Wx9XT+tNxKycYQ0Exm+DZxOTedagWDlsFMXroyhrTWzgdC18R2PaOQ==,
}
engines: { node: '>=0.10.0' }
dependencies:
......@@ -25861,10 +25861,10 @@ packages:
xmlchars: 2.2.0
dev: true
/scheduler/0.0.0-experimental-8951c5fc9-20220915:
/scheduler/0.0.0-experimental-cb5084d1c-20220924:
resolution:
{
integrity: sha512-3ar+dNPu8yBC0DK1aEgT+dPUwEFoVQjVmsjcqKuYK7inTwsgQkDeTlGVQV1ELULf9vUwyuodHjGBFQI+XBQ0bg==,
integrity: sha512-SeszKCdhM5OHxNMStjpKIAaloARUMZqIpDZjkZeGuRsyr7YlAqvlsCXyee4ZQOOU1pbr7BIvQntKy5Hil+DQJA==,
}
dependencies:
loose-envify: 1.4.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment