react-router 0.0.0-experimental-c19b79d → 0.0.0-experimental-e0b6ce9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/development/{chunk-AGOH44BE.mjs → chunk-4FI4BC6Y.mjs} +67 -51
- package/dist/development/{chunk-IMKEG5CI.mjs → chunk-F6CT5MEB.mjs} +314 -30
- package/dist/development/{chunk-LUB73E44.js → chunk-INO4IHBF.js} +352 -71
- package/dist/development/{chunk-2G2U5HGB.js → chunk-ITZFCV4J.js} +164 -161
- package/dist/development/dom-export.d.mts +59 -4
- package/dist/development/dom-export.d.ts +59 -3
- package/dist/development/dom-export.js +8 -5
- package/dist/development/dom-export.mjs +8 -5
- package/dist/development/{index-react-server-client-DKvU8YRr.d.ts → index-react-server-client-CYIi6gi0.d.mts} +198 -134
- package/dist/{production/index-react-server-client-DKvU8YRr.d.ts → development/index-react-server-client-ChBGplLn.d.ts} +198 -134
- package/dist/development/index-react-server-client.d.mts +3 -3
- package/dist/development/index-react-server-client.d.ts +3 -2
- package/dist/development/index-react-server-client.js +4 -4
- package/dist/development/index-react-server-client.mjs +2 -2
- package/dist/development/index-react-server.d.mts +90 -1
- package/dist/development/index-react-server.d.ts +90 -1
- package/dist/development/index-react-server.js +188 -9
- package/dist/development/index-react-server.mjs +188 -9
- package/dist/development/index.d.mts +13 -20
- package/dist/development/index.d.ts +13 -18
- package/dist/development/index.js +161 -147
- package/dist/development/index.mjs +3 -5
- package/dist/development/instrumentation-BGrNA7uj.d.ts +1122 -0
- package/dist/development/lib/types/internal.d.mts +3 -3
- package/dist/development/lib/types/internal.d.ts +3 -2
- package/dist/development/lib/types/internal.js +1 -1
- package/dist/development/lib/types/internal.mjs +1 -1
- package/dist/development/{register-BrVEYTED.d.mts → register-DiOIlEq5.d.mts} +1 -7
- package/dist/{production/register-BrVEYTED.d.mts → development/register-DiOIlEq5.d.ts} +1 -7
- package/dist/development/{route-data-CDwqkzPE.d.mts → routeModules-Cy4Xsfoi.d.mts} +157 -147
- package/dist/{production/routeModules-BmVo7q9e.d.ts → development/routeModules-DqotkItD.d.ts} +73 -1046
- package/dist/{production/context-BqL5Eckq.d.mts → development/router-DWv6Clt-.d.mts} +1390 -1253
- package/dist/production/{chunk-AODJW4D3.mjs → chunk-52MYED7O.mjs} +67 -51
- package/dist/production/{chunk-FGRCWJDI.js → chunk-DASXXYNZ.js} +164 -161
- package/dist/production/{chunk-2L5AG5Y5.js → chunk-K7VXYOZD.js} +352 -71
- package/dist/production/{chunk-UOQCOPF6.mjs → chunk-LKSLGWXX.mjs} +314 -30
- package/dist/production/dom-export.d.mts +59 -4
- package/dist/production/dom-export.d.ts +59 -3
- package/dist/production/dom-export.js +8 -5
- package/dist/production/dom-export.mjs +8 -5
- package/dist/production/{index-react-server-client-2EDmGlsZ.d.mts → index-react-server-client-CYIi6gi0.d.mts} +140 -77
- package/dist/{development/index-react-server-client-2EDmGlsZ.d.mts → production/index-react-server-client-ChBGplLn.d.ts} +140 -77
- package/dist/production/index-react-server-client.d.mts +3 -3
- package/dist/production/index-react-server-client.d.ts +3 -2
- package/dist/production/index-react-server-client.js +4 -4
- package/dist/production/index-react-server-client.mjs +2 -2
- package/dist/production/index-react-server.d.mts +90 -1
- package/dist/production/index-react-server.d.ts +90 -1
- package/dist/production/index-react-server.js +188 -9
- package/dist/production/index-react-server.mjs +188 -9
- package/dist/production/index.d.mts +13 -20
- package/dist/production/index.d.ts +13 -18
- package/dist/production/index.js +161 -147
- package/dist/production/index.mjs +3 -5
- package/dist/production/instrumentation-BGrNA7uj.d.ts +1122 -0
- package/dist/production/lib/types/internal.d.mts +3 -3
- package/dist/production/lib/types/internal.d.ts +3 -2
- package/dist/production/lib/types/internal.js +1 -1
- package/dist/production/lib/types/internal.mjs +1 -1
- package/dist/{development/register-D8NQoPsO.d.ts → production/register-DiOIlEq5.d.mts} +1 -7
- package/dist/production/{register-D8NQoPsO.d.ts → register-DiOIlEq5.d.ts} +1 -7
- package/dist/production/{route-data-CDwqkzPE.d.mts → routeModules-Cy4Xsfoi.d.mts} +157 -147
- package/dist/{development/routeModules-BmVo7q9e.d.ts → production/routeModules-DqotkItD.d.ts} +73 -1046
- package/dist/{development/context-BqL5Eckq.d.mts → production/router-DWv6Clt-.d.mts} +1390 -1253
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* react-router v0.0.0-experimental-
|
|
2
|
+
* react-router v0.0.0-experimental-e0b6ce9
|
|
3
3
|
*
|
|
4
4
|
* Copyright (c) Remix Software Inc.
|
|
5
5
|
*
|
|
@@ -38,6 +38,7 @@ import {
|
|
|
38
38
|
getManifestPath,
|
|
39
39
|
getSingleFetchDataStrategyImpl,
|
|
40
40
|
getStaticContextFromError,
|
|
41
|
+
instrumentHandler,
|
|
41
42
|
invariant,
|
|
42
43
|
isDataWithResponseInit,
|
|
43
44
|
isMutationMethod,
|
|
@@ -60,7 +61,7 @@ import {
|
|
|
60
61
|
withComponentProps,
|
|
61
62
|
withErrorBoundaryProps,
|
|
62
63
|
withHydrateFallbackProps
|
|
63
|
-
} from "./chunk-
|
|
64
|
+
} from "./chunk-F6CT5MEB.mjs";
|
|
64
65
|
|
|
65
66
|
// lib/dom/ssr/server.tsx
|
|
66
67
|
import * as React from "react";
|
|
@@ -517,7 +518,8 @@ async function callRouteHandler(handler, args) {
|
|
|
517
518
|
let result = await handler({
|
|
518
519
|
request: stripRoutesParam(stripIndexParam2(args.request)),
|
|
519
520
|
params: args.params,
|
|
520
|
-
context: args.context
|
|
521
|
+
context: args.context,
|
|
522
|
+
unstable_pattern: args.unstable_pattern
|
|
521
523
|
});
|
|
522
524
|
if (isDataWithResponseInit(result) && result.init && result.init.status && isRedirectStatusCode(result.init.status)) {
|
|
523
525
|
throw new Response(null, result.init);
|
|
@@ -1010,7 +1012,8 @@ function derive(build, mode) {
|
|
|
1010
1012
|
let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
|
|
1011
1013
|
let serverMode = isServerMode(mode) ? mode : "production" /* Production */;
|
|
1012
1014
|
let staticHandler = createStaticHandler(dataRoutes, {
|
|
1013
|
-
basename: build.basename
|
|
1015
|
+
basename: build.basename,
|
|
1016
|
+
unstable_instrumentations: build.entry.module.unstable_instrumentations
|
|
1014
1017
|
});
|
|
1015
1018
|
let errorHandler = build.entry.module.handleError || ((error, { request }) => {
|
|
1016
1019
|
if (serverMode !== "test" /* Test */ && !request.signal.aborted) {
|
|
@@ -1020,35 +1023,7 @@ function derive(build, mode) {
|
|
|
1020
1023
|
);
|
|
1021
1024
|
}
|
|
1022
1025
|
});
|
|
1023
|
-
|
|
1024
|
-
routes,
|
|
1025
|
-
dataRoutes,
|
|
1026
|
-
serverMode,
|
|
1027
|
-
staticHandler,
|
|
1028
|
-
errorHandler
|
|
1029
|
-
};
|
|
1030
|
-
}
|
|
1031
|
-
var createRequestHandler = (build, mode) => {
|
|
1032
|
-
let _build;
|
|
1033
|
-
let routes;
|
|
1034
|
-
let serverMode;
|
|
1035
|
-
let staticHandler;
|
|
1036
|
-
let errorHandler;
|
|
1037
|
-
return async function requestHandler(request, initialContext) {
|
|
1038
|
-
_build = typeof build === "function" ? await build() : build;
|
|
1039
|
-
if (typeof build === "function") {
|
|
1040
|
-
let derived = derive(_build, mode);
|
|
1041
|
-
routes = derived.routes;
|
|
1042
|
-
serverMode = derived.serverMode;
|
|
1043
|
-
staticHandler = derived.staticHandler;
|
|
1044
|
-
errorHandler = derived.errorHandler;
|
|
1045
|
-
} else if (!routes || !serverMode || !staticHandler || !errorHandler) {
|
|
1046
|
-
let derived = derive(_build, mode);
|
|
1047
|
-
routes = derived.routes;
|
|
1048
|
-
serverMode = derived.serverMode;
|
|
1049
|
-
staticHandler = derived.staticHandler;
|
|
1050
|
-
errorHandler = derived.errorHandler;
|
|
1051
|
-
}
|
|
1026
|
+
let requestHandler = async (request, initialContext) => {
|
|
1052
1027
|
let params = {};
|
|
1053
1028
|
let loadContext;
|
|
1054
1029
|
let handleError = (error) => {
|
|
@@ -1061,7 +1036,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1061
1036
|
request
|
|
1062
1037
|
});
|
|
1063
1038
|
};
|
|
1064
|
-
if (
|
|
1039
|
+
if (build.future.v8_middleware) {
|
|
1065
1040
|
if (initialContext && !(initialContext instanceof RouterContextProvider)) {
|
|
1066
1041
|
let error = new Error(
|
|
1067
1042
|
"Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `RouterContextProvider` from your `getLoadContext` function."
|
|
@@ -1074,7 +1049,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1074
1049
|
loadContext = initialContext || {};
|
|
1075
1050
|
}
|
|
1076
1051
|
let url = new URL(request.url);
|
|
1077
|
-
let normalizedBasename =
|
|
1052
|
+
let normalizedBasename = build.basename || "/";
|
|
1078
1053
|
let normalizedPath = url.pathname;
|
|
1079
1054
|
if (stripBasename(normalizedPath, normalizedBasename) === "/_root.data") {
|
|
1080
1055
|
normalizedPath = normalizedBasename;
|
|
@@ -1085,7 +1060,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1085
1060
|
normalizedPath = normalizedPath.slice(0, -1);
|
|
1086
1061
|
}
|
|
1087
1062
|
let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
|
|
1088
|
-
if (!
|
|
1063
|
+
if (!build.ssr) {
|
|
1089
1064
|
let decodedPath = decodeURI(normalizedPath);
|
|
1090
1065
|
if (normalizedBasename !== "/") {
|
|
1091
1066
|
let strippedPath = stripBasename(decodedPath, normalizedBasename);
|
|
@@ -1109,9 +1084,9 @@ var createRequestHandler = (build, mode) => {
|
|
|
1109
1084
|
}
|
|
1110
1085
|
decodedPath = strippedPath;
|
|
1111
1086
|
}
|
|
1112
|
-
if (
|
|
1087
|
+
if (build.prerender.length === 0) {
|
|
1113
1088
|
isSpaMode = true;
|
|
1114
|
-
} else if (!
|
|
1089
|
+
} else if (!build.prerender.includes(decodedPath) && !build.prerender.includes(decodedPath + "/")) {
|
|
1115
1090
|
if (url.pathname.endsWith(".data")) {
|
|
1116
1091
|
errorHandler(
|
|
1117
1092
|
new ErrorResponseImpl(
|
|
@@ -1135,19 +1110,19 @@ var createRequestHandler = (build, mode) => {
|
|
|
1135
1110
|
}
|
|
1136
1111
|
}
|
|
1137
1112
|
let manifestUrl = getManifestPath(
|
|
1138
|
-
|
|
1113
|
+
build.routeDiscovery.manifestPath,
|
|
1139
1114
|
normalizedBasename
|
|
1140
1115
|
);
|
|
1141
1116
|
if (url.pathname === manifestUrl) {
|
|
1142
1117
|
try {
|
|
1143
|
-
let res = await handleManifestRequest(
|
|
1118
|
+
let res = await handleManifestRequest(build, routes, url);
|
|
1144
1119
|
return res;
|
|
1145
1120
|
} catch (e) {
|
|
1146
1121
|
handleError(e);
|
|
1147
1122
|
return new Response("Unknown Server Error", { status: 500 });
|
|
1148
1123
|
}
|
|
1149
1124
|
}
|
|
1150
|
-
let matches = matchServerRoutes(routes, normalizedPath,
|
|
1125
|
+
let matches = matchServerRoutes(routes, normalizedPath, build.basename);
|
|
1151
1126
|
if (matches && matches.length > 0) {
|
|
1152
1127
|
Object.assign(params, matches[0].params);
|
|
1153
1128
|
}
|
|
@@ -1158,11 +1133,11 @@ var createRequestHandler = (build, mode) => {
|
|
|
1158
1133
|
let singleFetchMatches = matchServerRoutes(
|
|
1159
1134
|
routes,
|
|
1160
1135
|
handlerUrl.pathname,
|
|
1161
|
-
|
|
1136
|
+
build.basename
|
|
1162
1137
|
);
|
|
1163
1138
|
response = await handleSingleFetchRequest(
|
|
1164
1139
|
serverMode,
|
|
1165
|
-
|
|
1140
|
+
build,
|
|
1166
1141
|
staticHandler,
|
|
1167
1142
|
request,
|
|
1168
1143
|
handlerUrl,
|
|
@@ -1173,12 +1148,12 @@ var createRequestHandler = (build, mode) => {
|
|
|
1173
1148
|
response = generateSingleFetchRedirectResponse(
|
|
1174
1149
|
response,
|
|
1175
1150
|
request,
|
|
1176
|
-
|
|
1151
|
+
build,
|
|
1177
1152
|
serverMode
|
|
1178
1153
|
);
|
|
1179
1154
|
}
|
|
1180
|
-
if (
|
|
1181
|
-
response = await
|
|
1155
|
+
if (build.entry.module.handleDataRequest) {
|
|
1156
|
+
response = await build.entry.module.handleDataRequest(response, {
|
|
1182
1157
|
context: loadContext,
|
|
1183
1158
|
params: singleFetchMatches ? singleFetchMatches[0].params : {},
|
|
1184
1159
|
request
|
|
@@ -1187,7 +1162,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1187
1162
|
response = generateSingleFetchRedirectResponse(
|
|
1188
1163
|
response,
|
|
1189
1164
|
request,
|
|
1190
|
-
|
|
1165
|
+
build,
|
|
1191
1166
|
serverMode
|
|
1192
1167
|
);
|
|
1193
1168
|
}
|
|
@@ -1195,7 +1170,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1195
1170
|
} else if (!isSpaMode && matches && matches[matches.length - 1].route.module.default == null && matches[matches.length - 1].route.module.ErrorBoundary == null) {
|
|
1196
1171
|
response = await handleResourceRequest(
|
|
1197
1172
|
serverMode,
|
|
1198
|
-
|
|
1173
|
+
build,
|
|
1199
1174
|
staticHandler,
|
|
1200
1175
|
matches.slice(-1)[0].route.id,
|
|
1201
1176
|
request,
|
|
@@ -1205,14 +1180,14 @@ var createRequestHandler = (build, mode) => {
|
|
|
1205
1180
|
} else {
|
|
1206
1181
|
let { pathname } = url;
|
|
1207
1182
|
let criticalCss = void 0;
|
|
1208
|
-
if (
|
|
1209
|
-
criticalCss = await
|
|
1183
|
+
if (build.unstable_getCriticalCss) {
|
|
1184
|
+
criticalCss = await build.unstable_getCriticalCss({ pathname });
|
|
1210
1185
|
} else if (mode === "development" /* Development */ && getDevServerHooks()?.getCriticalCss) {
|
|
1211
1186
|
criticalCss = await getDevServerHooks()?.getCriticalCss?.(pathname);
|
|
1212
1187
|
}
|
|
1213
1188
|
response = await handleDocumentRequest(
|
|
1214
1189
|
serverMode,
|
|
1215
|
-
|
|
1190
|
+
build,
|
|
1216
1191
|
staticHandler,
|
|
1217
1192
|
request,
|
|
1218
1193
|
loadContext,
|
|
@@ -1230,6 +1205,47 @@ var createRequestHandler = (build, mode) => {
|
|
|
1230
1205
|
}
|
|
1231
1206
|
return response;
|
|
1232
1207
|
};
|
|
1208
|
+
if (build.entry.module.unstable_instrumentations) {
|
|
1209
|
+
requestHandler = instrumentHandler(
|
|
1210
|
+
requestHandler,
|
|
1211
|
+
build.entry.module.unstable_instrumentations.map((i) => i.handler).filter(Boolean)
|
|
1212
|
+
);
|
|
1213
|
+
}
|
|
1214
|
+
return {
|
|
1215
|
+
routes,
|
|
1216
|
+
dataRoutes,
|
|
1217
|
+
serverMode,
|
|
1218
|
+
staticHandler,
|
|
1219
|
+
errorHandler,
|
|
1220
|
+
requestHandler
|
|
1221
|
+
};
|
|
1222
|
+
}
|
|
1223
|
+
var createRequestHandler = (build, mode) => {
|
|
1224
|
+
let _build;
|
|
1225
|
+
let routes;
|
|
1226
|
+
let serverMode;
|
|
1227
|
+
let staticHandler;
|
|
1228
|
+
let errorHandler;
|
|
1229
|
+
let _requestHandler;
|
|
1230
|
+
return async function requestHandler(request, initialContext) {
|
|
1231
|
+
_build = typeof build === "function" ? await build() : build;
|
|
1232
|
+
if (typeof build === "function") {
|
|
1233
|
+
let derived = derive(_build, mode);
|
|
1234
|
+
routes = derived.routes;
|
|
1235
|
+
serverMode = derived.serverMode;
|
|
1236
|
+
staticHandler = derived.staticHandler;
|
|
1237
|
+
errorHandler = derived.errorHandler;
|
|
1238
|
+
_requestHandler = derived.requestHandler;
|
|
1239
|
+
} else if (!routes || !serverMode || !staticHandler || !errorHandler || !_requestHandler) {
|
|
1240
|
+
let derived = derive(_build, mode);
|
|
1241
|
+
routes = derived.routes;
|
|
1242
|
+
serverMode = derived.serverMode;
|
|
1243
|
+
staticHandler = derived.staticHandler;
|
|
1244
|
+
errorHandler = derived.errorHandler;
|
|
1245
|
+
_requestHandler = derived.requestHandler;
|
|
1246
|
+
}
|
|
1247
|
+
return _requestHandler(request, initialContext);
|
|
1248
|
+
};
|
|
1233
1249
|
};
|
|
1234
1250
|
async function handleManifestRequest(build, routes, url) {
|
|
1235
1251
|
if (build.assets.version !== url.searchParams.get("version")) {
|