next-vite-router 1.3.1 → 2.0.0
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/README.md +13 -13
- package/dist/cli.cjs +1 -1
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -12
- package/dist/index.d.ts +5 -12
- package/dist/index.js +108 -132
- package/package.json +7 -3
package/README.md
CHANGED
|
@@ -95,9 +95,8 @@ npm run dev
|
|
|
95
95
|
`Router` is only a convenience wrapper around `useRoutes(routes)`. The
|
|
96
96
|
lazy-loading behavior and `loadingFallback` configured through `configureRouter`
|
|
97
97
|
are read at render time, so they take effect even when `generateRoutes()` runs
|
|
98
|
-
at module scope before application setup finishes.
|
|
99
|
-
|
|
100
|
-
are wrapped while the tree is built. You can keep using React Router APIs:
|
|
98
|
+
at module scope before application setup finishes. You can keep using React
|
|
99
|
+
Router APIs:
|
|
101
100
|
|
|
102
101
|
```tsx
|
|
103
102
|
import {
|
|
@@ -230,21 +229,22 @@ The fallback is resolved when a route suspends during render, so the order of
|
|
|
230
229
|
`enableLazyLoading: false` is available for compatibility and testing. It does
|
|
231
230
|
not turn Vite's asynchronous imports into synchronous imports.
|
|
232
231
|
|
|
233
|
-
##
|
|
232
|
+
## Auth guards
|
|
234
233
|
|
|
235
|
-
|
|
236
|
-
|
|
234
|
+
Protect a subtree with a layout inside a route group: the group name stays out
|
|
235
|
+
of the URL, and the layout decides whether to render its `Outlet`:
|
|
237
236
|
|
|
238
237
|
```tsx
|
|
239
|
-
|
|
238
|
+
// src/app/(protected)/layout.tsx
|
|
239
|
+
import { Navigate, Outlet } from "react-router-dom";
|
|
240
240
|
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
241
|
+
export default function ProtectedLayout() {
|
|
242
|
+
const isAuthed = useAuth();
|
|
243
|
+
return isAuthed ? <Outlet /> : <Navigate to="/login" replace />;
|
|
244
|
+
}
|
|
244
245
|
```
|
|
245
246
|
|
|
246
|
-
|
|
247
|
-
replace React Router.
|
|
247
|
+
Every page under `src/app/(protected)/` is then guarded by `useAuth()`.
|
|
248
248
|
|
|
249
249
|
## CLI
|
|
250
250
|
|
|
@@ -295,7 +295,7 @@ The repository includes a runnable showcase in [`examples/`](./examples/):
|
|
|
295
295
|
- `basic`
|
|
296
296
|
- `layouts`
|
|
297
297
|
- `dynamic-routes`
|
|
298
|
-
- `
|
|
298
|
+
- `(protected)`
|
|
299
299
|
- `typed-routes`
|
|
300
300
|
|
|
301
301
|
Run it from the examples directory:
|
package/dist/cli.cjs
CHANGED
package/dist/index.cjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./tree-hc1dSMdb.cjs"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./tree-hc1dSMdb.cjs"),u=require("react"),z=require("react-router-dom"),C={enableLazyLoading:!0};let f={...C};function L(e){f={...f,...e}}function S(){f={...C}}function v(){return f}const F=()=>u.createElement("div"),h=new Map;function T(){const e=v();if(e.enableLazyLoading===!1)return null;const t=e.loadingFallback||F;return u.createElement(t)}function A(){h.clear()}function g(e,t){let n=h.get(t);return n||(n=u.lazy(e),h.set(t,n)),u.createElement(u.Suspense,{fallback:u.createElement(T)},u.createElement(n))}const d=u.createContext(void 0);function P({name:e,children:t}){return u.createElement(d.Provider,{value:e},t)}function N(){return u.useContext(d)}function k(e){const t=c.parseRouteSegments(e)[0];return(t==null?void 0:t.kind)==="catchAll"&&t.optional}function p(e){const t=c.parseRouteSegments(e)[0];return t?c.routeSegmentToPath(t):""}function s(e,t){return m(e,t,!0)}function m(e,t,n=!1){const a=e.page;if(!a)throw new Error(`Route node "${e.fullPath}" has no page loader`);const r=g(async()=>({default:(await a()).default}),`page:${e.fullPath||t}`),o=c.parseRouteSegments(e.segment)[0],l=(o==null?void 0:o.kind)==="catchAll"?u.createElement(P,{name:o.name,children:r}):r;return n?{index:!0,element:l}:{path:p(e.segment),element:l}}function w(e){const t=e.notFound;if(!t)throw new Error(`Route node "${e.fullPath}" has no not-found loader`);return{path:"*",element:g(async()=>({default:(await t()).default}),`notfound:${e.fullPath}`)}}function y(e){return e.notFound?[w(e)]:[]}function x(e,t,n){return{...e?{path:e}:{},element:u.createElement(t),children:n.length>0?n:void 0}}function E(e,t){const n=[];return[...e.children.entries()].sort(([a],[r])=>a.localeCompare(r)).forEach(([a,r])=>{const o=p(a),l=o?t?`${t}/${o}`:`/${o}`:t;n.push(...R(r,!1,l))}),n}function b(e,t){const n=[];return e.page&&n.push(s(e,t||"/")),n.push(...E(e,t)),n.push(...y(e)),n}function $(e,t,n,a,r,o){if(k(e.segment)){const l=[...r,...o];return[s(e,t),{path:a,element:m(e,n).element,children:l.length>0?l:void 0}]}return r.length>0||o.length>0?[{path:a,children:[s(e,n),...r,...o]}]:[{path:a,element:m(e,n).element}]}function D(e,t,n,a){const r=[...e.page?[s(e,t)]:[],...n,...a];return[{children:r.length>0?r:void 0}]}function q(e){const t=b(e,"");return e.layout?[{path:"/",element:u.createElement(e.layout),children:t}]:e.page?t.length>1?[{path:"/",children:t}]:[{path:"/",element:m(e,"/",!1).element}]:e.notFound?[{path:"/",children:t}]:t}function R(e,t=!1,n=""){if(t)return q(e);const a=p(e.segment),r=!a,o=r?n:n+"/"+a,l=E(e,o),i=y(e);return e.layout?[x(r?"":a,e.layout,b(e,o))]:e.page&&!r?$(e,n,o,a,l,i):e.page||e.notFound||!r?r?D(e,o,l,i):[{path:a,children:[...e.page?[s(e,o)]:[],...l,...i]}]:l}function G(e,t,n,a){return()=>{const r=c.buildRouteTree(e,t,n,a);return R(r,!0)}}function M(){const e=z.useParams(),t=N();return typeof t=="string"&&e["*"]!==void 0?{...e,[t]:e["*"]}:e}exports.assertNoDuplicateRoutes=c.assertNoDuplicateRoutes;exports.assertNoRouteConflicts=c.assertNoRouteConflicts;exports.buildRouteTree=c.buildRouteTree;exports.extractRoutePath=c.extractRoutePath;exports.normalizeSegment=c.normalizeSegment;exports.parseRouteSegments=c.parseRouteSegments;exports.routeSegmentToPath=c.routeSegmentToPath;exports.CatchAllParamProvider=P;exports.clearLazyCache=A;exports.configureRouter=L;exports.createLazyElement=g;exports.createRouteGenerator=G;exports.resetRouterConfig=S;exports.treeToRoutes=R;exports.useParams=M;
|
package/dist/index.d.cts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ComponentType } from 'react';
|
|
2
2
|
import { default as default_2 } from 'react';
|
|
3
|
-
import { ReactElement } from 'react';
|
|
4
3
|
import { RouteObject } from 'react-router-dom';
|
|
5
4
|
|
|
6
5
|
export declare function assertNoDuplicateRoutes(filePaths: string[], fileOptions?: RouteFileOptions): void;
|
|
@@ -21,21 +20,18 @@ export declare function CatchAllParamProvider({ name, children, }: {
|
|
|
21
20
|
* `React.lazy` component created in one context (for example a previous test)
|
|
22
21
|
* is reused whenever another context requests the same key with a different
|
|
23
22
|
* loader. Exposing an explicit reset keeps that state from leaking, mirroring
|
|
24
|
-
* `
|
|
23
|
+
* `resetRouterConfig` for the router configuration.
|
|
25
24
|
*/
|
|
26
25
|
export declare function clearLazyCache(): void;
|
|
27
26
|
|
|
28
|
-
export declare function clearMiddlewares(): void;
|
|
29
|
-
|
|
30
27
|
export declare function configureRouter(config: RouterConfig): void;
|
|
31
28
|
|
|
32
29
|
/**
|
|
33
|
-
* Create a lazy element wrapped with Suspense
|
|
30
|
+
* Create a lazy element wrapped with Suspense
|
|
34
31
|
* @param loader - Function that loads the component
|
|
35
32
|
* @param cacheKey - Unique key for the cache
|
|
36
|
-
* @param routePath - Route path for middlewares
|
|
37
33
|
*/
|
|
38
|
-
export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string
|
|
34
|
+
export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string): default_2.ReactElement;
|
|
39
35
|
|
|
40
36
|
/**
|
|
41
37
|
* Create a custom route generator function using your own files
|
|
@@ -81,15 +77,14 @@ export declare function normalizeSegment(segment: string): string;
|
|
|
81
77
|
|
|
82
78
|
export declare function parseRouteSegments(routePath: string): RouteSegment[];
|
|
83
79
|
|
|
84
|
-
export declare function registerMiddleware(pattern: RegExp, middleware: RouteMiddleware): void;
|
|
85
|
-
|
|
86
80
|
/**
|
|
87
81
|
* Restore the module-level router configuration to its defaults.
|
|
88
82
|
*
|
|
89
83
|
* `configureRouter` merges, so it can never drop keys back to their initial
|
|
90
84
|
* state. A dedicated reset lets isolated contexts (for example tests) start
|
|
91
85
|
* from a known configuration instead of inheriting whatever was set globally
|
|
92
|
-
* before, matching the explicit reset offered by `
|
|
86
|
+
* before, matching the explicit reset offered by `clearLazyCache` for the lazy
|
|
87
|
+
* component cache.
|
|
93
88
|
*/
|
|
94
89
|
export declare function resetRouterConfig(): void;
|
|
95
90
|
|
|
@@ -100,8 +95,6 @@ export declare type RouteFileOptions = {
|
|
|
100
95
|
notFoundFile?: string;
|
|
101
96
|
};
|
|
102
97
|
|
|
103
|
-
export declare type RouteMiddleware = (element: ReactElement) => ReactElement;
|
|
104
|
-
|
|
105
98
|
export declare type RouteModuleLoader = () => Promise<{
|
|
106
99
|
default: ComponentType;
|
|
107
100
|
}>;
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ComponentType } from 'react';
|
|
2
2
|
import { default as default_2 } from 'react';
|
|
3
|
-
import { ReactElement } from 'react';
|
|
4
3
|
import { RouteObject } from 'react-router-dom';
|
|
5
4
|
|
|
6
5
|
export declare function assertNoDuplicateRoutes(filePaths: string[], fileOptions?: RouteFileOptions): void;
|
|
@@ -21,21 +20,18 @@ export declare function CatchAllParamProvider({ name, children, }: {
|
|
|
21
20
|
* `React.lazy` component created in one context (for example a previous test)
|
|
22
21
|
* is reused whenever another context requests the same key with a different
|
|
23
22
|
* loader. Exposing an explicit reset keeps that state from leaking, mirroring
|
|
24
|
-
* `
|
|
23
|
+
* `resetRouterConfig` for the router configuration.
|
|
25
24
|
*/
|
|
26
25
|
export declare function clearLazyCache(): void;
|
|
27
26
|
|
|
28
|
-
export declare function clearMiddlewares(): void;
|
|
29
|
-
|
|
30
27
|
export declare function configureRouter(config: RouterConfig): void;
|
|
31
28
|
|
|
32
29
|
/**
|
|
33
|
-
* Create a lazy element wrapped with Suspense
|
|
30
|
+
* Create a lazy element wrapped with Suspense
|
|
34
31
|
* @param loader - Function that loads the component
|
|
35
32
|
* @param cacheKey - Unique key for the cache
|
|
36
|
-
* @param routePath - Route path for middlewares
|
|
37
33
|
*/
|
|
38
|
-
export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string
|
|
34
|
+
export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string): default_2.ReactElement;
|
|
39
35
|
|
|
40
36
|
/**
|
|
41
37
|
* Create a custom route generator function using your own files
|
|
@@ -81,15 +77,14 @@ export declare function normalizeSegment(segment: string): string;
|
|
|
81
77
|
|
|
82
78
|
export declare function parseRouteSegments(routePath: string): RouteSegment[];
|
|
83
79
|
|
|
84
|
-
export declare function registerMiddleware(pattern: RegExp, middleware: RouteMiddleware): void;
|
|
85
|
-
|
|
86
80
|
/**
|
|
87
81
|
* Restore the module-level router configuration to its defaults.
|
|
88
82
|
*
|
|
89
83
|
* `configureRouter` merges, so it can never drop keys back to their initial
|
|
90
84
|
* state. A dedicated reset lets isolated contexts (for example tests) start
|
|
91
85
|
* from a known configuration instead of inheriting whatever was set globally
|
|
92
|
-
* before, matching the explicit reset offered by `
|
|
86
|
+
* before, matching the explicit reset offered by `clearLazyCache` for the lazy
|
|
87
|
+
* component cache.
|
|
93
88
|
*/
|
|
94
89
|
export declare function resetRouterConfig(): void;
|
|
95
90
|
|
|
@@ -100,8 +95,6 @@ export declare type RouteFileOptions = {
|
|
|
100
95
|
notFoundFile?: string;
|
|
101
96
|
};
|
|
102
97
|
|
|
103
|
-
export declare type RouteMiddleware = (element: ReactElement) => ReactElement;
|
|
104
|
-
|
|
105
98
|
export declare type RouteModuleLoader = () => Promise<{
|
|
106
99
|
default: ComponentType;
|
|
107
100
|
}>;
|
package/dist/index.js
CHANGED
|
@@ -1,227 +1,203 @@
|
|
|
1
|
-
import { p as h, r as F, b } from "./tree-DfnssFxU.js";
|
|
2
|
-
import { a as
|
|
3
|
-
import
|
|
4
|
-
import { useParams as
|
|
5
|
-
const
|
|
1
|
+
import { p as h, r as F, b as L } from "./tree-DfnssFxU.js";
|
|
2
|
+
import { a as Y, c as Z, e as _, n as K } from "./tree-DfnssFxU.js";
|
|
3
|
+
import l, { lazy as b, Suspense as v, createContext as z, useContext as x } from "react";
|
|
4
|
+
import { useParams as A } from "react-router-dom";
|
|
5
|
+
const g = {
|
|
6
6
|
enableLazyLoading: !0
|
|
7
7
|
};
|
|
8
|
-
let i = { ...
|
|
9
|
-
function
|
|
8
|
+
let i = { ...g };
|
|
9
|
+
function H(t) {
|
|
10
10
|
i = { ...i, ...t };
|
|
11
11
|
}
|
|
12
|
-
function
|
|
13
|
-
i = { ...
|
|
12
|
+
function J() {
|
|
13
|
+
i = { ...g };
|
|
14
14
|
}
|
|
15
|
-
function
|
|
15
|
+
function $() {
|
|
16
16
|
return i;
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
function
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
function X() {
|
|
23
|
-
p = [];
|
|
24
|
-
}
|
|
25
|
-
function R(t, e) {
|
|
26
|
-
let r = e;
|
|
27
|
-
for (const n of p)
|
|
28
|
-
n.pattern.lastIndex = 0, n.pattern.test(t) && (r = n.middleware(r)), n.pattern.lastIndex = 0;
|
|
29
|
-
return r;
|
|
30
|
-
}
|
|
31
|
-
const M = () => u.createElement("div"), m = /* @__PURE__ */ new Map();
|
|
32
|
-
function T() {
|
|
33
|
-
const t = N();
|
|
18
|
+
const k = () => l.createElement("div"), m = /* @__PURE__ */ new Map();
|
|
19
|
+
function w() {
|
|
20
|
+
const t = $();
|
|
34
21
|
if (t.enableLazyLoading === !1)
|
|
35
22
|
return null;
|
|
36
|
-
const e = t.loadingFallback ||
|
|
37
|
-
return
|
|
23
|
+
const e = t.loadingFallback || k;
|
|
24
|
+
return l.createElement(e);
|
|
38
25
|
}
|
|
39
|
-
function
|
|
26
|
+
function Q() {
|
|
40
27
|
m.clear();
|
|
41
28
|
}
|
|
42
|
-
function
|
|
29
|
+
function R(t, e) {
|
|
43
30
|
let n = m.get(e);
|
|
44
|
-
n || (n =
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
u.createElement(n)
|
|
31
|
+
return n || (n = b(t), m.set(e, n)), l.createElement(
|
|
32
|
+
v,
|
|
33
|
+
{ fallback: l.createElement(w) },
|
|
34
|
+
l.createElement(n)
|
|
49
35
|
);
|
|
50
|
-
return r ? R(r, a) : a;
|
|
51
36
|
}
|
|
52
|
-
const
|
|
53
|
-
function
|
|
37
|
+
const C = z(void 0);
|
|
38
|
+
function N({
|
|
54
39
|
name: t,
|
|
55
40
|
children: e
|
|
56
41
|
}) {
|
|
57
|
-
return
|
|
58
|
-
|
|
42
|
+
return l.createElement(
|
|
43
|
+
C.Provider,
|
|
59
44
|
{ value: t },
|
|
60
45
|
e
|
|
61
46
|
);
|
|
62
47
|
}
|
|
63
|
-
function
|
|
64
|
-
return
|
|
65
|
-
}
|
|
66
|
-
function P(t, e) {
|
|
67
|
-
return R(t, u.createElement(e));
|
|
48
|
+
function T() {
|
|
49
|
+
return x(C);
|
|
68
50
|
}
|
|
69
|
-
function
|
|
51
|
+
function S(t) {
|
|
70
52
|
const e = h(t)[0];
|
|
71
53
|
return (e == null ? void 0 : e.kind) === "catchAll" && e.optional;
|
|
72
54
|
}
|
|
73
|
-
function
|
|
55
|
+
function p(t) {
|
|
74
56
|
const e = h(t)[0];
|
|
75
57
|
return e ? F(e) : "";
|
|
76
58
|
}
|
|
77
59
|
function c(t, e) {
|
|
78
60
|
return f(t, e, !0);
|
|
79
61
|
}
|
|
80
|
-
function f(t, e,
|
|
81
|
-
const
|
|
82
|
-
if (!
|
|
62
|
+
function f(t, e, n = !1) {
|
|
63
|
+
const a = t.page;
|
|
64
|
+
if (!a)
|
|
83
65
|
throw new Error(`Route node "${t.fullPath}" has no page loader`);
|
|
84
|
-
const
|
|
85
|
-
async () => ({ default: (await
|
|
86
|
-
`page:${t.fullPath || e}
|
|
87
|
-
|
|
88
|
-
), o = h(t.segment)[0], l = (o == null ? void 0 : o.kind) === "catchAll" ? u.createElement(I, {
|
|
66
|
+
const r = R(
|
|
67
|
+
async () => ({ default: (await a()).default }),
|
|
68
|
+
`page:${t.fullPath || e}`
|
|
69
|
+
), o = h(t.segment)[0], u = (o == null ? void 0 : o.kind) === "catchAll" ? l.createElement(N, {
|
|
89
70
|
name: o.name,
|
|
90
|
-
children:
|
|
91
|
-
}) :
|
|
92
|
-
return
|
|
71
|
+
children: r
|
|
72
|
+
}) : r;
|
|
73
|
+
return n ? { index: !0, element: u } : { path: p(t.segment), element: u };
|
|
93
74
|
}
|
|
94
|
-
function
|
|
75
|
+
function D(t) {
|
|
95
76
|
const e = t.notFound;
|
|
96
77
|
if (!e)
|
|
97
78
|
throw new Error(`Route node "${t.fullPath}" has no not-found loader`);
|
|
98
|
-
const r = t.fullPath ? `/${t.fullPath}` : "/";
|
|
99
79
|
return {
|
|
100
80
|
path: "*",
|
|
101
|
-
element:
|
|
81
|
+
element: R(
|
|
102
82
|
async () => ({ default: (await e()).default }),
|
|
103
|
-
`notfound:${t.fullPath}
|
|
104
|
-
r
|
|
83
|
+
`notfound:${t.fullPath}`
|
|
105
84
|
)
|
|
106
85
|
};
|
|
107
86
|
}
|
|
108
|
-
function
|
|
109
|
-
return t.notFound ? [
|
|
87
|
+
function d(t) {
|
|
88
|
+
return t.notFound ? [D(t)] : [];
|
|
110
89
|
}
|
|
111
|
-
function
|
|
90
|
+
function G(t, e, n) {
|
|
112
91
|
return {
|
|
113
|
-
...
|
|
114
|
-
element:
|
|
92
|
+
...t ? { path: t } : {},
|
|
93
|
+
element: l.createElement(e),
|
|
115
94
|
children: n.length > 0 ? n : void 0
|
|
116
95
|
};
|
|
117
96
|
}
|
|
118
|
-
function
|
|
119
|
-
const
|
|
120
|
-
return [...t.children.entries()].sort(([
|
|
121
|
-
const o =
|
|
122
|
-
|
|
123
|
-
}),
|
|
97
|
+
function y(t, e) {
|
|
98
|
+
const n = [];
|
|
99
|
+
return [...t.children.entries()].sort(([a], [r]) => a.localeCompare(r)).forEach(([a, r]) => {
|
|
100
|
+
const o = p(a), u = o ? e ? `${e}/${o}` : `/${o}` : e;
|
|
101
|
+
n.push(...P(r, !1, u));
|
|
102
|
+
}), n;
|
|
124
103
|
}
|
|
125
|
-
function
|
|
126
|
-
const
|
|
127
|
-
return t.page &&
|
|
104
|
+
function E(t, e) {
|
|
105
|
+
const n = [];
|
|
106
|
+
return t.page && n.push(c(t, e || "/")), n.push(...y(t, e)), n.push(...d(t)), n;
|
|
128
107
|
}
|
|
129
|
-
function
|
|
130
|
-
if (
|
|
131
|
-
const
|
|
108
|
+
function I(t, e, n, a, r, o) {
|
|
109
|
+
if (S(t.segment)) {
|
|
110
|
+
const u = [...r, ...o];
|
|
132
111
|
return [
|
|
133
112
|
c(t, e),
|
|
134
113
|
{
|
|
135
|
-
path:
|
|
136
|
-
element: f(t,
|
|
137
|
-
children:
|
|
114
|
+
path: a,
|
|
115
|
+
element: f(t, n).element,
|
|
116
|
+
children: u.length > 0 ? u : void 0
|
|
138
117
|
}
|
|
139
118
|
];
|
|
140
119
|
}
|
|
141
|
-
return
|
|
142
|
-
path:
|
|
120
|
+
return r.length > 0 || o.length > 0 ? [{
|
|
121
|
+
path: a,
|
|
143
122
|
children: [
|
|
144
|
-
c(t,
|
|
145
|
-
...
|
|
123
|
+
c(t, n),
|
|
124
|
+
...r,
|
|
146
125
|
...o
|
|
147
126
|
]
|
|
148
127
|
}] : [{
|
|
149
|
-
path:
|
|
150
|
-
element: f(t,
|
|
128
|
+
path: a,
|
|
129
|
+
element: f(t, n).element
|
|
151
130
|
}];
|
|
152
131
|
}
|
|
153
|
-
function
|
|
154
|
-
const
|
|
132
|
+
function M(t, e, n, a) {
|
|
133
|
+
const r = [
|
|
155
134
|
...t.page ? [c(t, e)] : [],
|
|
156
|
-
...
|
|
157
|
-
...
|
|
135
|
+
...n,
|
|
136
|
+
...a
|
|
158
137
|
];
|
|
159
138
|
return [{
|
|
160
|
-
children:
|
|
139
|
+
children: r.length > 0 ? r : void 0
|
|
161
140
|
}];
|
|
162
141
|
}
|
|
163
|
-
function
|
|
164
|
-
const e =
|
|
142
|
+
function O(t) {
|
|
143
|
+
const e = E(t, "");
|
|
165
144
|
return t.layout ? [{
|
|
166
145
|
path: "/",
|
|
167
|
-
element:
|
|
146
|
+
element: l.createElement(t.layout),
|
|
168
147
|
children: e
|
|
169
148
|
}] : t.page ? e.length > 1 ? [{ path: "/", children: e }] : [{
|
|
170
149
|
path: "/",
|
|
171
150
|
element: f(t, "/", !1).element
|
|
172
151
|
}] : t.notFound ? [{ path: "/", children: e }] : e;
|
|
173
152
|
}
|
|
174
|
-
function
|
|
153
|
+
function P(t, e = !1, n = "") {
|
|
175
154
|
if (e)
|
|
176
|
-
return
|
|
177
|
-
const
|
|
178
|
-
return t.layout ? [
|
|
179
|
-
|
|
180
|
-
a ? "" : n,
|
|
155
|
+
return O(t);
|
|
156
|
+
const a = p(t.segment), r = !a, o = r ? n : n + "/" + a, u = y(t, o), s = d(t);
|
|
157
|
+
return t.layout ? [G(
|
|
158
|
+
r ? "" : a,
|
|
181
159
|
t.layout,
|
|
182
|
-
|
|
183
|
-
)] : t.page && !
|
|
160
|
+
E(t, o)
|
|
161
|
+
)] : t.page && !r ? I(
|
|
184
162
|
t,
|
|
185
|
-
r,
|
|
186
|
-
o,
|
|
187
163
|
n,
|
|
188
|
-
|
|
164
|
+
o,
|
|
165
|
+
a,
|
|
166
|
+
u,
|
|
189
167
|
s
|
|
190
|
-
) : t.page || t.notFound || !
|
|
191
|
-
path:
|
|
168
|
+
) : t.page || t.notFound || !r ? r ? M(t, o, u, s) : [{
|
|
169
|
+
path: a,
|
|
192
170
|
children: [
|
|
193
171
|
...t.page ? [c(t, o)] : [],
|
|
194
|
-
...
|
|
172
|
+
...u,
|
|
195
173
|
...s
|
|
196
174
|
]
|
|
197
|
-
}] :
|
|
175
|
+
}] : u;
|
|
198
176
|
}
|
|
199
|
-
function
|
|
177
|
+
function U(t, e, n, a) {
|
|
200
178
|
return () => {
|
|
201
|
-
const
|
|
202
|
-
return
|
|
179
|
+
const r = L(t, e, n, a);
|
|
180
|
+
return P(r, !0);
|
|
203
181
|
};
|
|
204
182
|
}
|
|
205
|
-
function
|
|
206
|
-
const t =
|
|
183
|
+
function V() {
|
|
184
|
+
const t = A(), e = T();
|
|
207
185
|
return typeof e == "string" && t["*"] !== void 0 ? { ...t, [e]: t["*"] } : t;
|
|
208
186
|
}
|
|
209
187
|
export {
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
at as normalizeSegment,
|
|
188
|
+
N as CatchAllParamProvider,
|
|
189
|
+
Y as assertNoDuplicateRoutes,
|
|
190
|
+
Z as assertNoRouteConflicts,
|
|
191
|
+
L as buildRouteTree,
|
|
192
|
+
Q as clearLazyCache,
|
|
193
|
+
H as configureRouter,
|
|
194
|
+
R as createLazyElement,
|
|
195
|
+
U as createRouteGenerator,
|
|
196
|
+
_ as extractRoutePath,
|
|
197
|
+
K as normalizeSegment,
|
|
221
198
|
h as parseRouteSegments,
|
|
222
|
-
|
|
223
|
-
V as resetRouterConfig,
|
|
199
|
+
J as resetRouterConfig,
|
|
224
200
|
F as routeSegmentToPath,
|
|
225
|
-
|
|
226
|
-
|
|
201
|
+
P as treeToRoutes,
|
|
202
|
+
V as useParams
|
|
227
203
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "next-vite-router",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"description": "Next.js-like file-based routing for React + Vite",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -29,13 +29,17 @@
|
|
|
29
29
|
"types": "./dist/plugin.d.cts",
|
|
30
30
|
"default": "./dist/plugin.cjs"
|
|
31
31
|
}
|
|
32
|
-
}
|
|
32
|
+
},
|
|
33
|
+
"./package.json": "./package.json"
|
|
33
34
|
},
|
|
34
35
|
"files": [
|
|
35
36
|
"dist",
|
|
36
37
|
"README.md",
|
|
37
38
|
"LICENSE"
|
|
38
39
|
],
|
|
40
|
+
"engines": {
|
|
41
|
+
"node": ">=18"
|
|
42
|
+
},
|
|
39
43
|
"keywords": [
|
|
40
44
|
"react",
|
|
41
45
|
"vite",
|
|
@@ -74,7 +78,7 @@
|
|
|
74
78
|
},
|
|
75
79
|
"scripts": {
|
|
76
80
|
"dev": "vite build --watch",
|
|
77
|
-
"build": "vite build && vite build -c vite.config.cli.ts && node -e \"
|
|
81
|
+
"build": "vite build && vite build -c vite.config.cli.ts && node --input-type=commonjs -e \"const fs = require('node:fs'); for (const f of ['index','plugin']) fs.copyFileSync('dist/'+f+'.d.ts','dist/'+f+'.d.cts')\"",
|
|
78
82
|
"test": "pnpm run test:params && pnpm run test:generator && pnpm run test:routes && pnpm run test:local && pnpm run test:compatibility",
|
|
79
83
|
"test:local": "node test/test-package.js",
|
|
80
84
|
"test:routes": "node test/test-route-types.js",
|