next-vite-router 1.3.0 → 1.3.1

package/README.md

@@ -251,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.3.0";
+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/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": "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": {
     ".": {