next-vite-router 1.2.4 → 1.3.1

package/README.md

@@ -4,7 +4,7 @@ File-based routing for React + Vite.
 
 Define routes with folders and let the package generate the
 [React Router](https://reactrouter.com/) `RouteObject[]`. It does not replace
-React Router, navigation, history, loaders, or application state.
+React Router, navigation, history, or application state.
 
 ## Start here
 
@@ -31,6 +31,10 @@ export default defineConfig({
 });
 ```
 
+The plugin ships both ESM and CJS, so this works when `package.json` has no
+`"type": "module"` (Vite 5 loads `vite.config.ts` with `require()` in that
+case). You can also rename the file to `vite.config.mts` to force ESM.
+
 Create your route tree:
 
 ```text
@@ -88,10 +92,12 @@ npm run dev
 
 ## Use React Router directly
 
-`Router` is only a convenience wrapper around `useRoutes(routes)`. Routes are
-generated lazily on the first render, so calls to `configureRouter` and
-`registerMiddleware` made during application setup are applied before route
-elements are created. You can keep using React Router APIs:
+`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:
 
 ```tsx
 import {
@@ -115,10 +121,18 @@ export default function App() {
 }
 ```
 
-Use `useNavigate`, loaders, actions, and other React Router APIs from
-`react-router-dom`. The package `useParams` hook is also available from the
-virtual module and maps catch-all names such as `slug`. The package does not
-create competing navigation or data-loading APIs.
+Keep using React Router's navigation and hooks from `react-router-dom`
+(`useNavigate`, `useLocation`, `Link`, `Outlet`). For parameters, import
+`useParams` from the virtual module instead of `react-router-dom`: dynamic
+`[id]` segments work with either hook, but named catch-all segments
+(`[...slug]`, `[[...slug]]`) are only surfaced as `slug` through the package
+`useParams`. React Router's own `useParams` returns them under `params["*"]`.
+
+The generated `RouteObject[]` carries page, layout, and not-found elements only.
+There is no file convention that produces React Router route `loader` or
+`action` functions, and those data APIs run only under a data router
+(`createBrowserRouter` + `RouterProvider`), not under `BrowserRouter` with
+`useRoutes`. Fetch data inside your page components instead.
 
 ## File conventions
 
@@ -210,6 +224,9 @@ configureRouter({
 });
 ```
 
+The fallback is resolved when a route suspends during render, so the order of
+`configureRouter` relative to `generateRoutes()` does not matter.
+
 `enableLazyLoading: false` is available for compatibility and testing. It does
 not turn Vite's asynchronous imports into synchronous imports.
 
@@ -234,7 +251,7 @@ replace React Router.
 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

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.2.4";
+const version = "1.3.1";
 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

@@ -0,0 +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;

package/dist/index.d.cts

@@ -0,0 +1,144 @@
+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;
+
+export declare function assertNoRouteConflicts(pageFiles: string[], notFoundFiles: string[], fileOptions?: RouteFileOptions): void;
+
+export declare function buildRouteTree(pages: Record<string, () => Promise<any>>, layouts: Record<string, any>, notFounds: Record<string, () => Promise<any>>, fileOptions?: RouteFileOptions): RouteNode;
+
+export declare function CatchAllParamProvider({ name, children, }: {
+    name: string;
+    children: default_2.ReactElement;
+}): default_2.ReactElement;
+
+/**
+ * Clear the module-level lazy component cache.
+ *
+ * `lazyComponentCache` is a package-wide singleton keyed by route path, so a
+ * `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.
+ */
+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
+ * @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;
+
+/**
+ * Create a custom route generator function using your own files
+ *
+ * ⚠️ NOTE: This function is intended for advanced use only.
+ * For most cases, use the Vite plugin which automatically handles the paths.
+ *
+ * @example
+ * // In your configuration file
+ * const pages = import.meta.glob("../../pages/**\\/page.tsx");
+ * const layouts = import.meta.glob("../../pages/**\\/layout.tsx", { eager: true });
+ * const notFounds = import.meta.glob("../../pages/**\\/not-found.tsx");
+ *
+ * export const generateCustomRoutes = createRouteGenerator(pages, layouts, notFounds);
+ *
+ * // Then use it
+ * const routes = generateCustomRoutes();
+ */
+export declare function createRouteGenerator(pages: Record<string, () => Promise<any>>, layouts: Record<string, any>, notFounds: Record<string, () => Promise<any>>, fileOptions?: RouteFileOptions): () => RouteObject[];
+
+/**
+ * Extract the route path from a file path
+ * @example "../../app/blog/[id]/page.tsx" -> "blog/[id]"
+ * @example "../../app/page.tsx" -> ""
+ *
+ * `pagesDir` may be relative or absolute. The plugin resolves it relative to
+ * the Vite project root before passing it here.
+ * The prefix is stripped lazily so it matches the FIRST directory boundary
+ * that equals `pagesDir` (or the leading `app`/`pages` root marker when no
+ * `pagesDir` is supplied). A greedy match would instead consume up to the
+ * LAST such folder, which mangles routes that legitimately contain a nested
+ * folder named like the pages directory (e.g. `app/docs/app/page.tsx`).
+ */
+export declare function extractRoutePath(filePath: string, { pagesDir, pageFile, layoutFile, notFoundFile }?: RouteFileOptions): string;
+
+/**
+ * Normalize a Next.js segment to a React Router segment
+ * @example (admin) -> ""
+ * @example [id] -> :id
+ * @example [...slug] -> *
+ */
+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`.
+ */
+export declare function resetRouterConfig(): void;
+
+export declare type RouteFileOptions = {
+    pagesDir?: string;
+    pageFile?: string;
+    layoutFile?: string;
+    notFoundFile?: string;
+};
+
+export declare type RouteMiddleware = (element: ReactElement) => ReactElement;
+
+export declare type RouteModuleLoader = () => Promise<{
+    default: ComponentType;
+}>;
+
+export declare type RouteNode = {
+    segment: string;
+    fullPath: string;
+    page?: RouteModuleLoader;
+    layout?: ComponentType;
+    notFound?: RouteModuleLoader;
+    children: Map<string, RouteNode>;
+};
+
+export declare type RouterConfig = {
+    loadingFallback?: React.ComponentType;
+    enableLazyLoading?: boolean;
+};
+
+export declare type RouteSegment = {
+    kind: "group";
+    name: string;
+} | {
+    kind: "static";
+    name: string;
+} | {
+    kind: "dynamic";
+    name: string;
+} | {
+    kind: "catchAll";
+    name: string;
+    optional: boolean;
+};
+
+export declare function routeSegmentToPath(segment: RouteSegment): string;
+
+export declare function treeToRoutes(node: RouteNode, isRoot?: boolean, currentPath?: string): RouteObject[];
+
+export declare function useParams<T extends Record<string, string | undefined> = Record<string, string | undefined>>(): T;
+
+export { }

package/dist/index.d.ts

@@ -14,6 +14,17 @@ export declare function CatchAllParamProvider({ name, children, }: {
     children: default_2.ReactElement;
 }): default_2.ReactElement;
 
+/**
+ * Clear the module-level lazy component cache.
+ *
+ * `lazyComponentCache` is a package-wide singleton keyed by route path, so a
+ * `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.
+ */
+export declare function clearLazyCache(): void;
+
 export declare function clearMiddlewares(): void;
 
 export declare function configureRouter(config: RouterConfig): void;
@@ -52,6 +63,11 @@ export declare function createRouteGenerator(pages: Record<string, () => Promise
  *
  * `pagesDir` may be relative or absolute. The plugin resolves it relative to
  * the Vite project root before passing it here.
+ * The prefix is stripped lazily so it matches the FIRST directory boundary
+ * that equals `pagesDir` (or the leading `app`/`pages` root marker when no
+ * `pagesDir` is supplied). A greedy match would instead consume up to the
+ * LAST such folder, which mangles routes that legitimately contain a nested
+ * folder named like the pages directory (e.g. `app/docs/app/page.tsx`).
  */
 export declare function extractRoutePath(filePath: string, { pagesDir, pageFile, layoutFile, notFoundFile }?: RouteFileOptions): string;
 
@@ -67,6 +83,16 @@ 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`.
+ */
+export declare function resetRouterConfig(): void;
+
 export declare type RouteFileOptions = {
     pagesDir?: string;
     pageFile?: string;

package/dist/index.js

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

package/dist/plugin.cjs

@@ -0,0 +1,63 @@
+"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(`
+`);return`declare module 'virtual:next-vite-router' {
+  import type { ReactElement } from 'react';
+  import type { RouteObject } from 'react-router-dom';
+
+  export type RoutePath =
+${a||'  | "/"'};
+
+  export type RouteParams<P extends RoutePath> = P extends keyof RoutePathParams
+    ? RoutePathParams[P]
+    : never;
+
+  export interface RoutePathParams {
+${s}
+  }
+
+  export const generateRoutes: () => RouteObject[];
+  export function Router(): ReactElement | null;
+  export function useParams<T extends Record<string, string | undefined> = Record<string, string | undefined>>(): T;
+  export { Link, useRoutes } from 'react-router-dom';
+}
+`}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(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)
+// is the single place that strips the pagesDir prefix; stripping it here as
+// well would double-remove it and let the prefix regex match a same-named
+// nested folder (e.g. pagesDir "app" turning "app/docs/app" into "/").
+const pages = pagesGlob;
+const layouts = layoutsGlob;
+const notFounds = notFoundsGlob;
+
+export function generateRoutes() {
+  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(n)});
+  const routes = treeToRoutes(tree, true);
+  return routes;
+}
+
+export function Router() {
+  routes ??= generateRoutes();
+  return useRoutes(routes);
+}
+
+let routes;
+
+if (import.meta.hot) {
+  import.meta.hot.accept(() => {
+    routes = undefined;
+  });
+}
+
+export { Link, useRoutes };
+export { useParams };
+`}}}}exports.nextViteRouter=j;

