react-router 7.8.0-pre.1 → 7.8.0-pre.2
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/CHANGELOG.md +6 -0
- package/dist/development/{chunk-I22FVTOY.mjs → chunk-3D24XHV2.mjs} +19 -4
- package/dist/development/{chunk-NGF2R4G7.js → chunk-74TFO7SN.js} +1 -1
- package/dist/{production/chunk-4PESVXQ2.js → development/chunk-HQ37R3FK.js} +130 -130
- package/dist/development/{chunk-XFFANEXU.mjs → chunk-WSV33ENW.mjs} +2 -2
- package/dist/development/dom-export.js +3 -3
- package/dist/development/dom-export.mjs +3 -3
- package/dist/{production/index-react-server-client-BzBbJLAD.d.ts → development/index-react-server-client-CMphySRb.d.ts} +18 -1
- package/dist/{production/index-react-server-client-CuajY2vy.d.mts → development/index-react-server-client-DXb0OgpJ.d.mts} +18 -1
- package/dist/development/index-react-server-client.d.mts +1 -1
- package/dist/development/index-react-server-client.d.ts +1 -1
- 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.js +39 -25
- package/dist/development/index-react-server.mjs +39 -25
- package/dist/development/index.d.mts +2 -2
- package/dist/development/index.d.ts +2 -2
- package/dist/development/index.js +117 -102
- package/dist/development/index.mjs +3 -3
- package/dist/development/lib/types/internal.js +1 -1
- package/dist/development/lib/types/internal.mjs +1 -1
- package/dist/production/{chunk-RLJ23MYZ.js → chunk-DDK3XFL6.js} +1 -1
- package/dist/{development/chunk-4EVDZJGM.js → production/chunk-GSF7DANI.js} +130 -130
- package/dist/production/{chunk-P2ZJHOXZ.mjs → chunk-IEIDJVF4.mjs} +2 -2
- package/dist/production/{chunk-JJOMWYJ4.mjs → chunk-Q6IGLNPQ.mjs} +19 -4
- package/dist/production/dom-export.js +3 -3
- package/dist/production/dom-export.mjs +3 -3
- package/dist/{development/index-react-server-client-BzBbJLAD.d.ts → production/index-react-server-client-CMphySRb.d.ts} +18 -1
- package/dist/{development/index-react-server-client-CuajY2vy.d.mts → production/index-react-server-client-DXb0OgpJ.d.mts} +18 -1
- package/dist/production/index-react-server-client.d.mts +1 -1
- package/dist/production/index-react-server-client.d.ts +1 -1
- 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.js +39 -25
- package/dist/production/index-react-server.mjs +39 -25
- package/dist/production/index.d.mts +2 -2
- package/dist/production/index.d.ts +2 -2
- package/dist/production/index.js +117 -102
- package/dist/production/index.mjs +3 -3
- package/dist/production/lib/types/internal.js +1 -1
- package/dist/production/lib/types/internal.mjs +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
|
|
2
|
-
* react-router v7.8.0-pre.
|
|
2
|
+
* react-router v7.8.0-pre.2
|
|
3
3
|
*
|
|
4
4
|
* Copyright (c) Remix Software Inc.
|
|
5
5
|
*
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
|
|
55
55
|
|
|
56
56
|
|
|
57
|
-
var
|
|
57
|
+
var _chunkHQ37R3FKjs = require('./chunk-HQ37R3FK.js');
|
|
58
58
|
|
|
59
59
|
|
|
60
60
|
|
|
@@ -142,7 +142,7 @@ var _chunk4EVDZJGMjs = require('./chunk-4EVDZJGM.js');
|
|
|
142
142
|
|
|
143
143
|
|
|
144
144
|
|
|
145
|
-
var
|
|
145
|
+
var _chunk74TFO7SNjs = require('./chunk-74TFO7SN.js');
|
|
146
146
|
|
|
147
147
|
// lib/dom/ssr/server.tsx
|
|
148
148
|
var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react); var React4 = _interopRequireWildcard(_react); var React5 = _interopRequireWildcard(_react);
|
|
@@ -155,7 +155,7 @@ function ServerRouter({
|
|
|
155
155
|
url = new URL(url);
|
|
156
156
|
}
|
|
157
157
|
let { manifest, routeModules, criticalCss, serverHandoffString } = context;
|
|
158
|
-
let routes =
|
|
158
|
+
let routes = _chunk74TFO7SNjs.createServerRoutes.call(void 0,
|
|
159
159
|
manifest.routes,
|
|
160
160
|
routeModules,
|
|
161
161
|
context.future,
|
|
@@ -168,7 +168,7 @@ function ServerRouter({
|
|
|
168
168
|
let routeId = match.route.id;
|
|
169
169
|
let route = routeModules[routeId];
|
|
170
170
|
let manifestRoute = context.manifest.routes[routeId];
|
|
171
|
-
if (route && manifestRoute &&
|
|
171
|
+
if (route && manifestRoute && _chunk74TFO7SNjs.shouldHydrateRouteLoader.call(void 0,
|
|
172
172
|
routeId,
|
|
173
173
|
route.clientLoader,
|
|
174
174
|
manifestRoute.hasLoader,
|
|
@@ -177,9 +177,9 @@ function ServerRouter({
|
|
|
177
177
|
delete context.staticHandlerContext.loaderData[routeId];
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
|
-
let router =
|
|
180
|
+
let router = _chunkHQ37R3FKjs.createStaticRouter.call(void 0, routes, context.staticHandlerContext);
|
|
181
181
|
return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
|
|
182
|
-
|
|
182
|
+
_chunk74TFO7SNjs.FrameworkContext.Provider,
|
|
183
183
|
{
|
|
184
184
|
value: {
|
|
185
185
|
manifest,
|
|
@@ -194,8 +194,8 @@ function ServerRouter({
|
|
|
194
194
|
renderMeta: context.renderMeta
|
|
195
195
|
}
|
|
196
196
|
},
|
|
197
|
-
/* @__PURE__ */ React.createElement(
|
|
198
|
-
|
|
197
|
+
/* @__PURE__ */ React.createElement(_chunk74TFO7SNjs.RemixErrorBoundary, { location: router.state.location }, /* @__PURE__ */ React.createElement(
|
|
198
|
+
_chunkHQ37R3FKjs.StaticRouterProvider,
|
|
199
199
|
{
|
|
200
200
|
router,
|
|
201
201
|
context: context.staticHandlerContext,
|
|
@@ -203,7 +203,7 @@ function ServerRouter({
|
|
|
203
203
|
}
|
|
204
204
|
))
|
|
205
205
|
), context.serverHandoffStream ? /* @__PURE__ */ React.createElement(React.Suspense, null, /* @__PURE__ */ React.createElement(
|
|
206
|
-
|
|
206
|
+
_chunk74TFO7SNjs.StreamTransfer,
|
|
207
207
|
{
|
|
208
208
|
context,
|
|
209
209
|
identifier: 0,
|
|
@@ -245,18 +245,18 @@ function createRoutesStub(routes, _context) {
|
|
|
245
245
|
let patched = processRoutes(
|
|
246
246
|
// @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
|
|
247
247
|
// types compared to `AgnosticRouteObject`
|
|
248
|
-
|
|
249
|
-
_context !== void 0 ? _context : _optionalChain([future, 'optionalAccess', _4 => _4.unstable_middleware]) ? new (0,
|
|
248
|
+
_chunk74TFO7SNjs.convertRoutesToDataRoutes.call(void 0, routes, (r) => r),
|
|
249
|
+
_context !== void 0 ? _context : _optionalChain([future, 'optionalAccess', _4 => _4.unstable_middleware]) ? new (0, _chunk74TFO7SNjs.unstable_RouterContextProvider)() : {},
|
|
250
250
|
frameworkContextRef.current.manifest,
|
|
251
251
|
frameworkContextRef.current.routeModules
|
|
252
252
|
);
|
|
253
|
-
routerRef.current =
|
|
253
|
+
routerRef.current = _chunkHQ37R3FKjs.createMemoryRouter.call(void 0, patched, {
|
|
254
254
|
initialEntries,
|
|
255
255
|
initialIndex,
|
|
256
256
|
hydrationData
|
|
257
257
|
});
|
|
258
258
|
}
|
|
259
|
-
return /* @__PURE__ */ React2.createElement(
|
|
259
|
+
return /* @__PURE__ */ React2.createElement(_chunk74TFO7SNjs.FrameworkContext.Provider, { value: frameworkContextRef.current }, /* @__PURE__ */ React2.createElement(_chunkHQ37R3FKjs.RouterProvider, { router: routerRef.current }));
|
|
260
260
|
};
|
|
261
261
|
}
|
|
262
262
|
function processRoutes(routes, context, manifest, routeModules, parentId) {
|
|
@@ -270,9 +270,9 @@ function processRoutes(routes, context, manifest, routeModules, parentId) {
|
|
|
270
270
|
id: route.id,
|
|
271
271
|
path: route.path,
|
|
272
272
|
index: route.index,
|
|
273
|
-
Component: route.Component ?
|
|
274
|
-
HydrateFallback: route.HydrateFallback ?
|
|
275
|
-
ErrorBoundary: route.ErrorBoundary ?
|
|
273
|
+
Component: route.Component ? _chunkHQ37R3FKjs.withComponentProps.call(void 0, route.Component) : void 0,
|
|
274
|
+
HydrateFallback: route.HydrateFallback ? _chunkHQ37R3FKjs.withHydrateFallbackProps.call(void 0, route.HydrateFallback) : void 0,
|
|
275
|
+
ErrorBoundary: route.ErrorBoundary ? _chunkHQ37R3FKjs.withErrorBoundaryProps.call(void 0, route.ErrorBoundary) : void 0,
|
|
276
276
|
action: route.action ? (args) => route.action({ ...args, context }) : void 0,
|
|
277
277
|
loader: route.loader ? (args) => route.loader({ ...args, context }) : void 0,
|
|
278
278
|
handle: route.handle,
|
|
@@ -301,7 +301,7 @@ function processRoutes(routes, context, manifest, routeModules, parentId) {
|
|
|
301
301
|
};
|
|
302
302
|
manifest.routes[newRoute.id] = entryRoute;
|
|
303
303
|
routeModules[route.id] = {
|
|
304
|
-
default: newRoute.Component ||
|
|
304
|
+
default: newRoute.Component || _chunkHQ37R3FKjs.Outlet,
|
|
305
305
|
ErrorBoundary: newRoute.ErrorBoundary || void 0,
|
|
306
306
|
handle: route.handle,
|
|
307
307
|
links: route.links,
|
|
@@ -496,7 +496,7 @@ function myUnescape(value) {
|
|
|
496
496
|
return result;
|
|
497
497
|
}
|
|
498
498
|
function warnOnceAboutExpiresCookie(name, expires) {
|
|
499
|
-
|
|
499
|
+
_chunk74TFO7SNjs.warnOnce.call(void 0,
|
|
500
500
|
!expires,
|
|
501
501
|
`The "${name}" cookie has an "expires" property set. This will cause the expires value to not be updated when the session is committed. Instead, you should set the expires value when serializing the cookie. You can use \`commitSession(session, { expires })\` if using a session storage object, or \`cookie.serialize("value", { expires })\` if you're using the cookie directly.`
|
|
502
502
|
);
|
|
@@ -550,7 +550,7 @@ function serializeErrors(errors, serverMode) {
|
|
|
550
550
|
let entries = Object.entries(errors);
|
|
551
551
|
let serialized = {};
|
|
552
552
|
for (let [key, val] of entries) {
|
|
553
|
-
if (
|
|
553
|
+
if (_chunk74TFO7SNjs.isRouteErrorResponse.call(void 0, val)) {
|
|
554
554
|
serialized[key] = { ...val, __type: "RouteErrorResponse" };
|
|
555
555
|
} else if (val instanceof Error) {
|
|
556
556
|
let sanitized = sanitizeError(val, serverMode);
|
|
@@ -575,7 +575,7 @@ function serializeErrors(errors, serverMode) {
|
|
|
575
575
|
|
|
576
576
|
// lib/server-runtime/routeMatching.ts
|
|
577
577
|
function matchServerRoutes(routes, pathname, basename) {
|
|
578
|
-
let matches =
|
|
578
|
+
let matches = _chunk74TFO7SNjs.matchRoutes.call(void 0,
|
|
579
579
|
routes,
|
|
580
580
|
pathname,
|
|
581
581
|
basename
|
|
@@ -595,7 +595,7 @@ async function callRouteHandler(handler, args) {
|
|
|
595
595
|
params: args.params,
|
|
596
596
|
context: args.context
|
|
597
597
|
});
|
|
598
|
-
if (
|
|
598
|
+
if (_chunk74TFO7SNjs.isDataWithResponseInit.call(void 0, result) && result.init && result.init.status && _chunk74TFO7SNjs.isRedirectStatusCode.call(void 0, result.init.status)) {
|
|
599
599
|
throw new Response(null, result.init);
|
|
600
600
|
}
|
|
601
601
|
return result;
|
|
@@ -714,17 +714,17 @@ function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesBy
|
|
|
714
714
|
controller.close();
|
|
715
715
|
}
|
|
716
716
|
});
|
|
717
|
-
let decoded = await
|
|
717
|
+
let decoded = await _chunk74TFO7SNjs.decodeViaTurboStream.call(void 0, stream, global);
|
|
718
718
|
let data2 = decoded.value;
|
|
719
|
-
if (data2 &&
|
|
720
|
-
let result = data2[
|
|
719
|
+
if (data2 && _chunk74TFO7SNjs.SingleFetchRedirectSymbol in data2) {
|
|
720
|
+
let result = data2[_chunk74TFO7SNjs.SingleFetchRedirectSymbol];
|
|
721
721
|
let init = { status: result.status };
|
|
722
722
|
if (result.reload) {
|
|
723
|
-
throw
|
|
723
|
+
throw _chunk74TFO7SNjs.redirectDocument.call(void 0, result.redirect, init);
|
|
724
724
|
} else if (result.replace) {
|
|
725
|
-
throw
|
|
725
|
+
throw _chunk74TFO7SNjs.replace.call(void 0, result.redirect, init);
|
|
726
726
|
} else {
|
|
727
|
-
throw
|
|
727
|
+
throw _chunk74TFO7SNjs.redirect.call(void 0, result.redirect, init);
|
|
728
728
|
}
|
|
729
729
|
} else {
|
|
730
730
|
invariant2(
|
|
@@ -788,7 +788,7 @@ function getDocumentHeaders(context, build) {
|
|
|
788
788
|
return route.module.headers;
|
|
789
789
|
});
|
|
790
790
|
}
|
|
791
|
-
function getDocumentHeadersImpl(context, getRouteHeadersFn) {
|
|
791
|
+
function getDocumentHeadersImpl(context, getRouteHeadersFn, _defaultHeaders) {
|
|
792
792
|
let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors[m.route.id]) : -1;
|
|
793
793
|
let matches = boundaryIdx >= 0 ? context.matches.slice(0, boundaryIdx + 1) : context.matches;
|
|
794
794
|
let errorHeaders;
|
|
@@ -804,6 +804,7 @@ function getDocumentHeadersImpl(context, getRouteHeadersFn) {
|
|
|
804
804
|
return errorHeaders != null;
|
|
805
805
|
});
|
|
806
806
|
}
|
|
807
|
+
const defaultHeaders = new Headers(_defaultHeaders);
|
|
807
808
|
return matches.reduce((parentHeaders, match, idx) => {
|
|
808
809
|
let { id } = match.route;
|
|
809
810
|
let loaderHeaders = context.loaderHeaders[id] || new Headers();
|
|
@@ -835,7 +836,7 @@ function getDocumentHeadersImpl(context, getRouteHeadersFn) {
|
|
|
835
836
|
prependCookies(loaderHeaders, headers);
|
|
836
837
|
prependCookies(parentHeaders, headers);
|
|
837
838
|
return headers;
|
|
838
|
-
}, new Headers());
|
|
839
|
+
}, new Headers(defaultHeaders));
|
|
839
840
|
}
|
|
840
841
|
function prependCookies(parentHeaders, childHeaders) {
|
|
841
842
|
let parentSetCookieString = parentHeaders.get("Set-Cookie");
|
|
@@ -852,7 +853,7 @@ function prependCookies(parentHeaders, childHeaders) {
|
|
|
852
853
|
|
|
853
854
|
// lib/server-runtime/single-fetch.ts
|
|
854
855
|
var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
|
|
855
|
-
...
|
|
856
|
+
..._chunk74TFO7SNjs.NO_BODY_STATUS_CODES,
|
|
856
857
|
304
|
|
857
858
|
]);
|
|
858
859
|
async function singleFetchAction(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
|
|
@@ -882,10 +883,10 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
|
|
|
882
883
|
return handleQueryError(error);
|
|
883
884
|
}
|
|
884
885
|
function handleQueryResult(result) {
|
|
885
|
-
if (!
|
|
886
|
+
if (!_chunk74TFO7SNjs.isResponse.call(void 0, result)) {
|
|
886
887
|
result = staticContextToResponse(result);
|
|
887
888
|
}
|
|
888
|
-
if (
|
|
889
|
+
if (_chunk74TFO7SNjs.isRedirectResponse.call(void 0, result)) {
|
|
889
890
|
return generateSingleFetchResponse(request, build, serverMode, {
|
|
890
891
|
result: getSingleFetchRedirect(
|
|
891
892
|
result.status,
|
|
@@ -893,7 +894,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
|
|
|
893
894
|
build.basename
|
|
894
895
|
),
|
|
895
896
|
headers: result.headers,
|
|
896
|
-
status:
|
|
897
|
+
status: _chunk74TFO7SNjs.SINGLE_FETCH_REDIRECT_STATUS
|
|
897
898
|
});
|
|
898
899
|
}
|
|
899
900
|
return result;
|
|
@@ -908,7 +909,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
|
|
|
908
909
|
}
|
|
909
910
|
function staticContextToResponse(context) {
|
|
910
911
|
let headers = getDocumentHeaders(context, build);
|
|
911
|
-
if (
|
|
912
|
+
if (_chunk74TFO7SNjs.isRedirectStatusCode.call(void 0, context.statusCode) && headers.has("Location")) {
|
|
912
913
|
return generateSingleFetchResponse(request, build, serverMode, {
|
|
913
914
|
result: getSingleFetchRedirect(
|
|
914
915
|
context.statusCode,
|
|
@@ -916,12 +917,12 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
|
|
|
916
917
|
build.basename
|
|
917
918
|
),
|
|
918
919
|
headers,
|
|
919
|
-
status:
|
|
920
|
+
status: _chunk74TFO7SNjs.SINGLE_FETCH_REDIRECT_STATUS
|
|
920
921
|
});
|
|
921
922
|
}
|
|
922
923
|
if (context.errors) {
|
|
923
924
|
Object.values(context.errors).forEach((err) => {
|
|
924
|
-
if (!
|
|
925
|
+
if (!_chunk74TFO7SNjs.isRouteErrorResponse.call(void 0, err) || err.error) {
|
|
925
926
|
handleError(err);
|
|
926
927
|
}
|
|
927
928
|
});
|
|
@@ -968,18 +969,18 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
|
|
|
968
969
|
return handleQueryError(error);
|
|
969
970
|
}
|
|
970
971
|
function handleQueryResult(result) {
|
|
971
|
-
let response =
|
|
972
|
-
if (
|
|
972
|
+
let response = _chunk74TFO7SNjs.isResponse.call(void 0, result) ? result : staticContextToResponse(result);
|
|
973
|
+
if (_chunk74TFO7SNjs.isRedirectResponse.call(void 0, response)) {
|
|
973
974
|
return generateSingleFetchResponse(request, build, serverMode, {
|
|
974
975
|
result: {
|
|
975
|
-
[
|
|
976
|
+
[_chunk74TFO7SNjs.SingleFetchRedirectSymbol]: getSingleFetchRedirect(
|
|
976
977
|
response.status,
|
|
977
978
|
response.headers,
|
|
978
979
|
build.basename
|
|
979
980
|
)
|
|
980
981
|
},
|
|
981
982
|
headers: response.headers,
|
|
982
|
-
status:
|
|
983
|
+
status: _chunk74TFO7SNjs.SINGLE_FETCH_REDIRECT_STATUS
|
|
983
984
|
});
|
|
984
985
|
}
|
|
985
986
|
return response;
|
|
@@ -994,22 +995,22 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
|
|
|
994
995
|
}
|
|
995
996
|
function staticContextToResponse(context) {
|
|
996
997
|
let headers = getDocumentHeaders(context, build);
|
|
997
|
-
if (
|
|
998
|
+
if (_chunk74TFO7SNjs.isRedirectStatusCode.call(void 0, context.statusCode) && headers.has("Location")) {
|
|
998
999
|
return generateSingleFetchResponse(request, build, serverMode, {
|
|
999
1000
|
result: {
|
|
1000
|
-
[
|
|
1001
|
+
[_chunk74TFO7SNjs.SingleFetchRedirectSymbol]: getSingleFetchRedirect(
|
|
1001
1002
|
context.statusCode,
|
|
1002
1003
|
headers,
|
|
1003
1004
|
build.basename
|
|
1004
1005
|
)
|
|
1005
1006
|
},
|
|
1006
1007
|
headers,
|
|
1007
|
-
status:
|
|
1008
|
+
status: _chunk74TFO7SNjs.SINGLE_FETCH_REDIRECT_STATUS
|
|
1008
1009
|
});
|
|
1009
1010
|
}
|
|
1010
1011
|
if (context.errors) {
|
|
1011
1012
|
Object.values(context.errors).forEach((err) => {
|
|
1012
|
-
if (!
|
|
1013
|
+
if (!_chunk74TFO7SNjs.isRouteErrorResponse.call(void 0, err) || err.error) {
|
|
1013
1014
|
handleError(err);
|
|
1014
1015
|
}
|
|
1015
1016
|
});
|
|
@@ -1066,7 +1067,7 @@ function generateSingleFetchResponse(request, build, serverMode, {
|
|
|
1066
1067
|
function getSingleFetchRedirect(status, headers, basename) {
|
|
1067
1068
|
let redirect2 = headers.get("Location");
|
|
1068
1069
|
if (basename) {
|
|
1069
|
-
redirect2 =
|
|
1070
|
+
redirect2 = _chunk74TFO7SNjs.stripBasename.call(void 0, redirect2, basename) || redirect2;
|
|
1070
1071
|
}
|
|
1071
1072
|
return {
|
|
1072
1073
|
redirect: redirect2,
|
|
@@ -1092,7 +1093,7 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
|
|
|
1092
1093
|
typeof streamTimeout === "number" ? streamTimeout : 4950
|
|
1093
1094
|
);
|
|
1094
1095
|
requestSignal.addEventListener("abort", () => clearTimeout(timeoutId));
|
|
1095
|
-
return
|
|
1096
|
+
return _chunk74TFO7SNjs.encode.call(void 0, data2, {
|
|
1096
1097
|
signal: controller.signal,
|
|
1097
1098
|
plugins: [
|
|
1098
1099
|
(value) => {
|
|
@@ -1100,12 +1101,12 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
|
|
|
1100
1101
|
let { name, message, stack } = serverMode === "production" /* Production */ ? sanitizeError(value, serverMode) : value;
|
|
1101
1102
|
return ["SanitizedError", name, message, stack];
|
|
1102
1103
|
}
|
|
1103
|
-
if (value instanceof
|
|
1104
|
+
if (value instanceof _chunk74TFO7SNjs.ErrorResponseImpl) {
|
|
1104
1105
|
let { data: data3, status, statusText } = value;
|
|
1105
1106
|
return ["ErrorResponse", data3, status, statusText];
|
|
1106
1107
|
}
|
|
1107
|
-
if (value && typeof value === "object" &&
|
|
1108
|
-
return ["SingleFetchRedirect", value[
|
|
1108
|
+
if (value && typeof value === "object" && _chunk74TFO7SNjs.SingleFetchRedirectSymbol in value) {
|
|
1109
|
+
return ["SingleFetchRedirect", value[_chunk74TFO7SNjs.SingleFetchRedirectSymbol]];
|
|
1109
1110
|
}
|
|
1110
1111
|
}
|
|
1111
1112
|
],
|
|
@@ -1128,14 +1129,14 @@ function derive(build, mode) {
|
|
|
1128
1129
|
let routes = createRoutes(build.routes);
|
|
1129
1130
|
let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
|
|
1130
1131
|
let serverMode = isServerMode(mode) ? mode : "production" /* Production */;
|
|
1131
|
-
let staticHandler =
|
|
1132
|
+
let staticHandler = _chunk74TFO7SNjs.createStaticHandler.call(void 0, dataRoutes, {
|
|
1132
1133
|
basename: build.basename
|
|
1133
1134
|
});
|
|
1134
1135
|
let errorHandler = build.entry.module.handleError || ((error, { request }) => {
|
|
1135
1136
|
if (serverMode !== "test" /* Test */ && !request.signal.aborted) {
|
|
1136
1137
|
console.error(
|
|
1137
1138
|
// @ts-expect-error This is "private" from users but intended for internal use
|
|
1138
|
-
|
|
1139
|
+
_chunk74TFO7SNjs.isRouteErrorResponse.call(void 0, error) && error.error ? error.error : error
|
|
1139
1140
|
);
|
|
1140
1141
|
}
|
|
1141
1142
|
});
|
|
@@ -1181,26 +1182,26 @@ var createRequestHandler = (build, mode) => {
|
|
|
1181
1182
|
});
|
|
1182
1183
|
};
|
|
1183
1184
|
if (_build.future.unstable_middleware) {
|
|
1184
|
-
if (initialContext && !(initialContext instanceof
|
|
1185
|
+
if (initialContext && !(initialContext instanceof _chunk74TFO7SNjs.unstable_RouterContextProvider)) {
|
|
1185
1186
|
let error = new Error(
|
|
1186
1187
|
"Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `unstable_RouterContextProvider` from your `getLoadContext` function."
|
|
1187
1188
|
);
|
|
1188
1189
|
handleError(error);
|
|
1189
1190
|
return returnLastResortErrorResponse(error, serverMode);
|
|
1190
1191
|
}
|
|
1191
|
-
loadContext = initialContext || new (0,
|
|
1192
|
+
loadContext = initialContext || new (0, _chunk74TFO7SNjs.unstable_RouterContextProvider)();
|
|
1192
1193
|
} else {
|
|
1193
1194
|
loadContext = initialContext || {};
|
|
1194
1195
|
}
|
|
1195
1196
|
let url = new URL(request.url);
|
|
1196
1197
|
let normalizedBasename = _build.basename || "/";
|
|
1197
1198
|
let normalizedPath = url.pathname;
|
|
1198
|
-
if (
|
|
1199
|
+
if (_chunk74TFO7SNjs.stripBasename.call(void 0, normalizedPath, normalizedBasename) === "/_root.data") {
|
|
1199
1200
|
normalizedPath = normalizedBasename;
|
|
1200
1201
|
} else if (normalizedPath.endsWith(".data")) {
|
|
1201
1202
|
normalizedPath = normalizedPath.replace(/\.data$/, "");
|
|
1202
1203
|
}
|
|
1203
|
-
if (
|
|
1204
|
+
if (_chunk74TFO7SNjs.stripBasename.call(void 0, normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
|
|
1204
1205
|
normalizedPath = normalizedPath.slice(0, -1);
|
|
1205
1206
|
}
|
|
1206
1207
|
let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
|
|
@@ -1211,7 +1212,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1211
1212
|
} else if (!_build.prerender.includes(decodedPath) && !_build.prerender.includes(decodedPath + "/")) {
|
|
1212
1213
|
if (url.pathname.endsWith(".data")) {
|
|
1213
1214
|
errorHandler(
|
|
1214
|
-
new (0,
|
|
1215
|
+
new (0, _chunk74TFO7SNjs.ErrorResponseImpl)(
|
|
1215
1216
|
404,
|
|
1216
1217
|
"Not Found",
|
|
1217
1218
|
`Refusing to SSR the path \`${decodedPath}\` because \`ssr:false\` is set and the path is not included in the \`prerender\` config, so in production the path will be a 404.`
|
|
@@ -1231,7 +1232,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1231
1232
|
}
|
|
1232
1233
|
}
|
|
1233
1234
|
}
|
|
1234
|
-
let manifestUrl =
|
|
1235
|
+
let manifestUrl = _chunk74TFO7SNjs.getManifestPath.call(void 0,
|
|
1235
1236
|
_build.routeDiscovery.manifestPath,
|
|
1236
1237
|
normalizedBasename
|
|
1237
1238
|
);
|
|
@@ -1272,7 +1273,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1272
1273
|
params: singleFetchMatches ? singleFetchMatches[0].params : {},
|
|
1273
1274
|
request
|
|
1274
1275
|
});
|
|
1275
|
-
if (
|
|
1276
|
+
if (_chunk74TFO7SNjs.isRedirectResponse.call(void 0, response)) {
|
|
1276
1277
|
let result = getSingleFetchRedirect(
|
|
1277
1278
|
response.status,
|
|
1278
1279
|
response.headers,
|
|
@@ -1280,7 +1281,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1280
1281
|
);
|
|
1281
1282
|
if (request.method === "GET") {
|
|
1282
1283
|
result = {
|
|
1283
|
-
[
|
|
1284
|
+
[_chunk74TFO7SNjs.SingleFetchRedirectSymbol]: result
|
|
1284
1285
|
};
|
|
1285
1286
|
}
|
|
1286
1287
|
let headers = new Headers(response.headers);
|
|
@@ -1293,7 +1294,7 @@ var createRequestHandler = (build, mode) => {
|
|
|
1293
1294
|
serverMode
|
|
1294
1295
|
),
|
|
1295
1296
|
{
|
|
1296
|
-
status:
|
|
1297
|
+
status: _chunk74TFO7SNjs.SINGLE_FETCH_REDIRECT_STATUS,
|
|
1297
1298
|
headers
|
|
1298
1299
|
}
|
|
1299
1300
|
);
|
|
@@ -1407,7 +1408,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
|
|
|
1407
1408
|
unstable_generateMiddlewareResponse: build.future.unstable_middleware ? async (query) => {
|
|
1408
1409
|
try {
|
|
1409
1410
|
let innerResult = await query(request);
|
|
1410
|
-
if (!
|
|
1411
|
+
if (!_chunk74TFO7SNjs.isResponse.call(void 0, innerResult)) {
|
|
1411
1412
|
innerResult = await renderHtml(innerResult, isSpaMode);
|
|
1412
1413
|
}
|
|
1413
1414
|
return innerResult;
|
|
@@ -1417,7 +1418,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
|
|
|
1417
1418
|
}
|
|
1418
1419
|
} : void 0
|
|
1419
1420
|
});
|
|
1420
|
-
if (!
|
|
1421
|
+
if (!_chunk74TFO7SNjs.isResponse.call(void 0, result)) {
|
|
1421
1422
|
result = await renderHtml(result, isSpaMode);
|
|
1422
1423
|
}
|
|
1423
1424
|
return result;
|
|
@@ -1432,7 +1433,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
|
|
|
1432
1433
|
}
|
|
1433
1434
|
if (context.errors) {
|
|
1434
1435
|
Object.values(context.errors).forEach((err) => {
|
|
1435
|
-
if (!
|
|
1436
|
+
if (!_chunk74TFO7SNjs.isRouteErrorResponse.call(void 0, err) || err.error) {
|
|
1436
1437
|
handleError(err);
|
|
1437
1438
|
}
|
|
1438
1439
|
});
|
|
@@ -1484,10 +1485,10 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
|
|
|
1484
1485
|
} catch (error) {
|
|
1485
1486
|
handleError(error);
|
|
1486
1487
|
let errorForSecondRender = error;
|
|
1487
|
-
if (
|
|
1488
|
+
if (_chunk74TFO7SNjs.isResponse.call(void 0, error)) {
|
|
1488
1489
|
try {
|
|
1489
1490
|
let data2 = await unwrapResponse(error);
|
|
1490
|
-
errorForSecondRender = new (0,
|
|
1491
|
+
errorForSecondRender = new (0, _chunk74TFO7SNjs.ErrorResponseImpl)(
|
|
1491
1492
|
error.status,
|
|
1492
1493
|
error.statusText,
|
|
1493
1494
|
data2
|
|
@@ -1495,7 +1496,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
|
|
|
1495
1496
|
} catch (e) {
|
|
1496
1497
|
}
|
|
1497
1498
|
}
|
|
1498
|
-
context =
|
|
1499
|
+
context = _chunk74TFO7SNjs.getStaticContextFromError.call(void 0,
|
|
1499
1500
|
staticHandler.dataRoutes,
|
|
1500
1501
|
context,
|
|
1501
1502
|
errorForSecondRender
|
|
@@ -1554,7 +1555,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
|
|
|
1554
1555
|
return handleQueryRouteError(error);
|
|
1555
1556
|
}
|
|
1556
1557
|
function handleQueryRouteResult(result) {
|
|
1557
|
-
if (
|
|
1558
|
+
if (_chunk74TFO7SNjs.isResponse.call(void 0, result)) {
|
|
1558
1559
|
return result;
|
|
1559
1560
|
}
|
|
1560
1561
|
if (typeof result === "string") {
|
|
@@ -1563,11 +1564,11 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
|
|
|
1563
1564
|
return Response.json(result);
|
|
1564
1565
|
}
|
|
1565
1566
|
function handleQueryRouteError(error) {
|
|
1566
|
-
if (
|
|
1567
|
+
if (_chunk74TFO7SNjs.isResponse.call(void 0, error)) {
|
|
1567
1568
|
error.headers.set("X-Remix-Catch", "yes");
|
|
1568
1569
|
return error;
|
|
1569
1570
|
}
|
|
1570
|
-
if (
|
|
1571
|
+
if (_chunk74TFO7SNjs.isRouteErrorResponse.call(void 0, error)) {
|
|
1571
1572
|
handleError(error);
|
|
1572
1573
|
return errorResponseToJson(error, serverMode);
|
|
1573
1574
|
}
|
|
@@ -1693,7 +1694,7 @@ function createSessionStorage({
|
|
|
1693
1694
|
};
|
|
1694
1695
|
}
|
|
1695
1696
|
function warnOnceAboutSigningSessionCookie(cookie) {
|
|
1696
|
-
|
|
1697
|
+
_chunk74TFO7SNjs.warnOnce.call(void 0,
|
|
1697
1698
|
cookie.isSigned,
|
|
1698
1699
|
`The "${cookie.name}" cookie is not signed, but session cookies should be signed to prevent tampering on the client before they are sent back to the server. See https://reactrouter.com/explanation/sessions-and-cookies#signing-cookies for more information.`
|
|
1699
1700
|
);
|
|
@@ -1788,12 +1789,12 @@ function getHydrationData(state, routes, getRouteInfo, location2, basename, isSp
|
|
|
1788
1789
|
...state,
|
|
1789
1790
|
loaderData: { ...state.loaderData }
|
|
1790
1791
|
};
|
|
1791
|
-
let initialMatches =
|
|
1792
|
+
let initialMatches = _chunk74TFO7SNjs.matchRoutes.call(void 0, routes, location2, basename);
|
|
1792
1793
|
if (initialMatches) {
|
|
1793
1794
|
for (let match of initialMatches) {
|
|
1794
1795
|
let routeId = match.route.id;
|
|
1795
1796
|
let routeInfo = getRouteInfo(routeId);
|
|
1796
|
-
if (
|
|
1797
|
+
if (_chunk74TFO7SNjs.shouldHydrateRouteLoader.call(void 0,
|
|
1797
1798
|
routeId,
|
|
1798
1799
|
routeInfo.clientLoader,
|
|
1799
1800
|
routeInfo.hasLoader,
|
|
@@ -1871,7 +1872,7 @@ function RSCDefaultRootErrorBoundaryImpl({
|
|
|
1871
1872
|
}
|
|
1872
1873
|
}
|
|
1873
1874
|
);
|
|
1874
|
-
if (
|
|
1875
|
+
if (_chunk74TFO7SNjs.isRouteErrorResponse.call(void 0, error)) {
|
|
1875
1876
|
return /* @__PURE__ */ React.default.createElement(
|
|
1876
1877
|
ErrorWrapper,
|
|
1877
1878
|
{
|
|
@@ -1879,7 +1880,7 @@ function RSCDefaultRootErrorBoundaryImpl({
|
|
|
1879
1880
|
title: "Unhandled Thrown Response!"
|
|
1880
1881
|
},
|
|
1881
1882
|
/* @__PURE__ */ React.default.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText),
|
|
1882
|
-
|
|
1883
|
+
_chunk74TFO7SNjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
|
|
1883
1884
|
);
|
|
1884
1885
|
}
|
|
1885
1886
|
let errorInstance;
|
|
@@ -1905,7 +1906,7 @@ function RSCDefaultRootErrorBoundaryImpl({
|
|
|
1905
1906
|
function RSCDefaultRootErrorBoundary({
|
|
1906
1907
|
hasRootLayout
|
|
1907
1908
|
}) {
|
|
1908
|
-
let error =
|
|
1909
|
+
let error = _chunk74TFO7SNjs.useRouteError.call(void 0, );
|
|
1909
1910
|
if (hasRootLayout === void 0) {
|
|
1910
1911
|
throw new Error("Missing 'hasRootLayout' prop");
|
|
1911
1912
|
}
|
|
@@ -2019,7 +2020,7 @@ function createRouterFromPayload({
|
|
|
2019
2020
|
if (payload.type !== "render") throw new Error("Invalid payload type");
|
|
2020
2021
|
let patches = /* @__PURE__ */ new Map();
|
|
2021
2022
|
_optionalChain([payload, 'access', _20 => _20.patches, 'optionalAccess', _21 => _21.forEach, 'call', _22 => _22((patch) => {
|
|
2022
|
-
|
|
2023
|
+
_chunk74TFO7SNjs.invariant.call(void 0, patch.parentId, "Invalid patch parentId");
|
|
2023
2024
|
if (!patches.has(patch.parentId)) {
|
|
2024
2025
|
patches.set(patch.parentId, []);
|
|
2025
2026
|
}
|
|
@@ -2041,11 +2042,11 @@ function createRouterFromPayload({
|
|
|
2041
2042
|
}
|
|
2042
2043
|
return [route];
|
|
2043
2044
|
}, []);
|
|
2044
|
-
globalVar.__router =
|
|
2045
|
+
globalVar.__router = _chunk74TFO7SNjs.createRouter.call(void 0, {
|
|
2045
2046
|
routes,
|
|
2046
2047
|
unstable_getContext,
|
|
2047
2048
|
basename: payload.basename,
|
|
2048
|
-
history:
|
|
2049
|
+
history: _chunk74TFO7SNjs.createBrowserHistory.call(void 0, ),
|
|
2049
2050
|
hydrationData: getHydrationData(
|
|
2050
2051
|
{
|
|
2051
2052
|
loaderData: payload.loaderData,
|
|
@@ -2055,7 +2056,7 @@ function createRouterFromPayload({
|
|
|
2055
2056
|
routes,
|
|
2056
2057
|
(routeId) => {
|
|
2057
2058
|
let match = payload.matches.find((m) => m.id === routeId);
|
|
2058
|
-
|
|
2059
|
+
_chunk74TFO7SNjs.invariant.call(void 0, match, "Route not found in payload");
|
|
2059
2060
|
return {
|
|
2060
2061
|
clientLoader: match.clientLoader,
|
|
2061
2062
|
hasLoader: match.hasLoader,
|
|
@@ -2100,9 +2101,9 @@ function createRouterFromPayload({
|
|
|
2100
2101
|
});
|
|
2101
2102
|
return globalVar.__router;
|
|
2102
2103
|
}
|
|
2103
|
-
var renderedRoutesContext =
|
|
2104
|
+
var renderedRoutesContext = _chunk74TFO7SNjs.unstable_createContext.call(void 0, );
|
|
2104
2105
|
function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
|
|
2105
|
-
let dataStrategy =
|
|
2106
|
+
let dataStrategy = _chunk74TFO7SNjs.getSingleFetchDataStrategyImpl.call(void 0,
|
|
2106
2107
|
getRouter,
|
|
2107
2108
|
(match) => {
|
|
2108
2109
|
let M = match;
|
|
@@ -2156,20 +2157,20 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
|
|
|
2156
2157
|
function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation) {
|
|
2157
2158
|
return async (args, basename, targetRoutes) => {
|
|
2158
2159
|
let { request, context } = args;
|
|
2159
|
-
let url =
|
|
2160
|
+
let url = _chunk74TFO7SNjs.singleFetchUrl.call(void 0, request.url, basename, "rsc");
|
|
2160
2161
|
if (request.method === "GET") {
|
|
2161
|
-
url =
|
|
2162
|
+
url = _chunk74TFO7SNjs.stripIndexParam.call(void 0, url);
|
|
2162
2163
|
if (targetRoutes) {
|
|
2163
2164
|
url.searchParams.set("_routes", targetRoutes.join(","));
|
|
2164
2165
|
}
|
|
2165
2166
|
}
|
|
2166
2167
|
let res = await fetchImplementation(
|
|
2167
|
-
new Request(url, await
|
|
2168
|
+
new Request(url, await _chunk74TFO7SNjs.createRequestInit.call(void 0, request))
|
|
2168
2169
|
);
|
|
2169
2170
|
if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
|
|
2170
|
-
throw new (0,
|
|
2171
|
+
throw new (0, _chunk74TFO7SNjs.ErrorResponseImpl)(404, "Not Found", true);
|
|
2171
2172
|
}
|
|
2172
|
-
|
|
2173
|
+
_chunk74TFO7SNjs.invariant.call(void 0, res.body, "No response body to decode");
|
|
2173
2174
|
try {
|
|
2174
2175
|
const payload = await createFromReadableStream(res.body, {
|
|
2175
2176
|
temporaryReferences: void 0
|
|
@@ -2193,7 +2194,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
|
|
|
2193
2194
|
}
|
|
2194
2195
|
context.get(renderedRoutesContext).push(...payload.matches);
|
|
2195
2196
|
let results = { routes: {} };
|
|
2196
|
-
const dataKey =
|
|
2197
|
+
const dataKey = _chunk74TFO7SNjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
|
|
2197
2198
|
for (let [routeId, data2] of Object.entries(payload[dataKey] || {})) {
|
|
2198
2199
|
results.routes[routeId] = { data: data2 };
|
|
2199
2200
|
}
|
|
@@ -2315,7 +2316,7 @@ function RSCHydratedRouter({
|
|
|
2315
2316
|
routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
|
|
2316
2317
|
routeModules: {}
|
|
2317
2318
|
};
|
|
2318
|
-
return /* @__PURE__ */ React4.createElement(
|
|
2319
|
+
return /* @__PURE__ */ React4.createElement(_chunk74TFO7SNjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(_chunk74TFO7SNjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(_chunkHQ37R3FKjs.RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
|
|
2319
2320
|
}
|
|
2320
2321
|
function createRouteFromServerManifest(match, payload) {
|
|
2321
2322
|
let hasInitialData = payload && match.id in payload.loaderData;
|
|
@@ -2375,7 +2376,7 @@ function createRouteFromServerManifest(match, payload) {
|
|
|
2375
2376
|
return await callSingleFetch(singleFetch);
|
|
2376
2377
|
}
|
|
2377
2378
|
}) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : () => {
|
|
2378
|
-
throw
|
|
2379
|
+
throw _chunk74TFO7SNjs.noActionDefinedError.call(void 0, "action", match.id);
|
|
2379
2380
|
},
|
|
2380
2381
|
path: match.path,
|
|
2381
2382
|
shouldRevalidate: match.shouldRevalidate,
|
|
@@ -2388,7 +2389,7 @@ function createRouteFromServerManifest(match, payload) {
|
|
|
2388
2389
|
hasShouldRevalidate: match.shouldRevalidate != null
|
|
2389
2390
|
};
|
|
2390
2391
|
if (typeof dataRoute.loader === "function") {
|
|
2391
|
-
dataRoute.loader.hydrate =
|
|
2392
|
+
dataRoute.loader.hydrate = _chunk74TFO7SNjs.shouldHydrateRouteLoader.call(void 0,
|
|
2392
2393
|
match.id,
|
|
2393
2394
|
match.clientLoader,
|
|
2394
2395
|
match.hasLoader,
|
|
@@ -2398,7 +2399,7 @@ function createRouteFromServerManifest(match, payload) {
|
|
|
2398
2399
|
return dataRoute;
|
|
2399
2400
|
}
|
|
2400
2401
|
function callSingleFetch(singleFetch) {
|
|
2401
|
-
|
|
2402
|
+
_chunk74TFO7SNjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
|
|
2402
2403
|
return singleFetch();
|
|
2403
2404
|
}
|
|
2404
2405
|
function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
|
|
@@ -2406,7 +2407,7 @@ function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
|
|
|
2406
2407
|
let fn = type === "action" ? "serverAction()" : "serverLoader()";
|
|
2407
2408
|
let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${routeId}")`;
|
|
2408
2409
|
console.error(msg);
|
|
2409
|
-
throw new (0,
|
|
2410
|
+
throw new (0, _chunk74TFO7SNjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
|
|
2410
2411
|
}
|
|
2411
2412
|
}
|
|
2412
2413
|
var nextPaths = /* @__PURE__ */ new Set();
|
|
@@ -2597,6 +2598,20 @@ async function routeRSCServerRequest({
|
|
|
2597
2598
|
return payloadPromise;
|
|
2598
2599
|
};
|
|
2599
2600
|
try {
|
|
2601
|
+
const payload = await getPayload();
|
|
2602
|
+
if (serverResponse.status === _chunk74TFO7SNjs.SINGLE_FETCH_REDIRECT_STATUS && payload.type === "redirect") {
|
|
2603
|
+
const headers2 = new Headers(serverResponse.headers);
|
|
2604
|
+
headers2.delete("Content-Encoding");
|
|
2605
|
+
headers2.delete("Content-Length");
|
|
2606
|
+
headers2.delete("Content-Type");
|
|
2607
|
+
headers2.delete("x-remix-response");
|
|
2608
|
+
headers2.set("Location", payload.location);
|
|
2609
|
+
return new Response(_optionalChain([serverResponseB, 'optionalAccess', _37 => _37.body]) || "", {
|
|
2610
|
+
headers: headers2,
|
|
2611
|
+
status: payload.status,
|
|
2612
|
+
statusText: serverResponse.statusText
|
|
2613
|
+
});
|
|
2614
|
+
}
|
|
2600
2615
|
const html = await renderHTML(getPayload);
|
|
2601
2616
|
const headers = new Headers(serverResponse.headers);
|
|
2602
2617
|
headers.set("Content-Type", "text/html");
|
|
@@ -2606,7 +2621,7 @@ async function routeRSCServerRequest({
|
|
|
2606
2621
|
headers
|
|
2607
2622
|
});
|
|
2608
2623
|
}
|
|
2609
|
-
if (!_optionalChain([serverResponseB, 'optionalAccess',
|
|
2624
|
+
if (!_optionalChain([serverResponseB, 'optionalAccess', _38 => _38.body])) {
|
|
2610
2625
|
throw new Error("Failed to clone server response");
|
|
2611
2626
|
}
|
|
2612
2627
|
const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body));
|
|
@@ -2634,7 +2649,7 @@ function RSCStaticRouter({ getPayload }) {
|
|
|
2634
2649
|
if (payload.type !== "render") return null;
|
|
2635
2650
|
let patchedLoaderData = { ...payload.loaderData };
|
|
2636
2651
|
for (const match of payload.matches) {
|
|
2637
|
-
if (
|
|
2652
|
+
if (_chunk74TFO7SNjs.shouldHydrateRouteLoader.call(void 0,
|
|
2638
2653
|
match.id,
|
|
2639
2654
|
match.clientLoader,
|
|
2640
2655
|
match.hasLoader,
|
|
@@ -2668,7 +2683,7 @@ function RSCStaticRouter({ getPayload }) {
|
|
|
2668
2683
|
}
|
|
2669
2684
|
}))
|
|
2670
2685
|
};
|
|
2671
|
-
const router =
|
|
2686
|
+
const router = _chunkHQ37R3FKjs.createStaticRouter.call(void 0,
|
|
2672
2687
|
payload.matches.reduceRight((previous, match) => {
|
|
2673
2688
|
const route = {
|
|
2674
2689
|
id: match.id,
|
|
@@ -2712,8 +2727,8 @@ function RSCStaticRouter({ getPayload }) {
|
|
|
2712
2727
|
routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
|
|
2713
2728
|
routeModules: {}
|
|
2714
2729
|
};
|
|
2715
|
-
return /* @__PURE__ */ React5.createElement(
|
|
2716
|
-
|
|
2730
|
+
return /* @__PURE__ */ React5.createElement(_chunk74TFO7SNjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React5.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React5.createElement(_chunk74TFO7SNjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React5.createElement(
|
|
2731
|
+
_chunkHQ37R3FKjs.StaticRouterProvider,
|
|
2717
2732
|
{
|
|
2718
2733
|
context,
|
|
2719
2734
|
router,
|
|
@@ -2756,10 +2771,10 @@ function getRSCStream() {
|
|
|
2756
2771
|
});
|
|
2757
2772
|
if (typeof document !== "undefined" && document.readyState === "loading") {
|
|
2758
2773
|
document.addEventListener("DOMContentLoaded", () => {
|
|
2759
|
-
_optionalChain([streamController, 'optionalAccess',
|
|
2774
|
+
_optionalChain([streamController, 'optionalAccess', _39 => _39.close, 'call', _40 => _40()]);
|
|
2760
2775
|
});
|
|
2761
2776
|
} else {
|
|
2762
|
-
_optionalChain([streamController, 'optionalAccess',
|
|
2777
|
+
_optionalChain([streamController, 'optionalAccess', _41 => _41.close, 'call', _42 => _42()]);
|
|
2763
2778
|
}
|
|
2764
2779
|
return rscStream;
|
|
2765
2780
|
}
|
|
@@ -2771,7 +2786,7 @@ function deserializeErrors(errors) {
|
|
|
2771
2786
|
let serialized = {};
|
|
2772
2787
|
for (let [key, val] of entries) {
|
|
2773
2788
|
if (val && val.__type === "RouteErrorResponse") {
|
|
2774
|
-
serialized[key] = new (0,
|
|
2789
|
+
serialized[key] = new (0, _chunk74TFO7SNjs.ErrorResponseImpl)(
|
|
2775
2790
|
val.status,
|
|
2776
2791
|
val.statusText,
|
|
2777
2792
|
val.data,
|
|
@@ -2929,4 +2944,4 @@ function deserializeErrors(errors) {
|
|
|
2929
2944
|
|
|
2930
2945
|
|
|
2931
2946
|
|
|
2932
|
-
exports.Await =
|
|
2947
|
+
exports.Await = _chunkHQ37R3FKjs.Await; exports.BrowserRouter = _chunkHQ37R3FKjs.BrowserRouter; exports.Form = _chunkHQ37R3FKjs.Form; exports.HashRouter = _chunkHQ37R3FKjs.HashRouter; exports.IDLE_BLOCKER = _chunk74TFO7SNjs.IDLE_BLOCKER; exports.IDLE_FETCHER = _chunk74TFO7SNjs.IDLE_FETCHER; exports.IDLE_NAVIGATION = _chunk74TFO7SNjs.IDLE_NAVIGATION; exports.Link = _chunkHQ37R3FKjs.Link; exports.Links = _chunk74TFO7SNjs.Links; exports.MemoryRouter = _chunkHQ37R3FKjs.MemoryRouter; exports.Meta = _chunk74TFO7SNjs.Meta; exports.NavLink = _chunkHQ37R3FKjs.NavLink; exports.Navigate = _chunkHQ37R3FKjs.Navigate; exports.NavigationType = _chunk74TFO7SNjs.Action; exports.Outlet = _chunkHQ37R3FKjs.Outlet; exports.PrefetchPageLinks = _chunk74TFO7SNjs.PrefetchPageLinks; exports.Route = _chunkHQ37R3FKjs.Route; exports.Router = _chunkHQ37R3FKjs.Router; exports.RouterProvider = _chunkHQ37R3FKjs.RouterProvider; exports.Routes = _chunkHQ37R3FKjs.Routes; exports.Scripts = _chunk74TFO7SNjs.Scripts; exports.ScrollRestoration = _chunkHQ37R3FKjs.ScrollRestoration; exports.ServerRouter = ServerRouter; exports.StaticRouter = _chunkHQ37R3FKjs.StaticRouter; exports.StaticRouterProvider = _chunkHQ37R3FKjs.StaticRouterProvider; exports.UNSAFE_DataRouterContext = _chunk74TFO7SNjs.DataRouterContext; exports.UNSAFE_DataRouterStateContext = _chunk74TFO7SNjs.DataRouterStateContext; exports.UNSAFE_ErrorResponseImpl = _chunk74TFO7SNjs.ErrorResponseImpl; exports.UNSAFE_FetchersContext = _chunk74TFO7SNjs.FetchersContext; exports.UNSAFE_FrameworkContext = _chunk74TFO7SNjs.FrameworkContext; exports.UNSAFE_LocationContext = _chunk74TFO7SNjs.LocationContext; exports.UNSAFE_NavigationContext = _chunk74TFO7SNjs.NavigationContext; exports.UNSAFE_RSCDefaultRootErrorBoundary = RSCDefaultRootErrorBoundary; exports.UNSAFE_RemixErrorBoundary = _chunk74TFO7SNjs.RemixErrorBoundary; exports.UNSAFE_RouteContext = _chunk74TFO7SNjs.RouteContext; exports.UNSAFE_ServerMode = ServerMode; exports.UNSAFE_SingleFetchRedirectSymbol = _chunk74TFO7SNjs.SingleFetchRedirectSymbol; exports.UNSAFE_ViewTransitionContext = _chunk74TFO7SNjs.ViewTransitionContext; exports.UNSAFE_WithComponentProps = _chunkHQ37R3FKjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkHQ37R3FKjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkHQ37R3FKjs.WithHydrateFallbackProps; exports.UNSAFE_createBrowserHistory = _chunk74TFO7SNjs.createBrowserHistory; exports.UNSAFE_createClientRoutes = _chunk74TFO7SNjs.createClientRoutes; exports.UNSAFE_createClientRoutesWithHMRRevalidationOptOut = _chunk74TFO7SNjs.createClientRoutesWithHMRRevalidationOptOut; exports.UNSAFE_createRouter = _chunk74TFO7SNjs.createRouter; exports.UNSAFE_decodeViaTurboStream = _chunk74TFO7SNjs.decodeViaTurboStream; exports.UNSAFE_deserializeErrors = deserializeErrors; exports.UNSAFE_getHydrationData = getHydrationData; exports.UNSAFE_getPatchRoutesOnNavigationFunction = _chunk74TFO7SNjs.getPatchRoutesOnNavigationFunction; exports.UNSAFE_getTurboStreamSingleFetchDataStrategy = _chunk74TFO7SNjs.getTurboStreamSingleFetchDataStrategy; exports.UNSAFE_hydrationRouteProperties = _chunkHQ37R3FKjs.hydrationRouteProperties; exports.UNSAFE_invariant = _chunk74TFO7SNjs.invariant; exports.UNSAFE_mapRouteProperties = _chunkHQ37R3FKjs.mapRouteProperties; exports.UNSAFE_shouldHydrateRouteLoader = _chunk74TFO7SNjs.shouldHydrateRouteLoader; exports.UNSAFE_useFogOFWarDiscovery = _chunk74TFO7SNjs.useFogOFWarDiscovery; exports.UNSAFE_useScrollRestoration = _chunkHQ37R3FKjs.useScrollRestoration; exports.UNSAFE_withComponentProps = _chunkHQ37R3FKjs.withComponentProps; exports.UNSAFE_withErrorBoundaryProps = _chunkHQ37R3FKjs.withErrorBoundaryProps; exports.UNSAFE_withHydrateFallbackProps = _chunkHQ37R3FKjs.withHydrateFallbackProps; exports.createBrowserRouter = _chunkHQ37R3FKjs.createBrowserRouter; exports.createCookie = createCookie; exports.createCookieSessionStorage = createCookieSessionStorage; exports.createHashRouter = _chunkHQ37R3FKjs.createHashRouter; exports.createMemoryRouter = _chunkHQ37R3FKjs.createMemoryRouter; exports.createMemorySessionStorage = createMemorySessionStorage; exports.createPath = _chunk74TFO7SNjs.createPath; exports.createRequestHandler = createRequestHandler; exports.createRoutesFromChildren = _chunkHQ37R3FKjs.createRoutesFromChildren; exports.createRoutesFromElements = _chunkHQ37R3FKjs.createRoutesFromElements; exports.createRoutesStub = createRoutesStub; exports.createSearchParams = _chunkHQ37R3FKjs.createSearchParams; exports.createSession = createSession; exports.createSessionStorage = createSessionStorage; exports.createStaticHandler = _chunkHQ37R3FKjs.createStaticHandler; exports.createStaticRouter = _chunkHQ37R3FKjs.createStaticRouter; exports.data = _chunk74TFO7SNjs.data; exports.generatePath = _chunk74TFO7SNjs.generatePath; exports.href = href; exports.isCookie = isCookie; exports.isRouteErrorResponse = _chunk74TFO7SNjs.isRouteErrorResponse; exports.isSession = isSession; exports.matchPath = _chunk74TFO7SNjs.matchPath; exports.matchRoutes = _chunk74TFO7SNjs.matchRoutes; exports.parsePath = _chunk74TFO7SNjs.parsePath; exports.redirect = _chunk74TFO7SNjs.redirect; exports.redirectDocument = _chunk74TFO7SNjs.redirectDocument; exports.renderMatches = _chunkHQ37R3FKjs.renderMatches; exports.replace = _chunk74TFO7SNjs.replace; exports.resolvePath = _chunk74TFO7SNjs.resolvePath; exports.unstable_HistoryRouter = _chunkHQ37R3FKjs.HistoryRouter; exports.unstable_RSCHydratedRouter = RSCHydratedRouter; exports.unstable_RSCStaticRouter = RSCStaticRouter; exports.unstable_RouterContextProvider = _chunk74TFO7SNjs.unstable_RouterContextProvider; exports.unstable_createCallServer = createCallServer; exports.unstable_createContext = _chunk74TFO7SNjs.unstable_createContext; exports.unstable_getRSCStream = getRSCStream; exports.unstable_routeRSCServerRequest = routeRSCServerRequest; exports.unstable_setDevServerHooks = setDevServerHooks; exports.unstable_usePrompt = _chunkHQ37R3FKjs.usePrompt; exports.useActionData = _chunk74TFO7SNjs.useActionData; exports.useAsyncError = _chunk74TFO7SNjs.useAsyncError; exports.useAsyncValue = _chunk74TFO7SNjs.useAsyncValue; exports.useBeforeUnload = _chunkHQ37R3FKjs.useBeforeUnload; exports.useBlocker = _chunk74TFO7SNjs.useBlocker; exports.useFetcher = _chunkHQ37R3FKjs.useFetcher; exports.useFetchers = _chunkHQ37R3FKjs.useFetchers; exports.useFormAction = _chunkHQ37R3FKjs.useFormAction; exports.useHref = _chunk74TFO7SNjs.useHref; exports.useInRouterContext = _chunk74TFO7SNjs.useInRouterContext; exports.useLinkClickHandler = _chunkHQ37R3FKjs.useLinkClickHandler; exports.useLoaderData = _chunk74TFO7SNjs.useLoaderData; exports.useLocation = _chunk74TFO7SNjs.useLocation; exports.useMatch = _chunk74TFO7SNjs.useMatch; exports.useMatches = _chunk74TFO7SNjs.useMatches; exports.useNavigate = _chunk74TFO7SNjs.useNavigate; exports.useNavigation = _chunk74TFO7SNjs.useNavigation; exports.useNavigationType = _chunk74TFO7SNjs.useNavigationType; exports.useOutlet = _chunk74TFO7SNjs.useOutlet; exports.useOutletContext = _chunk74TFO7SNjs.useOutletContext; exports.useParams = _chunk74TFO7SNjs.useParams; exports.useResolvedPath = _chunk74TFO7SNjs.useResolvedPath; exports.useRevalidator = _chunk74TFO7SNjs.useRevalidator; exports.useRouteError = _chunk74TFO7SNjs.useRouteError; exports.useRouteLoaderData = _chunk74TFO7SNjs.useRouteLoaderData; exports.useRoutes = _chunk74TFO7SNjs.useRoutes; exports.useSearchParams = _chunkHQ37R3FKjs.useSearchParams; exports.useSubmit = _chunkHQ37R3FKjs.useSubmit; exports.useViewTransitionState = _chunkHQ37R3FKjs.useViewTransitionState;
|