npm - one - Versions diffs - 1.1.479 → 1.1.481 - Mend

one 1.1.479 → 1.1.481

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (224) hide show

package/dist/cjs/Root.cjs CHANGED Viewed

@@ -49,7 +49,7 @@ function Root(props) {
       navigationContainerProps,
       onRenderId
     } = props,
-    context = (0, import_useViteRoutes.useViteRoutes)(routes, routeOptions, globalThis.__vxrnVersion),
+    context = (0, import_useViteRoutes.useViteRoutes)(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion),
     location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", (0, import_getURL.getURL)()),
     store = (0, import_useInitializeOneRouter.useInitializeOneRouter)(context, location),
     [colorScheme] = (0, import_universal_color_scheme.useColorScheme)(),

package/dist/cjs/Root.js CHANGED Viewed

@@ -21,7 +21,7 @@ var import_native = require("@react-navigation/native"), import_universal_color_
 const ServerAsyncLocalIDContext = (0, import_react.createContext)(null);
 globalThis.__vxrnGetContextFromReactContext = () => (0, import_react.useContext)(ServerAsyncLocalIDContext);
 function Root(props) {
-  const { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props, context = (0, import_useViteRoutes.useViteRoutes)(routes, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", (0, import_getURL.getURL)()), store = (0, import_useInitializeOneRouter.useInitializeOneRouter)(context, location), [colorScheme] = (0, import_universal_color_scheme.useColorScheme)(), Component = store.rootComponent;
+  const { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props, context = (0, import_useViteRoutes.useViteRoutes)(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", (0, import_getURL.getURL)()), store = (0, import_useInitializeOneRouter.useInitializeOneRouter)(context, location), [colorScheme] = (0, import_universal_color_scheme.useColorScheme)(), Component = store.rootComponent;
   if (!Component)
     throw new Error("No root component found");
   const id = (0, import_react.useId)();

package/dist/cjs/Root.js.map CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Root.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["UpstreamNavigationContainer"]
 }

package/dist/cjs/Root.native.js CHANGED Viewed

@@ -23,7 +23,7 @@ globalThis.__vxrnGetContextFromReactContext = function() {
   return (0, import_react.useContext)(ServerAsyncLocalIDContext);
 };
 function Root(props) {
-  var _globalThis___vxrnrequestAsyncLocalStore, { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props, context = (0, import_useViteRoutes.useViteRoutes)(routes, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", (0, import_getURL.getURL)()), store = (0, import_useInitializeOneRouter.useInitializeOneRouter)(context, location), [colorScheme] = (0, import_universal_color_scheme.useColorScheme)(), Component = store.rootComponent;
+  var _globalThis___vxrnrequestAsyncLocalStore, { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props, context = (0, import_useViteRoutes.useViteRoutes)(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : new URL(path || "/", (0, import_getURL.getURL)()), store = (0, import_useInitializeOneRouter.useInitializeOneRouter)(context, location), [colorScheme] = (0, import_universal_color_scheme.useColorScheme)(), Component = store.rootComponent;
   if (!Component)
     throw new Error("No root component found");
   var id = (0, import_react.useId)();

package/dist/cjs/Root.native.js.map CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/one/packages/one/src/Root.tsx"],
-  "mappings": "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",
-  "names": ["ServerAsyncLocalIDContext", "createContext", "globalThis", "useContext", "Root", "props", "path", "routes", "routeOptions", "isClient", "navigationContainerProps", "onRenderId", "context", "useViteRoutes", "location", "window", "URL", "href", "getURL", "store", "useInitializeOneRouter", "colorScheme", "useColorScheme", "Component", "rootComponent", "Error", "id", "useId", "value", "getStore", "contents", "_jsx", "Provider", "_jsxs", "ServerRenderID", "UpstreamNavigationContainer", "ref", "navigationRef", "initialState", "linking", "onUnhandledAction", "theme", "DarkTheme", "DefaultTheme", "documentTitle", "enabled", "ServerLocationContext", "_Fragment", "ScrollBehavior", "RootErrorBoundary", "PreloadLinks", "flags", "FlagsContext", "process", "env", "ONE_DISABLE_STRICT_MODE", "StrictMode", "SERVER_CONTEXT_KEY", "mode", "show", "setShow", "useState", "useLayoutEffect", "NODE_ENV", "action", "payload", "message", "type", "JSON", "stringify", "name", "console", "error"]
+  "mappings": "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",
+  "names": ["ServerAsyncLocalIDContext", "createContext", "globalThis", "useContext", "Root", "props", "path", "routes", "routeOptions", "isClient", "navigationContainerProps", "onRenderId", "context", "useViteRoutes", "routerRoot", "location", "window", "URL", "href", "getURL", "store", "useInitializeOneRouter", "colorScheme", "useColorScheme", "Component", "rootComponent", "Error", "id", "useId", "value", "getStore", "contents", "_jsx", "Provider", "_jsxs", "ServerRenderID", "UpstreamNavigationContainer", "ref", "navigationRef", "initialState", "linking", "onUnhandledAction", "theme", "DarkTheme", "DefaultTheme", "documentTitle", "enabled", "ServerLocationContext", "_Fragment", "ScrollBehavior", "RootErrorBoundary", "PreloadLinks", "flags", "FlagsContext", "process", "env", "ONE_DISABLE_STRICT_MODE", "StrictMode", "SERVER_CONTEXT_KEY", "mode", "show", "setShow", "useState", "useLayoutEffect", "NODE_ENV", "action", "payload", "message", "type", "JSON", "stringify", "name", "console", "error"]
 }

package/dist/cjs/cli/build.cjs CHANGED Viewed

@@ -47,6 +47,7 @@ var import_fs_extra = __toESM(require("fs-extra"), 1),
   import_loadConfig = require("../vite/loadConfig.cjs"),
   import_one_server_only = require("../vite/one-server-only.cjs"),
   import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory.cjs"),
+  import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions.cjs"),
   import_buildPage = require("./buildPage.cjs"),
   import_checkNodeVersion = require("./checkNodeVersion.cjs"),
   import_label_process = require("./label-process.cjs");
@@ -67,7 +68,11 @@ async function build(args) {
   const {
       oneOptions
     } = await (0, import_loadConfig.loadUserOneOptions)("build"),
-    manifest = (0, import_getManifest.getManifest)(),
+    routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(oneOptions),
+    routerRootRegexp = new RegExp(`^${routerRoot}`),
+    manifest = (0, import_getManifest.getManifest)({
+      routerRoot
+    }),
     serverOutputFormat = oneOptions.build?.server === !1 ? "esm" : oneOptions.build?.server?.outputFormat ?? "esm",
     vxrnOutput = await (0, import_vxrn.build)({
       server: oneOptions.server,
@@ -95,7 +100,7 @@ async function build(args) {
     const input = routes.reduce((entries, {
         page,
         file
-      }) => (entries[page.slice(1) + ".js"] = (0, import_node_path.join)("app", file), entries), {}),
+      }) => (entries[page.slice(1) + ".js"] = (0, import_node_path.join)(routerRoot, file), entries), {}),
       outputFormat = oneOptions?.build?.api?.outputFormat ?? serverOutputFormat,
       treeshake = oneOptions?.build?.api?.treeshake,
       mergedConfig = (0, import_vite.mergeConfig)(apiBuildConfig, {
@@ -181,7 +186,7 @@ async function build(args) {
     const middlewareBuildInfo = await buildCustomRoutes("middlewares", manifest.middlewareRoutes);
     for (const middleware of manifest.middlewareRoutes) {
       const absoluteRoot = (0, import_node_path.resolve)(process.cwd(), options.root),
-        fullPath = (0, import_node_path.join)(absoluteRoot, "app", middleware.file),
+        fullPath = (0, import_node_path.join)(absoluteRoot, routerRoot, middleware.file),
         chunk = middlewareBuildInfo.output.filter(x => x.type === "chunk").find(x => x.facadeModuleId === fullPath);
       if (!chunk) throw new Error("internal err finding middleware");
       builtMiddlewares[middleware.file] = (0, import_node_path.join)("dist", "middlewares", chunk.fileName);
@@ -217,19 +222,19 @@ async function build(args) {
     }
     const id = output.facadeModuleId || "",
       file = import_node_path.default.basename(id);
-    if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes("/app/")) continue;
-    const relativeId = (0, import_node_path.relative)(process.cwd(), id).replace("app/", "/"),
+    if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes(`/${routerRoot}/`)) continue;
+    const relativeId = (0, import_node_path.relative)(process.cwd(), id).replace(`${routerRoot}/`, "/"),
       onlyBuild = vxrnOutput.buildArgs?.only;
     if (onlyBuild && !import_micromatch.default.contains(relativeId, onlyBuild)) continue;
     const clientManifestKey = Object.keys(vxrnOutput.clientManifest).find(key => id.endsWith(key)) || "";
     if (!clientManifestKey) continue;
     const clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey],
-      foundRoute = manifest.pageRoutes.find(route => route.file && clientManifestKey.replace(/^app/, "") === route.file.slice(1));
+      foundRoute = manifest.pageRoutes.find(route => route.file && clientManifestKey.replace(routerRootRegexp, "") === route.file.slice(1));
     if (!foundRoute) continue;
     foundRoute.loaderServerPath = output.fileName, clientManifestEntry || console.warn(`No client manifest entry found: ${clientManifestKey} in manifest ${JSON.stringify(vxrnOutput.clientManifest, null, 2)}`);
     const entryImports = collectImports(clientManifestEntry || {}),
       layoutEntries = foundRoute.layouts?.flatMap(layout => {
-        const clientKey = `app${layout.contextKey.slice(1)}`;
+        const clientKey = `${routerRoot}${layout.contextKey.slice(1)}`;
         return vxrnOutput.clientManifest[clientKey];
       }) ?? [],
       layoutImports = layoutEntries.flatMap(entry => [entry.file, ...collectImports(entry)]),
@@ -294,6 +299,7 @@ async function build(args) {
   });
   const routeMap = {},
     routeToBuildInfo = {},
+    pathToRoute = {},
     preloads = {},
     loaders = {};
   for (const route of builtRoutes) {
@@ -303,7 +309,9 @@ async function build(args) {
       loaderData: _loaderData,
       ...rest
     } = route;
-    routeToBuildInfo[route.routeFile] = rest, preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
+    routeToBuildInfo[route.routeFile] = rest;
+    for (let p of getCleanPaths([route.path, route.cleanPath])) pathToRoute[p] = route.routeFile;
+    preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
   }
   function createBuildManifestRoute(route) {
     const {
@@ -317,6 +325,7 @@ async function build(args) {
   const buildInfoForWriting = {
     oneOptions,
     routeToBuildInfo,
+    pathToRoute,
     manifest: {
       pageRoutes: manifest.pageRoutes.map(createBuildManifestRoute),
       apiRoutes: manifest.apiRoutes.map(createBuildManifestRoute)
@@ -354,6 +363,17 @@ async function build(args) {
 `);
 }
+const TRAILING_INDEX_REGEX = /\/index(\.(web))?/;
+function getCleanPaths(possiblePaths) {
+  return Array.from(new Set(Array.from(new Set(possiblePaths)).flatMap(p => {
+    const paths = [p];
+    if (p.match(TRAILING_INDEX_REGEX)) {
+      const pathWithTrailingIndexRemoved = p.replace(TRAILING_INDEX_REGEX, "");
+      paths.push(pathWithTrailingIndexRemoved), paths.push(pathWithTrailingIndexRemoved + "/");
+    }
+    return paths;
+  })));
+}
 async function moveAllFiles(src, dest) {
   try {
     await import_fs_extra.default.copy(src, dest, {

package/dist/cjs/cli/build.js CHANGED Viewed

@@ -25,7 +25,7 @@ __export(build_exports, {
   build: () => build
 });
 module.exports = __toCommonJS(build_exports);
-var import_fs_extra = __toESM(require("fs-extra"), 1), import_micromatch = __toESM(require("micromatch"), 1), import_node_module = require("node:module"), import_node_path = __toESM(require("node:path"), 1), import_vite = require("vite"), import_vxrn = require("vxrn"), constants = __toESM(require("../constants"), 1), import_setServerGlobals = require("../server/setServerGlobals"), import_toAbsolute = require("../utils/toAbsolute"), import_getManifest = require("../vite/getManifest"), import_loadConfig = require("../vite/loadConfig"), import_one_server_only = require("../vite/one-server-only"), import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory"), import_buildPage = require("./buildPage"), import_checkNodeVersion = require("./checkNodeVersion"), import_label_process = require("./label-process");
+var import_fs_extra = __toESM(require("fs-extra"), 1), import_micromatch = __toESM(require("micromatch"), 1), import_node_module = require("node:module"), import_node_path = __toESM(require("node:path"), 1), import_vite = require("vite"), import_vxrn = require("vxrn"), constants = __toESM(require("../constants"), 1), import_setServerGlobals = require("../server/setServerGlobals"), import_toAbsolute = require("../utils/toAbsolute"), import_getManifest = require("../vite/getManifest"), import_loadConfig = require("../vite/loadConfig"), import_one_server_only = require("../vite/one-server-only"), import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory"), import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions"), import_buildPage = require("./buildPage"), import_checkNodeVersion = require("./checkNodeVersion"), import_label_process = require("./label-process");
 const import_meta = {}, { ensureDir, writeJSON } = import_fs_extra.default;
 process.on("uncaughtException", (err) => {
   console.error(err?.message || err);
@@ -36,7 +36,7 @@ async function build(args) {
   process.env.ONE_SERVER_URL || console.warn(
     "\u26A0\uFE0F No ONE_SERVER_URL environment set, set it in your .env to your target deploy URL"
   );
-  const { oneOptions } = await (0, import_loadConfig.loadUserOneOptions)("build"), manifest = (0, import_getManifest.getManifest)(), serverOutputFormat = oneOptions.build?.server === !1 ? "esm" : oneOptions.build?.server?.outputFormat ?? "esm", vxrnOutput = await (0, import_vxrn.build)(
+  const { oneOptions } = await (0, import_loadConfig.loadUserOneOptions)("build"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(oneOptions), routerRootRegexp = new RegExp(`^${routerRoot}`), manifest = (0, import_getManifest.getManifest)({ routerRoot }), serverOutputFormat = oneOptions.build?.server === !1 ? "esm" : oneOptions.build?.server?.outputFormat ?? "esm", vxrnOutput = await (0, import_vxrn.build)(
     {
       server: oneOptions.server,
       build: {
@@ -62,7 +62,7 @@ async function build(args) {
     Object.entries(serverEnv).map(([key, value]) => [`process.env.${key}`, JSON.stringify(value)])
   );
   async function buildCustomRoutes(subFolder, routes) {
-    const input = routes.reduce((entries, { page, file }) => (entries[page.slice(1) + ".js"] = (0, import_node_path.join)("app", file), entries), {}), outputFormat = oneOptions?.build?.api?.outputFormat ?? serverOutputFormat, treeshake = oneOptions?.build?.api?.treeshake, mergedConfig = (0, import_vite.mergeConfig)(apiBuildConfig, {
+    const input = routes.reduce((entries, { page, file }) => (entries[page.slice(1) + ".js"] = (0, import_node_path.join)(routerRoot, file), entries), {}), outputFormat = oneOptions?.build?.api?.outputFormat ?? serverOutputFormat, treeshake = oneOptions?.build?.api?.treeshake, mergedConfig = (0, import_vite.mergeConfig)(apiBuildConfig, {
       appType: "custom",
       configFile: !1,
       // plugins: [
@@ -141,7 +141,7 @@ async function build(args) {
 `);
     const middlewareBuildInfo = await buildCustomRoutes("middlewares", manifest.middlewareRoutes);
     for (const middleware of manifest.middlewareRoutes) {
-      const absoluteRoot = (0, import_node_path.resolve)(process.cwd(), options.root), fullPath = (0, import_node_path.join)(absoluteRoot, "app", middleware.file), chunk = middlewareBuildInfo.output.filter((x) => x.type === "chunk").find((x) => x.facadeModuleId === fullPath);
+      const absoluteRoot = (0, import_node_path.resolve)(process.cwd(), options.root), fullPath = (0, import_node_path.join)(absoluteRoot, routerRoot, middleware.file), chunk = middlewareBuildInfo.output.filter((x) => x.type === "chunk").find((x) => x.facadeModuleId === fullPath);
       if (!chunk) throw new Error("internal err finding middleware");
       builtMiddlewares[middleware.file] = (0, import_node_path.join)("dist", "middlewares", chunk.fileName);
     }
@@ -174,15 +174,15 @@ async function build(args) {
       continue;
     }
     const id = output.facadeModuleId || "", file = import_node_path.default.basename(id);
-    if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes("/app/"))
+    if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes(`/${routerRoot}/`))
       continue;
-    const relativeId = (0, import_node_path.relative)(process.cwd(), id).replace("app/", "/"), onlyBuild = vxrnOutput.buildArgs?.only;
+    const relativeId = (0, import_node_path.relative)(process.cwd(), id).replace(`${routerRoot}/`, "/"), onlyBuild = vxrnOutput.buildArgs?.only;
     if (onlyBuild && !import_micromatch.default.contains(relativeId, onlyBuild))
       continue;
     const clientManifestKey = Object.keys(vxrnOutput.clientManifest).find((key) => id.endsWith(key)) || "";
     if (!clientManifestKey)
       continue;
-    const clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey], foundRoute = manifest.pageRoutes.find((route) => route.file && clientManifestKey.replace(/^app/, "") === route.file.slice(1));
+    const clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey], foundRoute = manifest.pageRoutes.find((route) => route.file && clientManifestKey.replace(routerRootRegexp, "") === route.file.slice(1));
     if (!foundRoute)
       continue;
     foundRoute.loaderServerPath = output.fileName, clientManifestEntry || console.warn(
@@ -193,7 +193,7 @@ async function build(args) {
       )}`
     );
     const entryImports = collectImports(clientManifestEntry || {}), layoutEntries = foundRoute.layouts?.flatMap((layout) => {
-      const clientKey = `app${layout.contextKey.slice(1)}`;
+      const clientKey = `${routerRoot}${layout.contextKey.slice(1)}`;
       return vxrnOutput.clientManifest[clientKey];
     }) ?? [], layoutImports = layoutEntries.flatMap((entry) => [entry.file, ...collectImports(entry)]), preloadSetupFilePreloads = (() => {
       if (oneOptions.setupFile) {
@@ -263,7 +263,7 @@ async function build(args) {
     }
   }
   await moveAllFiles(staticDir, clientDir), await import_fs_extra.default.rm(staticDir, { force: !0, recursive: !0 });
-  const routeMap = {}, routeToBuildInfo = {}, preloads = {}, loaders = {};
+  const routeMap = {}, routeToBuildInfo = {}, pathToRoute = {}, preloads = {}, loaders = {};
   for (const route of builtRoutes) {
     route.cleanPath.includes("*") || (routeMap[route.cleanPath] = route.htmlPath);
     const {
@@ -271,7 +271,10 @@ async function build(args) {
       loaderData: _loaderData,
       ...rest
     } = route;
-    routeToBuildInfo[route.routeFile] = rest, preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
+    routeToBuildInfo[route.routeFile] = rest;
+    for (let p of getCleanPaths([route.path, route.cleanPath]))
+      pathToRoute[p] = route.routeFile;
+    preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
   }
   function createBuildManifestRoute(route) {
     const { layouts, ...built } = route, buildInfo = builtRoutes.find((x) => x.routeFile === route.file);
@@ -283,6 +286,7 @@ async function build(args) {
   const buildInfoForWriting = {
     oneOptions,
     routeToBuildInfo,
+    pathToRoute,
     manifest: {
       pageRoutes: manifest.pageRoutes.map(createBuildManifestRoute),
       apiRoutes: manifest.apiRoutes.map(createBuildManifestRoute)
@@ -317,6 +321,21 @@ async function build(args) {
 `);
 }
+const TRAILING_INDEX_REGEX = /\/index(\.(web))?/;
+function getCleanPaths(possiblePaths) {
+  return Array.from(
+    new Set(
+      Array.from(new Set(possiblePaths)).flatMap((p) => {
+        const paths = [p];
+        if (p.match(TRAILING_INDEX_REGEX)) {
+          const pathWithTrailingIndexRemoved = p.replace(TRAILING_INDEX_REGEX, "");
+          paths.push(pathWithTrailingIndexRemoved), paths.push(pathWithTrailingIndexRemoved + "/");
+        }
+        return paths;
+      })
+    )
+  );
+}
 async function moveAllFiles(src, dest) {
   try {
     await import_fs_extra.default.copy(src, dest, { overwrite: !0, errorOnExist: !1 });

package/dist/cjs/cli/build.js.map CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/build.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["FSExtra", "vxrnBuild", "Path", "viteBuild", "MicroMatch", "file", "preloads"]
 }

package/dist/cjs/cli/build.native.js CHANGED Viewed

@@ -26,7 +26,7 @@ __export(build_exports, {
   build: () => build
 });
 module.exports = __toCommonJS(build_exports);
-var import_fs_extra = __toESM(require("fs-extra"), 1), import_micromatch = __toESM(require("micromatch"), 1), import_node_module = require("node:module"), import_node_path = __toESM(require("node:path"), 1), import_vite = require("vite"), import_vxrn = require("vxrn"), constants = __toESM(require("../constants"), 1), import_setServerGlobals = require("../server/setServerGlobals"), import_toAbsolute = require("../utils/toAbsolute"), import_getManifest = require("../vite/getManifest"), import_loadConfig = require("../vite/loadConfig"), import_one_server_only = require("../vite/one-server-only"), import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory"), import_buildPage = require("./buildPage"), import_checkNodeVersion = require("./checkNodeVersion"), import_label_process = require("./label-process");
+var import_fs_extra = __toESM(require("fs-extra"), 1), import_micromatch = __toESM(require("micromatch"), 1), import_node_module = require("node:module"), import_node_path = __toESM(require("node:path"), 1), import_vite = require("vite"), import_vxrn = require("vxrn"), constants = __toESM(require("../constants"), 1), import_setServerGlobals = require("../server/setServerGlobals"), import_toAbsolute = require("../utils/toAbsolute"), import_getManifest = require("../vite/getManifest"), import_loadConfig = require("../vite/loadConfig"), import_one_server_only = require("../vite/one-server-only"), import_buildVercelOutputDirectory = require("../vercel/build/buildVercelOutputDirectory"), import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions"), import_buildPage = require("./buildPage"), import_checkNodeVersion = require("./checkNodeVersion"), import_label_process = require("./label-process");
 const import_meta = {};
 var { ensureDir, writeJSON } = import_fs_extra.default;
 process.on("uncaughtException", function(err) {
@@ -37,7 +37,9 @@ async function build(args) {
   (0, import_label_process.labelProcess)("build"), (0, import_checkNodeVersion.checkNodeVersion)(), (0, import_setServerGlobals.setServerGlobals)();
   var { serverEnv } = await (0, import_vxrn.loadEnv)("production");
   process.env.ONE_SERVER_URL || console.warn("\u26A0\uFE0F No ONE_SERVER_URL environment set, set it in your .env to your target deploy URL");
-  var { oneOptions } = await (0, import_loadConfig.loadUserOneOptions)("build"), manifest = (0, import_getManifest.getManifest)(), _oneOptions_build_server_outputFormat, serverOutputFormat = ((_oneOptions_build = oneOptions.build) === null || _oneOptions_build === void 0 ? void 0 : _oneOptions_build.server) === !1 ? "esm" : (_oneOptions_build_server_outputFormat = (_oneOptions_build1 = oneOptions.build) === null || _oneOptions_build1 === void 0 || (_oneOptions_build_server = _oneOptions_build1.server) === null || _oneOptions_build_server === void 0 ? void 0 : _oneOptions_build_server.outputFormat) !== null && _oneOptions_build_server_outputFormat !== void 0 ? _oneOptions_build_server_outputFormat : "esm", vxrnOutput = await (0, import_vxrn.build)({
+  var { oneOptions } = await (0, import_loadConfig.loadUserOneOptions)("build"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(oneOptions), routerRootRegexp = new RegExp(`^${routerRoot}`), manifest = (0, import_getManifest.getManifest)({
+    routerRoot
+  }), _oneOptions_build_server_outputFormat, serverOutputFormat = ((_oneOptions_build = oneOptions.build) === null || _oneOptions_build === void 0 ? void 0 : _oneOptions_build.server) === !1 ? "esm" : (_oneOptions_build_server_outputFormat = (_oneOptions_build1 = oneOptions.build) === null || _oneOptions_build1 === void 0 || (_oneOptions_build_server = _oneOptions_build1.server) === null || _oneOptions_build_server === void 0 ? void 0 : _oneOptions_build_server.outputFormat) !== null && _oneOptions_build_server_outputFormat !== void 0 ? _oneOptions_build_server_outputFormat : "esm", vxrnOutput = await (0, import_vxrn.build)({
     server: oneOptions.server,
     build: {
       analyze: !0,
@@ -66,7 +68,7 @@ async function build(args) {
   async function buildCustomRoutes(subFolder, routes) {
     var _oneOptions_build_api, _oneOptions_build3, _oneOptions_build_api1, _oneOptions_build12, _oneOptions_build_api2, _oneOptions_build22, input = routes.reduce(function(entries, param) {
       var { page, file } = param;
-      return entries[page.slice(1) + ".js"] = (0, import_node_path.join)("app", file), entries;
+      return entries[page.slice(1) + ".js"] = (0, import_node_path.join)(routerRoot, file), entries;
     }, {}), _oneOptions_build_api_outputFormat, outputFormat = (_oneOptions_build_api_outputFormat = oneOptions == null || (_oneOptions_build3 = oneOptions.build) === null || _oneOptions_build3 === void 0 || (_oneOptions_build_api = _oneOptions_build3.api) === null || _oneOptions_build_api === void 0 ? void 0 : _oneOptions_build_api.outputFormat) !== null && _oneOptions_build_api_outputFormat !== void 0 ? _oneOptions_build_api_outputFormat : serverOutputFormat, treeshake = oneOptions == null || (_oneOptions_build12 = oneOptions.build) === null || _oneOptions_build12 === void 0 || (_oneOptions_build_api1 = _oneOptions_build12.api) === null || _oneOptions_build_api1 === void 0 ? void 0 : _oneOptions_build_api1.treeshake, mergedConfig = (0, import_vite.mergeConfig)(apiBuildConfig, {
       appType: "custom",
       configFile: !1,
@@ -155,7 +157,7 @@ async function build(args) {
     var middlewareBuildInfo = await buildCustomRoutes("middlewares", manifest.middlewareRoutes), _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
     try {
       for (var _loop = function() {
-        var middleware = _step.value, absoluteRoot = (0, import_node_path.resolve)(process.cwd(), options.root), fullPath = (0, import_node_path.join)(absoluteRoot, "app", middleware.file), outChunks = middlewareBuildInfo.output.filter(function(x) {
+        var middleware = _step.value, absoluteRoot = (0, import_node_path.resolve)(process.cwd(), options.root), fullPath = (0, import_node_path.join)(absoluteRoot, routerRoot, middleware.file), outChunks = middlewareBuildInfo.output.filter(function(x) {
           return x.type === "chunk";
         }), chunk = outChunks.find(function(x) {
           return x.facadeModuleId === fullPath;
@@ -191,9 +193,9 @@ async function build(args) {
       if (output.type === "asset")
         return assets.push(output), "continue";
       var id = output.facadeModuleId || "", file = import_node_path.default.basename(id);
-      if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes("/app/"))
+      if (!id || file[0] === "_" || file.includes("entry-server") || id.includes("+api") || !id.includes(`/${routerRoot}/`))
         return "continue";
-      var relativeId = (0, import_node_path.relative)(process.cwd(), id).replace("app/", "/"), onlyBuild = (_vxrnOutput_buildArgs = vxrnOutput.buildArgs) === null || _vxrnOutput_buildArgs === void 0 ? void 0 : _vxrnOutput_buildArgs.only;
+      var relativeId = (0, import_node_path.relative)(process.cwd(), id).replace(`${routerRoot}/`, "/"), onlyBuild = (_vxrnOutput_buildArgs = vxrnOutput.buildArgs) === null || _vxrnOutput_buildArgs === void 0 ? void 0 : _vxrnOutput_buildArgs.only;
       if (onlyBuild && !import_micromatch.default.contains(relativeId, onlyBuild))
         return "continue";
       var clientManifestKey = Object.keys(vxrnOutput.clientManifest).find(function(key) {
@@ -202,7 +204,7 @@ async function build(args) {
       if (!clientManifestKey)
         return "continue";
       var clientManifestEntry = vxrnOutput.clientManifest[clientManifestKey], foundRoute = manifest.pageRoutes.find(function(route2) {
-        return route2.file && clientManifestKey.replace(/^app/, "") === route2.file.slice(1);
+        return route2.file && clientManifestKey.replace(routerRootRegexp, "") === route2.file.slice(1);
       });
       if (!foundRoute)
         return "continue";
@@ -227,7 +229,7 @@ async function build(args) {
       }
       clientManifestEntry || console.warn(`No client manifest entry found: ${clientManifestKey} in manifest ${JSON.stringify(vxrnOutput.clientManifest, null, 2)}`);
       var entryImports = collectImports(clientManifestEntry || {}), _foundRoute_layouts_flatMap, layoutEntries = (_foundRoute_layouts_flatMap = (_foundRoute_layouts = foundRoute.layouts) === null || _foundRoute_layouts === void 0 ? void 0 : _foundRoute_layouts.flatMap(function(layout) {
-        var clientKey = `app${layout.contextKey.slice(1)}`;
+        var clientKey = `${routerRoot}${layout.contextKey.slice(1)}`;
         return vxrnOutput.clientManifest[clientKey];
       })) !== null && _foundRoute_layouts_flatMap !== void 0 ? _foundRoute_layouts_flatMap : [], layoutImports = layoutEntries.flatMap(function(entry) {
         return [
@@ -298,24 +300,24 @@ async function build(args) {
       console.info(`
  [build] page ${relativeId} (with ${paramsList.length} routes)
 `), process.env.DEBUG && console.info("paramsList", JSON.stringify(paramsList, null, 2));
-      var _iteratorNormalCompletion3 = !0, _didIteratorError3 = !1, _iteratorError3 = void 0;
+      var _iteratorNormalCompletion4 = !0, _didIteratorError4 = !1, _iteratorError4 = void 0;
       try {
         for (var _loop2 = async function() {
-          var params = _step3.value, cleanId = relativeId.replace(/\+(spa|ssg|ssr)\.tsx?$/, ""), path = getPathnameFromFilePath(cleanId, params, foundRoute.type === "ssg");
+          var params = _step4.value, cleanId = relativeId.replace(/\+(spa|ssg|ssr)\.tsx?$/, ""), path = getPathnameFromFilePath(cleanId, params, foundRoute.type === "ssg");
           console.info(`  \u21A6 route ${path}`);
           var built = await (0, import_one_server_only.runWithAsyncLocalContext)(async function() {
             return await (0, import_buildPage.buildPage)(vxrnOutput.serverEntry, path, relativeId, params, foundRoute, clientManifestEntry, staticDir, clientDir, builtMiddlewares, serverJsPath, preloads2, allCSS);
           });
           builtRoutes.push(built);
-        }, _iterator3 = paramsList[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) await _loop2();
+        }, _iterator4 = paramsList[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = !0) await _loop2();
       } catch (err) {
-        _didIteratorError3 = !0, _iteratorError3 = err;
+        _didIteratorError4 = !0, _iteratorError4 = err;
       } finally {
         try {
-          !_iteratorNormalCompletion3 && _iterator3.return != null && _iterator3.return();
+          !_iteratorNormalCompletion4 && _iterator4.return != null && _iterator4.return();
         } finally {
-          if (_didIteratorError3)
-            throw _iteratorError3;
+          if (_didIteratorError4)
+            throw _iteratorError4;
         }
       }
     }, _iterator1 = outputEntries[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) await _loop1();
@@ -333,7 +335,7 @@ async function build(args) {
     force: !0,
     recursive: !0
   });
-  var routeMap = {}, routeToBuildInfo = {}, preloads = {}, loaders = {}, _iteratorNormalCompletion2 = !0, _didIteratorError2 = !1, _iteratorError2 = void 0;
+  var routeMap = {}, routeToBuildInfo = {}, pathToRoute = {}, preloads = {}, loaders = {}, _iteratorNormalCompletion2 = !0, _didIteratorError2 = !1, _iteratorError2 = void 0;
   try {
     for (var _iterator2 = builtRoutes[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
       var route = _step2.value;
@@ -343,7 +345,27 @@ async function build(args) {
         loaderData: _loaderData,
         ...rest
       } = route;
-      routeToBuildInfo[route.routeFile] = rest, preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
+      routeToBuildInfo[route.routeFile] = rest;
+      var _iteratorNormalCompletion3 = !0, _didIteratorError3 = !1, _iteratorError3 = void 0;
+      try {
+        for (var _iterator3 = getCleanPaths([
+          route.path,
+          route.cleanPath
+        ])[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
+          var p = _step3.value;
+          pathToRoute[p] = route.routeFile;
+        }
+      } catch (err) {
+        _didIteratorError3 = !0, _iteratorError3 = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion3 && _iterator3.return != null && _iterator3.return();
+        } finally {
+          if (_didIteratorError3)
+            throw _iteratorError3;
+        }
+      }
+      preloads[route.preloadPath] = !0, loaders[route.loaderPath] = !0;
     }
   } catch (err) {
     _didIteratorError2 = !0, _iteratorError2 = err;
@@ -360,20 +382,20 @@ async function build(args) {
       return x.routeFile === route2.file;
     });
     if (built.middlewares && (buildInfo != null && buildInfo.middlewares)) {
-      var _iteratorNormalCompletion3 = !0, _didIteratorError3 = !1, _iteratorError3 = void 0;
+      var _iteratorNormalCompletion4 = !0, _didIteratorError4 = !1, _iteratorError4 = void 0;
       try {
-        for (var _iterator3 = built.middlewares.entries()[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
-          var [index, mw] = _step3.value;
+        for (var _iterator4 = built.middlewares.entries()[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = !0) {
+          var [index, mw] = _step4.value;
           mw.contextKey = buildInfo.middlewares[index];
         }
       } catch (err) {
-        _didIteratorError3 = !0, _iteratorError3 = err;
+        _didIteratorError4 = !0, _iteratorError4 = err;
       } finally {
         try {
-          !_iteratorNormalCompletion3 && _iterator3.return != null && _iterator3.return();
+          !_iteratorNormalCompletion4 && _iterator4.return != null && _iterator4.return();
         } finally {
-          if (_didIteratorError3)
-            throw _iteratorError3;
+          if (_didIteratorError4)
+            throw _iteratorError4;
         }
       }
     }
@@ -382,6 +404,7 @@ async function build(args) {
   var buildInfoForWriting = {
     oneOptions,
     routeToBuildInfo,
+    pathToRoute,
     manifest: {
       pageRoutes: manifest.pageRoutes.map(createBuildManifestRoute),
       apiRoutes: manifest.apiRoutes.map(createBuildManifestRoute)
@@ -417,6 +440,19 @@ async function build(args) {
 `);
 }
+var TRAILING_INDEX_REGEX = /\/index(\.(web))?/;
+function getCleanPaths(possiblePaths) {
+  return Array.from(new Set(Array.from(new Set(possiblePaths)).flatMap(function(p) {
+    var paths = [
+      p
+    ];
+    if (p.match(TRAILING_INDEX_REGEX)) {
+      var pathWithTrailingIndexRemoved = p.replace(TRAILING_INDEX_REGEX, "");
+      paths.push(pathWithTrailingIndexRemoved), paths.push(pathWithTrailingIndexRemoved + "/");
+    }
+    return paths;
+  })));
+}
 async function moveAllFiles(src, dest) {
   try {
     await import_fs_extra.default.copy(src, dest, {