one 1.2.20 → 1.2.22-1765155190908
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 +11 -2
- package/dist/cjs/cli/build.js +10 -2
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +44 -19
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/cli/buildPage.cjs +20 -4
- package/dist/cjs/cli/buildPage.js +21 -7
- package/dist/cjs/cli/buildPage.js.map +1 -1
- package/dist/cjs/cli/buildPage.native.js +38 -6
- package/dist/cjs/cli/buildPage.native.js.map +1 -1
- package/dist/cjs/createApp.cjs +23 -16
- package/dist/cjs/createApp.js +73 -67
- package/dist/cjs/createApp.js.map +2 -2
- 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 +27 -20
- package/dist/cjs/fork/useLinking.js +32 -20
- 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/index.cjs +2 -0
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/index.native.js +2 -0
- package/dist/cjs/index.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 +20 -17
- package/dist/cjs/router/router.js +24 -21
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +21 -18
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/router/useViteRoutes.cjs +57 -17
- package/dist/cjs/router/useViteRoutes.js +55 -17
- package/dist/cjs/router/useViteRoutes.js.map +2 -2
- package/dist/cjs/router/useViteRoutes.native.js +76 -0
- package/dist/cjs/router/useViteRoutes.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 +6 -3
- 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/useLoader.cjs +39 -40
- package/dist/cjs/useLoader.js +10 -7
- package/dist/cjs/useLoader.js.map +1 -1
- package/dist/cjs/useLoader.native.js +54 -54
- package/dist/cjs/useLoader.native.js.map +1 -1
- 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/cjs/vite/plugins/virtualEntryPlugin.cjs +12 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js +12 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js +12 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/dist/esm/cli/build.js +10 -2
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +11 -2
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +44 -19
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/cli/buildPage.js +21 -7
- package/dist/esm/cli/buildPage.js.map +1 -1
- package/dist/esm/cli/buildPage.mjs +20 -4
- package/dist/esm/cli/buildPage.mjs.map +1 -1
- package/dist/esm/cli/buildPage.native.js +38 -6
- package/dist/esm/cli/buildPage.native.js.map +1 -1
- package/dist/esm/createApp.js +73 -66
- package/dist/esm/createApp.js.map +2 -2
- package/dist/esm/createApp.mjs +23 -16
- package/dist/esm/createApp.mjs.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 +32 -19
- package/dist/esm/fork/useLinking.js.map +1 -1
- package/dist/esm/fork/useLinking.mjs +27 -20
- 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/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +2 -1
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +2 -1
- package/dist/esm/index.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 +24 -20
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +20 -18
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +21 -19
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/router/useViteRoutes.js +55 -17
- package/dist/esm/router/useViteRoutes.js.map +1 -1
- package/dist/esm/router/useViteRoutes.mjs +54 -18
- package/dist/esm/router/useViteRoutes.mjs.map +1 -1
- package/dist/esm/router/useViteRoutes.native.js +73 -1
- package/dist/esm/router/useViteRoutes.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 +6 -3
- 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/useLoader.js +10 -8
- package/dist/esm/useLoader.js.map +1 -1
- package/dist/esm/useLoader.mjs +40 -41
- package/dist/esm/useLoader.mjs.map +1 -1
- package/dist/esm/useLoader.native.js +55 -55
- package/dist/esm/useLoader.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/dist/esm/vite/plugins/virtualEntryPlugin.js +12 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs +12 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js +12 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/package.json +10 -10
- package/src/cli/build.ts +26 -1
- package/src/cli/buildPage.ts +28 -5
- package/src/createApp.tsx +29 -21
- 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 +89 -5
- package/src/getReactNavigationConfig.ts +7 -9
- package/src/hooks.tsx +21 -19
- package/src/index.ts +1 -0
- 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 +39 -26
- package/src/router/useViteRoutes.tsx +127 -17
- package/src/router/utils/getNavigateAction.ts +3 -2
- package/src/server/oneServe.ts +13 -0
- package/src/types.ts +1 -0
- package/src/useLoader.ts +20 -12
- package/src/vite/one.ts +9 -13
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +17 -5
- package/src/vite/plugins/virtualEntryPlugin.ts +12 -1
- package/src/vite/types.ts +2 -0
- package/types/cli/build.d.ts.map +1 -1
- package/types/cli/buildPage.d.ts +1 -1
- package/types/cli/buildPage.d.ts.map +1 -1
- package/types/createApp.d.ts.map +1 -1
- 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/index.d.ts +1 -0
- package/types/index.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 +3 -2
- package/types/router/router.d.ts.map +1 -1
- package/types/router/useViteRoutes.d.ts +11 -0
- package/types/router/useViteRoutes.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/types.d.ts +1 -0
- package/types/types.d.ts.map +1 -1
- package/types/useLoader.d.ts.map +1 -1
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
- package/types/vite/plugins/virtualEntryPlugin.d.ts.map +1 -1
- package/types/vite/types.d.ts +1 -0
- package/types/vite/types.d.ts.map +1 -1
|
@@ -3,6 +3,75 @@ var lastVersion = 0,
|
|
|
3
3
|
function useViteRoutes(routes, routerRoot, options, version) {
|
|
4
4
|
return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, routerRoot, options), context;
|
|
5
5
|
}
|
|
6
|
+
var preloadedModules = {};
|
|
7
|
+
function registerPreloadedRoute(key, module) {
|
|
8
|
+
preloadedModules[key] = module;
|
|
9
|
+
}
|
|
10
|
+
function getPreloadedModule(key) {
|
|
11
|
+
return preloadedModules[key];
|
|
12
|
+
}
|
|
13
|
+
function getPreloadedModuleKeys() {
|
|
14
|
+
return Object.keys(preloadedModules);
|
|
15
|
+
}
|
|
16
|
+
function matchDynamicRoute(routePattern, actualPath) {
|
|
17
|
+
var routeSegments = routePattern.split("/"),
|
|
18
|
+
pathSegments = actualPath.split("/"),
|
|
19
|
+
hasCatchAll = routeSegments.some(function (s) {
|
|
20
|
+
return s.startsWith("[...");
|
|
21
|
+
});
|
|
22
|
+
if (hasCatchAll) {
|
|
23
|
+
for (var catchAllIdx = routeSegments.findIndex(function (s) {
|
|
24
|
+
return s.startsWith("[...");
|
|
25
|
+
}), i = 0; i < catchAllIdx; i++) if (routeSegments[i] && !routeSegments[i].startsWith("[") && routeSegments[i] !== pathSegments[i]) return !1;
|
|
26
|
+
return pathSegments.length >= catchAllIdx;
|
|
27
|
+
}
|
|
28
|
+
if (routeSegments.length !== pathSegments.length) return !1;
|
|
29
|
+
for (var i1 = 0; i1 < routeSegments.length; i1++) {
|
|
30
|
+
var routeSeg = routeSegments[i1],
|
|
31
|
+
pathSeg = pathSegments[i1];
|
|
32
|
+
if (!(routeSeg.startsWith("[") && routeSeg.endsWith("]")) && routeSeg !== pathSeg) return !1;
|
|
33
|
+
}
|
|
34
|
+
return !0;
|
|
35
|
+
}
|
|
36
|
+
async function preloadRouteModules(href) {
|
|
37
|
+
var globbed = globalThis.__importMetaGlobbed;
|
|
38
|
+
if (globbed) {
|
|
39
|
+
var normalizedHref = href === "/" ? "" : href.replace(/^\//, "").replace(/\/$/, ""),
|
|
40
|
+
promises = [],
|
|
41
|
+
_iteratorNormalCompletion = !0,
|
|
42
|
+
_didIteratorError = !1,
|
|
43
|
+
_iteratorError = void 0;
|
|
44
|
+
try {
|
|
45
|
+
for (var _loop = function () {
|
|
46
|
+
var key = _step.value,
|
|
47
|
+
routePath = key.replace(/^\/[^/]+\//, "");
|
|
48
|
+
routePath = routePath.replace(/\([^)]+\)\//g, ""), routePath = routePath.replace(/\/_layout\.tsx$/, "").replace(/\/index(\+[a-z]+)?\.tsx$/, "").replace(/(\+[a-z]+)?\.tsx$/, ""), routePath = routePath.replace(/^\//, "");
|
|
49
|
+
var isStaticMatch = routePath === normalizedHref ||
|
|
50
|
+
// exact match
|
|
51
|
+
routePath.startsWith(normalizedHref + "/") ||
|
|
52
|
+
// child route
|
|
53
|
+
normalizedHref.startsWith(routePath + "/") ||
|
|
54
|
+
// parent layout
|
|
55
|
+
routePath === "" ||
|
|
56
|
+
// root layout
|
|
57
|
+
normalizedHref !== "" && routePath === normalizedHref.split("/")[0],
|
|
58
|
+
isDynamicMatch = routePath.includes("[") && matchDynamicRoute(routePath, normalizedHref);
|
|
59
|
+
(isStaticMatch || isDynamicMatch) && typeof globbed[key] == "function" && promises.push(globbed[key]().then(function (mod) {
|
|
60
|
+
preloadedModules[key] = mod;
|
|
61
|
+
}).catch(function () {}));
|
|
62
|
+
}, _iterator = Object.keys(globbed)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
|
|
63
|
+
} catch (err) {
|
|
64
|
+
_didIteratorError = !0, _iteratorError = err;
|
|
65
|
+
} finally {
|
|
66
|
+
try {
|
|
67
|
+
!_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
|
|
68
|
+
} finally {
|
|
69
|
+
if (_didIteratorError) throw _iteratorError;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
await Promise.all(promises);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
6
75
|
function loadRoutes(paths, routerRoot, options) {
|
|
7
76
|
return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
|
|
8
77
|
}
|
|
@@ -27,6 +96,9 @@ function globbedRoutesToRouteContext(paths, routerRoot, options) {
|
|
|
27
96
|
var moduleKeys = Object.keys(routesSync);
|
|
28
97
|
function resolve(id) {
|
|
29
98
|
if (clearTimeout(clears[id]), loadedRoutes[id]) return loadedRoutes[id];
|
|
99
|
+
var preloadKey = id.replace("./", `/${routerRoot}/`),
|
|
100
|
+
preloaded = getPreloadedModule(preloadKey);
|
|
101
|
+
if (preloaded) return loadedRoutes[id] = preloaded, preloaded;
|
|
30
102
|
if (typeof routesSync[id] != "function") return routesSync[id];
|
|
31
103
|
throw promises[id] || (promises[id] = routesSync[id]().then(function (val) {
|
|
32
104
|
return loadedRoutes[id] = val, delete promises[id], clears[id] = setTimeout(function () {
|
|
@@ -46,5 +118,5 @@ function globbedRoutesToRouteContext(paths, routerRoot, options) {
|
|
|
46
118
|
return id;
|
|
47
119
|
}, resolve;
|
|
48
120
|
}
|
|
49
|
-
export { globbedRoutesToRouteContext, loadRoutes, useViteRoutes };
|
|
121
|
+
export { getPreloadedModule, getPreloadedModuleKeys, globbedRoutesToRouteContext, loadRoutes, preloadRouteModules, registerPreloadedRoute, useViteRoutes };
|
|
50
122
|
//# sourceMappingURL=useViteRoutes.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","
|
|
1
|
+
{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","preloadedModules","registerPreloadedRoute","key","module","getPreloadedModule","getPreloadedModuleKeys","Object","keys","matchDynamicRoute","routePattern","actualPath","routeSegments","split","pathSegments","hasCatchAll","some","s","startsWith","catchAllIdx","findIndex","i","length","i1","routeSeg","pathSeg","endsWith","preloadRouteModules","href","globbed","globalThis","__importMetaGlobbed","normalizedHref","replace","promises","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","_step","value","routePath","isStaticMatch","isDynamicMatch","includes","push","then","mod","catch","_iterator","Symbol","iterator","next","done","err","return","Promise","all","paths","globbedRoutesToRouteContext","routesSync","loadedRoutes","clears","forEach","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -6,9 +6,9 @@ function getNavigateAction(actionState, navigationState, type = "NAVIGATE") {
|
|
|
6
6
|
for (; actionState && navigationState; ) {
|
|
7
7
|
const stateRoute = navigationState.routes[navigationState.index];
|
|
8
8
|
actionStateRoute = actionState.routes[actionState.routes.length - 1];
|
|
9
|
-
const childState = actionStateRoute.state, nextNavigationState = stateRoute.state,
|
|
9
|
+
const childState = actionStateRoute.state, nextNavigationState = stateRoute.state, dynamicMatch = matchDynamicName(actionStateRoute.name);
|
|
10
10
|
if (actionStateRoute.name !== stateRoute.name || // !deepEqual(actionStateRoute.params, stateRoute.params) ||
|
|
11
|
-
!childState || !nextNavigationState ||
|
|
11
|
+
!childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name])
|
|
12
12
|
break;
|
|
13
13
|
actionState = childState, navigationState = nextNavigationState;
|
|
14
14
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/router/utils/getNavigateAction.ts"],
|
|
4
|
-
"mappings": "AACA,SAAS,cAAc;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AAK1B,SAAS,kBAEd,aACA,iBACA,OAAO,YACP;AAgBA,MAAI;AAGJ,SAAO,eAAe,mBAAiB;AACrC,UAAM,aAAa,gBAAgB,OAAO,gBAAgB,KAAK;AAE/D,uBAAmB,YAAY,OAAO,YAAY,OAAO,SAAS,CAAC;AAEnE,UAAM,aAAa,iBAAiB,OAC9B,sBAAsB,WAAW,OAEjC,
|
|
4
|
+
"mappings": "AACA,SAAS,cAAc;AAEvB,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AAK1B,SAAS,kBAEd,aACA,iBACA,OAAO,YACP;AAgBA,MAAI;AAGJ,SAAO,eAAe,mBAAiB;AACrC,UAAM,aAAa,gBAAgB,OAAO,gBAAgB,KAAK;AAE/D,uBAAmB,YAAY,OAAO,YAAY,OAAO,SAAS,CAAC;AAEnE,UAAM,aAAa,iBAAiB,OAC9B,sBAAsB,WAAW,OAEjC,eAAe,iBAAiB,iBAAiB,IAAI;AAU3D,QAPE,iBAAiB,SAAS,WAAW;AAAA,IAErC,CAAC,cACD,CAAC,uBACA,gBACC,iBAAiB,SAAS,aAAa,IAAI,MAAM,WAAW,SAAS,aAAa,IAAI;AAGxF;AAGF,kBAAc,YACd,kBAAkB;AAAA,EACpB;AAMA,QAAM,cAAmC,EAAE,QAAQ,CAAC,EAAE;AACtD,MAAI,UAAU,aACV,SAAS,QAAQ;AAGrB,SAAO;AACL,WAAO,OAAO,QAAQ,EAAE,GAAG,iBAAiB,OAAO,CAAC,GACpD,QAAQ,SAAS,iBAAiB,MAClC,QAAQ,SAAS,EAAE,GAAG,iBAAiB,OAAO,GAE9C,mBAAmB,iBAAiB,OAAO,OAAO,iBAAiB,OAAO,OAAO,SAAS,CAAC,GAE3F,QAAQ,WAAW,CAAC,GACpB,UAAU,QAAQ,QAClB,SAAS;AAIX,SAAI,SAAS,WACX,cAAc,GAGd,OAAO,YAiBH,gBAAgB,SAAS,YAC3B,YAAY,MAAM,GAAG,YAAY,IAAI,IAAI,OAAO,CAAC,MAIjD,SAAS,aAAa,gBAAgB,SAAS,UACjD,OAAO,YAGF;AAAA,IACL;AAAA,IACA,QAAQ,gBAAgB;AAAA,IACxB,SAAS;AAAA,MACP,KAAK,YAAY;AAAA,MACjB,MAAM,YAAY;AAAA,MAClB,QAAQ,YAAY;AAAA,IACtB;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -8,10 +8,10 @@ function getNavigateAction(actionState, navigationState, type = "NAVIGATE") {
|
|
|
8
8
|
actionStateRoute = actionState.routes[actionState.routes.length - 1];
|
|
9
9
|
const childState = actionStateRoute.state,
|
|
10
10
|
nextNavigationState = stateRoute.state,
|
|
11
|
-
|
|
11
|
+
dynamicMatch = matchDynamicName(actionStateRoute.name);
|
|
12
12
|
if (actionStateRoute.name !== stateRoute.name ||
|
|
13
13
|
// !deepEqual(actionStateRoute.params, stateRoute.params) ||
|
|
14
|
-
!childState || !nextNavigationState ||
|
|
14
|
+
!childState || !nextNavigationState || dynamicMatch && actionStateRoute.params?.[dynamicMatch.name] !== stateRoute.params?.[dynamicMatch.name]) break;
|
|
15
15
|
actionState = childState, navigationState = nextNavigationState;
|
|
16
16
|
}
|
|
17
17
|
const rootPayload = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","actionStateRoute","stateRoute","routes","index","length","childState","state","nextNavigationState","
|
|
1
|
+
{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","actionStateRoute","stateRoute","routes","index","length","childState","state","nextNavigationState","dynamicMatch","name","params","rootPayload","payload","Object","assign","screen","key","target"],"sources":["../../../../src/router/utils/getNavigateAction.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,MAAA,QAAc;AAEvB,SAASC,aAAA,QAAqB;AAC9B,SAASC,gBAAA,QAAwB;AAK1B,SAASC,kBAEdC,WAAA,EACAC,eAAA,EACAC,IAAA,GAAO,YACP;EAgBA,IAAIC,gBAAA;EAGJ,OAAOH,WAAA,IAAeC,eAAA,GAAiB;IACrC,MAAMG,UAAA,GAAaH,eAAA,CAAgBI,MAAA,CAAOJ,eAAA,CAAgBK,KAAK;IAE/DH,gBAAA,GAAmBH,WAAA,CAAYK,MAAA,CAAOL,WAAA,CAAYK,MAAA,CAAOE,MAAA,GAAS,CAAC;IAEnE,MAAMC,UAAA,GAAaL,gBAAA,CAAiBM,KAAA;MAC9BC,mBAAA,GAAsBN,UAAA,CAAWK,KAAA;MAEjCE,YAAA,GAAeb,gBAAA,CAAiBK,gBAAA,CAAiBS,IAAI;IAU3D,IAPET,gBAAA,CAAiBS,IAAA,KAASR,UAAA,CAAWQ,IAAA;IAAA;IAErC,CAACJ,UAAA,IACD,CAACE,mBAAA,IACAC,YAAA,IACCR,gBAAA,CAAiBU,MAAA,GAASF,YAAA,CAAaC,IAAI,MAAMR,UAAA,CAAWS,MAAA,GAASF,YAAA,CAAaC,IAAI,GAGxF;IAGFZ,WAAA,GAAcQ,UAAA,EACdP,eAAA,GAAkBS,mBAAA;EACpB;EAMA,MAAMI,WAAA,GAAmC;IAAED,MAAA,EAAQ,CAAC;EAAE;EACtD,IAAIE,OAAA,GAAUD,WAAA;IACVD,MAAA,GAASE,OAAA,CAAQF,MAAA;EAGrB,OAAOV,gBAAA,GACLa,MAAA,CAAOC,MAAA,CAAOJ,MAAA,EAAQ;IAAE,GAAGV,gBAAA,CAAiBU;EAAO,CAAC,GACpDE,OAAA,CAAQG,MAAA,GAASf,gBAAA,CAAiBS,IAAA,EAClCG,OAAA,CAAQF,MAAA,GAAS;IAAE,GAAGV,gBAAA,CAAiBU;EAAO,GAE9CV,gBAAA,GAAmBA,gBAAA,CAAiBM,KAAA,EAAOJ,MAAA,CAAOF,gBAAA,CAAiBM,KAAA,EAAOJ,MAAA,CAAOE,MAAA,GAAS,CAAC,GAE3FQ,OAAA,CAAQF,MAAA,KAAW,CAAC,GACpBE,OAAA,GAAUA,OAAA,CAAQF,MAAA,EAClBA,MAAA,GAASE,OAAA;EAIX,OAAIb,IAAA,KAAS,WACXL,aAAA,CAAc,GAGdK,IAAA,GAAO,YAiBHD,eAAA,CAAgBC,IAAA,KAAS,YAC3BY,WAAA,CAAYK,GAAA,GAAM,GAAGL,WAAA,CAAYF,IAAI,IAAIhB,MAAA,CAAO,CAAC,MAIjDM,IAAA,KAAS,aAAaD,eAAA,CAAgBC,IAAA,KAAS,UACjDA,IAAA,GAAO,YAGF;IACLA,IAAA;IACAkB,MAAA,EAAQnB,eAAA,CAAgBkB,GAAA;IACxBJ,OAAA,EAAS;MACPI,GAAA,EAAKL,WAAA,CAAYK,GAAA;MACjBP,IAAA,EAAME,WAAA,CAAYI,MAAA;MAClBL,MAAA,EAAQC,WAAA,CAAYD;IACtB;EACF;AACF","ignoreList":[]}
|
|
@@ -9,10 +9,10 @@ function getNavigateAction(actionState, navigationState) {
|
|
|
9
9
|
actionStateRoute = actionState.routes[actionState.routes.length - 1];
|
|
10
10
|
var childState = actionStateRoute.state,
|
|
11
11
|
nextNavigationState = stateRoute.state,
|
|
12
|
-
|
|
12
|
+
dynamicMatch = matchDynamicName(actionStateRoute.name),
|
|
13
13
|
didActionAndCurrentStateDiverge = actionStateRoute.name !== stateRoute.name ||
|
|
14
14
|
// !deepEqual(actionStateRoute.params, stateRoute.params) ||
|
|
15
|
-
!childState || !nextNavigationState ||
|
|
15
|
+
!childState || !nextNavigationState || dynamicMatch && ((_actionStateRoute_params = actionStateRoute.params) === null || _actionStateRoute_params === void 0 ? void 0 : _actionStateRoute_params[dynamicMatch.name]) !== ((_stateRoute_params = stateRoute.params) === null || _stateRoute_params === void 0 ? void 0 : _stateRoute_params[dynamicMatch.name]);
|
|
16
16
|
if (didActionAndCurrentStateDiverge) break;
|
|
17
17
|
actionState = childState, navigationState = nextNavigationState;
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","arguments","length","actionStateRoute","_actionStateRoute_params","_stateRoute_params","stateRoute","routes","index","childState","state","nextNavigationState","
|
|
1
|
+
{"version":3,"names":["nanoid","setLastAction","matchDynamicName","getNavigateAction","actionState","navigationState","type","arguments","length","actionStateRoute","_actionStateRoute_params","_stateRoute_params","stateRoute","routes","index","childState","state","nextNavigationState","dynamicMatch","name","didActionAndCurrentStateDiverge","params","rootPayload","payload","_actionStateRoute_state","_actionStateRoute_state1","_payload","Object","assign","screen","_params","key","target"],"sources":["../../../../src/router/utils/getNavigateAction.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,MAAA,QAAc;AAEvB,SAASC,aAAA,QAAqB;AAC9B,SAASC,gBAAA,QAAwB;AAK1B,SAASC,kBAEdC,WAAA,EACAC,eAAA,EACA;EAiBA,KAAI,IAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA,kBAAAE,gBAAA,EAAAL,WAAA,IAAAC,eAAA;IAGJ,IAAAK,wBAAsB;MAAAC,kBAAiB;MAAAC,UAAA,GAAAP,eAAA,CAAAQ,MAAA,CAAAR,eAAA,CAAAS,KAAA;IACrCL,gBAAM,GAAaL,WAAA,CAAAS,MAAgB,CAAAT,WAAO,CAAAS,MAAA,CAAAL,MAAqB;IAE/D,IAAAO,UAAA,GAAAN,gBAA+B,CAAAO,KAAO;MAAAC,mBAAmB,GAAAL,UAAU,CAAAI,KAAA;MAAAE,YAAA,GAAAhB,gBAAA,CAAAO,gBAAA,CAAAU,IAAA;MAAAC,+BAAA,GAAAX,gBAAA,CAAAU,IAAA,KAAAP,UAAA,CAAAO,IAAA;MAAA;MAEnE,CAAAJ,UAAM,KAAAE,mBAAa,IAAiBC,YAC9B,MAAAR,wBAAiC,GAEjCD,gBAAe,CAAAY,MAAA,UAAiB,IAAAX,wBAAqB,uBAAAA,wBAAA,CAAAQ,YAAA,CAAAC,IAAA,SAAAR,kBAAA,GAAAC,UAAA,CAAAS,MAAA,cAAAV,kBAAA,uBAAAA,kBAAA,CAAAO,YAAA,CAAAC,IAAA;IAU3D,IAPEC,+BAA0B,EAEzB;IAMDhB,WAAA,GAAAW,UAAA,EAAAV,eAAA,GAAAY,mBAAA;EAGF;EAEF,SAAAK,WAAA;MAMAD,MAAM;IACN,GAAAE,OAAI,GAAAD,WAAU,EAAAD,MACV,GAAAE,OAAS,CAAAF,MAAQ,EAAAZ,gBAAA;IAGrB,IAAAe,uBAAO,EAAAC,wBAAA,EAAAC,QAAA;IACLC,MAAA,CAAOC,MAAA,CAAOP,MAAA,EAAQ;MAYxB,GAAIZ,gBAAS,CAAAY;IA+BX,IAAAE,OAAA,CAAAM,MAAA,GAAApB,gBAAA,CAAAU,IAAA,EAAAI,OAAA,CAAAF,MAAA;MACA,GAAAZ,gBAAQ,CAAAY;IACR,GAAAZ,gBAAS,IAAAgB,wBAAA,GAAAhB,gBAAA,CAAAO,KAAA,cAAAS,wBAAA,uBAAAA,wBAAA,CAAAZ,MAAA,GAAAW,uBAAA,GAAAf,gBAAA,CAAAO,KAAA,cAAAQ,uBAAA,uBAAAA,uBAAA,CAAAX,MAAA,CAAAL,MAAA;IAAA,IACPsB,OAAK;IAAY,CAAAA,OACX,IAAAJ,QAAY,GAAAH,OAAA,EAAAF,MAAA,cAAAS,OAAA,gBAAAJ,QAAA,CAAAL,MAAA,QAAAE,OAAA,GAAAA,OAAA,CAAAF,MAAA,EAAAA,MAAA,GAAAE,OAAA;EAAA;EACE,OACtBjB,IAAA,gBAAAL,aAAA,IAAAK,IAAA,eAAAD,eAAA,CAAAC,IAAA,iBAAAgB,WAAA,CAAAS,GAAA,MAAAT,WAAA,CAAAH,IAAA,IAAAnB,MAAA,QAAAM,IAAA,kBAAAD,eAAA,CAAAC,IAAA,eAAAA,IAAA;IACFA,IAAA;IACF0B,MAAA,EAAA3B,eAAA,CAAA0B,GAAA","ignoreList":[]}
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
import { getPathFromLoaderPath } from "../utils/cleanUrl";
|
|
12
12
|
import { isRolldown } from "../utils/isRolldown";
|
|
13
13
|
import { toAbsolute } from "../utils/toAbsolute";
|
|
14
|
+
const debugRouter = process.env.ONE_DEBUG_ROUTER;
|
|
14
15
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
15
16
|
const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import("../createHandleRequest"), { isResponse } = await import("../utils/isResponse"), { isStatusRedirect } = await import("../utils/isStatus"), isAPIRequest = /* @__PURE__ */ new WeakMap(), redirects = oneOptions.web?.redirects;
|
|
16
17
|
if (redirects)
|
|
@@ -20,7 +21,7 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
|
20
21
|
const paramName = param.substring(1);
|
|
21
22
|
return context.req.param(paramName) || "";
|
|
22
23
|
});
|
|
23
|
-
return context.redirect(destinationUrl, redirect.permanent ? 301 : 302);
|
|
24
|
+
return debugRouter && console.info(`[one] \u21AA redirect ${context.req.path} \u2192 ${destinationUrl}`), context.redirect(destinationUrl, redirect.permanent ? 301 : 302);
|
|
24
25
|
});
|
|
25
26
|
if (!buildInfo)
|
|
26
27
|
throw new Error("No build info found, have you run build?");
|
|
@@ -105,11 +106,13 @@ url: ${url}`);
|
|
|
105
106
|
}
|
|
106
107
|
switch (route.type) {
|
|
107
108
|
case "api":
|
|
108
|
-
return resolveAPIRoute(requestHandlers, request, url, route);
|
|
109
|
+
return debugRouter && console.info(`[one] \u26A1 ${url.pathname} \u2192 matched API route: ${route.page}`), resolveAPIRoute(requestHandlers, request, url, route);
|
|
109
110
|
case "ssg":
|
|
110
111
|
case "spa":
|
|
111
112
|
case "ssr":
|
|
112
|
-
return
|
|
113
|
+
return debugRouter && console.info(
|
|
114
|
+
`[one] \u26A1 ${url.pathname} \u2192 matched page route: ${route.page} (${route.type})`
|
|
115
|
+
), resolvePageRoute(requestHandlers, request, url, route);
|
|
113
116
|
}
|
|
114
117
|
})();
|
|
115
118
|
if (response) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,WAAW,eAAe;AAGnC,SAAS,SAAS,YAAY;AAC9B,SAAS,yBAAyB;AAClC,SAAS,sBAAsB;AAC/B,SAAS,4BAA4B,0BAA0B;AAC/D;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,OACK;AAEP,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAC3B,SAAS,kBAAkB;AAI3B,eAAsB,SAAS,YAA+B,WAA0B,KAAW;AACjG,QAAM,EAAE,iBAAiB,oBAAoB,iBAAiB,IAAI,MAAM,OACtE,wBACF,GACM,EAAE,WAAW,IAAI,MAAM,OAAO,qBAAqB,GACnD,EAAE,iBAAiB,IAAI,MAAM,OAAO,mBAAmB,GAEvD,eAAe,oBAAI,QAAsB,GAGzC,YAAY,WAAW,KAAK;AAClC,MAAI;AACF,eAAW,YAAY;AACrB,UAAI,IAAI,SAAS,QAAQ,CAAC,YAAY;AACpC,cAAM,iBAAiB,SAAS,YAAY,QAAQ,SAAS,CAAC,UAAU;AACtE,gBAAM,YAAY,MAAM,UAAU,CAAC;AACnC,iBAAO,QAAQ,IAAI,MAAM,SAAS,KAAK;AAAA,QACzC,CAAC;AACD,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["buildInfo", "preloads"]
|
|
6
6
|
}
|
|
@@ -7,6 +7,7 @@ import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../create
|
|
|
7
7
|
import { getPathFromLoaderPath } from "../utils/cleanUrl.mjs";
|
|
8
8
|
import { isRolldown } from "../utils/isRolldown.mjs";
|
|
9
9
|
import { toAbsolute } from "../utils/toAbsolute.mjs";
|
|
10
|
+
const debugRouter = process.env.ONE_DEBUG_ROUTER;
|
|
10
11
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
11
12
|
const {
|
|
12
13
|
resolveAPIRoute,
|
|
@@ -26,7 +27,7 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
|
26
27
|
const paramName = param.substring(1);
|
|
27
28
|
return context.req.param(paramName) || "";
|
|
28
29
|
});
|
|
29
|
-
return context.redirect(destinationUrl, redirect.permanent ? 301 : 302);
|
|
30
|
+
return debugRouter && console.info(`[one] \u21AA redirect ${context.req.path} \u2192 ${destinationUrl}`), context.redirect(destinationUrl, redirect.permanent ? 301 : 302);
|
|
30
31
|
});
|
|
31
32
|
if (!buildInfo) throw new Error("No build info found, have you run build?");
|
|
32
33
|
const {
|
|
@@ -132,11 +133,11 @@ url: ${url}`);
|
|
|
132
133
|
}
|
|
133
134
|
switch (route.type) {
|
|
134
135
|
case "api":
|
|
135
|
-
return resolveAPIRoute(requestHandlers, request, url, route);
|
|
136
|
+
return debugRouter && console.info(`[one] \u26A1 ${url.pathname} \u2192 matched API route: ${route.page}`), resolveAPIRoute(requestHandlers, request, url, route);
|
|
136
137
|
case "ssg":
|
|
137
138
|
case "spa":
|
|
138
139
|
case "ssr":
|
|
139
|
-
return resolvePageRoute(requestHandlers, request, url, route);
|
|
140
|
+
return debugRouter && console.info(`[one] \u26A1 ${url.pathname} \u2192 matched page route: ${route.page} (${route.type})`), resolvePageRoute(requestHandlers, request, url, route);
|
|
140
141
|
}
|
|
141
142
|
})();
|
|
142
143
|
if (response) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","serveStaticAssets","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","isRolldown","toAbsolute","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","useRolldown","requestHandlers","handleAPI","route","fileName","page","slice","
|
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","serveStaticAssets","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","isRolldown","toAbsolute","debugRouter","process","env","ONE_DEBUG_ROUTER","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","console","info","path","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","useRolldown","requestHandlers","handleAPI","route","fileName","page","slice","cwd","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","warn","json","JSON","stringify","handlePage","buildInfo2","type","error","Object","keys","loaderData","serverJsPath","preloads2","preloads","headers","Headers","set","rendered","mode","css","Response","status","isNotFound","err","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","cleanedRequest","Request","location","forEach","value","key","header","has","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","urlCleanPath","pageRoutes","c","body","compiledRegex","test","loaderRoute","loaderServerPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -7,6 +7,7 @@ import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../create
|
|
|
7
7
|
import { getPathFromLoaderPath } from "../utils/cleanUrl.native.js";
|
|
8
8
|
import { isRolldown } from "../utils/isRolldown.native.js";
|
|
9
9
|
import { toAbsolute } from "../utils/toAbsolute.native.js";
|
|
10
|
+
var debugRouter = process.env.ONE_DEBUG_ROUTER;
|
|
10
11
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
11
12
|
var _oneOptions_web,
|
|
12
13
|
_oneOptions_build_api,
|
|
@@ -36,7 +37,7 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
|
36
37
|
var paramName = param.substring(1);
|
|
37
38
|
return context.req.param(paramName) || "";
|
|
38
39
|
});
|
|
39
|
-
return context.redirect(destinationUrl, redirect.permanent ? 301 : 302);
|
|
40
|
+
return debugRouter && console.info(`[one] \u21AA redirect ${context.req.path} \u2192 ${destinationUrl}`), context.redirect(destinationUrl, redirect.permanent ? 301 : 302);
|
|
40
41
|
});
|
|
41
42
|
}, _iterator = redirects[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
|
|
42
43
|
} catch (err) {
|
|
@@ -166,11 +167,11 @@ url: ${url}`);
|
|
|
166
167
|
}
|
|
167
168
|
switch (route2.type) {
|
|
168
169
|
case "api":
|
|
169
|
-
return resolveAPIRoute(requestHandlers, request, url, route2);
|
|
170
|
+
return debugRouter && console.info(`[one] \u26A1 ${url.pathname} \u2192 matched API route: ${route2.page}`), resolveAPIRoute(requestHandlers, request, url, route2);
|
|
170
171
|
case "ssg":
|
|
171
172
|
case "spa":
|
|
172
173
|
case "ssr":
|
|
173
|
-
return resolvePageRoute(requestHandlers, request, url, route2);
|
|
174
|
+
return debugRouter && console.info(`[one] \u26A1 ${url.pathname} \u2192 matched page route: ${route2.page} (${route2.type})`), resolvePageRoute(requestHandlers, request, url, route2);
|
|
174
175
|
}
|
|
175
176
|
}();
|
|
176
177
|
if (response) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","serveStaticAssets","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","isRolldown","toAbsolute","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","useRolldown","requestHandlers","handleAPI","route","route2","fileName","page","slice","apiFile","
|
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","serveStaticAssets","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","isRolldown","toAbsolute","debugRouter","process","env","ONE_DEBUG_ROUTER","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","console","info","path","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","useRolldown","requestHandlers","handleAPI","route","route2","fileName","page","slice","apiFile","cwd","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","cleanedRequest","Request","location","forEach","key","header","has","compiledManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","urlCleanPath","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","pageRoutes","_step2","route1"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/useLoader.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useCallback, useSyncExternalStore } from "react";
|
|
2
2
|
import { useParams, usePathname } from "./hooks";
|
|
3
|
-
import {
|
|
4
|
-
import { preloadingLoader } from "./router/router";
|
|
3
|
+
import { preloadedLoaderData, preloadingLoader } from "./router/router";
|
|
5
4
|
import { getLoaderPath } from "./utils/cleanUrl";
|
|
6
5
|
import { dynamicImport } from "./utils/dynamicImport";
|
|
7
6
|
import { weakKey } from "./utils/weakKey";
|
|
@@ -45,7 +44,7 @@ async function refetchLoader(pathname2) {
|
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
46
|
function useLoaderState(loader) {
|
|
48
|
-
const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = useServerContext() || {}, params = useParams(), pathname = usePathname(), currentPath =
|
|
47
|
+
const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = useServerContext() || {}, params = useParams(), pathname = usePathname(), currentPath = pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
|
|
49
48
|
if (typeof window > "u" && loader)
|
|
50
49
|
return { data: useAsyncFn(
|
|
51
50
|
loader,
|
|
@@ -55,7 +54,7 @@ function useLoaderState(loader) {
|
|
|
55
54
|
}
|
|
56
55
|
), refetch: async () => {
|
|
57
56
|
}, state: "idle" };
|
|
58
|
-
const
|
|
57
|
+
const serverContextPath = loaderPropsFromServerContext?.path, preloadedData = serverContextPath === currentPath ? loaderDataFromServerContext : void 0, loaderStateEntry = useSyncExternalStore(
|
|
59
58
|
subscribe,
|
|
60
59
|
() => getLoaderState(currentPath, preloadedData),
|
|
61
60
|
() => getLoaderState(currentPath, preloadedData)
|
|
@@ -65,11 +64,13 @@ function useLoaderState(loader) {
|
|
|
65
64
|
refetch,
|
|
66
65
|
state: loaderStateEntry.state
|
|
67
66
|
};
|
|
68
|
-
if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader)
|
|
69
|
-
|
|
70
|
-
|
|
67
|
+
if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) {
|
|
68
|
+
const resolvedPreloadData = preloadedLoaderData[currentPath];
|
|
69
|
+
if (resolvedPreloadData !== void 0)
|
|
70
|
+
delete preloadedLoaderData[currentPath], delete preloadingLoader[currentPath], loaderStateEntry.data = resolvedPreloadData, loaderStateEntry.hasLoadedOnce = !0;
|
|
71
|
+
else if (preloadingLoader[currentPath]) {
|
|
71
72
|
const promise2 = preloadingLoader[currentPath].then((val) => {
|
|
72
|
-
delete preloadingLoader[currentPath], updateState(currentPath, {
|
|
73
|
+
delete preloadingLoader[currentPath], delete preloadedLoaderData[currentPath], updateState(currentPath, {
|
|
73
74
|
data: val,
|
|
74
75
|
hasLoadedOnce: !0,
|
|
75
76
|
promise: void 0
|
|
@@ -99,6 +100,7 @@ function useLoaderState(loader) {
|
|
|
99
100
|
}, promise = loadData();
|
|
100
101
|
loaderStateEntry.promise = promise;
|
|
101
102
|
}
|
|
103
|
+
}
|
|
102
104
|
if (loader) {
|
|
103
105
|
if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce)
|
|
104
106
|
throw loaderStateEntry.error;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useLoader.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,aAAa,4BAA4B;AAClD,SAAS,WAAW,mBAAmB;AACvC,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["preloadedData", "pathname", "loaderJSUrl", "result", "promise", "loader", "data"]
|
|
6
6
|
}
|