one 1.2.19 → 1.2.21
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/createHandleRequest.cjs +10 -6
- package/dist/cjs/createHandleRequest.js +10 -6
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +11 -7
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/fork/NavigationContainer.cjs +1 -1
- package/dist/cjs/fork/NavigationContainer.js +4 -1
- package/dist/cjs/fork/NavigationContainer.js.map +1 -1
- package/dist/cjs/fork/NavigationContainer.native.js +1 -1
- package/dist/cjs/fork/NavigationContainer.native.js.map +1 -1
- package/dist/cjs/fork/createMemoryHistory.cjs +2 -2
- package/dist/cjs/fork/createMemoryHistory.js +2 -2
- package/dist/cjs/fork/createMemoryHistory.js.map +1 -1
- package/dist/cjs/fork/createMemoryHistory.native.js +2 -2
- package/dist/cjs/fork/createMemoryHistory.native.js.map +1 -1
- package/dist/cjs/fork/extractPathFromURL.cjs +1 -1
- package/dist/cjs/fork/extractPathFromURL.js +1 -1
- package/dist/cjs/fork/extractPathFromURL.js.map +1 -1
- package/dist/cjs/fork/extractPathFromURL.native.js +1 -1
- package/dist/cjs/fork/extractPathFromURL.native.js.map +1 -1
- package/dist/cjs/fork/getPathFromState-mods.cjs +1 -1
- package/dist/cjs/fork/getPathFromState-mods.js +1 -1
- package/dist/cjs/fork/getPathFromState-mods.js.map +1 -1
- package/dist/cjs/fork/getPathFromState-mods.native.js +1 -1
- package/dist/cjs/fork/getPathFromState-mods.native.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath-mods.cjs +20 -19
- package/dist/cjs/fork/getStateFromPath-mods.js +18 -15
- package/dist/cjs/fork/getStateFromPath-mods.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath-mods.native.js +19 -18
- package/dist/cjs/fork/getStateFromPath-mods.native.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.cjs +1 -1
- package/dist/cjs/fork/getStateFromPath.js +1 -1
- package/dist/cjs/fork/getStateFromPath.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.native.js +1 -1
- package/dist/cjs/fork/getStateFromPath.native.js.map +1 -1
- package/dist/cjs/fork/useLinking.cjs +26 -19
- package/dist/cjs/fork/useLinking.js +31 -19
- package/dist/cjs/fork/useLinking.js.map +2 -2
- package/dist/cjs/fork/useLinking.native.js +2 -1
- package/dist/cjs/fork/useLinking.native.js.map +1 -1
- package/dist/cjs/getReactNavigationConfig.cjs +2 -4
- package/dist/cjs/getReactNavigationConfig.js +2 -5
- package/dist/cjs/getReactNavigationConfig.js.map +1 -1
- package/dist/cjs/getReactNavigationConfig.native.js +2 -4
- package/dist/cjs/getReactNavigationConfig.native.js.map +1 -1
- package/dist/cjs/hooks.cjs +1 -1
- package/dist/cjs/hooks.js +1 -1
- package/dist/cjs/hooks.js.map +1 -1
- package/dist/cjs/hooks.native.js +4 -1
- package/dist/cjs/hooks.native.js.map +1 -1
- package/dist/cjs/router/getRoutes.cjs +4 -5
- package/dist/cjs/router/getRoutes.js +2 -2
- package/dist/cjs/router/getRoutes.js.map +1 -1
- package/dist/cjs/router/getRoutes.native.js +4 -5
- package/dist/cjs/router/getRoutes.native.js.map +1 -1
- package/dist/cjs/router/matchers.cjs +9 -1
- package/dist/cjs/router/matchers.js +4 -1
- package/dist/cjs/router/matchers.js.map +1 -1
- package/dist/cjs/router/matchers.native.js +10 -2
- package/dist/cjs/router/matchers.native.js.map +1 -1
- package/dist/cjs/router/matchers.test.cjs +7 -1
- package/dist/cjs/router/matchers.test.js +1 -1
- package/dist/cjs/router/matchers.test.js.map +1 -1
- package/dist/cjs/router/matchers.test.native.js +7 -1
- package/dist/cjs/router/matchers.test.native.js.map +1 -1
- package/dist/cjs/router/router.cjs +35 -5
- package/dist/cjs/router/router.js +26 -5
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +32 -5
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/router/utils/getNavigateAction.cjs +2 -2
- package/dist/cjs/router/utils/getNavigateAction.js +2 -2
- package/dist/cjs/router/utils/getNavigateAction.js.map +1 -1
- package/dist/cjs/router/utils/getNavigateAction.native.js +2 -2
- package/dist/cjs/router/utils/getNavigateAction.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +4 -3
- package/dist/cjs/server/oneServe.js +12 -4
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +5 -4
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/setup.native.js.map +1 -6
- package/dist/cjs/vite/one.cjs +9 -12
- package/dist/cjs/vite/one.js +7 -7
- package/dist/cjs/vite/one.js.map +1 -1
- package/dist/cjs/vite/one.native.js +10 -15
- package/dist/cjs/vite/one.native.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +12 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +11 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +12 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +10 -6
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +10 -6
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +10 -6
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/fork/NavigationContainer.js +4 -1
- package/dist/esm/fork/NavigationContainer.js.map +1 -1
- package/dist/esm/fork/NavigationContainer.mjs +1 -1
- package/dist/esm/fork/NavigationContainer.mjs.map +1 -1
- package/dist/esm/fork/NavigationContainer.native.js +1 -1
- package/dist/esm/fork/NavigationContainer.native.js.map +1 -1
- package/dist/esm/fork/createMemoryHistory.js +2 -2
- package/dist/esm/fork/createMemoryHistory.js.map +1 -1
- package/dist/esm/fork/createMemoryHistory.mjs +2 -2
- package/dist/esm/fork/createMemoryHistory.mjs.map +1 -1
- package/dist/esm/fork/createMemoryHistory.native.js +2 -2
- package/dist/esm/fork/createMemoryHistory.native.js.map +1 -1
- package/dist/esm/fork/extractPathFromURL.js +1 -1
- package/dist/esm/fork/extractPathFromURL.js.map +1 -1
- package/dist/esm/fork/extractPathFromURL.mjs +1 -1
- package/dist/esm/fork/extractPathFromURL.mjs.map +1 -1
- package/dist/esm/fork/extractPathFromURL.native.js +1 -1
- package/dist/esm/fork/extractPathFromURL.native.js.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.js +2 -2
- package/dist/esm/fork/getPathFromState-mods.js.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.mjs +2 -2
- package/dist/esm/fork/getPathFromState-mods.mjs.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.native.js +2 -2
- package/dist/esm/fork/getPathFromState-mods.native.js.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.js +18 -15
- package/dist/esm/fork/getStateFromPath-mods.js.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.mjs +20 -19
- package/dist/esm/fork/getStateFromPath-mods.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.native.js +19 -18
- package/dist/esm/fork/getStateFromPath-mods.native.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.js +1 -1
- package/dist/esm/fork/getStateFromPath.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.mjs +1 -1
- package/dist/esm/fork/getStateFromPath.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath.native.js +1 -1
- package/dist/esm/fork/useLinking.js +31 -18
- package/dist/esm/fork/useLinking.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +26 -19
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/fork/useLinking.native.js +2 -1
- package/dist/esm/fork/useLinking.native.js.map +1 -1
- package/dist/esm/getReactNavigationConfig.js +3 -6
- package/dist/esm/getReactNavigationConfig.js.map +1 -1
- package/dist/esm/getReactNavigationConfig.mjs +3 -5
- package/dist/esm/getReactNavigationConfig.mjs.map +1 -1
- package/dist/esm/getReactNavigationConfig.native.js +3 -5
- package/dist/esm/getReactNavigationConfig.native.js.map +1 -1
- package/dist/esm/hooks.js +1 -1
- package/dist/esm/hooks.js.map +1 -1
- package/dist/esm/hooks.mjs +1 -1
- package/dist/esm/hooks.mjs.map +1 -1
- package/dist/esm/hooks.native.js +4 -1
- package/dist/esm/hooks.native.js.map +1 -1
- package/dist/esm/router/getRoutes.js +2 -3
- package/dist/esm/router/getRoutes.js.map +1 -1
- package/dist/esm/router/getRoutes.mjs +5 -6
- package/dist/esm/router/getRoutes.mjs.map +1 -1
- package/dist/esm/router/getRoutes.native.js +5 -6
- package/dist/esm/router/getRoutes.native.js.map +1 -1
- package/dist/esm/router/matchers.js +4 -1
- package/dist/esm/router/matchers.js.map +1 -1
- package/dist/esm/router/matchers.mjs +9 -1
- package/dist/esm/router/matchers.mjs.map +1 -1
- package/dist/esm/router/matchers.native.js +10 -2
- package/dist/esm/router/matchers.native.js.map +1 -1
- package/dist/esm/router/matchers.test.js +1 -1
- package/dist/esm/router/matchers.test.js.map +1 -1
- package/dist/esm/router/matchers.test.mjs +7 -1
- package/dist/esm/router/matchers.test.mjs.map +1 -1
- package/dist/esm/router/matchers.test.native.js +7 -1
- package/dist/esm/router/matchers.test.native.js.map +1 -1
- package/dist/esm/router/router.js +26 -5
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +35 -5
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +32 -5
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/router/utils/getNavigateAction.js +2 -2
- package/dist/esm/router/utils/getNavigateAction.js.map +1 -1
- package/dist/esm/router/utils/getNavigateAction.mjs +2 -2
- package/dist/esm/router/utils/getNavigateAction.mjs.map +1 -1
- package/dist/esm/router/utils/getNavigateAction.native.js +2 -2
- package/dist/esm/router/utils/getNavigateAction.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +12 -4
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +4 -3
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +4 -3
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/vite/one.js +9 -9
- package/dist/esm/vite/one.js.map +1 -1
- package/dist/esm/vite/one.mjs +9 -12
- package/dist/esm/vite/one.mjs.map +1 -1
- package/dist/esm/vite/one.native.js +10 -15
- package/dist/esm/vite/one.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +11 -7
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +12 -7
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +12 -7
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/package.json +10 -10
- package/src/createHandleRequest.ts +34 -0
- package/src/fork/NavigationContainer.tsx +8 -0
- package/src/fork/createMemoryHistory.tsx +8 -0
- package/src/fork/extractPathFromURL.ts +6 -0
- package/src/fork/getPathFromState-mods.ts +2 -7
- package/src/fork/getStateFromPath-mods.ts +43 -17
- package/src/fork/getStateFromPath.ts +1 -1
- package/src/fork/useLinking.native.ts +1 -1
- package/src/fork/useLinking.ts +80 -5
- package/src/getReactNavigationConfig.ts +7 -9
- package/src/hooks.tsx +21 -19
- package/src/router/getRoutes.ts +3 -6
- package/src/router/matchers.test.ts +2 -2
- package/src/router/matchers.ts +22 -6
- package/src/router/router.ts +45 -0
- package/src/router/utils/getNavigateAction.ts +3 -2
- package/src/server/oneServe.ts +13 -0
- package/src/vite/one.ts +9 -13
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +17 -5
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/fork/NavigationContainer.d.ts.map +1 -1
- package/types/fork/createMemoryHistory.d.ts.map +1 -1
- package/types/fork/extractPathFromURL.d.ts.map +1 -1
- package/types/fork/getStateFromPath-mods.d.ts +7 -10
- package/types/fork/getStateFromPath-mods.d.ts.map +1 -1
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/getReactNavigationConfig.d.ts.map +1 -1
- package/types/hooks.d.ts.map +1 -1
- package/types/router/getRoutes.d.ts.map +1 -1
- package/types/router/matchers.d.ts +10 -3
- package/types/router/matchers.d.ts.map +1 -1
- package/types/router/router.d.ts.map +1 -1
- package/types/router/utils/getNavigateAction.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
|
@@ -12,7 +12,8 @@ import { LoaderDataCache } from "../../vite/constants.mjs";
|
|
|
12
12
|
import { replaceLoader } from "../../vite/replaceLoader.mjs";
|
|
13
13
|
import { setServerContext } from "../one-server-only.mjs";
|
|
14
14
|
import { virtalEntryIdClient, virtualEntryId } from "./virtualEntryConstants.mjs";
|
|
15
|
-
const
|
|
15
|
+
const debugRouter = process.env.ONE_DEBUG_ROUTER,
|
|
16
|
+
USE_SERVER_ENV = !1;
|
|
16
17
|
//!!process.env.USE_SERVER_ENV
|
|
17
18
|
function createFileSystemRouterPlugin(options) {
|
|
18
19
|
const preloads = ["/@vite/client", virtalEntryIdClient];
|
|
@@ -177,16 +178,22 @@ ${stack}
|
|
|
177
178
|
const params = redirect.source.match(/:\w+/g);
|
|
178
179
|
params && params.forEach((param, index) => {
|
|
179
180
|
destination = destination.replace(param, match[index + 1] || "");
|
|
180
|
-
}), console.
|
|
181
|
+
}), debugRouter && console.info(`[one] \u21AA redirect ${url2.pathname} \u2192 ${destination}`), res.writeHead(redirect.permanent ? 301 : 302, {
|
|
181
182
|
Location: destination
|
|
182
183
|
}), res.end();
|
|
183
184
|
return;
|
|
184
185
|
}
|
|
185
186
|
}
|
|
186
187
|
}
|
|
187
|
-
const reply = await handleRequest.handler(
|
|
188
|
+
const reply = await handleRequest.handler(convertIncomingMessageToRequest(req));
|
|
188
189
|
if (!reply) return next();
|
|
189
190
|
if (typeof reply != "string" && isResponse(reply)) {
|
|
191
|
+
if (debugRouter) {
|
|
192
|
+
const headers = {};
|
|
193
|
+
reply.headers.forEach((v, k) => {
|
|
194
|
+
headers[k] = v;
|
|
195
|
+
}), console.info(`[one] \u{1F4E4} response ${reply.status}`, headers);
|
|
196
|
+
}
|
|
190
197
|
if (reply.headers.forEach((value, key) => {
|
|
191
198
|
if (key === "set-cookie") {
|
|
192
199
|
const cookies = value.split(", ");
|
|
@@ -194,7 +201,7 @@ ${stack}
|
|
|
194
201
|
} else res.setHeader(key, value);
|
|
195
202
|
}), isStatusRedirect(reply.status)) {
|
|
196
203
|
const location = `${reply.headers.get("location") || ""}`;
|
|
197
|
-
if (console.info(` \
|
|
204
|
+
if (debugRouter && console.info(`[one] \u21AA response redirect \u2192 ${location}`), location) {
|
|
198
205
|
res.writeHead(reply.status, {
|
|
199
206
|
Location: location
|
|
200
207
|
}), res.end();
|
|
@@ -202,9 +209,7 @@ ${stack}
|
|
|
202
209
|
}
|
|
203
210
|
console.error("No location provided to redirected status reply", reply);
|
|
204
211
|
}
|
|
205
|
-
res.statusCode = reply.status, res.statusMessage = reply.statusText
|
|
206
|
-
let outString = "";
|
|
207
|
-
if (reply.body && reply.body.locked) {
|
|
212
|
+
if (res.statusCode = reply.status, res.statusMessage = reply.statusText, reply.body && reply.body.locked) {
|
|
208
213
|
console.warn("Body is locked??", req.url), res.write(""), res.end();
|
|
209
214
|
return;
|
|
210
215
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["join","Readable","debounce","createServerModuleRunner","getSpaHeaderElements","createHandleRequest","getRouterRootFromOneOptions","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","setServerContext","virtalEntryIdClient","virtualEntryId","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","routerRoot","handlePage","route","url","loaderProps","console","info","type","isNotFound","file","slice","serverContext","mode","promise","resolve","routeFile","clearCache","globalThis","__vxrnresetState","exported","import","loaderData","loader","eval","entry","render","default","is404","html","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","subMessage","test","handleLoader","request","route2","url2","loaderProps2","routeFile2","transformedJS","transformRequest","code","loaderData2","platform","searchParams","get","environments","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","setting","optimization","autoEntriesScanning","manifest","pageRoutes","optimizeDeps","entries","Set","flatMap","split","filter","x","startsWith","length","layouts","layout","configureServer","serverIn","ssr","appDir","process","cwd","fileWatcherChangeListener","watcher","addListener","middlewares","use","req","res","next","redirects","web","URL","host","redirect","regexStr","source","replace","match","RegExp","destination","params","forEach","param","index","warn","writeHead","permanent","Location","end","reply","handler","convertIncomingMessageToRequest","value","key","cookies","cookie","appendHeader","setHeader","location","statusCode","statusMessage","statusText","outString","body","locked","write","fromWeb","pipe","originalUrl","urlBase","urlString","Headers","append","includes","method","toWeb","Request","duplex"],"sources":["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["join","Readable","debounce","createServerModuleRunner","getSpaHeaderElements","createHandleRequest","getRouterRootFromOneOptions","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","setServerContext","virtalEntryIdClient","virtualEntryId","debugRouter","process","env","ONE_DEBUG_ROUTER","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","routerRoot","handlePage","route","url","loaderProps","console","info","type","isNotFound","file","slice","serverContext","mode","promise","resolve","routeFile","clearCache","globalThis","__vxrnresetState","exported","import","loaderData","loader","eval","entry","render","default","is404","html","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","subMessage","test","handleLoader","request","route2","url2","loaderProps2","routeFile2","transformedJS","transformRequest","code","loaderData2","platform","searchParams","get","environments","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","setting","optimization","autoEntriesScanning","manifest","pageRoutes","optimizeDeps","entries","Set","flatMap","split","filter","x","startsWith","length","layouts","layout","configureServer","serverIn","ssr","appDir","cwd","fileWatcherChangeListener","watcher","addListener","middlewares","use","req","res","next","redirects","web","URL","host","redirect","regexStr","source","replace","match","RegExp","destination","params","forEach","param","index","writeHead","permanent","Location","end","reply","handler","convertIncomingMessageToRequest","v","k","value","key","cookies","cookie","appendHeader","setHeader","location","statusCode","statusMessage","statusText","body","locked","warn","write","fromWeb","pipe","originalUrl","urlBase","urlString","Headers","append","includes","method","toWeb","Request","duplex"],"sources":["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -20,7 +20,8 @@ function _type_of(obj) {
|
|
|
20
20
|
|
|
21
21
|
return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
22
22
|
}
|
|
23
|
-
var
|
|
23
|
+
var debugRouter = process.env.ONE_DEBUG_ROUTER,
|
|
24
|
+
USE_SERVER_ENV = !1;
|
|
24
25
|
//!!process.env.USE_SERVER_ENV
|
|
25
26
|
function createFileSystemRouterPlugin(options) {
|
|
26
27
|
var preloads = ["/@vite/client", virtalEntryIdClient],
|
|
@@ -252,7 +253,7 @@ ${stack}
|
|
|
252
253
|
params = redirect.source.match(/:\w+/g);
|
|
253
254
|
return params && params.forEach(function (param2, index) {
|
|
254
255
|
destination = destination.replace(param2, match[index + 1] || "");
|
|
255
|
-
}), console.
|
|
256
|
+
}), debugRouter && console.info(`[one] \u21AA redirect ${url2.pathname} \u2192 ${destination}`), res.writeHead(redirect.permanent ? 301 : 302, {
|
|
256
257
|
Location: destination
|
|
257
258
|
}), res.end(), {
|
|
258
259
|
v: void 0
|
|
@@ -272,9 +273,15 @@ ${stack}
|
|
|
272
273
|
}
|
|
273
274
|
}
|
|
274
275
|
}
|
|
275
|
-
var reply = await handleRequest.handler(
|
|
276
|
+
var reply = await handleRequest.handler(convertIncomingMessageToRequest(req));
|
|
276
277
|
if (!reply) return next();
|
|
277
278
|
if (typeof reply != "string" && isResponse(reply)) {
|
|
279
|
+
if (debugRouter) {
|
|
280
|
+
var headers = {};
|
|
281
|
+
reply.headers.forEach(function (v, k) {
|
|
282
|
+
headers[k] = v;
|
|
283
|
+
}), console.info(`[one] \u{1F4E4} response ${reply.status}`, headers);
|
|
284
|
+
}
|
|
278
285
|
if (reply.headers.forEach(function (value, key) {
|
|
279
286
|
if (key === "set-cookie") {
|
|
280
287
|
var cookies = value.split(", "),
|
|
@@ -298,7 +305,7 @@ ${stack}
|
|
|
298
305
|
} else res.setHeader(key, value);
|
|
299
306
|
}), isStatusRedirect(reply.status)) {
|
|
300
307
|
var location = `${reply.headers.get("location") || ""}`;
|
|
301
|
-
if (console.info(` \
|
|
308
|
+
if (debugRouter && console.info(`[one] \u21AA response redirect \u2192 ${location}`), location) {
|
|
302
309
|
res.writeHead(reply.status, {
|
|
303
310
|
Location: location
|
|
304
311
|
}), res.end();
|
|
@@ -306,9 +313,7 @@ ${stack}
|
|
|
306
313
|
}
|
|
307
314
|
console.error("No location provided to redirected status reply", reply);
|
|
308
315
|
}
|
|
309
|
-
res.statusCode = reply.status, res.statusMessage = reply.statusText
|
|
310
|
-
var outString = "";
|
|
311
|
-
if (reply.body && reply.body.locked) {
|
|
316
|
+
if (res.statusCode = reply.status, res.statusMessage = reply.statusText, reply.body && reply.body.locked) {
|
|
312
317
|
console.warn("Body is locked??", req.url), res.write(""), res.end();
|
|
313
318
|
return;
|
|
314
319
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["join","Readable","debounce","createServerModuleRunner","getSpaHeaderElements","createHandleRequest","getRouterRootFromOneOptions","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","setServerContext","virtalEntryIdClient","virtualEntryId","_instanceof","left","right","Symbol","hasInstance","_type_of","obj","constructor","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","routerRoot","handlePage","param","route","url","loaderProps","console","info","type","isNotFound","file","slice","serverContext","mode","promise","resolve","_globalThis___vxrnresetState","_globalThis","_exported_loader","routeFile","clearCache","globalThis","__vxrnresetState","call","exported","import","loaderData","loader","eval","entry","render","default","is404","html","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","isDuplicateReactError","test","subMessage","handleLoader","param2","request","route2","url2","loaderProps2","_this","_exported_loader2","routeFile2","transformedJS","transformRequest","code","exported2","loaderData2","platform","searchParams","get","environment","environments","nativeTransformedJS","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","_options_optimization","_options_optimization_autoEntriesScanning","setting","optimization","autoEntriesScanning","manifest","pageRoutes","routesAndLayouts","Set","flatMap","_route_layouts","split","filter","x","startsWith","length","layouts","layout","optimizeDeps","entries","configureServer","serverIn","ssr","appDir","
|
|
1
|
+
{"version":3,"names":["join","Readable","debounce","createServerModuleRunner","getSpaHeaderElements","createHandleRequest","getRouterRootFromOneOptions","isResponse","isStatusRedirect","promiseWithResolvers","LoaderDataCache","replaceLoader","setServerContext","virtalEntryIdClient","virtualEntryId","_instanceof","left","right","Symbol","hasInstance","_type_of","obj","constructor","debugRouter","process","env","ONE_DEBUG_ROUTER","USE_SERVER_ENV","createFileSystemRouterPlugin","options","preloads","runner","server","handleRequest","createRequestHandler","renderPromise","routerRoot","handlePage","param","route","url","loaderProps","console","info","type","isNotFound","file","slice","serverContext","mode","promise","resolve","_globalThis___vxrnresetState","_globalThis","_exported_loader","routeFile","clearCache","globalThis","__vxrnresetState","call","exported","import","loaderData","loader","eval","entry","render","default","is404","html","path","Response","status","headers","err","error","href","title","pathname","message","Error","stack","isDuplicateReactError","test","subMessage","handleLoader","param2","request","route2","url2","loaderProps2","_this","_exported_loader2","routeFile2","transformedJS","transformRequest","code","exported2","loaderData2","platform","searchParams","get","environment","environments","nativeTransformedJS","JSON","stringify","handleAPI","loadMiddleware","contextKey","name","enforce","apply","config","userConfig","_options_optimization","_options_optimization_autoEntriesScanning","setting","optimization","autoEntriesScanning","manifest","pageRoutes","routesAndLayouts","Set","flatMap","_route_layouts","split","filter","x","startsWith","length","layouts","layout","optimizeDeps","entries","configureServer","serverIn","ssr","appDir","cwd","fileWatcherChangeListener","watcher","addListener","middlewares","use","req","res","next","_options_web","redirects","web","URL","host","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","regexStr","source","replace","match","RegExp","destination","params","forEach","index","writeHead","permanent","Location","end","v","_iterator","iterator","done","_ret","return","reply","handler","convertIncomingMessageToRequest"],"sources":["../../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.21",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -121,17 +121,17 @@
|
|
|
121
121
|
"@react-navigation/routers": "~7.5.1",
|
|
122
122
|
"@swc/core": "^1.14.0",
|
|
123
123
|
"@ungap/structured-clone": "^1.2.0",
|
|
124
|
-
"@vxrn/compiler": "1.2.
|
|
125
|
-
"@vxrn/resolve": "1.2.
|
|
126
|
-
"@vxrn/tslib-lite": "1.2.
|
|
127
|
-
"@vxrn/universal-color-scheme": "1.2.
|
|
128
|
-
"@vxrn/use-isomorphic-layout-effect": "1.2.
|
|
129
|
-
"@vxrn/vite-plugin-metro": "1.2.
|
|
124
|
+
"@vxrn/compiler": "1.2.21",
|
|
125
|
+
"@vxrn/resolve": "1.2.21",
|
|
126
|
+
"@vxrn/tslib-lite": "1.2.21",
|
|
127
|
+
"@vxrn/universal-color-scheme": "1.2.21",
|
|
128
|
+
"@vxrn/use-isomorphic-layout-effect": "1.2.21",
|
|
129
|
+
"@vxrn/vite-plugin-metro": "1.2.21",
|
|
130
130
|
"babel-dead-code-elimination": "^1.0.10",
|
|
131
131
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
132
132
|
"citty": "^0.1.6",
|
|
133
133
|
"core-js": "^3.38.1",
|
|
134
|
-
"create-vxrn": "1.2.
|
|
134
|
+
"create-vxrn": "1.2.21",
|
|
135
135
|
"escape-string-regexp": "^5.0.0",
|
|
136
136
|
"expo-linking": "~8.0.8",
|
|
137
137
|
"expo-modules-core": "~3.0.24",
|
|
@@ -157,7 +157,7 @@
|
|
|
157
157
|
"vite": "^7.1.12",
|
|
158
158
|
"vite-plugin-barrel": "^0.4.1",
|
|
159
159
|
"vite-tsconfig-paths": "^5.1.4",
|
|
160
|
-
"vxrn": "1.2.
|
|
160
|
+
"vxrn": "1.2.21",
|
|
161
161
|
"ws": "^8.18.0",
|
|
162
162
|
"xxhashjs": "^0.2.2"
|
|
163
163
|
},
|
|
@@ -175,7 +175,7 @@
|
|
|
175
175
|
"devDependencies": {
|
|
176
176
|
"@react-navigation/core": "^7.13.0",
|
|
177
177
|
"@react-navigation/native": "~7.1.19",
|
|
178
|
-
"@tamagui/build": "^1.138.
|
|
178
|
+
"@tamagui/build": "^1.138.6",
|
|
179
179
|
"@types/node": "^24.10.0",
|
|
180
180
|
"@types/react-dom": "^19.2.2",
|
|
181
181
|
"@types/xxhashjs": "^0.2.4",
|
|
@@ -25,6 +25,8 @@ type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
|
|
|
25
25
|
|
|
26
26
|
type RequestHandlerResponse = null | string | Response
|
|
27
27
|
|
|
28
|
+
const debugRouter = process.env.ONE_DEBUG_ROUTER
|
|
29
|
+
|
|
28
30
|
export async function runMiddlewares(
|
|
29
31
|
handlers: RequestHandlers,
|
|
30
32
|
request: Request,
|
|
@@ -40,6 +42,10 @@ export async function runMiddlewares(
|
|
|
40
42
|
throw new Error(`No middleware handler configured`)
|
|
41
43
|
}
|
|
42
44
|
|
|
45
|
+
if (debugRouter) {
|
|
46
|
+
console.info(`[one] 🔗 middleware chain (${middlewares.length}) for ${route.page}`)
|
|
47
|
+
}
|
|
48
|
+
|
|
43
49
|
const context: MiddlewareContext = {}
|
|
44
50
|
|
|
45
51
|
async function dispatch(index: number): Promise<Response> {
|
|
@@ -47,9 +53,16 @@ export async function runMiddlewares(
|
|
|
47
53
|
|
|
48
54
|
// no more middlewares, finish
|
|
49
55
|
if (!middlewareModule) {
|
|
56
|
+
if (debugRouter) {
|
|
57
|
+
console.info(`[one] ✓ middleware chain complete`)
|
|
58
|
+
}
|
|
50
59
|
return await getResponse()
|
|
51
60
|
}
|
|
52
61
|
|
|
62
|
+
if (debugRouter) {
|
|
63
|
+
console.info(`[one] → middleware[${index}]: ${middlewareModule.contextKey}`)
|
|
64
|
+
}
|
|
65
|
+
|
|
53
66
|
const exported = (await handlers.loadMiddleware!(middlewareModule))?.default as
|
|
54
67
|
| Middleware
|
|
55
68
|
| undefined
|
|
@@ -67,6 +80,9 @@ export async function runMiddlewares(
|
|
|
67
80
|
const response = await exported({ request, next, context })
|
|
68
81
|
|
|
69
82
|
if (response) {
|
|
83
|
+
if (debugRouter) {
|
|
84
|
+
console.info(`[one] ← middleware[${index}] returned early (status: ${response.status})`)
|
|
85
|
+
}
|
|
70
86
|
return response
|
|
71
87
|
}
|
|
72
88
|
|
|
@@ -87,6 +103,10 @@ export async function resolveAPIRoute(
|
|
|
87
103
|
const { pathname } = url
|
|
88
104
|
const params = getRouteParams(pathname, route)
|
|
89
105
|
|
|
106
|
+
if (debugRouter) {
|
|
107
|
+
console.info(`[one] 📡 API ${request.method} ${pathname} → ${route.file}`, params)
|
|
108
|
+
}
|
|
109
|
+
|
|
90
110
|
try {
|
|
91
111
|
return resolveAPIEndpoint(
|
|
92
112
|
() =>
|
|
@@ -128,6 +148,10 @@ export async function resolveLoaderRoute(
|
|
|
128
148
|
url: URL,
|
|
129
149
|
route: RouteInfoCompiled
|
|
130
150
|
) {
|
|
151
|
+
if (debugRouter) {
|
|
152
|
+
console.info(`[one] 📦 loader ${url.pathname} → ${route.file}`)
|
|
153
|
+
}
|
|
154
|
+
|
|
131
155
|
return await runMiddlewares(handlers, request, route, async () => {
|
|
132
156
|
return await resolveResponse(async () => {
|
|
133
157
|
const headers = new Headers()
|
|
@@ -171,6 +195,10 @@ export async function resolvePageRoute(
|
|
|
171
195
|
) {
|
|
172
196
|
const { pathname, search } = url
|
|
173
197
|
|
|
198
|
+
if (debugRouter) {
|
|
199
|
+
console.info(`[one] 📄 page ${pathname} → ${route.file} (${route.type})`)
|
|
200
|
+
}
|
|
201
|
+
|
|
174
202
|
return resolveResponse(async () => {
|
|
175
203
|
const resolved = await runMiddlewares(handlers, request, route, async () => {
|
|
176
204
|
return await handlers.handlePage!({
|
|
@@ -241,6 +269,9 @@ export function createHandleRequest(
|
|
|
241
269
|
return route.compiledRegex.test(pathname)
|
|
242
270
|
})
|
|
243
271
|
if (apiRoute) {
|
|
272
|
+
if (debugRouter) {
|
|
273
|
+
console.info(`[one] ⚡ ${pathname} → matched API route: ${apiRoute.page}`)
|
|
274
|
+
}
|
|
244
275
|
return await resolveAPIRoute(handlers, request, url, apiRoute)
|
|
245
276
|
}
|
|
246
277
|
}
|
|
@@ -291,6 +322,9 @@ export function createHandleRequest(
|
|
|
291
322
|
if (!route.compiledRegex.test(pathname)) {
|
|
292
323
|
continue
|
|
293
324
|
}
|
|
325
|
+
if (debugRouter) {
|
|
326
|
+
console.info(`[one] ⚡ ${pathname} → matched page route: ${route.page} (${route.type})`)
|
|
327
|
+
}
|
|
294
328
|
return resolvePageRoute(handlers, request, url, route)
|
|
295
329
|
}
|
|
296
330
|
}
|
|
@@ -164,6 +164,14 @@ function NavigationContainerInner(
|
|
|
164
164
|
|
|
165
165
|
const [isResolved, initialState] = useThenable(getInitialState)
|
|
166
166
|
|
|
167
|
+
if (process.env.ONE_DEBUG_ROUTER) {
|
|
168
|
+
console.info(
|
|
169
|
+
`[one] 🏠 NavigationContainer isResolved=${isResolved} initialState=`,
|
|
170
|
+
JSON.stringify(initialState, null, 2)
|
|
171
|
+
)
|
|
172
|
+
console.info(`[one] 🏠 NavigationContainer rest.initialState=`, rest.initialState)
|
|
173
|
+
}
|
|
174
|
+
|
|
167
175
|
React.useImperativeHandle(ref, () => refContainer.current!)
|
|
168
176
|
|
|
169
177
|
const isLinkingReady = rest.initialState != null || !isLinkingEnabled || isResolved
|
|
@@ -82,6 +82,10 @@ export function createMemoryHistory() {
|
|
|
82
82
|
items.push({ path, state, id })
|
|
83
83
|
index = items.length - 1
|
|
84
84
|
|
|
85
|
+
if (process.env.ONE_DEBUG_ROUTER) {
|
|
86
|
+
console.info(`[one] 📜 history.push path=${path}`)
|
|
87
|
+
}
|
|
88
|
+
|
|
85
89
|
// We pass empty string for title because it's ignored in all browsers except safari
|
|
86
90
|
// We don't store state object in history.state because:
|
|
87
91
|
// - browsers have limits on how big it can be, and we don't control the size
|
|
@@ -117,6 +121,10 @@ export function createMemoryHistory() {
|
|
|
117
121
|
items[index] = { path, state, id }
|
|
118
122
|
}
|
|
119
123
|
|
|
124
|
+
if (process.env.ONE_DEBUG_ROUTER) {
|
|
125
|
+
console.info(`[one] 📜 history.replace path=${pathWithHash}`)
|
|
126
|
+
}
|
|
127
|
+
|
|
120
128
|
window.history.replaceState({ id }, '', pathWithHash)
|
|
121
129
|
},
|
|
122
130
|
|
|
@@ -82,6 +82,12 @@ function fromDeepLink(url: string): string {
|
|
|
82
82
|
* - It has a valid App scheme, but the scheme isn't a valid URL scheme (e.g. `my_app://`)
|
|
83
83
|
*/
|
|
84
84
|
|
|
85
|
+
// If `url` is already a path (starts with `/`), return it as-is
|
|
86
|
+
// This prevents incorrect rewrites when URL is in query params (e.g. `/?url=https://example.com`)
|
|
87
|
+
if (url.startsWith('/')) {
|
|
88
|
+
return url
|
|
89
|
+
}
|
|
90
|
+
|
|
85
91
|
/**
|
|
86
92
|
* App schemes are not valid URL schemes, so they will fail to parse.
|
|
87
93
|
* We need to strip the scheme from these URLs
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
import type { Route } from '@react-navigation/core'
|
|
8
8
|
|
|
9
|
-
import {
|
|
9
|
+
import { matchDynamicName, matchGroupName } from '../router/matchers'
|
|
10
10
|
import { getParamName } from './_shared'
|
|
11
11
|
|
|
12
12
|
export type AdditionalOptions = {
|
|
@@ -136,12 +136,7 @@ export function appendBaseUrl(
|
|
|
136
136
|
}
|
|
137
137
|
|
|
138
138
|
function segmentMatchesConvention(segment: string): boolean {
|
|
139
|
-
return (
|
|
140
|
-
segment === 'index' ||
|
|
141
|
-
matchDynamicName(segment) != null ||
|
|
142
|
-
matchGroupName(segment) != null ||
|
|
143
|
-
matchDeepDynamicRouteName(segment) != null
|
|
144
|
-
)
|
|
139
|
+
return segment === 'index' || matchDynamicName(segment) != null || matchGroupName(segment) != null
|
|
145
140
|
}
|
|
146
141
|
|
|
147
142
|
function encodeURISegment(str: string, { preserveBrackets = false } = {}) {
|
|
@@ -16,35 +16,44 @@ export type AdditionalRouteConfig = {
|
|
|
16
16
|
hasChildren: boolean
|
|
17
17
|
expandedRouteNames: string[]
|
|
18
18
|
parts: string[]
|
|
19
|
+
staticPartCount: number
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
interface UrlWithReactNavigationConcessions {
|
|
23
|
+
path: string
|
|
24
|
+
nonstandardPathname: string
|
|
25
|
+
hash: string
|
|
26
|
+
pathWithoutGroups: string
|
|
19
27
|
}
|
|
20
28
|
|
|
21
29
|
export function getUrlWithReactNavigationConcessions(
|
|
22
30
|
path: string,
|
|
23
31
|
baseUrl: string | undefined = process.env.EXPO_BASE_URL
|
|
24
|
-
) {
|
|
25
|
-
|
|
32
|
+
): UrlWithReactNavigationConcessions {
|
|
33
|
+
const pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl))
|
|
34
|
+
|
|
35
|
+
let pathname = ''
|
|
36
|
+
let hash = ''
|
|
26
37
|
try {
|
|
27
|
-
|
|
38
|
+
// NOTE: This used to use a dummy base URL for parsing (phony.example)
|
|
39
|
+
// However, this seems to get flagged since it's preserved 1:1 in the output bytecode by certain scanners
|
|
40
|
+
// Instead, we use an empty `file:` URL. This will still perform `pathname` normalization, search parameter parsing
|
|
41
|
+
// encoding, and all other logic, except the logic that applies to hostnames and protocols, and also not leave a
|
|
42
|
+
// dummy URL in the output bytecode
|
|
43
|
+
const parsed = new URL(path, 'file:')
|
|
44
|
+
pathname = parsed.pathname
|
|
45
|
+
hash = parsed.hash
|
|
28
46
|
} catch {
|
|
29
47
|
// Do nothing with invalid URLs.
|
|
30
|
-
return {
|
|
31
|
-
path,
|
|
32
|
-
cleanUrl: '',
|
|
33
|
-
nonstandardPathname: '',
|
|
34
|
-
url: new URL('https://phony.example'),
|
|
35
|
-
}
|
|
36
48
|
}
|
|
37
49
|
|
|
38
|
-
const pathname = parsed.pathname
|
|
39
50
|
const withoutBaseUrl = stripBaseUrl(pathname, baseUrl)
|
|
40
|
-
const pathWithoutGroups = stripGroupSegmentsFromPath(stripBaseUrl(path, baseUrl))
|
|
41
|
-
|
|
42
|
-
// Make sure there is a trailing slash
|
|
43
51
|
return {
|
|
44
|
-
// The slashes are at the end, not the beginning
|
|
45
52
|
path,
|
|
53
|
+
// Make sure there is a trailing slash
|
|
54
|
+
// The slashes are at the end, not the beginning
|
|
46
55
|
nonstandardPathname: withoutBaseUrl.replace(/^\/+/g, '').replace(/\/+$/g, '') + '/',
|
|
47
|
-
|
|
56
|
+
hash,
|
|
48
57
|
pathWithoutGroups,
|
|
49
58
|
}
|
|
50
59
|
}
|
|
@@ -145,6 +154,13 @@ export function getRouteConfigSorter(previousSegments: string[] = []) {
|
|
|
145
154
|
return 1
|
|
146
155
|
}
|
|
147
156
|
|
|
157
|
+
/*
|
|
158
|
+
* If the routes have any static segments, the one with the most static segments should be higher
|
|
159
|
+
*/
|
|
160
|
+
if (a.staticPartCount !== b.staticPartCount) {
|
|
161
|
+
return b.staticPartCount - a.staticPartCount
|
|
162
|
+
}
|
|
163
|
+
|
|
148
164
|
/*
|
|
149
165
|
* If both are static/dynamic or a layout file, then we check group similarity
|
|
150
166
|
*/
|
|
@@ -312,15 +328,23 @@ export function createConfigItemAdditionalProperties(
|
|
|
312
328
|
): Omit<AdditionalRouteConfig, 'isInitial'> {
|
|
313
329
|
const parts: string[] = []
|
|
314
330
|
let isDynamic = false
|
|
331
|
+
let staticPartCount = 0
|
|
315
332
|
const isIndex = screen === 'index' || screen.endsWith('/index')
|
|
316
333
|
|
|
317
334
|
for (const part of pattern.split('/')) {
|
|
318
335
|
if (part) {
|
|
319
336
|
// If any part is dynamic, then the route is dynamic
|
|
320
|
-
|
|
337
|
+
const isDynamicPart =
|
|
338
|
+
part.startsWith(':') || part.startsWith('*') || part.includes('*not-found')
|
|
339
|
+
|
|
340
|
+
isDynamic ||= isDynamicPart
|
|
321
341
|
|
|
322
342
|
if (!matchGroupName(part)) {
|
|
323
343
|
parts.push(part)
|
|
344
|
+
|
|
345
|
+
if (!isDynamicPart) {
|
|
346
|
+
staticPartCount++
|
|
347
|
+
}
|
|
324
348
|
}
|
|
325
349
|
}
|
|
326
350
|
}
|
|
@@ -330,6 +354,7 @@ export function createConfigItemAdditionalProperties(
|
|
|
330
354
|
|
|
331
355
|
if (isIndex) {
|
|
332
356
|
parts.push('index')
|
|
357
|
+
staticPartCount++
|
|
333
358
|
}
|
|
334
359
|
|
|
335
360
|
return {
|
|
@@ -337,6 +362,7 @@ export function createConfigItemAdditionalProperties(
|
|
|
337
362
|
isIndex,
|
|
338
363
|
hasChildren,
|
|
339
364
|
parts,
|
|
365
|
+
staticPartCount,
|
|
340
366
|
userReadableName: [...routeNames.slice(0, -1), config.path || screen].join('/'),
|
|
341
367
|
expandedRouteNames: routeNames.flatMap((name) => {
|
|
342
368
|
return name.split('/')
|
|
@@ -350,7 +376,7 @@ export function parseQueryParamsExtended(
|
|
|
350
376
|
parseConfig?: Record<string, (value: string) => any>,
|
|
351
377
|
hash?: string
|
|
352
378
|
) {
|
|
353
|
-
const searchParams = new URL(path, '
|
|
379
|
+
const searchParams = new URL(path, 'file:').searchParams
|
|
354
380
|
const params: Record<string, string | string[]> = Object.create(null)
|
|
355
381
|
|
|
356
382
|
if (hash) {
|
|
@@ -189,7 +189,7 @@ export function useLinking(
|
|
|
189
189
|
// If the link were handled, it gets cleared in NavigationContainer
|
|
190
190
|
onUnhandledLinking(extractPathFromURL(prefixes, url))
|
|
191
191
|
const rootState = navigation.getRootState()
|
|
192
|
-
if (state.routes.some((r) => !rootState?.routeNames
|
|
192
|
+
if (state.routes.some((r) => !rootState?.routeNames?.includes(r.name))) {
|
|
193
193
|
return
|
|
194
194
|
}
|
|
195
195
|
|