package/dist/plugin.d.cts

@@ -0,0 +1,12 @@
+import { Plugin as Plugin_2 } from 'vite';
+
+export declare function nextViteRouter(options?: NextViteRouterPluginOptions): Plugin_2;
+
+export declare type NextViteRouterPluginOptions = {
+    pagesDir?: string;
+    pageFile?: string;
+    layoutFile?: string;
+    notFoundFile?: string;
+};
+
+export { }

package/dist/plugin.js

@@ -1,77 +1,73 @@
 import P from "node:fs";
-import l from "node:path";
-import { c as $, p as S, r as k } from "./tree-DW5A1s6W.js";
-function j(n) {
-  const a = n.map(k).filter(Boolean);
+import f from "node:path";
+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 w(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, o] of a)
-    if (!o.trim())
-      throw new Error(`nextViteRouter option "${e}" must not be empty.`);
-  const r = a.slice(1), i = r.find(
-    ([, e], o) => r.slice(o + 1).some(([, u]) => u === e)
+  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 O(n) {
-  return n.replace(/\\/g, "/").replace(/^\/|\/$/g, "");
+function j(r) {
+  return r.replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/|\/$/g, "");
 }
-function T(n, a) {
-  const r = /* @__PURE__ */ new Map();
-  function i(e) {
-    for (const o of P.readdirSync(e, { withFileTypes: !0 })) {
-      const u = l.join(e, o.name);
-      if (o.isDirectory())
-        i(u);
-      else if (o.isFile() && o.name === a) {
-        const d = l.relative(n, e).split(l.sep).filter(Boolean), s = S(d.join("/")), R = s.filter(
-          (c) => c.kind === "dynamic" || c.kind === "catchAll"
-        ).map((c) => ({
-          name: c.name,
-          optional: c.kind === "catchAll" && c.optional
-        })), m = j(s);
-        r.set(m, { path: m, params: R });
-        const f = s[s.length - 1];
-        if ((f == null ? void 0 : f.kind) === "catchAll" && f.optional) {
-          const c = d.slice(0, -1).join(l.sep), t = j(
-            S(c.split(l.sep).join("/"))
-          );
-          r.has(t) || r.set(t, { path: t, params: [] });
-        }
-      }
+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
+    })), 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 P.existsSync(n) && i(n), [...r.values()].sort((e, o) => e.path.localeCompare(o.path));
+  return [...o.values()].sort((e, n) => e.path.localeCompare(n.path));
 }
