one 1.9.7 → 1.9.8
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/cjs/cli/build.cjs +25 -19
- package/dist/cjs/cli/build.js +36 -24
- package/dist/cjs/cli/build.js.map +2 -2
- package/dist/cjs/cli/build.native.js +153 -117
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/createApp.cjs +12 -1
- package/dist/cjs/createApp.js +11 -1
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/createHandleRequest.cjs +1 -1
- package/dist/cjs/createHandleRequest.js +1 -1
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +1 -1
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/createHandleRequest.test.cjs +13 -7
- package/dist/cjs/createHandleRequest.test.js +6 -3
- package/dist/cjs/createHandleRequest.test.js.map +1 -1
- package/dist/cjs/createHandleRequest.test.native.js +13 -7
- package/dist/cjs/createHandleRequest.test.native.js.map +1 -1
- package/dist/cjs/notFoundState.cjs +103 -0
- package/dist/cjs/notFoundState.js +99 -0
- package/dist/cjs/notFoundState.js.map +6 -0
- package/dist/cjs/notFoundState.native.js +176 -0
- package/dist/cjs/notFoundState.native.js.map +1 -0
- package/dist/cjs/router/router.cjs +10 -3
- package/dist/cjs/router/router.js +9 -3
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +10 -3
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +21 -16
- package/dist/cjs/server/oneServe.js +24 -15
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +28 -26
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/useLoader.cjs +26 -9
- package/dist/cjs/useLoader.js +26 -11
- package/dist/cjs/useLoader.js.map +1 -1
- package/dist/cjs/useLoader.native.js +44 -17
- package/dist/cjs/useLoader.native.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.cjs +2 -2
- package/dist/cjs/utils/cleanUrl.js +2 -2
- package/dist/cjs/utils/cleanUrl.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.native.js +4 -2
- package/dist/cjs/utils/cleanUrl.native.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.test.cjs +64 -0
- package/dist/cjs/utils/cleanUrl.test.js +72 -0
- package/dist/cjs/utils/cleanUrl.test.js.map +6 -0
- package/dist/cjs/utils/cleanUrl.test.native.js +67 -0
- package/dist/cjs/utils/cleanUrl.test.native.js.map +1 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.cjs +60 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.js +72 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.js.map +6 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.native.js +65 -0
- package/dist/cjs/utils/getPathnameFromFilePath.test.native.js.map +1 -0
- package/dist/cjs/views/Navigator.cjs +18 -3
- package/dist/cjs/views/Navigator.js +13 -4
- package/dist/cjs/views/Navigator.js.map +2 -2
- package/dist/cjs/views/Navigator.native.js +21 -6
- package/dist/cjs/views/Navigator.native.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +23 -36
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +28 -34
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +30 -40
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/cli/build.js +36 -24
- package/dist/esm/cli/build.js.map +2 -2
- package/dist/esm/cli/build.mjs +25 -19
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +153 -117
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/createApp.js +11 -1
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +12 -1
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/createHandleRequest.js +1 -1
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +1 -1
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +1 -1
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/createHandleRequest.test.js +6 -3
- package/dist/esm/createHandleRequest.test.js.map +1 -1
- package/dist/esm/createHandleRequest.test.mjs +13 -7
- package/dist/esm/createHandleRequest.test.mjs.map +1 -1
- package/dist/esm/createHandleRequest.test.native.js +13 -7
- package/dist/esm/createHandleRequest.test.native.js.map +1 -1
- package/dist/esm/notFoundState.js +75 -0
- package/dist/esm/notFoundState.js.map +6 -0
- package/dist/esm/notFoundState.mjs +64 -0
- package/dist/esm/notFoundState.mjs.map +1 -0
- package/dist/esm/notFoundState.native.js +134 -0
- package/dist/esm/notFoundState.native.js.map +1 -0
- package/dist/esm/router/router.js +13 -2
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +9 -2
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +9 -2
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +24 -15
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +21 -16
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +28 -26
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/useLoader.js +27 -11
- package/dist/esm/useLoader.js.map +1 -1
- package/dist/esm/useLoader.mjs +27 -10
- package/dist/esm/useLoader.mjs.map +1 -1
- package/dist/esm/useLoader.native.js +45 -18
- package/dist/esm/useLoader.native.js.map +1 -1
- package/dist/esm/utils/cleanUrl.js +2 -2
- package/dist/esm/utils/cleanUrl.js.map +1 -1
- package/dist/esm/utils/cleanUrl.mjs +2 -2
- package/dist/esm/utils/cleanUrl.mjs.map +1 -1
- package/dist/esm/utils/cleanUrl.native.js +4 -2
- package/dist/esm/utils/cleanUrl.native.js.map +1 -1
- package/dist/esm/utils/cleanUrl.test.js +73 -0
- package/dist/esm/utils/cleanUrl.test.js.map +6 -0
- package/dist/esm/utils/cleanUrl.test.mjs +65 -0
- package/dist/esm/utils/cleanUrl.test.mjs.map +1 -0
- package/dist/esm/utils/cleanUrl.test.native.js +65 -0
- package/dist/esm/utils/cleanUrl.test.native.js.map +1 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.js +73 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.js.map +6 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.mjs +61 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.mjs.map +1 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.native.js +63 -0
- package/dist/esm/utils/getPathnameFromFilePath.test.native.js.map +1 -0
- package/dist/esm/views/Navigator.js +16 -1
- package/dist/esm/views/Navigator.js.map +1 -1
- package/dist/esm/views/Navigator.mjs +16 -1
- package/dist/esm/views/Navigator.mjs.map +1 -1
- package/dist/esm/views/Navigator.native.js +18 -3
- package/dist/esm/views/Navigator.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +28 -34
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +23 -36
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +30 -40
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/package.json +9 -9
- package/src/cli/build.ts +43 -30
- package/src/createApp.tsx +22 -0
- package/src/createHandleRequest.test.ts +11 -3
- package/src/createHandleRequest.ts +3 -1
- package/src/notFoundState.ts +158 -0
- package/src/router/router.ts +15 -1
- package/src/server/oneServe.ts +37 -14
- package/src/useLoader.ts +25 -12
- package/src/utils/cleanUrl.test.ts +120 -0
- package/src/utils/cleanUrl.ts +12 -11
- package/src/utils/getPathnameFromFilePath.test.ts +118 -0
- package/src/views/Navigator.tsx +28 -0
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +31 -45
- package/types/cli/build.d.ts.map +1 -1
- package/types/createApp.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/notFoundState.d.ts +13 -0
- package/types/notFoundState.d.ts.map +1 -0
- package/types/router/router.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/useLoader.d.ts.map +1 -1
- package/types/utils/cleanUrl.d.ts.map +1 -1
- package/types/utils/cleanUrl.test.d.ts +2 -0
- package/types/utils/cleanUrl.test.d.ts.map +1 -0
- package/types/utils/getPathnameFromFilePath.test.d.ts +2 -0
- package/types/utils/getPathnameFromFilePath.test.d.ts.map +1 -0
- package/types/views/Navigator.d.ts +2 -2
- package/types/views/Navigator.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
|
@@ -50,8 +50,10 @@ var import_native = require("@react-navigation/native"),
|
|
|
50
50
|
React = __toESM(require("react"), 1),
|
|
51
51
|
import_react_native_safe_area_context = require("react-native-safe-area-context"),
|
|
52
52
|
import_withLayoutContext = require("../layouts/withLayoutContext.cjs"),
|
|
53
|
+
import_notFoundState = require("../notFoundState.cjs"),
|
|
53
54
|
import_Route = require("../router/Route.cjs"),
|
|
54
55
|
import_router = require("../router/router.cjs"),
|
|
56
|
+
import_router2 = require("../router/router.cjs"),
|
|
55
57
|
import_useScreens = require("../router/useScreens.cjs"),
|
|
56
58
|
import_Screen = require("./Screen.cjs"),
|
|
57
59
|
import_interceptRoutes = require("../router/interceptRoutes.cjs"),
|
|
@@ -93,8 +95,8 @@ function Navigator({
|
|
|
93
95
|
isCustomNavigator: !0,
|
|
94
96
|
contextKey
|
|
95
97
|
});
|
|
96
|
-
(0,
|
|
97
|
-
(0,
|
|
98
|
+
(0, import_router2.registerProtectedRoutes)(contextKey, protectedScreens), React.useEffect(() => ((0, import_router2.registerProtectedRoutes)(contextKey, protectedScreens), () => {
|
|
99
|
+
(0, import_router2.unregisterProtectedRoutes)(contextKey);
|
|
98
100
|
}), [contextKey, protectedScreens]);
|
|
99
101
|
const sorted = (0, import_useScreens.useSortedScreens)(screens ?? [], {
|
|
100
102
|
protectedScreens
|
|
@@ -155,7 +157,20 @@ function useSlot() {
|
|
|
155
157
|
state,
|
|
156
158
|
descriptorsRef
|
|
157
159
|
} = context,
|
|
158
|
-
|
|
160
|
+
notFoundState = (0, import_notFoundState.useNotFoundState)();
|
|
161
|
+
if (notFoundState) {
|
|
162
|
+
const notFoundRouteNode = notFoundState.notFoundRouteNode || (0, import_notFoundState.findRouteNodeByPath)(notFoundState.notFoundPath, import_router.routeNode) || (0, import_notFoundState.findNearestNotFoundRoute)(notFoundState.originalPath, import_router.routeNode);
|
|
163
|
+
if (notFoundRouteNode) {
|
|
164
|
+
const NotFoundComponent = (0, import_useScreens.getQualifiedRouteComponent)(notFoundRouteNode);
|
|
165
|
+
return /* @__PURE__ */(0, import_jsx_runtime.jsx)(NotFoundComponent, {
|
|
166
|
+
route: {
|
|
167
|
+
params: {}
|
|
168
|
+
}
|
|
169
|
+
}, "one-not-found-inline");
|
|
170
|
+
}
|
|
171
|
+
return null;
|
|
172
|
+
}
|
|
173
|
+
const current = state.routes.find((route, i) => state.index === i);
|
|
159
174
|
if (!current) return null;
|
|
160
175
|
const renderedElement = descriptorsRef.current[current.key]?.render() ?? null;
|
|
161
176
|
return renderedElement !== null ? React.cloneElement(renderedElement, {
|
|
@@ -37,7 +37,7 @@ __export(Navigator_exports, {
|
|
|
37
37
|
useSlot: () => useSlot
|
|
38
38
|
});
|
|
39
39
|
module.exports = __toCommonJS(Navigator_exports);
|
|
40
|
-
var import_native = require("@react-navigation/native"), React = __toESM(require("react"), 1), import_react_native_safe_area_context = require("react-native-safe-area-context"), import_withLayoutContext = require("../layouts/withLayoutContext"), import_Route = require("../router/Route"), import_router = require("../router/router"), import_useScreens = require("../router/useScreens"), import_Screen = require("./Screen"), import_interceptRoutes = require("../router/interceptRoutes"), import_jsx_runtime = require("react/jsx-runtime");
|
|
40
|
+
var import_native = require("@react-navigation/native"), React = __toESM(require("react"), 1), import_react_native_safe_area_context = require("react-native-safe-area-context"), import_withLayoutContext = require("../layouts/withLayoutContext"), import_notFoundState = require("../notFoundState"), import_Route = require("../router/Route"), import_router = require("../router/router"), import_router2 = require("../router/router"), import_useScreens = require("../router/useScreens"), import_Screen = require("./Screen"), import_interceptRoutes = require("../router/interceptRoutes"), import_jsx_runtime = require("react/jsx-runtime");
|
|
41
41
|
const SLOT_STATIC_KEY = "one-slot-static-key", globalSlotState = /* @__PURE__ */ new Map(), slotStateListeners = /* @__PURE__ */ new Set();
|
|
42
42
|
function getSlotState(slotName) {
|
|
43
43
|
return globalSlotState.get(slotName);
|
|
@@ -72,8 +72,8 @@ function Navigator({
|
|
|
72
72
|
isCustomNavigator: !0,
|
|
73
73
|
contextKey
|
|
74
74
|
});
|
|
75
|
-
(0,
|
|
76
|
-
(0,
|
|
75
|
+
(0, import_router2.registerProtectedRoutes)(contextKey, protectedScreens), React.useEffect(() => ((0, import_router2.registerProtectedRoutes)(contextKey, protectedScreens), () => {
|
|
76
|
+
(0, import_router2.unregisterProtectedRoutes)(contextKey);
|
|
77
77
|
}), [contextKey, protectedScreens]);
|
|
78
78
|
const sorted = (0, import_useScreens.useSortedScreens)(screens ?? [], { protectedScreens });
|
|
79
79
|
return sorted.length ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
@@ -123,7 +123,16 @@ function useNavigatorContext() {
|
|
|
123
123
|
return context;
|
|
124
124
|
}
|
|
125
125
|
function useSlot() {
|
|
126
|
-
const context = useNavigatorContext(), { state, descriptorsRef } = context,
|
|
126
|
+
const context = useNavigatorContext(), { state, descriptorsRef } = context, notFoundState = (0, import_notFoundState.useNotFoundState)();
|
|
127
|
+
if (notFoundState) {
|
|
128
|
+
const notFoundRouteNode = notFoundState.notFoundRouteNode || (0, import_notFoundState.findRouteNodeByPath)(notFoundState.notFoundPath, import_router.routeNode) || (0, import_notFoundState.findNearestNotFoundRoute)(notFoundState.originalPath, import_router.routeNode);
|
|
129
|
+
if (notFoundRouteNode) {
|
|
130
|
+
const NotFoundComponent = (0, import_useScreens.getQualifiedRouteComponent)(notFoundRouteNode);
|
|
131
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(NotFoundComponent, { route: { params: {} } }, "one-not-found-inline");
|
|
132
|
+
}
|
|
133
|
+
return null;
|
|
134
|
+
}
|
|
135
|
+
const current = state.routes.find((route, i) => state.index === i);
|
|
127
136
|
if (!current)
|
|
128
137
|
return null;
|
|
129
138
|
const renderedElement = descriptorsRef.current[current.key]?.render() ?? null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/views/Navigator.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAIO,qCACP,QAAuB,8BACvB,wCAA6B,2CAC7B,2BAAwC,yCACxC,eAA8B,4BAC9B,
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["import_router", "globalRouteNode"]
|
|
6
6
|
}
|
|
@@ -53,8 +53,10 @@ var import_jsx_runtime = require("react/jsx-runtime"),
|
|
|
53
53
|
React = __toESM(require("react"), 1),
|
|
54
54
|
import_react_native_safe_area_context = require("react-native-safe-area-context"),
|
|
55
55
|
import_withLayoutContext = require("../layouts/withLayoutContext.native.js"),
|
|
56
|
+
import_notFoundState = require("../notFoundState.native.js"),
|
|
56
57
|
import_Route = require("../router/Route.native.js"),
|
|
57
58
|
import_router = require("../router/router.native.js"),
|
|
59
|
+
import_router2 = require("../router/router.native.js"),
|
|
58
60
|
import_useScreens = require("../router/useScreens.native.js"),
|
|
59
61
|
import_Screen = require("./Screen.native.js"),
|
|
60
62
|
import_interceptRoutes = require("../router/interceptRoutes.native.js"),
|
|
@@ -104,9 +106,9 @@ function Navigator(param) {
|
|
|
104
106
|
isCustomNavigator: !0,
|
|
105
107
|
contextKey
|
|
106
108
|
});
|
|
107
|
-
(0,
|
|
108
|
-
return (0,
|
|
109
|
-
(0,
|
|
109
|
+
(0, import_router2.registerProtectedRoutes)(contextKey, protectedScreens), React.useEffect(function () {
|
|
110
|
+
return (0, import_router2.registerProtectedRoutes)(contextKey, protectedScreens), function () {
|
|
111
|
+
(0, import_router2.unregisterProtectedRoutes)(contextKey);
|
|
110
112
|
};
|
|
111
113
|
}, [contextKey, protectedScreens]);
|
|
112
114
|
var sorted = (0, import_useScreens.useSortedScreens)(screens ?? [], {
|
|
@@ -173,9 +175,22 @@ function useSlot() {
|
|
|
173
175
|
state,
|
|
174
176
|
descriptorsRef
|
|
175
177
|
} = context,
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
178
|
+
notFoundState = (0, import_notFoundState.useNotFoundState)();
|
|
179
|
+
if (notFoundState) {
|
|
180
|
+
var notFoundRouteNode = notFoundState.notFoundRouteNode || (0, import_notFoundState.findRouteNodeByPath)(notFoundState.notFoundPath, import_router.routeNode) || (0, import_notFoundState.findNearestNotFoundRoute)(notFoundState.originalPath, import_router.routeNode);
|
|
181
|
+
if (notFoundRouteNode) {
|
|
182
|
+
var NotFoundComponent = (0, import_useScreens.getQualifiedRouteComponent)(notFoundRouteNode);
|
|
183
|
+
return /* @__PURE__ */(0, import_jsx_runtime.jsx)(NotFoundComponent, {
|
|
184
|
+
route: {
|
|
185
|
+
params: {}
|
|
186
|
+
}
|
|
187
|
+
}, "one-not-found-inline");
|
|
188
|
+
}
|
|
189
|
+
return null;
|
|
190
|
+
}
|
|
191
|
+
var current = state.routes.find(function (route, i) {
|
|
192
|
+
return state.index === i;
|
|
193
|
+
});
|
|
179
194
|
if (!current) return null;
|
|
180
195
|
var renderedElement = (_ref = (_descriptorsRef_current_current_key = descriptorsRef.current[current.key]) === null || _descriptorsRef_current_current_key === void 0 ? void 0 : _descriptorsRef_current_current_key.render()) !== null && _ref !== void 0 ? _ref : null;
|
|
181
196
|
return renderedElement !== null ? /* @__PURE__ */React.cloneElement(renderedElement, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_Route","import_router","import_useScreens","import_Screen","import_interceptRoutes","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","slotName","get","state","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","contextKey","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","length","jsx","QualifiedNavigator","console","warn","StackRouter","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","current","useMemo","Provider","context","useContext","Error","_ref","_descriptorsRef_current_current_key","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_notFoundState","import_Route","import_router","import_router2","import_useScreens","import_Screen","import_interceptRoutes","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","slotName","get","state","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","contextKey","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","length","jsx","QualifiedNavigator","console","warn","StackRouter","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","current","useMemo","Provider","context","useContext","Error","_ref","_descriptorsRef_current_current_key","notFoundState","useNotFoundState","notFoundRouteNode","findRouteNodeByPath","notFoundPath","routeNode","findNearestNotFoundRoute","originalPath","NotFoundComponent","getQualifiedRouteComponent","route","params","routes","find","i","index","renderedElement","key","render","cloneElement","memo","props","SafeAreaView","style","flex","Screen","layoutContextKey"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -198,67 +198,54 @@ function createFileSystemRouterPlugin(options) {
|
|
|
198
198
|
currentParams = loaderProps?.params || {};
|
|
199
199
|
isMissingSsgSlug = !staticParams.some(sp => Object.keys(sp).every(key => sp[key] === currentParams[key]));
|
|
200
200
|
}
|
|
201
|
-
const is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
searchDir = route.file.replace(/\/[^/]+$/, "");
|
|
201
|
+
const is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug;
|
|
202
|
+
let notFoundRoutePath = null;
|
|
203
|
+
if (isMissingSsgSlug) {
|
|
204
|
+
let searchDir = route.file.replace(/^\.\//, "").replace(/\/[^/]+$/, "");
|
|
206
205
|
for (;;) {
|
|
207
206
|
for (const ext of [".tsx", ".ts", ".jsx", ".js"]) {
|
|
208
207
|
const candidate = import_node_path.default.join(routerRoot, searchDir, `+not-found${ext}`);
|
|
209
208
|
try {
|
|
210
|
-
if (
|
|
209
|
+
if ((await runner.import(candidate))?.default) {
|
|
211
210
|
notFoundRoutePath = searchDir ? `/${searchDir}/+not-found` : "/+not-found";
|
|
212
211
|
break;
|
|
213
212
|
}
|
|
214
213
|
} catch {}
|
|
215
214
|
}
|
|
216
|
-
if (
|
|
215
|
+
if (notFoundRoutePath || !searchDir) break;
|
|
217
216
|
const parent = searchDir.replace(/\/[^/]+$/, "");
|
|
218
217
|
parent === searchDir ? searchDir = "" : searchDir = parent;
|
|
219
218
|
}
|
|
220
|
-
if (
|
|
221
|
-
(0, import_one_server_only.setServerContext)({
|
|
222
|
-
loaderData: void 0,
|
|
223
|
-
loaderProps,
|
|
224
|
-
matches: []
|
|
225
|
-
});
|
|
226
|
-
const notFoundHtml = await render({
|
|
227
|
-
mode: "ssg",
|
|
228
|
-
loaderData: void 0,
|
|
229
|
-
loaderProps,
|
|
230
|
-
path: notFoundRoutePath,
|
|
231
|
-
preloads,
|
|
232
|
-
matches: []
|
|
233
|
-
});
|
|
234
|
-
return new Response(notFoundHtml, {
|
|
235
|
-
status: 404,
|
|
236
|
-
headers: {
|
|
237
|
-
"Content-Type": "text/html"
|
|
238
|
-
}
|
|
239
|
-
});
|
|
240
|
-
}
|
|
241
|
-
return new Response("<html><body><h1>404 - Not Found</h1></body></html>", {
|
|
219
|
+
if (!notFoundRoutePath) return new Response("<html><body><h1>404 - Not Found</h1></body></html>", {
|
|
242
220
|
status: 404,
|
|
243
221
|
headers: {
|
|
244
222
|
"Content-Type": "text/html"
|
|
245
223
|
}
|
|
246
224
|
});
|
|
247
225
|
}
|
|
248
|
-
const
|
|
226
|
+
const renderPath = notFoundRoutePath || loaderProps?.path || "/";
|
|
227
|
+
let html = await render({
|
|
249
228
|
mode: isSpaShell ? "spa-shell" : route.type === "ssg" ? "ssg" : route.type === "ssr" ? "ssr" : "spa",
|
|
250
229
|
loaderData,
|
|
251
230
|
loaderProps,
|
|
252
|
-
path:
|
|
231
|
+
path: renderPath,
|
|
253
232
|
preloads,
|
|
254
233
|
matches
|
|
255
234
|
});
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
235
|
+
if (is404) {
|
|
236
|
+
if (notFoundRoutePath) {
|
|
237
|
+
const originalPath = loaderProps?.path || "/",
|
|
238
|
+
notFoundMarker = `<script>window.__one404={originalPath:${JSON.stringify(originalPath)},notFoundPath:${JSON.stringify(notFoundRoutePath)}}</script>`;
|
|
239
|
+
html = html.includes("</head>") ? html.replace("</head>", `${notFoundMarker}</head>`) : html.replace("<body", `${notFoundMarker}<body`);
|
|
260
240
|
}
|
|
261
|
-
|
|
241
|
+
return new Response(html, {
|
|
242
|
+
status: 404,
|
|
243
|
+
headers: {
|
|
244
|
+
"Content-Type": "text/html"
|
|
245
|
+
}
|
|
246
|
+
});
|
|
247
|
+
}
|
|
248
|
+
return html;
|
|
262
249
|
} catch (err) {
|
|
263
250
|
if ((0, import_isResponse.isResponse)(err)) return err;
|
|
264
251
|
console.error(`SSR error while loading file ${route.file} from URL ${url.href}
|
|
@@ -152,60 +152,54 @@ function createFileSystemRouterPlugin(options) {
|
|
|
152
152
|
(sp) => Object.keys(sp).every((key) => sp[key] === currentParams[key])
|
|
153
153
|
);
|
|
154
154
|
}
|
|
155
|
-
const is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug
|
|
156
|
-
|
|
157
|
-
|
|
155
|
+
const is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug;
|
|
156
|
+
let notFoundRoutePath = null;
|
|
157
|
+
if (isMissingSsgSlug) {
|
|
158
|
+
let searchDir = route.file.replace(/^\.\//, "").replace(/\/[^/]+$/, "");
|
|
158
159
|
for (; ; ) {
|
|
159
160
|
for (const ext of [".tsx", ".ts", ".jsx", ".js"]) {
|
|
160
161
|
const candidate = import_node_path.default.join(routerRoot, searchDir, `+not-found${ext}`);
|
|
161
162
|
try {
|
|
162
|
-
if (
|
|
163
|
+
if ((await runner.import(candidate))?.default) {
|
|
163
164
|
notFoundRoutePath = searchDir ? `/${searchDir}/+not-found` : "/+not-found";
|
|
164
165
|
break;
|
|
165
166
|
}
|
|
166
167
|
} catch {
|
|
167
168
|
}
|
|
168
169
|
}
|
|
169
|
-
if (
|
|
170
|
+
if (notFoundRoutePath || !searchDir) break;
|
|
170
171
|
const parent = searchDir.replace(/\/[^/]+$/, "");
|
|
171
172
|
parent === searchDir ? searchDir = "" : searchDir = parent;
|
|
172
173
|
}
|
|
173
|
-
if (
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
loaderData: void 0,
|
|
182
|
-
loaderProps,
|
|
183
|
-
path: notFoundRoutePath,
|
|
184
|
-
preloads,
|
|
185
|
-
matches: []
|
|
186
|
-
});
|
|
187
|
-
return new Response(notFoundHtml, {
|
|
188
|
-
status: 404,
|
|
189
|
-
headers: { "Content-Type": "text/html" }
|
|
190
|
-
});
|
|
191
|
-
}
|
|
192
|
-
return new Response("<html><body><h1>404 - Not Found</h1></body></html>", {
|
|
193
|
-
status: 404,
|
|
194
|
-
headers: { "Content-Type": "text/html" }
|
|
195
|
-
});
|
|
174
|
+
if (!notFoundRoutePath)
|
|
175
|
+
return new Response(
|
|
176
|
+
"<html><body><h1>404 - Not Found</h1></body></html>",
|
|
177
|
+
{
|
|
178
|
+
status: 404,
|
|
179
|
+
headers: { "Content-Type": "text/html" }
|
|
180
|
+
}
|
|
181
|
+
);
|
|
196
182
|
}
|
|
197
|
-
const
|
|
183
|
+
const renderPath = notFoundRoutePath || loaderProps?.path || "/";
|
|
184
|
+
let html = await render({
|
|
198
185
|
mode: isSpaShell ? "spa-shell" : route.type === "ssg" ? "ssg" : route.type === "ssr" ? "ssr" : "spa",
|
|
199
186
|
loaderData,
|
|
200
187
|
loaderProps,
|
|
201
|
-
path:
|
|
188
|
+
path: renderPath,
|
|
202
189
|
preloads,
|
|
203
190
|
matches
|
|
204
191
|
});
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
192
|
+
if (is404) {
|
|
193
|
+
if (notFoundRoutePath) {
|
|
194
|
+
const originalPath = loaderProps?.path || "/", notFoundMarker = `<script>window.__one404={originalPath:${JSON.stringify(originalPath)},notFoundPath:${JSON.stringify(notFoundRoutePath)}}</script>`;
|
|
195
|
+
html = html.includes("</head>") ? html.replace("</head>", `${notFoundMarker}</head>`) : html.replace("<body", `${notFoundMarker}<body`);
|
|
196
|
+
}
|
|
197
|
+
return new Response(html, {
|
|
198
|
+
status: 404,
|
|
199
|
+
headers: { "Content-Type": "text/html" }
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
return html;
|
|
209
203
|
} catch (err) {
|
|
210
204
|
if ((0, import_isResponse.isResponse)(err))
|
|
211
205
|
return err;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAiB,kCACjB,qBAAyB,wBACzB,0BAAyB,6BACzB,oBAAmB,mCAEnB,cAAyC,iBAEzC,mBAA2D,4BAC3D,6BAAoC,sCAGpC,uBAA8B,sCAC9B,qCAA4C,oDAC5C,oBAA2B,mCAC3B,kBAAiC,iCACjC,8BAAqC,6CACrC,iCAAwC,gDACxCA,oBAAgC,iCAChC,uBAA8B,qCAE9B,yBAAiC,+BACjC,+BAAoD;AAEpD,MAAM,cAAc,QAAQ,IAAI,kBAC1B,kBAAkB,QAAQ,IAAI,uBAE9B,kBAAyD;AAAA,EAC7D,KAAK,kBAAAC,QAAO;AAAA,EACZ,KAAK,kBAAAA,QAAO;AAAA,EACZ,KAAK,kBAAAA,QAAO;AAAA,EACZ,KAAK,kBAAAA,QAAO;AACd,GAGM,iBAAiB;AAAM;AAEtB,SAAS,6BAA6B,SAAoC;AAC/E,QAAM,WAAW,CAAC,iBAAiB,gDAAmB;AAEtD,MAAI,QACA;AAIJ,QAAM,yBAAyB,oBAAI,IAAyB;AAE5D,MAAI,gBAAgB,qBAAqB,GAErC,gBAAsC;AAE1C,WAAS,uBAAuB;AAC9B,UAAM,iBAAa,gEAA4B,OAAO;AAGtD,mBAAe,wBAAwBC,YAAoC;AAEzE,UAAI,YADaA,WAAU,QAAQ,YAAY,EAAE;AAEjD,iBAAa;AACX,mBAAW,OAAO,CAAC,QAAQ,OAAO,QAAQ,KAAK,GAAG;AAChD,gBAAM,YAAY,iBAAAC,QAAK,KAAK,YAAY,WAAW,aAAa,GAAG,EAAE;AACrE,cAAI;AAEF,iBADY,MAAM,OAAO,OAAO,SAAS,IAChC;AACP,qBAAO,YAAY,IAAI,SAAS,gBAAgB;AAAA,UAEpD,QAAQ;AAAA,UAER;AAAA,QACF;AACA,YAAI,CAAC,UAAW;AAChB,cAAM,SAAS,UAAU,QAAQ,YAAY,EAAE;AAC/C,QAAI,WAAW,YACb,YAAY,KAEZ,YAAY;AAAA,MAEhB;AACA,aAAO;AAAA,IACT;AAEA,eAAO;AAAA,MACL;AAAA,QACE,MAAM,WAAW,EAAE,OAAO,KAAK,YAAY,GAAG;AAC5C,cAAI,QAAQ,QAAQ,mBAAmB,IAAO;AAC5C,kBAAM,YAAY,gBAAgB,MAAM,IAAI,KAAK,kBAAAF,QAAO,OAClD,WACJ,OAAO,OAAQ,WAAW,IAAI,IAAI,GAAG,EAAE,WAAW,IAAI,UAClD,OAAO,MAAM,aACf,kBAAAA,QAAO,IAAI,KAAK,IAChB,kBAAAA,QAAO,IAAI,OAAO,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE;AAC3C,oBAAQ;AAAA,cACN,YAAO,UAAU,IAAI,MAAM,IAAI,GAAG,CAAC,IAAI,QAAQ,IAAI,kBAAAA,QAAO,IAAI,QAAG,CAAC,IAAI,IAAI;AAAA,YAC5E;AAAA,UACF;AAGA,gBAAM,UAAW,MAAM,WAAW,CAAC,GAC7B,aACJ,MAAM,SAAS,SACf,QAAQ;AAAA,YACN,CAAC,WACC,OAAO,qBAAqB,SAAS,OAAO,qBAAqB;AAAA,UACrE;AAEF,cAAI,MAAM,SAAS,SAAS,CAAC;AAE3B,mBAAO;AAAA,kBACL,uCAAqB,EAAE,eAAe,EAAE,MAAM,MAAM,EAAE,CAAC,CAAC;AAAA;AAAA;AAAA;AAAA;AAO5D,UAAI,iBACF,MAAM;AAGR,gBAAM,EAAE,SAAS,SAAS,cAAc,QAAI,kDAA2B;AACvE,0BAAgB;AAEhB,cAAI;AACF,kBAAM,YAAY,iBAAAE,QAAK,KAAK,YAAY,MAAM,IAAI;AAClD,mBAAO,WAAW,GAElB,WAAW,mBAAsB;AAEjC,kBAAM,WAAW,cAAc,KAAK,CAAC,IAAI,MAAM,OAAO,OAAO,SAAS;AAGtE,2BAAe,sBACb,WACA,UAC+C;AAC/C,oBAAM,UAAU,UAAU;AAC1B,kBAAI,CAAC;AACH,uBAAO,EAAE,YAAY,QAAW,QAAQ;AAG1C,kBAAI;AACF,sBAAM,UAAU,UAAM,wDAAwB,MAAM,SAAS,WAAW,CAAC,GAGnE,YAAY,aAAa,QAAQ;AACvC,2BAAW,OAAO,QAAQ,cAAc;AACtC,wBAAM,cAAc,iBAAAA,QAAK,QAAQ,GAAG;AACpC,kBAAK,uBAAuB,IAAI,WAAW,MACzC,uBAAuB,IAAI,aAAa,oBAAI,IAAI,CAAC,GACjD,QAAQ,QAAQ,IAAI,WAAW,GAC3B,mBACF,QAAQ,KAAK,mCAA8B,WAAW,EAAE,IAG5D,uBAAuB,IAAI,WAAW,EAAG,IAAI,SAAS;AAAA,gBACxD;AAEA,uBAAO,EAAE,YAAY,QAAQ,QAAQ,QAAQ;AAAA,cAC/C,SAAS,KAAK;AAEZ,wBAAI,8BAAW,GAAG;AAChB,wBAAM;AAER,+BAAQ,MAAM,kCAAkC,OAAO,KAAK,GAAG,GACxD,EAAE,YAAY,QAAW,QAAQ;AAAA,cAC1C;AAAA,YACF;AAEA,gBAAI,YACA;AAEJ,gBAAI,YAAY;AAEd,oBAAM,uBAAuB,QAAQ,IAAI,OAAO,WAAW;AACzD,sBAAM,aAAa,iBAAAA,QAAK,KAAK,YAAY,OAAO,UAAU,GACpD,iBAAiB,MAAM,OAAO,OAAO,UAAU;AACrD,uBAAO,sBAAsB,QAAQ,eAAe,MAAM;AAAA,cAC5D,CAAC;AAED,yBADsB,MAAM,QAAQ,IAAI,oBAAoB,GACpC,IAAI,CAAC,YAAY;AAAA,gBACvC,SAAS,OAAO;AAAA,gBAChB,UAAU,aAAa,QAAQ;AAAA,gBAC/B,QAAQ,aAAa,UAAU,CAAC;AAAA,gBAChC,YAAY,OAAO;AAAA,cACrB,EAAE,GAIF,aAAa;AAAA,YACf,OAAO;AAEL,oBAAM,eAAgB,MAAM,WAAW,CAAC,GAClC,YAAY,EAAE,YAAY,MAAM,MAAM,MAAM,MAAM,KAAK,GAGvD,uBAAuB,aAAa,IAAI,OAAO,WAAW;AAC9D,sBAAM,aAAa,iBAAAA,QAAK,KAAK,YAAY,OAAO,UAAU,GACpD,iBAAiB,MAAM,OAAO,OAAO,UAAU;AACrD,uBAAO,sBAAsB,QAAQ,eAAe,MAAM;AAAA,cAC5D,CAAC,GAGK,oBAAoB,sBAAsB,WAAW,SAAS,MAAM,GAGpE,CAAC,eAAe,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,gBACpD,QAAQ,IAAI,oBAAoB;AAAA,gBAChC;AAAA,cACF,CAAC;AAGD,wBAAU;AAAA,gBACR,GAAG,cAAc,IAAI,CAAC,YAAY;AAAA,kBAChC,SAAS,OAAO;AAAA,kBAChB,UAAU,aAAa,QAAQ;AAAA,kBAC/B,QAAQ,aAAa,UAAU,CAAC;AAAA,kBAChC,YAAY,OAAO;AAAA,gBACrB,EAAE;AAAA,gBACF;AAAA,kBACE,SAAS,WAAW;AAAA,kBACpB,UAAU,aAAa,QAAQ;AAAA,kBAC/B,QAAQ,aAAa,UAAU,CAAC;AAAA,kBAChC,YAAY,WAAW;AAAA,gBACzB;AAAA,cACF,GAGA,aAAa,WAAW;AAAA,YAC1B;AAGA,iBAAK,qCAAqC;AAE1C,kBAAM,QAAQ,MAAM,OAAO,OAAO,2CAAc,GAE1C,SAAS,MAAM,QAAQ;AAE7B,yDAAiB;AAAA,cACf;AAAA,cACA;AAAA,cACA;AAAA,YACF,CAAC,GAED,kCAAgB,MAAM,IAAI,IAAI;AAG9B,kBAAM,iBAAiB,OAAO,KAAK,MAAM,aAAa,CAAC,CAAC,EAAE,SAAS;AAGnE,gBAAI,mBAAmB;AACvB,gBAAI,MAAM,SAAS,SAAS,kBAAkB,SAAS,sBAAsB;AAC3E,oBAAM,eAAe,MAAM,SAAS,qBAAqB;AAAA,gBACvD,QAAQ,aAAa;AAAA,cACvB,CAAC,GACK,gBAAgB,aAAa,UAAU,CAAC;AAC9C,iCAAmB,CAAC,aAAa;AAAA,gBAAK,CAAC,OACrC,OAAO,KAAK,EAAE,EAAE,MAAM,CAAC,QAAQ,GAAG,GAAG,MAAM,cAAc,GAAG,CAAC;AAAA,cAC/D;AAAA,YACF;AAEA,kBAAM,QACJ,MAAM,cACN,KAAC,oCAAc,QAAQ,KACvB,oBACC,MAAM,SAAS,SAAS,kBAAkB,eAAe;AAG5D,gBACE,oBACC,MAAM,SAAS,SAAS,kBAAkB,eAAe,QAC1D;AAEA,kBAAI,mBAAwB,CAAC,GACzB,oBAAoB,eAEpB,YADa,MAAM,KAAK,QAAQ,YAAY,EAAE;AAElD,yBAAa;AACX,2BAAW,OAAO,CAAC,QAAQ,OAAO,QAAQ,KAAK,GAAG;AAChD,wBAAM,YAAY,iBAAAA,QAAK,KAAK,YAAY,WAAW,aAAa,GAAG,EAAE;AACrE,sBAAI;AAEF,wBADA,mBAAmB,MAAM,OAAO,OAAO,SAAS,GAC5C,kBAAkB,SAAS;AAC7B,0CAAoB,YAChB,IAAI,SAAS,gBACb;AACJ;AAAA,oBACF;AAAA,kBACF,QAAQ;AAAA,kBAER;AAAA,gBACF;AACA,oBAAI,kBAAkB,WAAW,CAAC,UAAW;AAC7C,sBAAM,SAAS,UAAU,QAAQ,YAAY,EAAE;AAC/C,gBAAI,WAAW,YACb,YAAY,KAEZ,YAAY;AAAA,cAEhB;AAEA,kBAAI,iBAAiB,SAAS;AAE5B,6DAAiB;AAAA,kBACf,YAAY;AAAA,kBACZ;AAAA,kBACA,SAAS,CAAC;AAAA,gBACZ,CAAC;AAED,sBAAM,eAAe,MAAM,OAAO;AAAA,kBAChC,MAAM;AAAA,kBACN,YAAY;AAAA,kBACZ;AAAA,kBACA,MAAM;AAAA,kBACN;AAAA,kBACA,SAAS,CAAC;AAAA,gBACZ,CAAC;AAED,uBAAO,IAAI,SAAS,cAAc;AAAA,kBAChC,QAAQ;AAAA,kBACR,SAAS,EAAE,gBAAgB,YAAY;AAAA,gBACzC,CAAC;AAAA,cACH;AAGA,qBAAO,IAAI,SAAS,sDAAsD;AAAA,gBACxE,QAAQ;AAAA,gBACR,SAAS,EAAE,gBAAgB,YAAY;AAAA,cACzC,CAAC;AAAA,YACH;AAEA,kBAAM,OAAO,MAAM,OAAO;AAAA,cACxB,MAAM,aACF,cACA,MAAM,SAAS,QACb,QACA,MAAM,SAAS,QACb,QACA;AAAA,cACR;AAAA,cACA;AAAA,cACA,MAAM,aAAa,QAAQ;AAAA,cAC3B;AAAA,cACA;AAAA,YACF,CAAC;AAED,mBAAI,QACK,IAAI,SAAS,MAAM;AAAA,cACxB,QAAQ;AAAA,cACR,SAAS,EAAE,gBAAgB,YAAY;AAAA,YACzC,CAAC,IAGI;AAAA,UACT,SAAS,KAAK;AAEZ,oBAAI,8BAAW,GAAG;AAChB,qBAAO;AAGT,oBAAQ;AAAA,cACN,gCAAgC,MAAM,IAAI,aAAa,IAAI,IAAI;AAAA;AAAA,cAC/D;AAAA,YACF;AACA,kBAAM,QAAQ,mBAAmB,IAAI,QAAQ,cACvC,UAAU,eAAe,QAAQ,IAAI,UAAU,GAAG,GAAG,IACrD,QAAQ,eAAe,SAAQ,IAAI,SAAS,IAM5C,aAHJ,+FAA+F;AAAA,cAC7F;AAAA,YACF,IAEE;AAAA;AAAA;AAAA,cAIA;AAEJ,2BAAQ,MAAM,GAAG,KAAK;AAAA,GAAM,OAAO;AAAA;AAAA,EAAO,KAAK;AAAA,CAAI,GAE5C;AAAA;AAAA;AAAA,+GAG4F,KAAK;AAAA,sBAC9F,OAAO;AAAA,kBACX,UAAU;AAAA,kBAEV,QACI;AAAA,sBACA,KAAK;AAAA,0BAEL,EACN;AAAA;AAAA;AAAA;AAAA,UAIN,UAAE;AACA,0BAAc;AAAA,UAChB;AAAA,QACF;AAAA,QAEA,MAAM,aAAa,EAAE,SAAS,OAAAC,QAAO,KAAAC,MAAK,aAAAC,aAAY,GAAG;AACvD,gBAAMJ,aAAY,iBAAAC,QAAK,KAAK,YAAYC,OAAM,IAAI;AAGlD,cAAI,iBAAiB,MAAM,OAAO,iBAAiBF,UAAS,IAAI;AAChE,cAAI,CAAC;AACH,kBAAM,IAAI,MAAM,4BAA4B;AAG9C,gBAAMK,YAAW,MAAM,OAAO,OAAOL,UAAS,GAGxCM,kBAAiB,OAAO,KAAKJ,OAAM,aAAa,CAAC,CAAC,EAAE,SAAS;AACnE,cAAIA,OAAM,SAAS,SAASI,mBAAkBD,UAAS,sBAAsB;AAC3E,kBAAM,eAAe,MAAMA,UAAS,qBAAqB;AAAA,cACvD,QAAQD,cAAa;AAAA,YACvB,CAAC,GACK,gBAAgBA,cAAa,UAAU,CAAC;AAI9C,gBAAI,CAHgB,aAAa;AAAA,cAAK,CAAC,OACrC,OAAO,KAAK,EAAE,EAAE,MAAM,CAAC,QAAQ,GAAG,GAAG,MAAM,cAAc,GAAG,CAAC;AAAA,YAC/D,GACkB;AAChB,oBAAM,SAAS,MAAM,wBAAwBF,OAAM,IAAI;AACvD,qBAAO,kGAAkG,KAAK,UAAU,MAAM,CAAC;AAAA,YACjI;AAAA,UACF;AAGA,cAAIK;AACJ,cAAIF,UAAS;AACX,gBAAI;AACF,oBAAM,UAAU,UAAM;AAAA,gBAAwB,MAC5CA,UAAS,OAAOD,YAAW;AAAA,cAC7B;AAMA,kBALAG,cAAa,QAAQ,YAKjB,8BAAWA,WAAU;AACvB,sBAAMA;AAIR,oBAAM,YAAYH,cAAa,QAAQ;AACvC,yBAAW,OAAO,QAAQ,cAAc;AAEtC,sBAAM,cAAc,iBAAAH,QAAK,QAAQ,GAAG;AACpC,gBAAK,uBAAuB,IAAI,WAAW,MACzC,uBAAuB,IAAI,aAAa,oBAAI,IAAI,CAAC,GACjD,QAAQ,QAAQ,IAAI,WAAW,GAC3B,mBACF,QAAQ,KAAK,mCAA8B,WAAW,EAAE,IAG5D,uBAAuB,IAAI,WAAW,EAAG,IAAI,SAAS;AAAA,cACxD;AAAA,YACF,SAAS,KAAK;AAEZ,sBAAI,8BAAW,GAAG;AAChB,sBAAM;AAIR,kBAAK,KAAa,SAAS,UAAU;AACnC,sBAAM,SAAS,MAAM,wBAAwBC,OAAM,IAAI;AACvD,uBAAO,kGAAkG,KAAK,UAAU,MAAM,CAAC;AAAA,cACjI;AACA,oBAAM;AAAA,YACR;AAGF,UAAIK,gBAEF,oBAAgB,oCAAc;AAAA,YAC5B,MAAM;AAAA,YACN,YAAAA;AAAA,UACF,CAAC;AAGH,gBAAM,WAAWJ,KAAI,aAAa,IAAI,UAAU;AAEhD,cAAI,aAAa,SAAS,aAAa,WAAW;AAIhD,gBAAI,CADgB,OAAO,aAAa,YAAY,EAAE;AAEpD,oBAAM,IAAI;AAAA,gBACR,0DAA0D,QAAQ;AAAA,cACpE;AAMF,mBAF4B,2BAA2B,KAAK,UAAUI,WAAU,CAAC;AAAA,UAGnF;AAEA,iBAAO;AAAA,QACT;AAAA,QAEA,MAAM,UAAU,EAAE,OAAAL,OAAM,GAAG;AACzB,iBAAO,MAAM,OAAO,OAAO,iBAAAD,QAAK,KAAK,YAAYC,OAAM,IAAI,CAAC;AAAA,QAC9D;AAAA,QAEA,MAAM,eAAeA,QAAO;AAC1B,iBAAO,MAAM,OAAO,OAAO,iBAAAD,QAAK,KAAK,YAAYC,OAAM,UAAU,CAAC;AAAA,QACpE;AAAA,MACF;AAAA,MACA,EAAE,WAAW;AAAA,IACf;AAAA,EACF;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,MAAM,OAAO,YAAY;AACvB,YAAM,UAAU,QAAQ,cAAc,uBAAuB;AAE7D,UAAI,YAAY,MAIZ,cAAc,SAAS;AA0BzB,eAAO;AAAA,UACL,cAAc;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,YAQZ,SAlCqB;AAAA,cACvB,GAAG,IAAI;AAAA,gBACL,cAAc,SAAS,WAAW,QAAQ,CAACA,WACrCA,OAAM,aAAmB,CAAC,IAEzBA,OAAM,OAGT,YAAY,UACZA,OAAM,KAAK,MAAM,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,CAAC,EAAE,SAAS,IAE1D,CAAC,IAGH;AAAA,kBACL,iBAAAD,QAAK,KAAK,SAASC,OAAM,IAAI;AAAA,kBAC7B,GAAIA,OAAM,SAAS,QAAQ,CAAC,WACrB,OAAO,aACL,CAAC,iBAAAD,QAAK,KAAK,SAAS,OAAO,UAAU,CAAC,IADd,CAAC,CAEjC,KAAK,CAAC;AAAA,gBACT,IAfwB,CAAC,CAgB1B;AAAA,cACH;AAAA,YACF;AAAA,UAYE;AAAA,QACF;AAAA,IAuCJ;AAAA,IAEA,gBAAgB,UAAU;AACxB,eAAS,UAGT,aAAS;AAAA,QACP,iBAAiB,OAAO,aAAa,SAAS,OAAO,aAAa;AAAA,MACpE;AAEA,YAAM,SAAS,iBAAAA,QAAK,KAAK,QAAQ,IAAI,OAAG,gEAA4B,OAAO,CAAC,GAGtE,gCAA4B;AAAA,QAChC,OAAO,MAAc,gBAAwB;AAC3C,WAAI,SAAS,SAAS,SAAS,aAER,iBAAAA,QAAK,QAAQ,WAAW,EAC5B,WAAW,MAAM,MAChC,gBAAgB,qBAAqB;AAAA,QAG3C;AAAA,QACA;AAAA,MACF;AAEA,aAAO,QAAQ,YAAY,OAAO,yBAAyB;AAG3D,YAAM,8BAA0B,kCAAS,CAAC,gBAAwB;AAChE,cAAM,eAAe,iBAAAA,QAAK,QAAQ,WAAW,GACvC,aAAa,uBAAuB,IAAI,YAAY;AAC1D,QAAI,cAAc,WAAW,OAAO,MAC9B,mBACF,QAAQ;AAAA,UACN,kCAA6B,YAAY;AAAA,UACzC,CAAC,GAAG,UAAU;AAAA,QAChB,GAGF,OAAO,IAAI,KAAK;AAAA,UACd,MAAM;AAAA,UACN,OAAO;AAAA,UACP,MAAM,EAAE,YAAY,CAAC,GAAG,UAAU,EAAE;AAAA,QACtC,CAAC;AAAA,MAEL,GAAG,GAAG;AAEN,oBAAO,QAAQ,GAAG,UAAU,uBAAuB,GAM5C,MAAM;AACX,eAAO,YAAY,IAAI,OAAO,KAAK,KAAK,SAAS;AAE/C,cAAI,UAAU,iBAAiB,UAAU;AAEzC,cAAI;AACF,kBAAM,YAAY,QAAQ,KAAK;AAC/B,gBAAI,WAAW;AACb,oBAAME,OAAM,IAAI,IAAI,IAAI,OAAO,IAAI,UAAU,IAAI,QAAQ,IAAI,EAAE;AAC/D,yBAAW,YAAY,WAAW;AAChC,sBAAM,WAAW,IAAI,SAAS,OAAO,QAAQ,SAAS,SAAS,CAAC,KAC1D,QAAQA,KAAI,SAAS,MAAM,IAAI,OAAO,QAAQ,CAAC;AAErD,oBAAI,OAAO;AACT,sBAAI,cAAc,SAAS;AAC3B,wBAAM,SAAS,SAAS,OAAO,MAAM,OAAO;AAE5C,kBAAI,UACF,OAAO,QAAQ,CAAC,OAAO,UAAU;AAC/B,kCAAc,YAAY,QAAQ,OAAO,MAAM,QAAQ,CAAC,KAAK,EAAE;AAAA,kBACjE,CAAC,GAGC,eACF,QAAQ,KAAK,yBAAoBA,KAAI,QAAQ,WAAM,WAAW,EAAE,GAGlE,IAAI,UAAU,SAAS,YAAY,MAAM,KAAK;AAAA,oBAC5C,UAAU;AAAA,kBACZ,CAAC,GACD,IAAI,IAAI;AACR;AAAA,gBACF;AAAA,cACF;AAAA,YACF;AAEA,kBAAM,QAAQ,MAAM,cAAc;AAAA,cAChC,gCAAgC,GAAG;AAAA,YACrC;AAEA,gBAAI,CAAC;AACH,qBAAO,KAAK;AAGd,gBAAI,OAAO,SAAU,gBAAY,8BAAW,KAAK,GAAG;AAClD,kBAAI,aAAa;AACf,sBAAM,UAAkC,CAAC;AACzC,sBAAM,QAAQ,QAAQ,CAAC,GAAG,MAAM;AAC9B,0BAAQ,CAAC,IAAI;AAAA,gBACf,CAAC,GACD,QAAQ,KAAK,4BAAqB,MAAM,MAAM,IAAI,OAAO;AAAA,cAC3D;AAcA,kBAZA,MAAM,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACpC,oBAAI,QAAQ,cAAc;AAExB,wBAAM,UAAU,MAAM,MAAM,IAAI;AAChC,6BAAW,UAAU;AACnB,wBAAI,aAAa,cAAc,MAAM;AAAA,gBAEzC;AACE,sBAAI,UAAU,KAAK,KAAK;AAAA,cAE5B,CAAC,OAEG,kCAAiB,MAAM,MAAM,GAAG;AAClC,sBAAM,WAAW,GAAG,MAAM,QAAQ,IAAI,UAAU,KAAK,EAAE;AAIvD,oBAHI,eACF,QAAQ,KAAK,yCAA+B,QAAQ,EAAE,GAEpD,UAAU;AACZ,sBAAI,UAAU,MAAM,QAAQ;AAAA,oBAC1B,UAAU;AAAA,kBACZ,CAAC,GACD,IAAI,IAAI;AACR;AAAA,gBACF;AACA,wBAAQ,MAAM,mDAAmD,KAAK;AAAA,cACxE;AAKA,kBAHA,IAAI,aAAa,MAAM,QACvB,IAAI,gBAAgB,MAAM,YAEtB,MAAM,QACJ,MAAM,KAAK,QAAQ;AACrB,wBAAQ,KAAK,oBAAoB,IAAI,GAAG,GACxC,IAAI,MAAM,EAAE,GACZ,IAAI,IAAI;AACR;AAAA,cACF;AAGF,kBAAI,MAAM,MAAM;AACd,oBAAI,MAAM,KAAK,QAAQ;AACrB,0BAAQ,KAAK,oBAAoB,IAAI,GAAG,GACxC,IAAI,IAAI;AACR;AAAA,gBACF;AACA,oBAAI;AAEF,8CAAS,QAAQ,MAAM,IAAW,EAAE,KAAK,GAAG;AAAA,gBAC9C,SAAS,KAAK;AACZ,0BAAQ,KAAK,wCAAwC,GAAG,GACxD,IAAI,IAAI;AAAA,gBACV;AACA;AAAA,cACF;AAEA,kBAAI,IAAI;AACR;AAAA,YACF;AAEA,gBAAI,SAAS,OAAO,SAAU,UAAU;AACtC,kBAAI,UAAU,gBAAgB,kBAAkB,GAChD,IAAI,MAAM,KAAK,UAAU,KAAK,CAAC,GAC/B,IAAI,IAAI;AACR;AAAA,YACF;AAEA,gBAAI,MAAM,KAAK,GACf,IAAI,IAAI;AACR;AAAA,UACF,SAAS,OAAO;AACd,oBAAQ,MAAM,uBAAuB,IAAI,GAAG,KAAK,KAAK,EAAE,GAExD,KAAK,KAAK;AAAA,UACZ;AAMA,kBAAQ,KAAK,+CAA+C,IAAI,GAAG,EAAE;AAAA,QACvE,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AACF;AAEA,MAAM,kCAAkC,CAAC,QAA0C;AACjF,MAAI,CAAC,IAAI;AACP,UAAM,IAAI,MAAM,uCAAuC;AAGzD,QAAM,UAAU,UAAU,IAAI,QAAQ,IAAI,IACpC,YAAY,IAAI,aAChBA,OAAM,IAAI,IAAI,WAAW,OAAO,GAEhC,UAAU,IAAI,QAAQ;AAC5B,aAAW,OAAO,IAAI;AACpB,IAAI,IAAI,QAAQ,GAAG,KACjB,QAAQ,OAAO,KAAK,IAAI,QAAQ,GAAG,CAAW;AAKlD,QAAM,OADU,CAAC,QAAQ,OAAO,SAAS,QAAQ,EAAE,SAAS,IAAI,UAAU,EAAE,IACrD,4BAAS,MAAM,GAAG,IAAI;AAE7C,SAAO,IAAI,QAAQA,MAAK;AAAA,IACtB,QAAQ,IAAI;AAAA,IACZ;AAAA,IACA;AAAA;AAAA,IAEA,QAAQ;AAAA,EACV,CAAqC;AACvC;",
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["import_constants", "colors", "routeFile", "path", "route", "url", "loaderProps", "exported", "isDynamicRoute", "loaderData"]
|
|
6
6
|
}
|
|
@@ -241,65 +241,55 @@ function createFileSystemRouterPlugin(options) {
|
|
|
241
241
|
});
|
|
242
242
|
});
|
|
243
243
|
}
|
|
244
|
-
var is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug
|
|
245
|
-
|
|
246
|
-
|
|
244
|
+
var is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug,
|
|
245
|
+
notFoundRoutePath = null;
|
|
246
|
+
if (isMissingSsgSlug) {
|
|
247
|
+
for (var routeDir = route.file.replace(/^\.\//, "").replace(/\/[^/]+$/, ""), searchDir = routeDir;;) {
|
|
247
248
|
for (var _i = 0, _iter = [".tsx", ".ts", ".jsx", ".js"]; _i < _iter.length; _i++) {
|
|
248
249
|
var ext = _iter[_i],
|
|
249
250
|
candidate = import_path.default.join(routerRoot, searchDir, `+not-found${ext}`);
|
|
250
251
|
try {
|
|
251
|
-
|
|
252
|
+
var notFoundExported = await runner.import(candidate);
|
|
253
|
+
if (notFoundExported?.default) {
|
|
252
254
|
notFoundRoutePath = searchDir ? `/${searchDir}/+not-found` : "/+not-found";
|
|
253
255
|
break;
|
|
254
256
|
}
|
|
255
257
|
} catch {}
|
|
256
258
|
}
|
|
257
|
-
if (
|
|
259
|
+
if (notFoundRoutePath || !searchDir) break;
|
|
258
260
|
var parent = searchDir.replace(/\/[^/]+$/, "");
|
|
259
261
|
parent === searchDir ? searchDir = "" : searchDir = parent;
|
|
260
262
|
}
|
|
261
|
-
if (
|
|
262
|
-
(0, import_one_server_only.setServerContext)({
|
|
263
|
-
loaderData: void 0,
|
|
264
|
-
loaderProps,
|
|
265
|
-
matches: []
|
|
266
|
-
});
|
|
267
|
-
var notFoundHtml = await render({
|
|
268
|
-
mode: "ssg",
|
|
269
|
-
loaderData: void 0,
|
|
270
|
-
loaderProps,
|
|
271
|
-
path: notFoundRoutePath,
|
|
272
|
-
preloads,
|
|
273
|
-
matches: []
|
|
274
|
-
});
|
|
275
|
-
return new Response(notFoundHtml, {
|
|
276
|
-
status: 404,
|
|
277
|
-
headers: {
|
|
278
|
-
"Content-Type": "text/html"
|
|
279
|
-
}
|
|
280
|
-
});
|
|
281
|
-
}
|
|
282
|
-
return new Response("<html><body><h1>404 - Not Found</h1></body></html>", {
|
|
263
|
+
if (!notFoundRoutePath) return new Response("<html><body><h1>404 - Not Found</h1></body></html>", {
|
|
283
264
|
status: 404,
|
|
284
265
|
headers: {
|
|
285
266
|
"Content-Type": "text/html"
|
|
286
267
|
}
|
|
287
268
|
});
|
|
288
269
|
}
|
|
289
|
-
var
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
270
|
+
var renderPath = notFoundRoutePath || loaderProps?.path || "/",
|
|
271
|
+
html = await render({
|
|
272
|
+
mode: isSpaShell ? "spa-shell" : route.type === "ssg" ? "ssg" : route.type === "ssr" ? "ssr" : "spa",
|
|
273
|
+
loaderData,
|
|
274
|
+
loaderProps,
|
|
275
|
+
path: renderPath,
|
|
276
|
+
preloads,
|
|
277
|
+
matches
|
|
278
|
+
});
|
|
279
|
+
if (is404) {
|
|
280
|
+
if (notFoundRoutePath) {
|
|
281
|
+
var originalPath = loaderProps?.path || "/",
|
|
282
|
+
notFoundMarker = `<script>window.__one404={originalPath:${JSON.stringify(originalPath)},notFoundPath:${JSON.stringify(notFoundRoutePath)}}</script>`;
|
|
283
|
+
html = html.includes("</head>") ? html.replace("</head>", `${notFoundMarker}</head>`) : html.replace("<body", `${notFoundMarker}<body`);
|
|
301
284
|
}
|
|
302
|
-
|
|
285
|
+
return new Response(html, {
|
|
286
|
+
status: 404,
|
|
287
|
+
headers: {
|
|
288
|
+
"Content-Type": "text/html"
|
|
289
|
+
}
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
return html;
|
|
303
293
|
} catch (err) {
|
|
304
294
|
if ((0, import_isResponse.isResponse)(err)) return err;
|
|
305
295
|
console.error(`SSR error while loading file ${route.file} from URL ${url.href}
|