next-vite-router 1.3.0 → 2.0.0

package/README.md

@@ -95,9 +95,8 @@ npm run dev
 `Router` is only a convenience wrapper around `useRoutes(routes)`. The
 lazy-loading behavior and `loadingFallback` configured through `configureRouter`
 are read at render time, so they take effect even when `generateRoutes()` runs
-at module scope before application setup finishes. Register middleware with
-`registerMiddleware` *before* calling `generateRoutes()`, because route elements
-are wrapped while the tree is built. You can keep using React Router APIs:
+at module scope before application setup finishes. You can keep using React
+Router APIs:
 
 ```tsx
 import {
@@ -230,28 +229,29 @@ The fallback is resolved when a route suspends during render, so the order of
 `enableLazyLoading: false` is available for compatibility and testing. It does
 not turn Vite's asynchronous imports into synchronous imports.
 
-## Optional middleware
+## Auth guards
 
-Prefer layouts for route-scoped behavior. `registerMiddleware` is an optional
-escape hatch for cross-cutting wrappers:
+Protect a subtree with a layout inside a route group: the group name stays out
+of the URL, and the layout decides whether to render its `Outlet`:
 
 ```tsx
-import { registerMiddleware } from "next-vite-router";
+// src/app/(protected)/layout.tsx
+import { Navigate, Outlet } from "react-router-dom";
 
-registerMiddleware(/^\/dashboard/, (element) => (
-  <AuthGuard>{element}</AuthGuard>
-));
+export default function ProtectedLayout() {
+  const isAuthed = useAuth();
+  return isAuthed ? <Outlet /> : <Navigate to="/login" replace />;
+}
 ```
 
-Middleware wraps generated route elements; it does not create routes or
-replace React Router.
+Every page under `src/app/(protected)/` is then guarded by `useAuth()`.
 
 ## CLI
 
 For an interactive setup:
 
 ```bash
-npx next-vite-router init
+npx next-vite-router create
 ```
 
 The CLI creates a Vite React project, installs the package and
@@ -295,7 +295,7 @@ The repository includes a runnable showcase in [`examples/`](./examples/):
 - `basic`
 - `layouts`
 - `dynamic-routes`
-- `middleware`
+- `(protected)`
 - `typed-routes`
 
 Run it from the examples directory:

package/dist/cli.cjs

@@ -3,6 +3,8 @@
 const commander = require("commander");
 const node_child_process = require("node:child_process");
 const child_process = require("child_process");
+const fs$1 = require("node:fs");
+const path$1 = require("node:path");
 const prompts = require("prompts");
 const fs = require("fs");
 const path = require("path");
@@ -30,13 +32,13 @@ function detectPackageManager() {
   if (fromUA) candidates.push(fromUA);
   if (preferred && !candidates.includes(preferred)) candidates.push(preferred);
   ["pnpm", "bun", "yarn", "npm"].forEach((p) => {
-    const pm2 = p;
-    if (!candidates.includes(pm2)) candidates.push(pm2);
+    const pm = p;
+    if (!candidates.includes(pm)) candidates.push(pm);
   });
   let chosen = null;
-  for (const pm2 of candidates) {
-    if (isAvailable(pm2)) {
-      chosen = pm2;
+  for (const pm of candidates) {
+    if (isAvailable(pm)) {
+      chosen = pm;
       break;
     }
   }
@@ -87,7 +89,7 @@ if (typeof process !== "undefined") {
 const $ = {
   enabled: !NODE_DISABLE_COLORS && NO_COLOR == null && TERM !== "dumb" && (FORCE_COLOR != null && FORCE_COLOR !== "0" || isTTY)
 };
-function init$1(x, y) {
+function init(x, y) {
   let rgx = new RegExp(`\\x1b\\[${y}m`, "g");
   let open = `\x1B[${x}m`, close = `\x1B[${y}m`;
   return function(txt) {
@@ -95,10 +97,10 @@ function init$1(x, y) {
     return open + (!!~("" + txt).indexOf(close) ? txt.replace(rgx, close + open) : txt) + close;
   };
 }
-const red = init$1(31, 39);
-const green = init$1(32, 39);
-const yellow = init$1(33, 39);
-const cyan = init$1(36, 39);
+const red = init(31, 39);
+const green = init(32, 39);
+const yellow = init(33, 39);
+const cyan = init(36, 39);
 const highlighter = {
   error: red,
   warn: yellow,
@@ -164,7 +166,6 @@ function updateAppTsConfig(projectDir, src) {
   const aliasPath = src ? "./src/*" : "./*";
   tsConfigApp.compilerOptions = {
     ...tsConfigApp.compilerOptions,
-    baseUrl: ".",
     paths: {
       ...tsConfigApp.compilerOptions?.paths,
       "@/*": [aliasPath]
@@ -194,12 +195,24 @@ function updateTsConfigJson(projectDir, src) {
   if (!tsConfig.compilerOptions) {
     tsConfig.compilerOptions = {};
   }
-  tsConfig.compilerOptions.baseUrl = ".";
   tsConfig.compilerOptions.paths = {
     "@/*": [src ? "./src/*" : "./*"]
   };
   fs.writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2), "utf-8");
 }
+function updateIndexHtml(projectDir, src) {
+  if (src) return;
+  const indexPath = path.join(projectDir, "index.html");
+  if (!fs.existsSync(indexPath)) return;
+  const content = fs.readFileSync(indexPath, "utf-8");
+  const updated = content.replace(
+    /(src\s*=\s*["'])\/src\/main\.tsx(["'])/,
+    "$1/main.tsx$2"
+  );
+  if (updated !== content) {
+    fs.writeFileSync(indexPath, updated, "utf-8");
+  }
+}
 function createVirtualDTS(projectDir, useSrc) {
   const targetDir = useSrc ? path.join(projectDir, "src") : projectDir;
   if (useSrc && !fs.existsSync(targetDir)) {
@@ -374,7 +387,6 @@ function addTailwindToViteConfig(projectDir) {
   }
   writeViteConfig(projectDir, updatedContent);
 }
-const pm$1 = detectPackageManager();
 function startNextViteRouterConfig({
   projectDir = process.cwd(),
   src,
@@ -382,16 +394,31 @@ function startNextViteRouterConfig({
 }) {
   startViteConfig(projectDir, src);
   const srcPath = path.join(projectDir, "src");
-  if (fs.existsSync(srcPath)) {
+  if (src) {
+    for (const entry of [
+      "App.tsx",
+      "App.css",
+      "index.css",
+      "main.tsx",
+      "assets"
+    ]) {
+      const entryPath = path.join(srcPath, entry);
+      if (fs.existsSync(entryPath)) {
+        fs.rmSync(entryPath, { recursive: true, force: true });
+      }
+    }
+  } else if (fs.existsSync(srcPath)) {
     fs.rmSync(srcPath, { recursive: true, force: true });
   }
   updateTsConfigJson(projectDir, src);
   updateAppTsConfig(projectDir, src);
   createVirtualDTS(projectDir, src);
   createMainTSX(projectDir, src);
+  updateIndexHtml(projectDir, src);
   if (tailwindcss) {
     logger.info("Setting up Tailwind CSS...");
-    const addDevDepsCmd = pm$1.addDevDepsCommand([
+    const pm = detectPackageManager();
+    const addDevDepsCmd = pm.addDevDepsCommand([
       "tailwindcss",
       "@tailwindcss/vite"
     ]);
@@ -434,7 +461,7 @@ ${resolveConfig}
   }
   const pluginsRegex = /plugins\s*:\s*\[(.*?)\]/s;
   const match = viteConfigContent.match(pluginsRegex);
-  const pluginString = "nextViteRouter()";
+  const pluginString = src ? "nextViteRouter()" : 'nextViteRouter({ pagesDir: "app" })';
   if (match) {
     const existing = match[1].trim();
     const newPlugins = existing ? `${existing}, ${pluginString}` : pluginString;
@@ -451,9 +478,9 @@ ${resolveConfig}
   }
   writeViteConfig(projectDir, viteConfigContent);
 }
-const pm = detectPackageManager();
-const init = new commander.Command().name("init").description(
-  "Initialize a new Vite project with next-vite-router configuration"
+const PROJECT_NAME_RE = /^[a-z0-9][a-z0-9._-]*$/i;
+const create = new commander.Command().name("create").description(
+  "Create a new Vite project with next-vite-router configuration"
 ).action(async () => {
   const projectNameResponse = await prompts(
     {
@@ -470,6 +497,16 @@ const init = new commander.Command().name("init").description(
     }
   );
   const projectName = projectNameResponse.projectName;
+  if (!PROJECT_NAME_RE.test(projectName)) {
+    logger.error(
+      "Invalid project name (letters, digits, '.', '_' and '-' only)."
+    );
+    process.exit(1);
+  }
+  if (fs$1.existsSync(path$1.resolve(projectName))) {
+    logger.error(`Directory "${projectName}" already exists.`);
+    process.exit(1);
+  }
   const variantResponse = await prompts(
     {
       type: "select",
@@ -522,12 +559,10 @@ const init = new commander.Command().name("init").description(
     }
   );
   const useTailwind = tailwindResponse.useTailwind;
+  const pm = detectPackageManager();
   const createCommand = pm.createProjectCommand(projectName, variant);
   logger.info(`Creating project "${projectName}" using ${pm.name}...`);
-  child_process.execSync(createCommand, {
-    stdio: ["pipe", "inherit", "inherit"],
-    input: "n\n"
-  });
+  child_process.execSync(createCommand, { stdio: "inherit" });
   logger.info("Installing dependencies...");
   child_process.execSync(pm.installCommand, { stdio: "inherit", cwd: projectName });
   logger.info(
@@ -548,13 +583,18 @@ const init = new commander.Command().name("init").description(
 Project "${projectName}" is ready!
 `);
 });