-function b(n, a) {
-  const r = [];
-  function i(e) {
-    for (const o of P.readdirSync(e, { withFileTypes: !0 })) {
-      const u = l.join(e, o.name);
-      o.isDirectory() ? i(u) : o.isFile() && o.name === a && r.push(l.relative(n, u));
+function R(r, a, s) {
+  const i = [];
+  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) && i(n), r;
+  return P.existsSync(r) && o(r), i;
 }
-function G(n) {
-  const a = n.map(({ path: i }) => `  | ${JSON.stringify(i)}`).join(`
-`), r = n.map(({ path: i, params: e }) => {
-    const o = e.length > 0 ? [
-      ...e.map(({ name: u, optional: y }) => `    ${u}${y ? "?" : ""}: 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)}: {
-${o}
+${e}
   };`;
   }).join(`
 `);
@@ -87,7 +83,7 @@ ${a || '  | "/"'};
     : never;
 
   export interface RoutePathParams {
-${r}
+${s}
   }
 
   export const generateRoutes: () => RouteObject[];
@@ -97,89 +93,90 @@ ${r}
 }
 `;
 }
-function M(n = {}) {
+function L(r = {}) {
   const {
     pagesDir: a = "src/app",
-    pageFile: r = "page.tsx",
+    pageFile: s = "page.tsx",
     layoutFile: i = "layout.tsx",
-    notFoundFile: e = "not-found.tsx"
-  } = n;
-  w({ pagesDir: a, pageFile: r, layoutFile: i, notFoundFile: e });
-  const o = O(a), u = { pagesDir: a, pageFile: r, layoutFile: i, notFoundFile: e }, y = "virtual:next-vite-router", d = "\0" + y;
-  let s = "", R = "", m, f;
-  function c() {
-    const t = G(T(s, r));
-    P.writeFileSync(R, t, "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(t) {
-      s = l.resolve(t.root, a), R = l.join(l.dirname(s), "virtual-next-vite-router.d.ts"), $(
-        b(s, r),
-        b(s, e),
-        u
-      ), c();
+      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(t) {
-      if (m === t)
+      if (x === t)
         return;
-      f == null || f(), m = t;
-      const h = (x) => {
-        if (l.relative(s, x).startsWith("..") || ![r, i, e].includes(l.basename(x)))
+      h == null || h(), x = t;
+      const d = (b) => {
+        if (f.relative(p, b).startsWith("..") || ![s, i, o].includes(f.basename(b)))
           return;
         try {
-          $(
-            b(s, r),
-            b(s, e),
-            u
+          w(
+            R(p, s, e),
+            R(p, o, e),
+            n
           );
-        } catch (v) {
+        } catch (F) {
           t.config.logger.error(
-            v instanceof Error ? v.message : String(v)
+            F instanceof Error ? F.message : String(F)
           );
           return;
         }
-        c();
-        const F = t.moduleGraph.getModuleById(d);
-        F && (t.moduleGraph.invalidateModule(F), p && clearTimeout(p), p = setTimeout(() => {
-          p = void 0, t.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;
-      const g = () => {
-        p && (clearTimeout(p), p = void 0), t.watcher.off("add", h), t.watcher.off("unlink", h), t.watcher.off("close", g), m === t && (m = void 0, f = void 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), x === t && (x = void 0, h = void 0);
       };
-      t.watcher.on("add", h), t.watcher.on("unlink", h), t.watcher.once("close", g), f = g;
+      t.watcher.on("add", d), t.watcher.on("unlink", d), t.watcher.once("close", y), h = y;
     },
     resolveId(t) {
-      if (t === y)
-        return d;
+      if (t === l)
+        return g;
     },
     load(t) {
-      if (t === d) {
-        const h = `/${o}/**/${r}`, p = `/${o}/**/${i}`, g = `/${o}/**/${e}`, x = `/${o}/`;
+      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(h)});
-const layoutsGlob = import.meta.glob(${JSON.stringify(p)}, { eager: true });
-const notFoundsGlob = import.meta.glob(${JSON.stringify(g)});
-
-const transformPath = (path) => path.replace(${JSON.stringify(x)}, '');
+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)});
 
-const pages = Object.fromEntries(
-  Object.entries(pagesGlob).map(([key, value]) => [transformPath(key), value])
-);
-const layouts = Object.fromEntries(
-  Object.entries(layoutsGlob).map(([key, value]) => [transformPath(key), value])
-);
-const notFounds = Object.fromEntries(
-  Object.entries(notFoundsGlob).map(([key, value]) => [transformPath(key), value])
-);
+// Keep the raw root-relative glob keys. extractRoutePath (via buildRouteTree)
+// is the single place that strips the pagesDir prefix; stripping it here as
+// well would double-remove it and let the prefix regex match a same-named
+// nested folder (e.g. pagesDir "app" turning "app/docs/app" into "/").
+const pages = pagesGlob;
+const layouts = layoutsGlob;
+const notFounds = notFoundsGlob;
 
 export function generateRoutes() {
-  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(u)});
+  const tree = buildRouteTree(pages, layouts, notFounds, ${JSON.stringify(n)});
   const routes = treeToRoutes(tree, true);
   return routes;
 }
@@ -205,5 +202,5 @@ export { useParams };
   };
 }
 export {
-  M as nextViteRouter
+  L as nextViteRouter
 };

package/dist/{tree-DW5A1s6W.js → tree-DfnssFxU.js}

@@ -27,9 +27,9 @@ function m(t) {
   return o;
 }
 function f(t, { pagesDir: s, pageFile: o = "page.tsx", layoutFile: c = "layout.tsx", notFoundFile: a = "not-found.tsx" } = {}) {
-  const n = t.replace(/\\/g, "/"), e = s == null ? void 0 : s.replace(/\\/g, "/").replace(/^\/|\/$/g, ""), r = e == null ? void 0 : e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), i = [o, c, a].map((l) => l.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+  const n = t.replace(/\\/g, "/"), e = s == null ? void 0 : s.replace(/\\/g, "/").replace(/^\.\//, "").replace(/^\/|\/$/g, ""), r = e == null ? void 0 : e.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), i = [o, c, a].map((l) => l.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
   return n.replace(
-    e ? new RegExp(`^.*(?:^|/)${r}/`) : /^.*(?:^|\/)(?:app|pages)\//,
+    e ? new RegExp(`^.*?(?:^|/)${r}/`) : /^.*?(?:^|\/)(?:app|pages)\//,
     ""
   ).replace(/\\/g, "/").replace(new RegExp(`/?(?:${i})$`), "");
 }

package/dist/tree-hc1dSMdb.cjs

@@ -0,0 +1,10 @@
+"use strict";function w(t){return/^\([^)]+\)$/.test(t)?"":/^\[\[\.\.\.(.+)\]\]$/.test(t)||/^\[\.\.\.(.+)\]$/.test(t)?"*":/^\[([^\]]+)\]$/.test(t)?t.replace(/^\[([^\]]+)\]$/,":$1"):t}const R=/^[A-Za-z_][A-Za-z0-9_]*$/;function $(t){return t.kind==="group"?"":t.kind==="dynamic"?`:${t.name}`:t.kind==="catchAll"?"*":t.name}function d(t){const s=t?t.split("/").filter(Boolean):[],o=[],c=new Set;for(const a of s){const n=a.match(/^\(([^)]+)\)$/),e=a.match(/^\[\[\.\.\.(.+)\]\]$/),r=a.match(/^\[\.\.\.(.+)\]$/),i=a.match(/^\[([^\]]+)\]$/),l=e?{name:e[1],optional:!0,kind:"catchAll"}:r?{name:r[1],optional:!1,kind:"catchAll"}:i?{name:i[1],optional:!1,kind:"dynamic"}:void 0;if(n)o.push({kind:"group",name:n[1]});else if(l){if(!R.test(l.name))throw new Error(`Invalid route parameter name "${l.name}" in segment "${a}". Parameter names must start with a letter or underscore and contain only letters, numbers, and underscores.`);if(c.has(l.name))throw new Error(`Duplicate route parameter "${l.name}" in route "${t||"/"}".`);c.add(l.name),o.push(l)}else o.push({kind:"static",name:a})}return o}function u(t,{pagesDir:s,pageFile:o="page.tsx",layoutFile:c="layout.tsx",notFoundFile:a="not-found.tsx"}={}){const n=t.replace(/\\/g,"/"),e=s==null?void 0:s.replace(/\\/g,"/").replace(/^\.\//,"").replace(/^\/|\/$/g,""),r=e==null?void 0:e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),i=[o,c,a].map(l=>l.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")).join("|");return n.replace(e?new RegExp(`^.*?(?:^|/)${r}/`):/^.*?(?:^|\/)(?:app|pages)\//,"").replace(/\\/g,"/").replace(new RegExp(`/?(?:${i})$`),"")}function g(t){return t.kind==="group"?"":t.kind==="catchAll"?"*":t.kind==="dynamic"?":param":$(t)}function P(t,s){const o=u(t,s),c=d(o),a=c.map(g).filter(Boolean),n=[a.length>0?`/${a.join("/")}`:"/"],e=c[c.length-1];if((e==null?void 0:e.kind)==="catchAll"&&e.optional){const r=a.slice(0,-1);n.push(r.length>0?`/${r.join("/")}`:"/")}return n}function j(t){return/(^|\/)(:param|\*)($|\/)/.test(t)?"pattern":"literal"}function E(t,s,o){const c=t.flatMap(n=>{const e=u(n,o),r=d(e),i=r[r.length-1];if((i==null?void 0:i.kind)!=="catchAll")return[];const l=r.map(g).filter(Boolean),h=l.length>0?`/${l.join("/")}`:"/",m=l.slice(0,-1),A=m.length>0?`/${m.join("/")}`:"/";return[{filePath:n,paths:new Set([h,A])}]}),a=new Map;for(const n of s)for(const e of P(n,o))for(const r of c)if(r.paths.has(e)){const i=`${e}\0${r.filePath}\0${n}`;a.set(i,{routePath:e,pageFile:r.filePath,notFoundFile:n})}if(a.size>0)throw new Error([...a.values()].sort((n,e)=>n.routePath.localeCompare(e.routePath)).map(({routePath:n,pageFile:e,notFoundFile:r})=>`Conflicting fallback routes "${n}" detected:
+  catch-all page: ${e}
+  not-found file: ${r}
+A not-found route and a catch-all page cannot coexist at the same route level.`).join(`
+
+`))}function p(t,s){const o=new Map;for(const a of t)for(const n of P(a,s)){const e=o.get(n)??[];e.push({kind:j(n),filePath:a}),o.set(n,e)}const c=[...o.entries()].filter(([,a])=>a.length>1).sort(([a],[n])=>a.localeCompare(n));if(c.length>0)throw new Error(c.map(([a,n])=>`${n[0].kind==="pattern"?"Ambiguous route pattern":"Duplicate route"} "${a}" detected:
+${n.sort((e,r)=>e.filePath.localeCompare(r.filePath)).map(e=>`  ${e.filePath}`).join(`
+`)}`).join(`
+
+`))}function k(t,s,o){p(t,o),p(s,o),E(t,s,o)}function f(t,s,o,c,a){const n=u(s,a),e=n?n.split("/"):[];let r=t,i="";e.forEach((l,h)=>{i=i?`${i}/${l}`:l,r.children.has(l)||r.children.set(l,{segment:l,fullPath:i,children:new Map}),r=r.children.get(l),h===e.length-1&&(r[c]=o)}),e.length===0&&(t[c]=o)}function b(t,s,o,c){k(Object.keys(t),Object.keys(o),c);const a={segment:"",fullPath:"",children:new Map};return Object.entries(s).forEach(([n,e])=>{f(a,n,e.default,"layout",c)}),Object.entries(t).forEach(([n,e])=>{f(a,n,e,"page",c)}),Object.entries(o).forEach(([n,e])=>{f(a,n,e,"notFound",c)}),a}exports.assertNoDuplicateRoutes=p;exports.assertNoRouteConflicts=k;exports.buildRouteTree=b;exports.extractRoutePath=u;exports.normalizeSegment=w;exports.parseRouteSegments=d;exports.routeSegmentToPath=$;

package/package.json

@@ -1,22 +1,34 @@
 {
   "name": "next-vite-router",
-  "version": "1.2.4",
+  "version": "1.3.1",
   "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": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./plugin": {
-      "import": "./dist/plugin.js",
-      "types": "./dist/plugin.d.ts"
+      "import": {
+        "types": "./dist/plugin.d.ts",
+        "default": "./dist/plugin.js"
+      },
+      "require": {
+        "types": "./dist/plugin.d.cts",
+        "default": "./dist/plugin.cjs"
+      }
     }
   },
   "files": [
@@ -36,7 +48,7 @@
   "author": "Rlzee",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Rlzee/next-vite-router"
+    "url": "git+https://github.com/Rlzee/next-vite-router.git"
   },
   "homepage": "https://github.com/Rlzee/next-vite-router#readme",
   "license": "MIT",
@@ -62,7 +74,8 @@
   },
   "scripts": {
     "dev": "vite build --watch",
-    "build": "vite build && vite build -c vite.config.cli.ts",
+    "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')\"",
+    "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",
     "test:generator": "node --test test/routes.test.js",