one 1.4.7 → 1.4.9-1770140739190
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/devtools/devtools.mjs +35 -27
- package/dist/cjs/cli/buildPage.cjs +1 -1
- package/dist/cjs/cli/buildPage.js +1 -1
- package/dist/cjs/cli/buildPage.native.js +1 -1
- package/dist/cjs/cli.cjs +30 -3
- package/dist/cjs/cli.js +31 -3
- package/dist/cjs/cli.js.map +1 -1
- package/dist/cjs/cli.native.js +31 -3
- package/dist/cjs/cli.native.js.map +1 -1
- package/dist/cjs/createHandleRequest.cjs +8 -15
- package/dist/cjs/createHandleRequest.js +6 -10
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +3 -8
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/fork/useLinking.cjs +17 -13
- package/dist/cjs/fork/useLinking.js +14 -12
- package/dist/cjs/fork/useLinking.js.map +1 -1
- package/dist/cjs/index.cjs +10 -9
- package/dist/cjs/index.js +7 -6
- package/dist/cjs/index.js.map +2 -2
- package/dist/cjs/index.native.js +10 -9
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/cjs/router/Route.js.map +1 -1
- package/dist/cjs/router/Route.native.js.map +1 -1
- package/dist/cjs/router/getRoutes.cjs +102 -8
- package/dist/cjs/router/getRoutes.js +111 -8
- package/dist/cjs/router/getRoutes.js.map +1 -1
- package/dist/cjs/router/getRoutes.native.js +197 -8
- package/dist/cjs/router/getRoutes.native.js.map +1 -1
- package/dist/cjs/router/interceptRoutes.cjs +191 -0
- package/dist/cjs/router/interceptRoutes.js +197 -0
- package/dist/cjs/router/interceptRoutes.js.map +6 -0
- package/dist/cjs/router/interceptRoutes.native.js +250 -0
- package/dist/cjs/router/interceptRoutes.native.js.map +1 -0
- package/dist/cjs/router/linkingConfig.cjs +2 -4
- package/dist/cjs/router/linkingConfig.js +2 -5
- package/dist/cjs/router/linkingConfig.js.map +1 -1
- package/dist/cjs/router/linkingConfig.native.js +2 -4
- package/dist/cjs/router/linkingConfig.native.js.map +1 -1
- package/dist/cjs/router/matchers.cjs +37 -0
- package/dist/cjs/router/matchers.js +29 -0
- package/dist/cjs/router/matchers.js.map +1 -1
- package/dist/cjs/router/matchers.native.js +44 -0
- package/dist/cjs/router/matchers.native.js.map +1 -1
- package/dist/cjs/router/router.cjs +37 -29
- package/dist/cjs/router/router.js +29 -28
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +73 -46
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/router/useScreens.cjs +13 -2
- package/dist/cjs/router/useScreens.js +9 -4
- package/dist/cjs/router/useScreens.js.map +1 -1
- package/dist/cjs/router/useScreens.native.js +31 -2
- package/dist/cjs/router/useScreens.native.js.map +1 -1
- package/dist/cjs/typed-routes/getTypedRoutesDeclarationFile.cjs +7 -1
- package/dist/cjs/typed-routes/getTypedRoutesDeclarationFile.js +7 -1
- package/dist/cjs/typed-routes/getTypedRoutesDeclarationFile.js.map +1 -1
- package/dist/cjs/typed-routes/getTypedRoutesDeclarationFile.native.js +6 -2
- package/dist/cjs/typed-routes/getTypedRoutesDeclarationFile.native.js.map +1 -1
- package/dist/cjs/views/Navigator.cjs +58 -2
- package/dist/cjs/views/Navigator.js +54 -2
- package/dist/cjs/views/Navigator.js.map +1 -1
- package/dist/cjs/views/Navigator.native.js +66 -1
- package/dist/cjs/views/Navigator.native.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +1 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.cjs +1 -7
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js +1 -5
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js +1 -8
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/dist/esm/cli/buildPage.js +1 -1
- package/dist/esm/cli/buildPage.mjs +1 -1
- package/dist/esm/cli/buildPage.native.js +1 -1
- package/dist/esm/cli.js +31 -3
- package/dist/esm/cli.js.map +1 -1
- package/dist/esm/cli.mjs +30 -3
- package/dist/esm/cli.mjs.map +1 -1
- package/dist/esm/cli.native.js +31 -3
- package/dist/esm/cli.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +5 -10
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +8 -15
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +3 -8
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/fork/useLinking.js +20 -12
- package/dist/esm/fork/useLinking.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +17 -13
- package/dist/esm/fork/useLinking.mjs.map +1 -1
- package/dist/esm/index.js +5 -4
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +3 -3
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +3 -3
- package/dist/esm/index.native.js.map +1 -1
- package/dist/esm/router/Route.js.map +1 -1
- package/dist/esm/router/Route.mjs.map +1 -1
- package/dist/esm/router/Route.native.js.map +1 -1
- package/dist/esm/router/getRoutes.js +115 -9
- package/dist/esm/router/getRoutes.js.map +1 -1
- package/dist/esm/router/getRoutes.mjs +103 -9
- package/dist/esm/router/getRoutes.mjs.map +1 -1
- package/dist/esm/router/getRoutes.native.js +198 -9
- package/dist/esm/router/getRoutes.native.js.map +1 -1
- package/dist/esm/router/interceptRoutes.js +182 -0
- package/dist/esm/router/interceptRoutes.js.map +6 -0
- package/dist/esm/router/interceptRoutes.mjs +153 -0
- package/dist/esm/router/interceptRoutes.mjs.map +1 -0
- package/dist/esm/router/interceptRoutes.native.js +209 -0
- package/dist/esm/router/interceptRoutes.native.js.map +1 -0
- package/dist/esm/router/linkingConfig.js +1 -5
- package/dist/esm/router/linkingConfig.js.map +1 -1
- package/dist/esm/router/linkingConfig.mjs +1 -3
- package/dist/esm/router/linkingConfig.mjs.map +1 -1
- package/dist/esm/router/linkingConfig.native.js +2 -4
- package/dist/esm/router/linkingConfig.native.js.map +1 -1
- package/dist/esm/router/matchers.js +29 -0
- package/dist/esm/router/matchers.js.map +1 -1
- package/dist/esm/router/matchers.mjs +32 -1
- package/dist/esm/router/matchers.mjs.map +1 -1
- package/dist/esm/router/matchers.native.js +39 -1
- package/dist/esm/router/matchers.native.js.map +1 -1
- package/dist/esm/router/router.js +35 -28
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +38 -28
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +74 -45
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/router/useScreens.js +9 -3
- package/dist/esm/router/useScreens.js.map +1 -1
- package/dist/esm/router/useScreens.mjs +13 -2
- package/dist/esm/router/useScreens.mjs.map +1 -1
- package/dist/esm/router/useScreens.native.js +31 -2
- package/dist/esm/router/useScreens.native.js.map +1 -1
- package/dist/esm/typed-routes/getTypedRoutesDeclarationFile.js +7 -1
- package/dist/esm/typed-routes/getTypedRoutesDeclarationFile.js.map +1 -1
- package/dist/esm/typed-routes/getTypedRoutesDeclarationFile.mjs +7 -1
- package/dist/esm/typed-routes/getTypedRoutesDeclarationFile.mjs.map +1 -1
- package/dist/esm/typed-routes/getTypedRoutesDeclarationFile.native.js +6 -2
- package/dist/esm/typed-routes/getTypedRoutesDeclarationFile.native.js.map +1 -1
- package/dist/esm/views/Navigator.js +56 -3
- package/dist/esm/views/Navigator.js.map +1 -1
- package/dist/esm/views/Navigator.mjs +54 -4
- package/dist/esm/views/Navigator.mjs.map +1 -1
- package/dist/esm/views/Navigator.native.js +63 -4
- package/dist/esm/views/Navigator.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.js +1 -5
- package/dist/esm/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs +1 -7
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js +1 -8
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/package.json +9 -9
- package/src/cli/buildPage.ts +1 -1
- package/src/cli.ts +32 -1
- package/src/createHandleRequest.ts +3 -15
- package/src/fork/useLinking.ts +43 -21
- package/src/index.ts +3 -3
- package/src/router/Route.tsx +29 -0
- package/src/router/getRoutes.ts +202 -13
- package/src/router/interceptRoutes.ts +497 -0
- package/src/router/linkingConfig.ts +2 -11
- package/src/router/matchers.ts +82 -0
- package/src/router/router.ts +62 -54
- package/src/router/useScreens.tsx +15 -2
- package/src/typed-routes/getTypedRoutesDeclarationFile.ts +6 -6
- package/src/views/Navigator.tsx +144 -1
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +1 -1
- package/src/vite/plugins/virtualEntryPlugin.ts +0 -11
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/fork/useLinking.d.ts.map +1 -1
- package/types/index.d.ts +2 -2
- package/types/index.d.ts.map +1 -1
- package/types/router/Route.d.ts +22 -0
- package/types/router/Route.d.ts.map +1 -1
- package/types/router/getRoutes.d.ts.map +1 -1
- package/types/router/interceptRoutes.d.ts +69 -0
- package/types/router/interceptRoutes.d.ts.map +1 -0
- package/types/router/linkingConfig.d.ts.map +1 -1
- package/types/router/matchers.d.ts +37 -0
- package/types/router/matchers.d.ts.map +1 -1
- package/types/router/router.d.ts +0 -23
- package/types/router/router.d.ts.map +1 -1
- package/types/router/useScreens.d.ts.map +1 -1
- package/types/views/Navigator.d.ts +52 -0
- package/types/views/Navigator.d.ts.map +1 -1
- package/types/vite/plugins/virtualEntryPlugin.d.ts.map +1 -1
package/devtools/devtools.mjs
CHANGED
|
@@ -263,35 +263,43 @@
|
|
|
263
263
|
function setupKeyboard() {
|
|
264
264
|
if (keyboardSetup) return
|
|
265
265
|
keyboardSetup = true
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
if (e.
|
|
266
|
+
// use capture: false so app handlers can preventDefault first
|
|
267
|
+
document.addEventListener(
|
|
268
|
+
'keydown',
|
|
269
|
+
(e) => {
|
|
270
|
+
// respect other handlers and browser shortcuts
|
|
271
|
+
if (e.defaultPrevented || e.metaKey || e.ctrlKey) return
|
|
272
|
+
|
|
273
|
+
if (e.altKey && e.code === 'Space') {
|
|
272
274
|
e.preventDefault()
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
275
|
+
toggleSpotlight()
|
|
276
|
+
} else if (e.altKey) {
|
|
277
|
+
if (e.code === 'KeyI') {
|
|
278
|
+
e.preventDefault()
|
|
279
|
+
hideSpotlight()
|
|
280
|
+
window.__oneSourceInspector?.activate()
|
|
281
|
+
return
|
|
282
|
+
}
|
|
283
|
+
const tabMap = {
|
|
284
|
+
KeyS: 'seo',
|
|
285
|
+
KeyR: 'route',
|
|
286
|
+
KeyL: 'loader',
|
|
287
|
+
KeyE: 'errors',
|
|
288
|
+
}
|
|
289
|
+
const tab = tabMap[e.code]
|
|
290
|
+
if (tab) {
|
|
291
|
+
e.preventDefault()
|
|
292
|
+
activeTab = tab
|
|
293
|
+
hideSpotlight()
|
|
294
|
+
showPanel()
|
|
295
|
+
}
|
|
296
|
+
} else if (e.code === 'Escape') {
|
|
297
|
+
if (spotlightDialog?.open) spotlightDialog.close()
|
|
298
|
+
else if (panelDialog?.open) panelDialog.close()
|
|
289
299
|
}
|
|
290
|
-
}
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
}
|
|
294
|
-
})
|
|
300
|
+
},
|
|
301
|
+
{ capture: false }
|
|
302
|
+
)
|
|
295
303
|
}
|
|
296
304
|
|
|
297
305
|
function toggleSpotlight() {
|
|
@@ -238,7 +238,7 @@ if (typeof document === 'undefined') globalThis.document = {}
|
|
|
238
238
|
`),
|
|
239
239
|
deferredLinks = (deferredPreloads || []).map(preload => ` <link rel="modulepreload" fetchPriority="low" href="${preload}"/>`).join(`
|
|
240
240
|
`);
|
|
241
|
-
await outputFile(htmlOutPath,
|
|
241
|
+
await outputFile(htmlOutPath, `<!DOCTYPE html><html><head>
|
|
242
242
|
${constants.getSpaHeaderElements({
|
|
243
243
|
serverContext: {
|
|
244
244
|
loaderProps,
|
|
@@ -217,7 +217,7 @@ if (typeof document === 'undefined') globalThis.document = {}
|
|
|
217
217
|
`);
|
|
218
218
|
await outputFile(
|
|
219
219
|
htmlOutPath,
|
|
220
|
-
|
|
220
|
+
`<!DOCTYPE html><html><head>
|
|
221
221
|
${constants.getSpaHeaderElements({ serverContext: { loaderProps, loaderData } })}
|
|
222
222
|
${criticalScripts}
|
|
223
223
|
${deferredLinks}
|
|
@@ -309,7 +309,7 @@ if (typeof document === 'undefined') globalThis.document = {}
|
|
|
309
309
|
return ` <link rel="modulepreload" fetchPriority="low" href="${preload}"/>`;
|
|
310
310
|
}).join(`
|
|
311
311
|
`);
|
|
312
|
-
await outputFile(htmlOutPath,
|
|
312
|
+
await outputFile(htmlOutPath, `<!DOCTYPE html><html><head>
|
|
313
313
|
${constants.getSpaHeaderElements({
|
|
314
314
|
serverContext: {
|
|
315
315
|
loaderProps,
|
package/dist/cjs/cli.cjs
CHANGED
|
@@ -43,7 +43,8 @@ const version = getPackageVersion(),
|
|
|
43
43
|
"run:android": `${DOCS_BASE}/guides-ios-native`,
|
|
44
44
|
clean: `${DOCS_BASE}/configuration`,
|
|
45
45
|
patch: `${DOCS_BASE}/configuration`,
|
|
46
|
-
"generate-routes": `${DOCS_BASE}/routing-typed-routes
|
|
46
|
+
"generate-routes": `${DOCS_BASE}/routing-typed-routes`,
|
|
47
|
+
typegen: `${DOCS_BASE}/routing-typed-routes`
|
|
47
48
|
};
|
|
48
49
|
function withDocsLink(description, command) {
|
|
49
50
|
return `${description}
|
|
@@ -282,7 +283,32 @@ const modes = {
|
|
|
282
283
|
meta: {
|
|
283
284
|
name: "generate-routes",
|
|
284
285
|
version,
|
|
285
|
-
description: withDocsLink("Generate route type definitions", "generate-routes")
|
|
286
|
+
description: withDocsLink("Generate route type definitions (routes.d.ts)", "generate-routes")
|
|
287
|
+
},
|
|
288
|
+
args: {
|
|
289
|
+
appDir: {
|
|
290
|
+
type: "string",
|
|
291
|
+
description: 'Path to app directory (default: "app")'
|
|
292
|
+
},
|
|
293
|
+
typed: {
|
|
294
|
+
type: "string",
|
|
295
|
+
description: 'Auto-generate route helpers. Options: "type" (type-only helpers) or "runtime" (runtime helpers)'
|
|
296
|
+
}
|
|
297
|
+
},
|
|
298
|
+
async run({
|
|
299
|
+
args
|
|
300
|
+
}) {
|
|
301
|
+
const {
|
|
302
|
+
run
|
|
303
|
+
} = await import("./cli/generateRoutes");
|
|
304
|
+
await run(args);
|
|
305
|
+
}
|
|
306
|
+
}),
|
|
307
|
+
typegen = (0, import_citty.defineCommand)({
|
|
308
|
+
meta: {
|
|
309
|
+
name: "typegen",
|
|
310
|
+
version,
|
|
311
|
+
description: withDocsLink("Generate routes.d.ts (alias for generate-routes)", "typegen")
|
|
286
312
|
},
|
|
287
313
|
args: {
|
|
288
314
|
appDir: {
|
|
@@ -312,7 +338,8 @@ const modes = {
|
|
|
312
338
|
"run:android": runAndroid,
|
|
313
339
|
patch,
|
|
314
340
|
serve: serveCommand,
|
|
315
|
-
"generate-routes": generateRoutes
|
|
341
|
+
"generate-routes": generateRoutes,
|
|
342
|
+
typegen
|
|
316
343
|
},
|
|
317
344
|
subMain = (0, import_citty.defineCommand)({
|
|
318
345
|
meta: {
|
package/dist/cjs/cli.js
CHANGED
|
@@ -34,7 +34,8 @@ const version = getPackageVersion(), DOCS_BASE = "https://onestack.dev/docs", do
|
|
|
34
34
|
"run:android": `${DOCS_BASE}/guides-ios-native`,
|
|
35
35
|
clean: `${DOCS_BASE}/configuration`,
|
|
36
36
|
patch: `${DOCS_BASE}/configuration`,
|
|
37
|
-
"generate-routes": `${DOCS_BASE}/routing-typed-routes
|
|
37
|
+
"generate-routes": `${DOCS_BASE}/routing-typed-routes`,
|
|
38
|
+
typegen: `${DOCS_BASE}/routing-typed-routes`
|
|
38
39
|
};
|
|
39
40
|
function withDocsLink(description, command) {
|
|
40
41
|
return `${description}
|
|
@@ -238,7 +239,33 @@ const modes = {
|
|
|
238
239
|
meta: {
|
|
239
240
|
name: "generate-routes",
|
|
240
241
|
version,
|
|
241
|
-
description: withDocsLink(
|
|
242
|
+
description: withDocsLink(
|
|
243
|
+
"Generate route type definitions (routes.d.ts)",
|
|
244
|
+
"generate-routes"
|
|
245
|
+
)
|
|
246
|
+
},
|
|
247
|
+
args: {
|
|
248
|
+
appDir: {
|
|
249
|
+
type: "string",
|
|
250
|
+
description: 'Path to app directory (default: "app")'
|
|
251
|
+
},
|
|
252
|
+
typed: {
|
|
253
|
+
type: "string",
|
|
254
|
+
description: 'Auto-generate route helpers. Options: "type" (type-only helpers) or "runtime" (runtime helpers)'
|
|
255
|
+
}
|
|
256
|
+
},
|
|
257
|
+
async run({ args }) {
|
|
258
|
+
const { run } = await import("./cli/generateRoutes");
|
|
259
|
+
await run(args);
|
|
260
|
+
}
|
|
261
|
+
}), typegen = (0, import_citty.defineCommand)({
|
|
262
|
+
meta: {
|
|
263
|
+
name: "typegen",
|
|
264
|
+
version,
|
|
265
|
+
description: withDocsLink(
|
|
266
|
+
"Generate routes.d.ts (alias for generate-routes)",
|
|
267
|
+
"typegen"
|
|
268
|
+
)
|
|
242
269
|
},
|
|
243
270
|
args: {
|
|
244
271
|
appDir: {
|
|
@@ -263,7 +290,8 @@ const modes = {
|
|
|
263
290
|
"run:android": runAndroid,
|
|
264
291
|
patch,
|
|
265
292
|
serve: serveCommand,
|
|
266
|
-
"generate-routes": generateRoutes
|
|
293
|
+
"generate-routes": generateRoutes,
|
|
294
|
+
typegen
|
|
267
295
|
}, subMain = (0, import_citty.defineCommand)({
|
|
268
296
|
meta: {
|
|
269
297
|
name: "main",
|
package/dist/cjs/cli.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/cli.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;AAAA,qBAA6B,oBAC7B,mBAAiB,kCACjB,kBAA8B,qBAC9B,eAAkD,kBAClD,oBAAmB;AAJnB;AAMA,SAAS,oBAAoB;AAC3B,MAAI;AACJ,EAAI,OAAO,YAAc,MAEvB,UAAU,YAGV,UAAU,iBAAAA,QAAK,YAAQ,+BAAc,YAAY,GAAG,CAAC;AAEvD,QAAM,cAAc,iBAAAA,QAAK,KAAK,SAAS,MAAM,MAAM,cAAc;AAEjE,SADoB,KAAK,UAAM,6BAAa,aAAa,OAAO,CAAC,EAC9C;AACrB;AAEA,MAAM,UAAU,kBAAkB,GAE5B,YAAY,6BAEZ,YAAY;AAAA,EAChB,KAAK,GAAG,SAAS;AAAA,EACjB,OAAO,GAAG,SAAS;AAAA,EACnB,OAAO,GAAG,SAAS;AAAA,EACnB,UAAU,GAAG,SAAS;AAAA,EACtB,WAAW,GAAG,SAAS;AAAA,EACvB,eAAe,GAAG,SAAS;AAAA,EAC3B,OAAO,GAAG,SAAS;AAAA,EACnB,OAAO,GAAG,SAAS;AAAA,EACnB,mBAAmB,GAAG,SAAS;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["path", "colors", "dev"]
|
|
6
6
|
}
|
package/dist/cjs/cli.native.js
CHANGED
|
@@ -46,7 +46,8 @@ var version = getPackageVersion(),
|
|
|
46
46
|
"run:android": `${DOCS_BASE}/guides-ios-native`,
|
|
47
47
|
clean: `${DOCS_BASE}/configuration`,
|
|
48
48
|
patch: `${DOCS_BASE}/configuration`,
|
|
49
|
-
"generate-routes": `${DOCS_BASE}/routing-typed-routes
|
|
49
|
+
"generate-routes": `${DOCS_BASE}/routing-typed-routes`,
|
|
50
|
+
typegen: `${DOCS_BASE}/routing-typed-routes`
|
|
50
51
|
};
|
|
51
52
|
function withDocsLink(description, command) {
|
|
52
53
|
return `${description}
|
|
@@ -292,7 +293,33 @@ var modes = {
|
|
|
292
293
|
meta: {
|
|
293
294
|
name: "generate-routes",
|
|
294
295
|
version,
|
|
295
|
-
description: withDocsLink("Generate route type definitions", "generate-routes")
|
|
296
|
+
description: withDocsLink("Generate route type definitions (routes.d.ts)", "generate-routes")
|
|
297
|
+
},
|
|
298
|
+
args: {
|
|
299
|
+
appDir: {
|
|
300
|
+
type: "string",
|
|
301
|
+
description: 'Path to app directory (default: "app")'
|
|
302
|
+
},
|
|
303
|
+
typed: {
|
|
304
|
+
type: "string",
|
|
305
|
+
description: 'Auto-generate route helpers. Options: "type" (type-only helpers) or "runtime" (runtime helpers)'
|
|
306
|
+
}
|
|
307
|
+
},
|
|
308
|
+
async run(param) {
|
|
309
|
+
var {
|
|
310
|
+
args
|
|
311
|
+
} = param,
|
|
312
|
+
{
|
|
313
|
+
run
|
|
314
|
+
} = await import("./cli/generateRoutes");
|
|
315
|
+
await run(args);
|
|
316
|
+
}
|
|
317
|
+
}),
|
|
318
|
+
typegen = (0, import_citty.defineCommand)({
|
|
319
|
+
meta: {
|
|
320
|
+
name: "typegen",
|
|
321
|
+
version,
|
|
322
|
+
description: withDocsLink("Generate routes.d.ts (alias for generate-routes)", "typegen")
|
|
296
323
|
},
|
|
297
324
|
args: {
|
|
298
325
|
appDir: {
|
|
@@ -323,7 +350,8 @@ var modes = {
|
|
|
323
350
|
"run:android": runAndroid,
|
|
324
351
|
patch,
|
|
325
352
|
serve: serveCommand,
|
|
326
|
-
"generate-routes": generateRoutes
|
|
353
|
+
"generate-routes": generateRoutes,
|
|
354
|
+
typegen
|
|
327
355
|
},
|
|
328
356
|
subMain = (0, import_citty.defineCommand)({
|
|
329
357
|
meta: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["import_fs","require","import_path","__toESM","import_url","import_citty","import_picocolors","import_meta","getPackageVersion","dirname","__dirname","default","fileURLToPath","url","packagePath","join","packageJson","JSON","parse","readFileSync","version","DOCS_BASE","docsLinks","dev","build","serve","prebuild","clean","patch","withDocsLink","description","command","sep","console","warn","bgYellow","yellow","modes","development","production","defineCommand","meta","name","args","type","host","port","https","mode","debug","run","param","dev2","debugBundle","buildCommand","step","required","only","platform","platforms","ios","web","android","Error","process","exit","serveCommand","compress","loadEnv","expo","install","runIos","runAndroid","vxrnClean","root","cwd","force","generateRoutes","appDir","typed","subCommands","subMain","main","runMain","cliMain","helpIndex","argv","indexOf","subCommandName","subCommand","showUsage"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;gBAAA;AAAA,IAAAA,SAAA,GAAAC,OAAA;EAAAC,WAAA,GAAAC,OAAA,CAAAF,OAAA;EAAAG,UAAA,GAAAH,OAAA;EAAAI,YAAA,GAAAJ,OAAA;EAAAK,iBAAA,GAAAH,OAAA,CAAAF,OAAA;AAMA,MAAAM,WAAS;AACP,SAAIC,kBAAA;EACA,IAAAC,OAAO;EAOX,OAAMC,SAAA,MAAc,GAAAD,OAAA,GAAAC,SAAA,GAAKD,OAAK,GAAAP,WAAe,CAAAS,OAAM,CAAAF,OAAA,CAAc,IAAAL,UAAA,CAAAQ,aAAA,EAAAL,WAAA,CAAAM,GAAA;EAEjE,IAAAC,WADyB,GAAAZ,WAAM,CAAAS,OAAA,CAAAI,IAAA,CAAAN,OAAA,EAAa,YAAa,cACtC;IAAAO,WAAA,GAAAC,IAAA,CAAAC,KAAA,KAAAlB,SAAA,CAAAmB,YAAA,EAAAL,WAAA;EACrB,OAAAE,WAAA,CAAAI,OAAA;AAEA;AAIkB,IAChBA,OAAQ,GAAAZ,iBAAS;EAAAa,SAAA;EAAAC,SAAA;IACjBC,GAAA,KAAOF,SAAG,UAAS;IACnBG,KAAA,EAAO,GAAGH,SAAS;IACnBI,KAAA,KAAUJ,SAAG,YAAS;IACtBK,QAAA,KAAWL,SAAG,oBAAS;IACvB,cAAAA,SAAkB,oBAAS;IAC3B,aAAU,KAAAA,SAAS;IACnBM,KAAA,EAAO,GAAGN,SAAS;IACnBO,KAAA,KAAAP,SAAmB,gBAAY;
|
|
1
|
+
{"version":3,"names":["import_fs","require","import_path","__toESM","import_url","import_citty","import_picocolors","import_meta","getPackageVersion","dirname","__dirname","default","fileURLToPath","url","packagePath","join","packageJson","JSON","parse","readFileSync","version","DOCS_BASE","docsLinks","dev","build","serve","prebuild","clean","patch","typegen","withDocsLink","description","command","sep","console","warn","bgYellow","yellow","modes","development","production","defineCommand","meta","name","args","type","host","port","https","mode","debug","run","param","dev2","debugBundle","buildCommand","step","required","only","platform","platforms","ios","web","android","Error","process","exit","serveCommand","compress","loadEnv","expo","install","runIos","runAndroid","vxrnClean","root","cwd","force","generateRoutes","appDir","typed","subCommands","subMain","main","runMain","cliMain","helpIndex","argv","indexOf","subCommandName","subCommand","showUsage"],"sources":["../../src/cli.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -30,7 +30,6 @@ __export(createHandleRequest_exports, {
|
|
|
30
30
|
});
|
|
31
31
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
|
32
32
|
var import_constants = require("./constants.cjs"),
|
|
33
|
-
import_routeMask = require("./router/routeMask.cjs"),
|
|
34
33
|
import_cleanUrl = require("./utils/cleanUrl.cjs"),
|
|
35
34
|
import_isResponse = require("./utils/isResponse.cjs"),
|
|
36
35
|
import_getManifest = require("./vite/getManifest.cjs"),
|
|
@@ -184,21 +183,15 @@ function createHandleRequest(handlers, {
|
|
|
184
183
|
routes: manifest.pageRoutes
|
|
185
184
|
}), Response.error();
|
|
186
185
|
}
|
|
187
|
-
if (handlers.handlePage) {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
if (looksLikeStaticFile && isDynamicRoute && !isNotFoundRoute) {
|
|
195
|
-
debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 skipping dynamic route ${route.page} for static-looking path`);
|
|
196
|
-
continue;
|
|
197
|
-
}
|
|
198
|
-
debugRouter && console.info(`[one] \u26A1 ${routeMatchPath} \u2192 matched page route: ${route.page} (${route.type})${unmaskParam ? " (unmasked)" : ""}`);
|
|
199
|
-
const resolveUrl = unmaskParam ? new URL(unmaskParam + url.search, url.origin) : url;
|
|
200
|
-
return resolvePageRoute(handlers, request, resolveUrl, route);
|
|
186
|
+
if (handlers.handlePage) for (const route of compiledManifest.pageRoutes) {
|
|
187
|
+
if (!route.compiledRegex.test(pathname)) continue;
|
|
188
|
+
const isDynamicRoute = Object.keys(route.routeKeys).length > 0,
|
|
189
|
+
isNotFoundRoute = route.page.endsWith("/+not-found");
|
|
190
|
+
if (looksLikeStaticFile && isDynamicRoute && !isNotFoundRoute) {
|
|
191
|
+
debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 skipping dynamic route ${route.page} for static-looking path`);
|
|
192
|
+
continue;
|
|
201
193
|
}
|
|
194
|
+
return debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 matched page route: ${route.page} (${route.type})`), resolvePageRoute(handlers, request, url, route);
|
|
202
195
|
}
|
|
203
196
|
return null;
|
|
204
197
|
}
|
|
@@ -23,7 +23,7 @@ __export(createHandleRequest_exports, {
|
|
|
23
23
|
runMiddlewares: () => runMiddlewares
|
|
24
24
|
});
|
|
25
25
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
|
26
|
-
var import_constants = require("./constants"),
|
|
26
|
+
var import_constants = require("./constants"), import_cleanUrl = require("./utils/cleanUrl"), import_isResponse = require("./utils/isResponse"), import_getManifest = require("./vite/getManifest"), import_resolveResponse = require("./vite/resolveResponse");
|
|
27
27
|
const debugRouter = process.env.ONE_DEBUG_ROUTER;
|
|
28
28
|
async function runMiddlewares(handlers, request, route, getResponse) {
|
|
29
29
|
const middlewares = route.middlewares;
|
|
@@ -178,10 +178,9 @@ function createHandleRequest(handlers, { routerRoot }) {
|
|
|
178
178
|
routes: manifest.pageRoutes
|
|
179
179
|
}), Response.error();
|
|
180
180
|
}
|
|
181
|
-
if (handlers.handlePage)
|
|
182
|
-
const unmaskParam = (0, import_routeMask.parseUnmaskFromPath)(pathname), routeMatchPath = unmaskParam || pathname;
|
|
181
|
+
if (handlers.handlePage)
|
|
183
182
|
for (const route of compiledManifest.pageRoutes) {
|
|
184
|
-
if (!route.compiledRegex.test(
|
|
183
|
+
if (!route.compiledRegex.test(pathname))
|
|
185
184
|
continue;
|
|
186
185
|
const isDynamicRoute = Object.keys(route.routeKeys).length > 0, isNotFoundRoute = route.page.endsWith("/+not-found");
|
|
187
186
|
if (looksLikeStaticFile && isDynamicRoute && !isNotFoundRoute) {
|
|
@@ -190,13 +189,10 @@ function createHandleRequest(handlers, { routerRoot }) {
|
|
|
190
189
|
);
|
|
191
190
|
continue;
|
|
192
191
|
}
|
|
193
|
-
debugRouter && console.info(
|
|
194
|
-
`[one] \u26A1 ${
|
|
195
|
-
);
|
|
196
|
-
const resolveUrl = unmaskParam ? new URL(unmaskParam + url.search, url.origin) : url;
|
|
197
|
-
return resolvePageRoute(handlers, request, resolveUrl, route);
|
|
192
|
+
return debugRouter && console.info(
|
|
193
|
+
`[one] \u26A1 ${pathname} \u2192 matched page route: ${route.page} (${route.type})`
|
|
194
|
+
), resolvePageRoute(handlers, request, url, route);
|
|
198
195
|
}
|
|
199
|
-
}
|
|
200
196
|
return null;
|
|
201
197
|
}
|
|
202
198
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA2C,wBAK3C,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA2C,wBAK3C,kBAAsC,6BACtC,oBAA2B,+BAC3B,qBAA4B,+BAC5B,yBAAoD;AAmBpD,MAAM,cAAc,QAAQ,IAAI;AAEhC,eAAsB,eACpB,UACA,SACA,OACA,aACmB;AACnB,QAAM,cAAc,MAAM;AAE1B,MAAI,CAAC,aAAa;AAChB,WAAO,MAAM,YAAY;AAE3B,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,kCAAkC;AAGpD,EAAI,eACF,QAAQ,KAAK,qCAA8B,YAAY,MAAM,SAAS,MAAM,IAAI,EAAE;AAGpF,QAAM,UAA6B,CAAC;AAEpC,iBAAe,SAAS,OAAkC;AACxD,UAAM,mBAAmB,YAAa,KAAK;AAG3C,QAAI,CAAC;AACH,aAAI,eACF,QAAQ,KAAK,wCAAmC,GAE3C,MAAM,YAAY;AAG3B,IAAI,eACF,QAAQ,KAAK,6BAAwB,KAAK,MAAM,iBAAiB,UAAU,EAAE;AAG/E,UAAM,YAAY,MAAM,SAAS,eAAgB,gBAAgB,IAAI;AAIrE,QAAI,CAAC;AACH,YAAM,IAAI;AAAA,QACR,wCAAwC,iBAAiB,UAAU;AAAA,MACrE;AASF,UAAM,WAAW,MAAM,SAAS,EAAE,SAAS,MAL9B,YACJ,SAAS,QAAQ,CAAC,GAIsB,QAAQ,CAAC;AAE1D,WAAI,YACE,eACF,QAAQ;AAAA,MACN,6BAAwB,KAAK,6BAA6B,SAAS,MAAM;AAAA,IAC3E,GAEK,YAIF,SAAS,QAAQ,CAAC;AAAA,EAC3B;AAGA,SAAO,SAAS,CAAC;AACnB;AAEA,eAAsB,gBACpB,UACA,SACA,KACA,OACA;AACA,QAAM,EAAE,SAAS,IAAI,KACf,SAAS,eAAe,UAAU,KAAK;AAE7C,SAAI,eACF,QAAQ,KAAK,uBAAgB,QAAQ,MAAM,IAAI,QAAQ,WAAM,MAAM,IAAI,IAAI,MAAM,GAG5E,MAAM,eAAe,UAAU,SAAS,OAAO,YAAY;AAChE,QAAI;AACF,iBAAO;AAAA,QACL,MACE,SAAS,UAAW;AAAA,UAClB;AAAA,UACA;AAAA,UACA;AAAA,UACA,aAAa;AAAA,YACX,MAAM;AAAA,YACN,QAAQ,IAAI;AAAA,YACZ;AAAA,UACF;AAAA,QACF,CAAC;AAAA,QACH;AAAA,QACA,UAAU,CAAC;AAAA,MACb;AAAA,IACF,SAAS,KAAK;AACZ,cAAI,8BAAW,GAAG;AAChB,eAAO;AAGT,YAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM;AAAA,sCAAyC,QAAQ;AAAA;AAAA,YAE3D,GAAG;AAAA;AAAA;AAAA;AAAA,SAIN,GAGG;AAAA,IACR;AAAA,EACF,CAAC;AACH;AAEA,eAAsB,mBACpB,UACA,SACA,KACA,OACA;AACA,SAAI,eACF,QAAQ,KAAK,0BAAmB,IAAI,QAAQ,WAAM,MAAM,IAAI,EAAE,GAGzD,MAAM,eAAe,UAAU,SAAS,OAAO,YAC7C,UAAM,wCAAgB,YAAY;AACvC,UAAM,UAAU,IAAI,QAAQ;AAC5B,YAAQ,IAAI,gBAAgB,iBAAiB;AAE7C,QAAI;AACF,YAAM,iBAAiB,MAAM,SAAS,aAAc;AAAA,QAClD;AAAA,QACA;AAAA,QACA;AAAA,QACA,aAAa;AAAA,UACX,MAAM,IAAI;AAAA,UACV,QAAQ,IAAI;AAAA,UACZ,SAAS,MAAM,SAAS,QAAQ,UAAU;AAAA,UAC1C,QAAQ,gBAAgB,KAAK,KAAK;AAAA,QACpC;AAAA,MACF,CAAC;AAED,aAAO,IAAI,SAAS,gBAAgB;AAAA,QAClC;AAAA,MACF,CAAC;AAAA,IACH,SAAS,KAAK;AAEZ,cAAI,8BAAW,GAAG;AAChB,eAAO;AAGT,YAAK,KAAa,SAAS,0BACzB,QAAQ,MAAM,yBAAyB,GAAG,EAAE,GAGxC;AAAA,IACR;AAAA,EACF,CAAC,CACF;AACH;AAEA,eAAsB,iBACpB,UACA,SACA,KACA,OACA;AACA,QAAM,EAAE,UAAU,OAAO,IAAI;AAE7B,SAAI,eACF,QAAQ,KAAK,wBAAiB,QAAQ,WAAM,MAAM,IAAI,KAAK,MAAM,IAAI,GAAG,OAGnE,wCAAgB,YACJ,MAAM,eAAe,UAAU,SAAS,OAAO,YACvD,MAAM,SAAS,WAAY;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,MACX,MAAM;AAAA,MACN;AAAA;AAAA,MAEA,SAAS,MAAM,SAAS,QAAQ,UAAU;AAAA,MAC1C,QAAQ,gBAAgB,KAAK,KAAK;AAAA,IACpC;AAAA,EACF,CAAC,CACF,CAEF;AACH;AAEO,SAAS,qBAAqB,SAAkB;AACrD,QAAM,YAAY,QAAQ,OAAO;AACjC,SAAO,IAAI;AAAA,IACT,aAAa;AAAA,IACb,QAAQ,QAAQ,IAAI,MAAM,IAAI,UAAU,QAAQ,QAAQ,IAAI,MAAM,CAAC,KAAK;AAAA,EAC1E;AACF;AAEA,SAAS,kBAAkB,OAAqC;AAC9D,SAAO;AAAA,IACL,GAAG;AAAA,IACH,eAAe,IAAI,OAAO,MAAM,UAAU;AAAA,EAC5C;AACF;AAEO,SAAS,gBAAgB,UAM9B;AACA,SAAO;AAAA,IACL,YAAY,SAAS,WAAW,IAAI,iBAAiB;AAAA,IACrD,WAAW,SAAS,UAAU,IAAI,iBAAiB;AAAA,EACrD;AACF;AAGO,SAAS,oBACd,UACA,EAAE,WAAW,GACb;AACA,QAAM,eAAW,gCAAY,EAAE,WAAW,CAAC;AAC3C,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,oBAAoB;AAEtC,QAAM,mBAAmB,gBAAgB,QAAQ;AAEjD,SAAO;AAAA,IACL;AAAA,IACA,SAAS,eACP,SACiC;AACjC,YAAM,MAAM,qBAAqB,OAAO,GAClC,EAAE,UAAU,OAAO,IAAI;AAG7B,UACE,aAAa,gBACb,SAAS,WAAW,IAAI,KACxB,SAAS,WAAW,oBAAoB,KACxC,SAAS,WAAW,YAAY;AAEhC,eAAO;AAKT,YAAM,sBACJ,CAAC,SAAS,SAAS,2CAA0B,KAC7C,sBAAsB,KAAK,QAAQ;AAErC,UAAI,SAAS,WAAW;AACtB,cAAM,WAAW,iBAAiB,UAAU,KAAK,CAAC,UACzC,MAAM,cAAc,KAAK,QAAQ,CACzC;AACD,YAAI;AACF,iBAAI,eACF,QAAQ,KAAK,gBAAW,QAAQ,8BAAyB,SAAS,IAAI,EAAE,GAEnE,MAAM,gBAAgB,UAAU,SAAS,KAAK,QAAQ;AAAA,MAEjE;AAEA,UAAI,QAAQ,WAAW;AACrB,eAAO;AAGT,UAAI,SAAS,gBACwB,SAAS,SAAS,2CAA0B,GAE/C;AAC9B,cAAM,kBAAc,uCAAsB,QAAQ;AAElD,mBAAW,SAAS,iBAAiB,YAAY;AAC/C,cAAI,MAAM,SAAS;AAEjB;AAGF,gBAAM,WAAW,IAAI,IAAI,aAAa,IAAI,MAAM;AAGhD,cAFA,SAAS,SAAS,IAAI,QAElB,CAAC,MAAM,cAAc,KAAK,SAAS,QAAQ;AAC7C;AAGF,gBAAM,iBAAiB,IAAI,QAAQ,UAAU,OAAO;AACpD,iBAAO,mBAAmB,UAAU,gBAAgB,UAAU,KAAK;AAAA,QACrE;AAEA,eAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM,uCAAuC;AAAA,UACnD;AAAA,UACA;AAAA,UACA,QAAQ,SAAS;AAAA,QACnB,CAAC,GAKI,SAAS,MAAM;AAAA,MACxB;AAGF,UAAI,SAAS;AACX,mBAAW,SAAS,iBAAiB,YAAY;AAC/C,cAAI,CAAC,MAAM,cAAc,KAAK,QAAQ;AACpC;AAMF,gBAAM,iBAAiB,OAAO,KAAK,MAAM,SAAS,EAAE,SAAS,GACvD,kBAAkB,MAAM,KAAK,SAAS,aAAa;AACzD,cAAI,uBAAuB,kBAAkB,CAAC,iBAAiB;AAC7D,YAAI,eACF,QAAQ;AAAA,cACN,gBAAW,QAAQ,kCAA6B,MAAM,IAAI;AAAA,YAC5D;AAEF;AAAA,UACF;AAEA,iBAAI,eACF,QAAQ;AAAA,YACN,gBAAW,QAAQ,+BAA0B,MAAM,IAAI,KAAK,MAAM,IAAI;AAAA,UACxE,GAGK,iBAAiB,UAAU,SAAS,KAAK,KAAK;AAAA,QACvD;AAGF,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,SAAS,gBACP,KACA,QACA;AACA,QAAM,SAAiC,CAAC,GAClC,QAAQ,IAAI,OAAO,OAAO,aAAa,EAAE,KAAK,IAAI,QAAQ;AAChE,MAAI,OAAO;AACT,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,MAAM,MAAM,GAAG;AACvD,YAAM,WAAW,OAAO,UAAU,GAAG;AACrC,aAAO,QAAQ,IAAI;AAAA,IACrB;AAEF,SAAO;AACT;AAGA,SAAS,eAAe,UAAkB,OAA0B;AAElE,QAAM,QADQ,IAAI,OAAO,MAAM,UAAU,EACrB,KAAK,QAAQ;AACjC,SAAK,QACE,OAAO;AAAA,IACZ,OAAO,QAAQ,MAAM,SAAS,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,MACvC,CAAC,OAAQ,MAAM,SAAS,GAAG,KAAK,EAAa,CACrD;AAAA,EACH,IALmB,CAAC;AAMtB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -32,7 +32,6 @@ __export(createHandleRequest_exports, {
|
|
|
32
32
|
});
|
|
33
33
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
|
34
34
|
var import_constants = require("./constants.native.js"),
|
|
35
|
-
import_routeMask = require("./router/routeMask.native.js"),
|
|
36
35
|
import_cleanUrl = require("./utils/cleanUrl.native.js"),
|
|
37
36
|
import_isResponse = require("./utils/isResponse.native.js"),
|
|
38
37
|
import_getManifest = require("./vite/getManifest.native.js"),
|
|
@@ -222,24 +221,20 @@ function createHandleRequest(handlers, param) {
|
|
|
222
221
|
}
|
|
223
222
|
}
|
|
224
223
|
if (handlers.handlePage) {
|
|
225
|
-
var
|
|
226
|
-
routeMatchPath = unmaskParam || pathname,
|
|
227
|
-
_iteratorNormalCompletion1 = !0,
|
|
224
|
+
var _iteratorNormalCompletion1 = !0,
|
|
228
225
|
_didIteratorError1 = !1,
|
|
229
226
|
_iteratorError1 = void 0;
|
|
230
227
|
try {
|
|
231
228
|
for (var _iterator1 = compiledManifest.pageRoutes[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
|
|
232
229
|
var route1 = _step1.value;
|
|
233
|
-
if (route1.compiledRegex.test(
|
|
230
|
+
if (route1.compiledRegex.test(pathname)) {
|
|
234
231
|
var isDynamicRoute = Object.keys(route1.routeKeys).length > 0,
|
|
235
232
|
isNotFoundRoute = route1.page.endsWith("/+not-found");
|
|
236
233
|
if (looksLikeStaticFile && isDynamicRoute && !isNotFoundRoute) {
|
|
237
234
|
debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 skipping dynamic route ${route1.page} for static-looking path`);
|
|
238
235
|
continue;
|
|
239
236
|
}
|
|
240
|
-
debugRouter && console.info(`[one] \u26A1 ${
|
|
241
|
-
var resolveUrl = unmaskParam ? new URL(unmaskParam + url.search, url.origin) : url;
|
|
242
|
-
return resolvePageRoute(handlers, request, resolveUrl, route1);
|
|
237
|
+
return debugRouter && console.info(`[one] \u26A1 ${pathname} \u2192 matched page route: ${route1.page} (${route1.type})`), resolvePageRoute(handlers, request, url, route1);
|
|
243
238
|
}
|
|
244
239
|
}
|
|
245
240
|
} catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createHandleRequest_exports","__export","compileManifest","createHandleRequest","getURLfromRequestURL","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","runMiddlewares","module","exports","import_constants","require","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createHandleRequest_exports","__export","compileManifest","createHandleRequest","getURLfromRequestURL","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","runMiddlewares","module","exports","import_constants","require","import_cleanUrl","import_isResponse","import_getManifest","import_resolveResponse","debugRouter","process","env","ONE_DEBUG_ROUTER","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","console","info","page","context","dispatch","index","_this","middlewareModule","contextKey","exported","default","next","response","status","url","pathname","params","getRouteParams","method","file","resolveAPIEndpoint","handleAPI","loaderProps","path","search","err","isResponse","NODE_ENV","error","resolveResponse","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","code","resolved","handlePage","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","manifest","pageRoutes","map","apiRoutes","param","routerRoot","getManifest","compiledManifest","handler","startsWith","looksLikeStaticFile","endsWith","LOADER_JS_POSTFIX_UNCACHED","test","apiRoute","find","route2","isClientRequestingNewRoute","originalUrl","getPathFromLoaderPath","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","finalUrl","origin","cleanedRequest","Request","return","routes","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","route1","isDynamicRoute","Object","keys","routeKeys","isNotFoundRoute"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -40,9 +40,10 @@ var import_core = require("@react-navigation/core"),
|
|
|
40
40
|
import_fast_deep_equal = __toESM(require("fast-deep-equal"), 1),
|
|
41
41
|
React = __toESM(require("react"), 1),
|
|
42
42
|
import_matchers = require("../router/matchers.cjs"),
|
|
43
|
-
|
|
43
|
+
import_interceptRoutes = require("../router/interceptRoutes.cjs"),
|
|
44
44
|
import_router = require("../router/router.cjs"),
|
|
45
45
|
import_serverLocationContext = require("../router/serverLocationContext.cjs"),
|
|
46
|
+
import_Navigator = require("../views/Navigator.cjs"),
|
|
46
47
|
import_createMemoryHistory = require("./createMemoryHistory.cjs"),
|
|
47
48
|
import_getPathFromState_mods = require("./getPathFromState-mods.cjs");
|
|
48
49
|
const findMatchingState = (a, b) => {
|
|
@@ -100,21 +101,19 @@ function useLinking(ref, {
|
|
|
100
101
|
location: React.useContext(import_serverLocationContext.ServerLocationContext)
|
|
101
102
|
},
|
|
102
103
|
getInitialState = React.useCallback(() => {
|
|
104
|
+
(0, import_interceptRoutes.setNavigationType)("hard"), (0, import_Navigator.clearAllSlotStates)();
|
|
103
105
|
let value;
|
|
104
106
|
if (enabledRef.current) {
|
|
105
107
|
const location2 = server?.location ?? (typeof window < "u" ? window.location : void 0);
|
|
106
108
|
let path = location2 ? location2.pathname + location2.search : void 0;
|
|
107
|
-
if (location2) {
|
|
108
|
-
const
|
|
109
|
-
if (
|
|
110
|
-
const
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
} = historyState;
|
|
116
|
-
__tempLocation?.pathname && !__tempKey && (path = __tempLocation.pathname + (__tempLocation.search || ""), restoringFromTempLocationRef.current = !0);
|
|
117
|
-
}
|
|
109
|
+
if (location2 && typeof window < "u") {
|
|
110
|
+
const historyState = window.history.state;
|
|
111
|
+
if (historyState) {
|
|
112
|
+
const {
|
|
113
|
+
__tempLocation,
|
|
114
|
+
__tempKey
|
|
115
|
+
} = historyState;
|
|
116
|
+
__tempLocation?.pathname && !__tempKey && (path = __tempLocation.pathname + (__tempLocation.search || ""), restoringFromTempLocationRef.current = !0);
|
|
118
117
|
}
|
|
119
118
|
}
|
|
120
119
|
process.env.ONE_DEBUG_ROUTER && console.info(`[one] \u{1F50D} getInitialState path=${path}`), path && (value = getStateFromPathRef.current(path, configRef.current)), onUnhandledLinking(path);
|
|
@@ -136,7 +135,12 @@ function useLinking(ref, {
|
|
|
136
135
|
return React.useEffect(() => (previousIndexRef.current = history.index, history.listen(() => {
|
|
137
136
|
const navigation = ref.current;
|
|
138
137
|
if (!navigation || !enabled) return;
|
|
139
|
-
|
|
138
|
+
if ((0, import_interceptRoutes.isReturningFromIntercept)()) {
|
|
139
|
+
(0, import_interceptRoutes.setReturningFromIntercept)(!1), (0, import_Navigator.clearAllSlotStates)();
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
if ((0, import_interceptRoutes.restoreInterceptFromHistory)()) return;
|
|
143
|
+
(0, import_interceptRoutes.setNavigationType)("hard"), (0, import_Navigator.clearAllSlotStates)(), maskedDisplayPathRef.current = void 0;
|
|
140
144
|
const {
|
|
141
145
|
location: location2
|
|
142
146
|
} = window,
|