-const version = "1.3.0";
+const version = "2.0.0";
 const pkg = {
   version
 };
 async function main() {
   const program = new commander.Command();
-  program.name("create-next-vite-router").version(pkg.version).addCommand(init);
-  program.parse(process.argv);
+  program.name("next-vite-router").version(pkg.version).addCommand(create);
+  try {
+    await program.parseAsync(process.argv);
+  } catch (e) {
+    logger.error(e instanceof Error ? e.message : String(e));
+    process.exit(1);
+  }
 }
 main();

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("./tree-hc1dSMdb.cjs"),l=require("react"),S=require("react-router-dom"),C={enableLazyLoading:!0};let f={...C};function v(e){f={...f,...e}}function F(){f={...C}}function T(){return f}let g=[];function x(e,t){g.push({pattern:e,middleware:t})}function A(){g=[]}function y(e,t){let r=t;for(const n of g)n.pattern.lastIndex=0,n.pattern.test(e)&&(r=n.middleware(r)),n.pattern.lastIndex=0;return r}const M=()=>l.createElement("div"),h=new Map;function N(){const e=T();if(e.enableLazyLoading===!1)return null;const t=e.loadingFallback||M;return l.createElement(t)}function $(){h.clear()}function p(e,t,r){let n=h.get(t);n||(n=l.lazy(e),h.set(t,n));const a=l.createElement(l.Suspense,{fallback:l.createElement(N)},l.createElement(n));return r?y(r,a):a}const P=l.createContext(void 0);function w({name:e,children:t}){return l.createElement(P.Provider,{value:e},t)}function k(){return l.useContext(P)}function E(e,t){return y(e,l.createElement(t))}function D(e){const t=c.parseRouteSegments(e)[0];return(t==null?void 0:t.kind)==="catchAll"&&t.optional}function d(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,r=!1){const n=e.page;if(!n)throw new Error(`Route node "${e.fullPath}" has no page loader`);const a=p(async()=>({default:(await n()).default}),`page:${e.fullPath||t}`,t),o=c.parseRouteSegments(e.segment)[0],u=(o==null?void 0:o.kind)==="catchAll"?l.createElement(w,{name:o.name,children:a}):a;return r?{index:!0,element:u}:{path:d(e.segment),element:u}}function q(e){const t=e.notFound;if(!t)throw new Error(`Route node "${e.fullPath}" has no not-found loader`);const r=e.fullPath?`/${e.fullPath}`:"/";return{path:"*",element:p(async()=>({default:(await t()).default}),`notfound:${e.fullPath}`,r)}}function L(e){return e.notFound?[q(e)]:[]}function I(e,t,r,n){return{...t?{path:t}:{},element:E(e,r),children:n.length>0?n:void 0}}function b(e,t){const r=[];return[...e.children.entries()].sort(([n],[a])=>n.localeCompare(a)).forEach(([n,a])=>{const o=d(n),u=o?t?`${t}/${o}`:`/${o}`:t;r.push(...R(a,!1,u))}),r}function z(e,t){const r=[];return e.page&&r.push(s(e,t||"/")),r.push(...b(e,t)),r.push(...L(e)),r}function G(e,t,r,n,a,o){if(D(e.segment)){const u=[...a,...o];return[s(e,t),{path:n,element:m(e,r).element,children:u.length>0?u:void 0}]}return a.length>0||o.length>0?[{path:n,children:[s(e,r),...a,...o]}]:[{path:n,element:m(e,r).element}]}function O(e,t,r,n){const a=[...e.page?[s(e,t)]:[],...r,...n];return[{children:a.length>0?a:void 0}]}function j(e){const t=z(e,"");return e.layout?[{path:"/",element:E("/",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,r=""){if(t)return j(e);const n=d(e.segment),a=!n,o=a?r:r+"/"+n,u=b(e,o),i=L(e);return e.layout?[I(o,a?"":n,e.layout,z(e,o))]:e.page&&!a?G(e,r,o,n,u,i):e.page||e.notFound||!a?a?O(e,o,u,i):[{path:n,children:[...e.page?[s(e,o)]:[],...u,...i]}]:u}function B(e,t,r,n){return()=>{const a=c.buildRouteTree(e,t,r,n);return R(a,!0)}}function H(){const e=S.useParams(),t=k();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=w;exports.clearLazyCache=$;exports.clearMiddlewares=A;exports.configureRouter=v;exports.createLazyElement=p;exports.createRouteGenerator=B;exports.registerMiddleware=x;exports.resetRouterConfig=F;exports.treeToRoutes=R;exports.useParams=H;
+"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

@@ -1,6 +1,5 @@
 import { ComponentType } from 'react';
 import { default as default_2 } from 'react';
-import { ReactElement } from 'react';
 import { RouteObject } from 'react-router-dom';
 
 export declare function assertNoDuplicateRoutes(filePaths: string[], fileOptions?: RouteFileOptions): void;
@@ -21,21 +20,18 @@ export declare function CatchAllParamProvider({ name, children, }: {
  * `React.lazy` component created in one context (for example a previous test)
  * is reused whenever another context requests the same key with a different
  * loader. Exposing an explicit reset keeps that state from leaking, mirroring
- * `clearMiddlewares` for the middleware registry.
+ * `resetRouterConfig` for the router configuration.
  */
 export declare function clearLazyCache(): void;
 
-export declare function clearMiddlewares(): void;
-
 export declare function configureRouter(config: RouterConfig): void;
 
 /**
- * Create a lazy element wrapped with Suspense and apply middlewares
+ * Create a lazy element wrapped with Suspense
  * @param loader - Function that loads the component
  * @param cacheKey - Unique key for the cache
- * @param routePath - Route path for middlewares
  */
-export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string, routePath?: string): default_2.ReactElement;
+export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string): default_2.ReactElement;
 
 /**
  * Create a custom route generator function using your own files
@@ -81,15 +77,14 @@ export declare function normalizeSegment(segment: string): string;
 
 export declare function parseRouteSegments(routePath: string): RouteSegment[];
 
-export declare function registerMiddleware(pattern: RegExp, middleware: RouteMiddleware): void;
-
 /**
  * Restore the module-level router configuration to its defaults.
  *
  * `configureRouter` merges, so it can never drop keys back to their initial
  * state. A dedicated reset lets isolated contexts (for example tests) start
  * from a known configuration instead of inheriting whatever was set globally
- * before, matching the explicit reset offered by `clearMiddlewares`.
+ * before, matching the explicit reset offered by `clearLazyCache` for the lazy
+ * component cache.
  */
 export declare function resetRouterConfig(): void;
 
@@ -100,8 +95,6 @@ export declare type RouteFileOptions = {
     notFoundFile?: string;
 };
 
-export declare type RouteMiddleware = (element: ReactElement) => ReactElement;
-
 export declare type RouteModuleLoader = () => Promise<{
     default: ComponentType;
 }>;

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { ComponentType } from 'react';
 import { default as default_2 } from 'react';
-import { ReactElement } from 'react';
 import { RouteObject } from 'react-router-dom';
 
 export declare function assertNoDuplicateRoutes(filePaths: string[], fileOptions?: RouteFileOptions): void;
@@ -21,21 +20,18 @@ export declare function CatchAllParamProvider({ name, children, }: {
  * `React.lazy` component created in one context (for example a previous test)
  * is reused whenever another context requests the same key with a different
  * loader. Exposing an explicit reset keeps that state from leaking, mirroring
- * `clearMiddlewares` for the middleware registry.
+ * `resetRouterConfig` for the router configuration.
  */
 export declare function clearLazyCache(): void;
 
-export declare function clearMiddlewares(): void;
-
 export declare function configureRouter(config: RouterConfig): void;
 
 /**
- * Create a lazy element wrapped with Suspense and apply middlewares
+ * Create a lazy element wrapped with Suspense
  * @param loader - Function that loads the component
  * @param cacheKey - Unique key for the cache
- * @param routePath - Route path for middlewares
  */
-export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string, routePath?: string): default_2.ReactElement;
+export declare function createLazyElement(loader: () => Promise<any>, cacheKey: string): default_2.ReactElement;
 
 /**
  * Create a custom route generator function using your own files
@@ -81,15 +77,14 @@ export declare function normalizeSegment(segment: string): string;
 
 export declare function parseRouteSegments(routePath: string): RouteSegment[];
 
-export declare function registerMiddleware(pattern: RegExp, middleware: RouteMiddleware): void;
-
 /**
  * Restore the module-level router configuration to its defaults.
  *
  * `configureRouter` merges, so it can never drop keys back to their initial
  * state. A dedicated reset lets isolated contexts (for example tests) start
  * from a known configuration instead of inheriting whatever was set globally
- * before, matching the explicit reset offered by `clearMiddlewares`.
+ * before, matching the explicit reset offered by `clearLazyCache` for the lazy
+ * component cache.
  */
 export declare function resetRouterConfig(): void;
 
@@ -100,8 +95,6 @@ export declare type RouteFileOptions = {
     notFoundFile?: string;
 };
 
-export declare type RouteMiddleware = (element: ReactElement) => ReactElement;
-
 export declare type RouteModuleLoader = () => Promise<{
     default: ComponentType;
 }>;

package/dist/index.js

@@ -1,227 +1,203 @@
-import { p as h, r as F, b } from "./tree-DfnssFxU.js";
-import { a as et, c as nt, e as rt, n as at } from "./tree-DfnssFxU.js";
-import u, { lazy as v, Suspense as z, createContext as $, useContext as A } from "react";
-import { useParams as k } from "react-router-dom";
-const d = {
+import { p as h, r as F, b as L } from "./tree-DfnssFxU.js";
+import { a as Y, c as Z, e as _, n as K } from "./tree-DfnssFxU.js";
+import l, { lazy as b, Suspense as v, createContext as z, useContext as x } from "react";
+import { useParams as A } from "react-router-dom";
+const g = {
   enableLazyLoading: !0
 };
-let i = { ...d };
-function U(t) {
+let i = { ...g };
+function H(t) {
   i = { ...i, ...t };
 }
-function V() {
-  i = { ...d };
+function J() {
+  i = { ...g };
 }
-function N() {
+function $() {
   return i;
 }
-let p = [];
-function W(t, e) {
-  p.push({ pattern: t, middleware: e });
-}
-function X() {
-  p = [];
-}
-function R(t, e) {
-  let r = e;
-  for (const n of p)
-    n.pattern.lastIndex = 0, n.pattern.test(t) && (r = n.middleware(r)), n.pattern.lastIndex = 0;
-  return r;
-}
-const M = () => u.createElement("div"), m = /* @__PURE__ */ new Map();
-function T() {
-  const t = N();
+const k = () => l.createElement("div"), m = /* @__PURE__ */ new Map();
+function w() {
+  const t = $();
   if (t.enableLazyLoading === !1)
     return null;
-  const e = t.loadingFallback || M;
-  return u.createElement(e);
+  const e = t.loadingFallback || k;
+  return l.createElement(e);
 }
-function Y() {
+function Q() {
   m.clear();
 }
-function C(t, e, r) {
+function R(t, e) {
   let n = m.get(e);
-  n || (n = v(t), m.set(e, n));
-  const a = u.createElement(
-    z,
-    { fallback: u.createElement(T) },
-    u.createElement(n)
+  return n || (n = b(t), m.set(e, n)), l.createElement(
+    v,
+    { fallback: l.createElement(w) },
+    l.createElement(n)
   );
-  return r ? R(r, a) : a;
 }
-const y = $(void 0);
-function I({
+const C = z(void 0);
+function N({
   name: t,
   children: e
 }) {
-  return u.createElement(
-    y.Provider,
+  return l.createElement(
+    C.Provider,
     { value: t },
     e
   );
 }
-function S() {
-  return A(y);
-}
-function P(t, e) {
-  return R(t, u.createElement(e));
+function T() {
+  return x(C);
 }
-function D(t) {
+function S(t) {
   const e = h(t)[0];
   return (e == null ? void 0 : e.kind) === "catchAll" && e.optional;
 }
-function g(t) {
+function p(t) {
   const e = h(t)[0];
   return e ? F(e) : "";
 }
 function c(t, e) {
   return f(t, e, !0);
 }
-function f(t, e, r = !1) {
-  const n = t.page;
-  if (!n)
+function f(t, e, n = !1) {
+  const a = t.page;
+  if (!a)
     throw new Error(`Route node "${t.fullPath}" has no page loader`);
-  const a = C(
-    async () => ({ default: (await n()).default }),
-    `page:${t.fullPath || e}`,
-    e
-  ), o = h(t.segment)[0], l = (o == null ? void 0 : o.kind) === "catchAll" ? u.createElement(I, {
+  const r = R(
+    async () => ({ default: (await a()).default }),
+    `page:${t.fullPath || e}`
+  ), o = h(t.segment)[0], u = (o == null ? void 0 : o.kind) === "catchAll" ? l.createElement(N, {
     name: o.name,
-    children: a
-  }) : a;
-  return r ? { index: !0, element: l } : { path: g(t.segment), element: l };
+    children: r
+  }) : r;
+  return n ? { index: !0, element: u } : { path: p(t.segment), element: u };
 }
-function G(t) {
+function D(t) {
   const e = t.notFound;
   if (!e)
     throw new Error(`Route node "${t.fullPath}" has no not-found loader`);
-  const r = t.fullPath ? `/${t.fullPath}` : "/";
   return {
     path: "*",
-    element: C(
+    element: R(
       async () => ({ default: (await e()).default }),
-      `notfound:${t.fullPath}`,
-      r
+      `notfound:${t.fullPath}`
     )
   };
 }
-function E(t) {
-  return t.notFound ? [G(t)] : [];
+function d(t) {
+  return t.notFound ? [D(t)] : [];
 }
-function O(t, e, r, n) {
+function G(t, e, n) {
   return {
-    ...e ? { path: e } : {},
-    element: P(t, r),
+    ...t ? { path: t } : {},
+    element: l.createElement(e),
     children: n.length > 0 ? n : void 0
   };
 }
-function w(t, e) {
-  const r = [];
-  return [...t.children.entries()].sort(([n], [a]) => n.localeCompare(a)).forEach(([n, a]) => {
-    const o = g(n), l = o ? e ? `${e}/${o}` : `/${o}` : e;
-    r.push(...x(a, !1, l));
-  }), r;
+function y(t, e) {
+  const n = [];
+  return [...t.children.entries()].sort(([a], [r]) => a.localeCompare(r)).forEach(([a, r]) => {
+    const o = p(a), u = o ? e ? `${e}/${o}` : `/${o}` : e;
+    n.push(...P(r, !1, u));
+  }), n;
 }
-function L(t, e) {
-  const r = [];
-  return t.page && r.push(c(t, e || "/")), r.push(...w(t, e)), r.push(...E(t)), r;
+function E(t, e) {
+  const n = [];
+  return t.page && n.push(c(t, e || "/")), n.push(...y(t, e)), n.push(...d(t)), n;
 }
-function j(t, e, r, n, a, o) {
-  if (D(t.segment)) {
-    const l = [...a, ...o];
+function I(t, e, n, a, r, o) {
+  if (S(t.segment)) {
+    const u = [...r, ...o];
     return [
       c(t, e),
       {
-        path: n,
-        element: f(t, r).element,
-        children: l.length > 0 ? l : void 0
+        path: a,
+        element: f(t, n).element,
+        children: u.length > 0 ? u : void 0
       }
     ];
   }
-  return a.length > 0 || o.length > 0 ? [{
-    path: n,
+  return r.length > 0 || o.length > 0 ? [{
+    path: a,
     children: [
-      c(t, r),
-      ...a,
+      c(t, n),
+      ...r,
       ...o
     ]
   }] : [{
-    path: n,
-    element: f(t, r).element
+    path: a,
+    element: f(t, n).element
   }];
 }
-function q(t, e, r, n) {
-  const a = [
+function M(t, e, n, a) {
+  const r = [
     ...t.page ? [c(t, e)] : [],
-    ...r,
-    ...n
+    ...n,
+    ...a
   ];
   return [{
-    children: a.length > 0 ? a : void 0
+    children: r.length > 0 ? r : void 0
   }];
 }
-function B(t) {
-  const e = L(t, "");
+function O(t) {
+  const e = E(t, "");
   return t.layout ? [{
     path: "/",
-    element: P("/", t.layout),
+    element: l.createElement(t.layout),
     children: e
   }] : t.page ? e.length > 1 ? [{ path: "/", children: e }] : [{
     path: "/",
     element: f(t, "/", !1).element
   }] : t.notFound ? [{ path: "/", children: e }] : e;
 }
-function x(t, e = !1, r = "") {
+function P(t, e = !1, n = "") {
   if (e)
-    return B(t);
-  const n = g(t.segment), a = !n, o = a ? r : r + "/" + n, l = w(t, o), s = E(t);
-  return t.layout ? [O(
-    o,
-    a ? "" : n,
+    return O(t);
+  const a = p(t.segment), r = !a, o = r ? n : n + "/" + a, u = y(t, o), s = d(t);
+  return t.layout ? [G(
+    r ? "" : a,
     t.layout,
-    L(t, o)
-  )] : t.page && !a ? j(
+    E(t, o)
+  )] : t.page && !r ? I(
     t,
-    r,
-    o,
     n,
-    l,
+    o,
+    a,
+    u,
     s
-  ) : t.page || t.notFound || !a ? a ? q(t, o, l, s) : [{
-    path: n,
+  ) : t.page || t.notFound || !r ? r ? M(t, o, u, s) : [{
+    path: a,
     children: [
       ...t.page ? [c(t, o)] : [],
-      ...l,
+      ...u,
       ...s
     ]
-  }] : l;
+  }] : u;
 }
-function Z(t, e, r, n) {
+function U(t, e, n, a) {
   return () => {
-    const a = b(t, e, r, n);
-    return x(a, !0);
+    const r = L(t, e, n, a);
+    return P(r, !0);
   };
 }
-function _() {
-  const t = k(), e = S();
+function V() {
+  const t = A(), e = T();
   return typeof e == "string" && t["*"] !== void 0 ? { ...t, [e]: t["*"] } : t;
 }
 export {
-  I as CatchAllParamProvider,
-  et as assertNoDuplicateRoutes,
-  nt as assertNoRouteConflicts,
-  b as buildRouteTree,
-  Y as clearLazyCache,
-  X as clearMiddlewares,
-  U as configureRouter,
-  C as createLazyElement,
-  Z as createRouteGenerator,
-  rt as extractRoutePath,
-  at as normalizeSegment,
+  N as CatchAllParamProvider,
+  Y as assertNoDuplicateRoutes,
+  Z as assertNoRouteConflicts,
+  L as buildRouteTree,
+  Q as clearLazyCache,
+  H as configureRouter,
+  R as createLazyElement,
+  U as createRouteGenerator,
+  _ as extractRoutePath,
+  K as normalizeSegment,
   h as parseRouteSegments,
-  W as registerMiddleware,
-  V as resetRouterConfig,
+  J as resetRouterConfig,
   F as routeSegmentToPath,
-  x as treeToRoutes,
-  _ as useParams
+  P as treeToRoutes,
+  V as useParams
 };

package/dist/plugin.cjs

@@ -1,5 +1,5 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("node:fs"),m=require("node:path"),x=require("./tree-hc1dSMdb.cjs");function w(n){const a=n.map(x.routeSegmentToPath).filter(Boolean);return a.length>0?`/${a.join("/")}`:"/"}function S(n){const a=[["pagesDir",n.pagesDir],["pageFile",n.pageFile],["layoutFile",n.layoutFile],["notFoundFile",n.notFoundFile]];for(const[t,e]of a)if(!e.trim())throw new Error(`nextViteRouter option "${t}" must not be empty.`);const s=a.slice(1),i=s.find(([,t],e)=>s.slice(e+1).some(([,r])=>r===t));if(i)throw new Error(`nextViteRouter file options must be distinct; "${i[0]}" is duplicated.`)}function T(n){return n.replace(/\\/g,"/").replace(/^\.\//,"").replace(/^\/|\/$/g,"")}function k(n,a,s){const i=a.pageFile??"page.tsx",t=new Map;for(const e of R(n,i,s)){const r=x.extractRoutePath(e,a),l=x.parseRouteSegments(r),d=l.filter(u=>u.kind==="dynamic"||u.kind==="catchAll").map(u=>({name:u.name,optional:u.kind==="catchAll"&&u.optional})),c=w(l);t.set(c,{path:c,params:d});const f=l[l.length-1];if((f==null?void 0:f.kind)==="catchAll"&&f.optional){const u=w(l.slice(0,-1));t.has(u)||t.set(u,{path:u,params:[]})}}return[...t.values()].sort((e,r)=>e.path.localeCompare(r.path))}function R(n,a,s){const i=[];function t(e){for(const r of b.readdirSync(e,{withFileTypes:!0})){const l=m.join(e,r.name);if(r.isDirectory())t(l);else if(r.isFile()&&r.name===a){const d=m.relative(n,l).replace(/\\/g,"/");i.push(`/${s}/${d}`)}}}return b.existsSync(n)&&t(n),i}function G(n){const a=n.map(({path:i})=>`  | ${JSON.stringify(i)}`).join(`
-`),s=n.map(({path:i,params:t})=>{const e=t.length>0?[...t.map(({name:r,optional:l})=>`    ${r}${l?"?":""}: string;`)].join(`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("node:fs"),f=require("node:path"),x=require("./tree-hc1dSMdb.cjs");function S(r){const a=r.map(x.routeSegmentToPath).filter(Boolean);return a.length>0?`/${a.join("/")}`:"/"}function T(r){const a=[["pagesDir",r.pagesDir],["pageFile",r.pageFile],["layoutFile",r.layoutFile],["notFoundFile",r.notFoundFile]];for(const[o,e]of a)if(!e.trim())throw new Error(`nextViteRouter option "${o}" must not be empty.`);const s=a.slice(1),i=s.find(([,o],e)=>s.slice(e+1).some(([,n])=>n===o));if(i)throw new Error(`nextViteRouter file options must be distinct; "${i[0]}" is duplicated.`)}function k(r){return r.replace(/\\/g,"/").replace(/^\.\//,"").replace(/^\/|\/$/g,"")}function G(r,a,s){const i=a.pageFile??"page.tsx",o=new Map;for(const e of R(r,i,s)){const n=x.extractRoutePath(e,a),l=x.parseRouteSegments(n),g=l.filter(u=>u.kind==="dynamic"||u.kind==="catchAll").map(u=>({name:u.name,optional:u.kind==="catchAll"&&u.optional})),p=S(l);o.set(p,{path:p,params:g});const m=l[l.length-1];if((m==null?void 0:m.kind)==="catchAll"&&m.optional){const u=S(l.slice(0,-1));o.has(u)||o.set(u,{path:u,params:[]})}}return[...o.values()].sort((e,n)=>e.path.localeCompare(n.path))}function R(r,a,s){const i=[];function o(e){for(const n of b.readdirSync(e,{withFileTypes:!0})){const l=f.join(e,n.name);if(n.isDirectory())o(l);else if(n.isFile()&&n.name===a){const g=f.relative(r,l).replace(/\\/g,"/");i.push(`/${s}/${g}`)}}}return b.existsSync(r)&&o(r),i}function O(r){const a=r.map(({path:i})=>`  | ${JSON.stringify(i)}`).join(`
+`),s=r.map(({path:i,params:o})=>{const e=o.length>0?[...o.map(({name:n,optional:l})=>`    ${n}${l?"?":""}: string;`)].join(`
 `):"    [key: string]: never;";return`  ${JSON.stringify(i)}: {
 ${e}
   };`}).join(`
@@ -23,12 +23,12 @@ ${s}
   export function useParams<T extends Record<string, string | undefined> = Record<string, string | undefined>>(): T;
   export { Link, useRoutes } from 'react-router-dom';
 }
-`}function O(n={}){const{pagesDir:a="src/app",pageFile:s="page.tsx",layoutFile:i="layout.tsx",notFoundFile:t="not-found.tsx"}=n;S({pagesDir:a,pageFile:s,layoutFile:i,notFoundFile:t});const e=T(a),r={pagesDir:e,pageFile:s,layoutFile:i,notFoundFile:t},l="virtual:next-vite-router",d="\0"+l;let c="",f="",u,h;function F(){const o=G(k(c,r,e));b.writeFileSync(f,o,"utf-8")}return{name:"next-vite-router",configResolved(o){c=m.resolve(o.root,a),f=m.join(m.dirname(c),"virtual-next-vite-router.d.ts"),x.assertNoRouteConflicts(R(c,s,e),R(c,t,e),r),F()},configureServer(o){if(u===o)return;h==null||h(),u=o;const g=$=>{if(m.relative(c,$).startsWith("..")||![s,i,t].includes(m.basename($)))return;try{x.assertNoRouteConflicts(R(c,s,e),R(c,t,e),r)}catch(P){o.config.logger.error(P instanceof Error?P.message:String(P));return}F();const v=o.moduleGraph.getModuleById(d);v&&(o.moduleGraph.invalidateModule(v),p&&clearTimeout(p),p=setTimeout(()=>{p=void 0,o.ws.send({type:"full-reload",path:"*"})},0))};let p;const y=()=>{p&&(clearTimeout(p),p=void 0),o.watcher.off("add",g),o.watcher.off("unlink",g),o.watcher.off("close",y),u===o&&(u=void 0,h=void 0)};o.watcher.on("add",g),o.watcher.on("unlink",g),o.watcher.once("close",y),h=y},resolveId(o){if(o===l)return d},load(o){if(o===d){const g=`/${e}/**/${s}`,p=`/${e}/**/${i}`,y=`/${e}/**/${t}`;return`
+`}function j(r={}){const{pagesDir:a="src/app",pageFile:s="page.tsx",layoutFile:i="layout.tsx",notFoundFile:o="not-found.tsx"}=r;T({pagesDir:a,pageFile:s,layoutFile:i,notFoundFile:o});const e=k(a),n={pagesDir:e,pageFile:s,layoutFile:i,notFoundFile:o},l="virtual:next-vite-router",g="\0"+l;let p="",m="",u,P,h;function v(){const t=O(G(p,n,e));try{b.mkdirSync(f.dirname(m),{recursive:!0}),b.writeFileSync(m,t,"utf-8")}catch(d){const c=`next-vite-router could not write route types to ${m}: ${d instanceof Error?d.message:String(d)}`;u?u.warn(c):console.warn(c)}}return{name:"next-vite-router",configResolved(t){p=f.resolve(t.root,a),m=f.join(f.dirname(p),"virtual-next-vite-router.d.ts"),u=t.logger,x.assertNoRouteConflicts(R(p,s,e),R(p,o,e),n),v()},configureServer(t){if(P===t)return;h==null||h(),P=t;const d=$=>{if(f.relative(p,$).startsWith("..")||![s,i,o].includes(f.basename($)))return;try{x.assertNoRouteConflicts(R(p,s,e),R(p,o,e),n)}catch(F){t.config.logger.error(F instanceof Error?F.message:String(F));return}v();const w=t.moduleGraph.getModuleById(g);w&&(t.moduleGraph.invalidateModule(w),c&&clearTimeout(c),c=setTimeout(()=>{c=void 0,t.ws.send({type:"full-reload",path:"*"})},0))};let c;const y=()=>{c&&(clearTimeout(c),c=void 0),t.watcher.off("add",d),t.watcher.off("unlink",d),t.watcher.off("close",y),P===t&&(P=void 0,h=void 0)};t.watcher.on("add",d),t.watcher.on("unlink",d),t.watcher.once("close",y),h=y},resolveId(t){if(t===l)return g},load(t){if(t===g){const d=`/${e}/**/${s}`,c=`/${e}/**/${i}`,y=`/${e}/**/${o}`;return`
 import { buildRouteTree, treeToRoutes, normalizeSegment, createLazyElement, useParams } from 'next-vite-router';
 import { Link, useRoutes } from 'react-router-dom';
 
-const pagesGlob = import.meta.glob(${JSON.stringify(g)});
-const layoutsGlob = import.meta.glob(${JSON.stringify(p)}, { eager: true });
+const pagesGlob = import.meta.glob(${JSON.stringify(d)});
+const layoutsGlob = import.meta.glob(${JSON.stringify(c)}, { eager: true });
 const notFoundsGlob = import.meta.glob(${JSON.stringify(y)});
 
 // Keep the raw root-relative glob keys. extractRoutePath (via buildRouteTree)
@@ -40,7 +40,7 @@ const layouts = layoutsGlob;
 const notFounds = notFoundsGlob;
 
 export function generateRoutes() {
-  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(r)});
+  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(n)});
   const routes = treeToRoutes(tree, true);
   return routes;
 }
@@ -60,4 +60,4 @@ if (import.meta.hot) {
 
 export { Link, useRoutes };
 export { useParams };
-`}}}}exports.nextViteRouter=O;
+`}}}}exports.nextViteRouter=j;

package/dist/plugin.js

@@ -1,73 +1,73 @@
 import P from "node:fs";
 import f from "node:path";
-import { c as v, e as S, p as T, r as k } from "./tree-DfnssFxU.js";
-function w(n) {
-  const a = n.map(k).filter(Boolean);
+import { c as w, e as T, p as k, r as G } from "./tree-DfnssFxU.js";
+function S(r) {
+  const a = r.map(G).filter(Boolean);
   return a.length > 0 ? `/${a.join("/")}` : "/";
 }
-function G(n) {
+function O(r) {
   const a = [
-    ["pagesDir", n.pagesDir],
-    ["pageFile", n.pageFile],
-    ["layoutFile", n.layoutFile],
-    ["notFoundFile", n.notFoundFile]
+    ["pagesDir", r.pagesDir],
+    ["pageFile", r.pageFile],
+    ["layoutFile", r.layoutFile],
+    ["notFoundFile", r.notFoundFile]
   ];
-  for (const [e, t] of a)
-    if (!t.trim())
-      throw new Error(`nextViteRouter option "${e}" must not be empty.`);
+  for (const [o, e] of a)
+    if (!e.trim())
+      throw new Error(`nextViteRouter option "${o}" must not be empty.`);
   const s = a.slice(1), i = s.find(
-    ([, e], t) => s.slice(t + 1).some(([, r]) => r === e)
+    ([, o], e) => s.slice(e + 1).some(([, n]) => n === o)
   );
   if (i)
     throw new Error(
       `nextViteRouter file options must be distinct; "${i[0]}" is duplicated.`
     );
 }
-function O(n) {
-  return n.replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/|\/$/g, "");
+function j(r) {
+  return r.replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/|\/$/g, "");
 }
-function j(n, a, s) {
-  const i = a.pageFile ?? "page.tsx", e = /* @__PURE__ */ new Map();
-  for (const t of R(n, i, s)) {
-    const r = S(t, a), l = T(r), d = l.filter(
+function D(r, a, s) {
+  const i = a.pageFile ?? "page.tsx", o = /* @__PURE__ */ new Map();
+  for (const e of R(r, i, s)) {
+    const n = T(e, a), l = k(n), g = l.filter(
       (u) => u.kind === "dynamic" || u.kind === "catchAll"
     ).map((u) => ({
       name: u.name,
       optional: u.kind === "catchAll" && u.optional
-    })), c = w(l);
-    e.set(c, { path: c, params: d });
+    })), p = S(l);
+    o.set(p, { path: p, params: g });
     const m = l[l.length - 1];
     if ((m == null ? void 0 : m.kind) === "catchAll" && m.optional) {
-      const u = w(l.slice(0, -1));
-      e.has(u) || e.set(u, { path: u, params: [] });
+      const u = S(l.slice(0, -1));
+      o.has(u) || o.set(u, { path: u, params: [] });
     }
   }
-  return [...e.values()].sort((t, r) => t.path.localeCompare(r.path));
+  return [...o.values()].sort((e, n) => e.path.localeCompare(n.path));
 }
-function R(n, a, s) {
+function R(r, a, s) {
   const i = [];
-  function e(t) {
-    for (const r of P.readdirSync(t, { withFileTypes: !0 })) {
-      const l = f.join(t, r.name);
-      if (r.isDirectory())
-        e(l);
-      else if (r.isFile() && r.name === a) {
-        const d = f.relative(n, l).replace(/\\/g, "/");
-        i.push(`/${s}/${d}`);
+  function o(e) {
+    for (const n of P.readdirSync(e, { withFileTypes: !0 })) {
+      const l = f.join(e, n.name);
+      if (n.isDirectory())
+        o(l);
+      else if (n.isFile() && n.name === a) {
+        const g = f.relative(r, l).replace(/\\/g, "/");
+        i.push(`/${s}/${g}`);
       }
     }
   }
-  return P.existsSync(n) && e(n), i;
+  return P.existsSync(r) && o(r), i;
 }
-function D(n) {
-  const a = n.map(({ path: i }) => `  | ${JSON.stringify(i)}`).join(`
-`), s = n.map(({ path: i, params: e }) => {
-    const t = e.length > 0 ? [
-      ...e.map(({ name: r, optional: l }) => `    ${r}${l ? "?" : ""}: string;`)
+function N(r) {
+  const a = r.map(({ path: i }) => `  | ${JSON.stringify(i)}`).join(`
+`), s = r.map(({ path: i, params: o }) => {
+    const e = o.length > 0 ? [
+      ...o.map(({ name: n, optional: l }) => `    ${n}${l ? "?" : ""}: string;`)
     ].join(`
 `) : "    [key: string]: never;";
     return `  ${JSON.stringify(i)}: {
-${t}
+${e}
   };`;
   }).join(`
 `);
@@ -93,73 +93,78 @@ ${s}
 }
 `;
 }
-function z(n = {}) {
+function L(r = {}) {
   const {
     pagesDir: a = "src/app",
     pageFile: s = "page.tsx",
     layoutFile: i = "layout.tsx",
-    notFoundFile: e = "not-found.tsx"
-  } = n;
-  G({ pagesDir: a, pageFile: s, layoutFile: i, notFoundFile: e });
-  const t = O(a), r = { pagesDir: t, pageFile: s, layoutFile: i, notFoundFile: e }, l = "virtual:next-vite-router", d = "\0" + l;
-  let c = "", m = "", u, h;
-  function F() {
-    const o = D(j(c, r, t));
-    P.writeFileSync(m, o, "utf-8");
+    notFoundFile: o = "not-found.tsx"
+  } = r;
+  O({ pagesDir: a, pageFile: s, layoutFile: i, notFoundFile: o });
+  const e = j(a), n = { pagesDir: e, pageFile: s, layoutFile: i, notFoundFile: o }, l = "virtual:next-vite-router", g = "\0" + l;
+  let p = "", m = "", u, x, h;
+  function $() {
+    const t = N(D(p, n, e));
+    try {
+      P.mkdirSync(f.dirname(m), { recursive: !0 }), P.writeFileSync(m, t, "utf-8");
+    } catch (d) {
+      const c = `next-vite-router could not write route types to ${m}: ${d instanceof Error ? d.message : String(d)}`;
+      u ? u.warn(c) : console.warn(c);
+    }
   }
   return {
     name: "next-vite-router",
-    configResolved(o) {
-      c = f.resolve(o.root, a), m = f.join(f.dirname(c), "virtual-next-vite-router.d.ts"), v(
-        R(c, s, t),
-        R(c, e, t),
-        r
-      ), F();
+    configResolved(t) {
+      p = f.resolve(t.root, a), m = f.join(f.dirname(p), "virtual-next-vite-router.d.ts"), u = t.logger, w(
+        R(p, s, e),
+        R(p, o, e),
+        n
+      ), $();
     },
-    configureServer(o) {
-      if (u === o)
+    configureServer(t) {
+      if (x === t)
         return;
-      h == null || h(), u = o;
-      const g = (b) => {
-        if (f.relative(c, b).startsWith("..") || ![s, i, e].includes(f.basename(b)))
+      h == null || h(), x = t;
+      const d = (b) => {
+        if (f.relative(p, b).startsWith("..") || ![s, i, o].includes(f.basename(b)))
           return;
         try {
-          v(
-            R(c, s, t),
-            R(c, e, t),
-            r
+          w(
+            R(p, s, e),
+            R(p, o, e),
+            n
           );
-        } catch (x) {
-          o.config.logger.error(
-            x instanceof Error ? x.message : String(x)
+        } catch (F) {
+          t.config.logger.error(
+            F instanceof Error ? F.message : String(F)
           );
           return;
         }
-        F();
-        const $ = o.moduleGraph.getModuleById(d);
-        $ && (o.moduleGraph.invalidateModule($), p && clearTimeout(p), p = setTimeout(() => {
-          p = void 0, o.ws.send({ type: "full-reload", path: "*" });
+        $();
+        const v = t.moduleGraph.getModuleById(g);
+        v && (t.moduleGraph.invalidateModule(v), c && clearTimeout(c), c = setTimeout(() => {
+          c = void 0, t.ws.send({ type: "full-reload", path: "*" });
         }, 0));
       };
-      let p;
+      let c;
       const y = () => {
-        p && (clearTimeout(p), p = void 0), o.watcher.off("add", g), o.watcher.off("unlink", g), o.watcher.off("close", y), u === o && (u = void 0, h = void 0);
+        c && (clearTimeout(c), c = void 0), t.watcher.off("add", d), t.watcher.off("unlink", d), t.watcher.off("close", y), x === t && (x = void 0, h = void 0);
       };
-      o.watcher.on("add", g), o.watcher.on("unlink", g), o.watcher.once("close", y), h = y;
+      t.watcher.on("add", d), t.watcher.on("unlink", d), t.watcher.once("close", y), h = y;
     },
-    resolveId(o) {
-      if (o === l)
-        return d;
+    resolveId(t) {
+      if (t === l)
+        return g;
     },
-    load(o) {
-      if (o === d) {
-        const g = `/${t}/**/${s}`, p = `/${t}/**/${i}`, y = `/${t}/**/${e}`;
+    load(t) {
+      if (t === g) {
+        const d = `/${e}/**/${s}`, c = `/${e}/**/${i}`, y = `/${e}/**/${o}`;
         return `
 import { buildRouteTree, treeToRoutes, normalizeSegment, createLazyElement, useParams } from 'next-vite-router';
 import { Link, useRoutes } from 'react-router-dom';
 
-const pagesGlob = import.meta.glob(${JSON.stringify(g)});
-const layoutsGlob = import.meta.glob(${JSON.stringify(p)}, { eager: true });
+const pagesGlob = import.meta.glob(${JSON.stringify(d)});
+const layoutsGlob = import.meta.glob(${JSON.stringify(c)}, { eager: true });
 const notFoundsGlob = import.meta.glob(${JSON.stringify(y)});
 
 // Keep the raw root-relative glob keys. extractRoutePath (via buildRouteTree)
@@ -171,7 +176,7 @@ const layouts = layoutsGlob;
 const notFounds = notFoundsGlob;
 
 export function generateRoutes() {
-  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(r)});
+  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(n)});
   const routes = treeToRoutes(tree, true);
   return routes;
 }
@@ -197,5 +202,5 @@ export { useParams };
   };
 }
 export {
-  z as nextViteRouter
+  L as nextViteRouter
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "next-vite-router",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Next.js-like file-based routing for React + Vite",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "sideEffects": false,
   "bin": {
-    "create-next-vite-router": "./dist/cli.cjs"
+    "next-vite-router": "./dist/cli.cjs"
   },
   "exports": {
     ".": {
@@ -29,13 +29,17 @@
         "types": "./dist/plugin.d.cts",
         "default": "./dist/plugin.cjs"
       }
-    }
+    },
+    "./package.json": "./package.json"
   },
   "files": [
     "dist",
     "README.md",
     "LICENSE"
   ],
+  "engines": {
+    "node": ">=18"
+  },
   "keywords": [
     "react",
     "vite",
@@ -74,7 +78,7 @@
   },
   "scripts": {
     "dev": "vite build --watch",
-    "build": "vite build && vite build -c vite.config.cli.ts && node -e \"import fs from 'node:fs'; for (const f of ['index','plugin']) fs.copyFileSync('dist/'+f+'.d.ts','dist/'+f+'.d.cts')\"",
+    "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')\"",
     "test": "pnpm run test:params && pnpm run test:generator && pnpm run test:routes && pnpm run test:local && pnpm run test:compatibility",
     "test:local": "node test/test-package.js",
     "test:routes": "node test/test-route-types.js",