one 1.14.4 → 1.15.0

package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs

@@ -2,85 +2,96 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var fileSystemRouterPlugin_exports = {};
 __export(fileSystemRouterPlugin_exports, {
   createFileSystemRouterPlugin: () => createFileSystemRouterPlugin
 });
 module.exports = __toCommonJS(fileSystemRouterPlugin_exports);
-var import_node_path = __toESM(require("node:path"), 1),
-  import_node_stream = require("node:stream"),
-  import_perfect_debounce = require("perfect-debounce"),
-  import_picocolors = __toESM(require("picocolors"), 1),
-  import_vite = require("vite"),
-  import_constants = require("../../constants.cjs"),
-  import_createHandleRequest = require("../../createHandleRequest.cjs"),
-  import_getPageExport = require("../../utils/getPageExport.cjs"),
-  import_getRouterRootFromOneOptions = require("../../utils/getRouterRootFromOneOptions.cjs"),
-  import_isResponse = require("../../utils/isResponse.cjs"),
-  import_isStatus = require("../../utils/isStatus.cjs"),
-  import_promiseWithResolvers = require("../../utils/promiseWithResolvers.cjs"),
-  import_trackLoaderDependencies = require("../../utils/trackLoaderDependencies.cjs"),
-  import_constants2 = require("../../vite/constants.cjs"),
-  import_replaceLoader = require("../../vite/replaceLoader.cjs"),
-  import_one_server_only = require("../one-server-only.cjs"),
-  import_virtualEntryConstants = require("./virtualEntryConstants.cjs");
-const debugRouter = process.env.ONE_DEBUG_ROUTER,
-  debugLoaderDeps = process.env.ONE_DEBUG_LOADER_DEPS,
-  routeTypeColors = {
-    ssg: import_picocolors.default.green,
-    ssr: import_picocolors.default.blue,
-    spa: import_picocolors.default.yellow,
-    api: import_picocolors.default.magenta
-  },
-  USE_SERVER_ENV = !1;
+var import_node_path = __toESM(require("node:path"), 1);
+var import_node_stream = require("node:stream");
+var import_perfect_debounce = require("perfect-debounce");
+var import_picocolors = __toESM(require("picocolors"), 1);
+var import_vite = require("vite");
+var import_constants = require("../../constants.cjs");
+var import_createHandleRequest = require("../../createHandleRequest.cjs");
+var import_getPageExport = require("../../utils/getPageExport.cjs");
+var import_getRouterRootFromOneOptions = require("../../utils/getRouterRootFromOneOptions.cjs");
+var import_isResponse = require("../../utils/isResponse.cjs");
+var import_isStatus = require("../../utils/isStatus.cjs");
+var import_promiseWithResolvers = require("../../utils/promiseWithResolvers.cjs");
+var import_trackLoaderDependencies = require("../../utils/trackLoaderDependencies.cjs");
+var import_constants2 = require("../../vite/constants.cjs");
+var import_replaceLoader = require("../../vite/replaceLoader.cjs");
+var import_one_server_only = require("../one-server-only.cjs");
+var import_virtualEntryConstants = require("./virtualEntryConstants.cjs");
+const debugRouter = process.env.ONE_DEBUG_ROUTER;
+const debugLoaderDeps = process.env.ONE_DEBUG_LOADER_DEPS;
+const routeTypeColors = {
+  ssg: import_picocolors.default.green,
+  ssr: import_picocolors.default.blue,
+  spa: import_picocolors.default.yellow,
+  api: import_picocolors.default.magenta
+};
+const USE_SERVER_ENV = false;
 //!!process.env.USE_SERVER_ENV
 function createFileSystemRouterPlugin(options) {
   const preloads = ["/@vite/client", import_virtualEntryConstants.virtalEntryIdClient];
-  let runner, server;
+  let runner;
+  let server;
   const loaderFileDependencies = /* @__PURE__ */new Map();
-  let handleRequest = createRequestHandler(),
-    renderPromise = null;
+  let handleRequest = createRequestHandler();
+  let renderPromise = null;
   function createRequestHandler() {
     const routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options);
     async function findNearestNotFoundPath(routeFile2) {
-      let searchDir = routeFile2.replace(/\/[^/]+$/, "");
-      for (;;) {
+      const routeDir = routeFile2.replace(/\/[^/]+$/, "");
+      let searchDir = routeDir;
+      while (true) {
         for (const ext of [".tsx", ".ts", ".jsx", ".js"]) {
           const candidate = import_node_path.default.join(routerRoot, searchDir, `+not-found${ext}`);
           try {
-            if ((await runner.import(candidate))?.default) return searchDir ? `/${searchDir}/+not-found` : "/+not-found";
+            const mod = await runner.import(candidate);
+            if (mod?.default) {
+              return searchDir ? `/${searchDir}/+not-found` : "/+not-found";
+            }
           } catch {}
         }
         if (!searchDir) break;
         const parent = searchDir.replace(/\/[^/]+$/, "");
-        parent === searchDir ? searchDir = "" : searchDir = parent;
+        if (parent === searchDir) {
+          searchDir = "";
+        } else {
+          searchDir = parent;
+        }
       }
       return "/+not-found";
     }
@@ -90,25 +101,29 @@ function createFileSystemRouterPlugin(options) {
         url,
         loaderProps
       }) {
-        if (options.server?.loggingEnabled !== !1) {
-          const colorType = routeTypeColors[route.type] || import_picocolors.default.white,
-            pathname = typeof url == "string" ? new URL(url).pathname : url.pathname,
-            file = route.isNotFound ? import_picocolors.default.red("404") : import_picocolors.default.dim(`app/${route.file.slice(2)}`);
+        if (options.server?.loggingEnabled !== false) {
+          const colorType = routeTypeColors[route.type] || import_picocolors.default.white;
+          const pathname = typeof url === "string" ? new URL(url).pathname : url.pathname;
+          const file = route.isNotFound ? import_picocolors.default.red("404") : import_picocolors.default.dim(`app/${route.file.slice(2)}`);
           console.info(` \u24F5  ${colorType(`[${route.type}]`)} ${pathname} ${import_picocolors.default.dim("\u2192")} ${file}`);
         }
-        const layouts = route.layouts || [],
-          isSpaShell = route.type === "spa" && layouts.some(layout => layout.layoutRenderMode === "ssg" || layout.layoutRenderMode === "ssr");
-        if (route.type === "spa" && !isSpaShell) return `<!DOCTYPE html><html><head>
+        const layouts = route.layouts || [];
+        const isSpaShell = route.type === "spa" && layouts.some(layout => layout.layoutRenderMode === "ssg" || layout.layoutRenderMode === "ssr");
+        if (route.type === "spa" && !isSpaShell) {
+          return `<!DOCTYPE html><html><head>
             ${(0, import_constants.getSpaHeaderElements)({
-          serverContext: {
-            mode: "spa"
-          }
-        })}
+            serverContext: {
+              mode: "spa"
+            }
+          })}
             <script type="module" src="/@one/dev.js"></script>
             <script type="module" src="/@vite/client" async=""></script>
             <script type="module" src="/@id/__x00__virtual:one-entry" async=""></script>
           </head></html>`;
-        renderPromise && (await renderPromise);
+        }
+        if (renderPromise) {
+          await renderPromise;
+        }
         const {
           promise,
           resolve: resolveRender
@@ -116,64 +131,85 @@ function createFileSystemRouterPlugin(options) {
         renderPromise = promise;
         try {
           const routeFile = import_node_path.default.join(routerRoot, route.file);
-          runner.clearCache(), globalThis.__vxrnresetState?.();
+          runner.clearCache();
+          globalThis["__vxrnresetState"]?.();
           const exported = routeFile === "" ? {} : await runner.import(routeFile);
           async function runLoaderWithTracking(routeNode, loaderFn) {
             const routeId = routeNode.contextKey;
-            if (!loaderFn) return {
-              loaderData: void 0,
-              routeId
-            };
+            if (!loaderFn) {
+              return {
+                loaderData: void 0,
+                routeId
+              };
+            }
             try {
-              const tracked = await (0, import_trackLoaderDependencies.trackLoaderDependencies)(() => loaderFn(loaderProps)),
-                routePath = loaderProps?.path || "/";
+              const tracked = await (0, import_trackLoaderDependencies.trackLoaderDependencies)(() => loaderFn(loaderProps));
+              const routePath = loaderProps?.path || "/";
               for (const dep of tracked.dependencies) {
                 const absoluteDep = import_node_path.default.resolve(dep);
-                loaderFileDependencies.has(absoluteDep) || (loaderFileDependencies.set(absoluteDep, /* @__PURE__ */new Set()), server?.watcher.add(absoluteDep), debugLoaderDeps && console.info(` \u24F5  [loader-dep] watching: ${absoluteDep}`)), loaderFileDependencies.get(absoluteDep).add(routePath);
+                if (!loaderFileDependencies.has(absoluteDep)) {
+                  loaderFileDependencies.set(absoluteDep, /* @__PURE__ */new Set());
+                  server?.watcher.add(absoluteDep);
+                  if (debugLoaderDeps) {
+                    console.info(` \u24F5  [loader-dep] watching: ${absoluteDep}`);
+                  }
+                }
+                loaderFileDependencies.get(absoluteDep).add(routePath);
               }
               return {
                 loaderData: tracked.result,
                 routeId
               };
             } catch (err) {
-              if ((0, import_isResponse.isResponse)(err)) throw err;
-              return err?.code === "ENOENT" ? {
-                loaderData: void 0,
-                routeId,
-                isEnoent: !0
-              } : (console.error(`[one] Error running loader for ${routeId}:`, err), {
+              if ((0, import_isResponse.isResponse)(err)) {
+                throw err;
+              }
+              if (err?.code === "ENOENT") {
+                return {
+                  loaderData: void 0,
+                  routeId,
+                  isEnoent: true
+                };
+              }
+              console.error(`[one] Error running loader for ${routeId}:`, err);
+              return {
                 loaderData: void 0,
                 routeId
-              });
+              };
             }
           }
-          let loaderData, matches, pageResult;
+          let loaderData;
+          let matches;
+          let pageResult;
           if (isSpaShell) {
             const layoutLoaderPromises = layouts.map(async layout => {
-              const layoutFile = import_node_path.default.join(routerRoot, layout.contextKey),
-                layoutExported = await runner.import(layoutFile);
+              const layoutFile = import_node_path.default.join(routerRoot, layout.contextKey);
+              const layoutExported = await runner.import(layoutFile);
               return runLoaderWithTracking(layout, layoutExported.loader);
             });
-            matches = (await Promise.all(layoutLoaderPromises)).map(result => ({
+            const layoutResults = await Promise.all(layoutLoaderPromises);
+            matches = layoutResults.map(result => ({
               routeId: result.routeId,
               pathname: loaderProps?.path || "/",
               params: loaderProps?.params || {},
               loaderData: result.loaderData
-            })), loaderData = void 0;
+            }));
+            loaderData = void 0;
           } else {
-            const layoutRoutes = route.layouts || [],
-              pageRoute = {
-                contextKey: route.file,
-                file: route.file
-              },
-              layoutLoaderPromises = layoutRoutes.map(async layout => {
-                const layoutFile = import_node_path.default.join(routerRoot, layout.contextKey),
-                  layoutExported = await runner.import(layoutFile);
-                return runLoaderWithTracking(layout, layoutExported.loader);
-              }),
-              pageLoaderPromise = runLoaderWithTracking(pageRoute, exported.loader);
+            const layoutRoutes = route.layouts || [];
+            const pageRoute = {
+              contextKey: route.file,
+              file: route.file
+            };
+            const layoutLoaderPromises = layoutRoutes.map(async layout => {
+              const layoutFile = import_node_path.default.join(routerRoot, layout.contextKey);
+              const layoutExported = await runner.import(layoutFile);
+              return runLoaderWithTracking(layout, layoutExported.loader);
+            });
+            const pageLoaderPromise = runLoaderWithTracking(pageRoute, exported.loader);
             let layoutResults;
-            [layoutResults, pageResult] = await Promise.all([Promise.all(layoutLoaderPromises), pageLoaderPromise]), matches = [...layoutResults.map(result => ({
+            [layoutResults, pageResult] = await Promise.all([Promise.all(layoutLoaderPromises), pageLoaderPromise]);
+            matches = [...layoutResults.map(result => ({
               routeId: result.routeId,
               pathname: loaderProps?.path || "/",
               params: loaderProps?.params || {},
@@ -183,35 +219,39 @@ function createFileSystemRouterPlugin(options) {
               pathname: loaderProps?.path || "/",
               params: loaderProps?.params || {},
               loaderData: pageResult.loaderData
-            }], loaderData = pageResult.loaderData;
+            }];
+            loaderData = pageResult.loaderData;
           }
-          eval("process.env.TAMAGUI_IS_SERVER = '1'");
-          const entry = await runner.import(import_virtualEntryConstants.virtualEntryId),
-            render = entry.default.render;
+          eval(`process.env.TAMAGUI_IS_SERVER = '1'`);
+          const entry = await runner.import(import_virtualEntryConstants.virtualEntryId);
+          const render = entry.default.render;
           (0, import_one_server_only.setServerContext)({
             loaderData,
             loaderProps,
             matches
-          }), import_constants2.LoaderDataCache[route.file] = loaderData;
+          });
+          import_constants2.LoaderDataCache[route.file] = loaderData;
           const isDynamicRoute = Object.keys(route.routeKeys || {}).length > 0;
-          let isMissingSsgSlug = !1;
+          let isMissingSsgSlug = false;
           if (route.type === "ssg" && isDynamicRoute && exported.generateStaticParams) {
             const staticParams = await exported.generateStaticParams({
-                params: loaderProps?.params
-              }),
-              currentParams = loaderProps?.params || {};
+              params: loaderProps?.params
+            });
+            const currentParams = loaderProps?.params || {};
             isMissingSsgSlug = !staticParams.some(sp => Object.keys(sp).every(key => sp[key] === currentParams[key]));
           }
-          const isLoaderEnoent = !isSpaShell && pageResult?.isEnoent,
-            is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug || isLoaderEnoent;
+          const isLoaderEnoent = !isSpaShell && pageResult?.isEnoent;
+          const is404 = route.isNotFound || !(0, import_getPageExport.getPageExport)(exported) || isMissingSsgSlug || isLoaderEnoent;
           let notFoundRoutePath = null;
           if (isMissingSsgSlug || isLoaderEnoent) {
-            let searchDir = route.file.replace(/^\.\//, "").replace(/\/[^/]+$/, "");
-            for (;;) {
+            const routeDir = route.file.replace(/^\.\//, "").replace(/\/[^/]+$/, "");
+            let searchDir = routeDir;
+            while (true) {
               for (const ext of [".tsx", ".ts", ".jsx", ".js"]) {
                 const candidate = import_node_path.default.join(routerRoot, searchDir, `+not-found${ext}`);
                 try {
-                  if ((await runner.import(candidate))?.default) {
+                  const notFoundExported = await runner.import(candidate);
+                  if (notFoundExported?.default) {
                     notFoundRoutePath = searchDir ? `/${searchDir}/+not-found` : "/+not-found";
                     break;
                   }
@@ -219,14 +259,20 @@ function createFileSystemRouterPlugin(options) {
               }
               if (notFoundRoutePath || !searchDir) break;
               const parent = searchDir.replace(/\/[^/]+$/, "");
-              parent === searchDir ? searchDir = "" : searchDir = parent;
-            }
-            if (!notFoundRoutePath) return new Response("<html><body><h1>404 - Not Found</h1></body></html>", {
-              status: 404,
-              headers: {
-                "Content-Type": "text/html"
+              if (parent === searchDir) {
+                searchDir = "";
+              } else {
+                searchDir = parent;
               }
-            });
+            }
+            if (!notFoundRoutePath) {
+              return new Response("<html><body><h1>404 - Not Found</h1></body></html>", {
+                status: 404,
+                headers: {
+                  "Content-Type": "text/html"
+                }
+              });
+            }
           }
           const renderPath = notFoundRoutePath || loaderProps?.path || "/";
           let html = await render({
@@ -239,8 +285,8 @@ function createFileSystemRouterPlugin(options) {
           });
           if (is404) {
             if (notFoundRoutePath) {
-              const originalPath = loaderProps?.path || "/",
-                notFoundMarker = `<script>window.__one404={originalPath:${JSON.stringify(originalPath)},notFoundPath:${JSON.stringify(notFoundRoutePath)}}</script>`;
+              const originalPath = loaderProps?.path || "/";
+              const notFoundMarker = `<script>window.__one404={originalPath:${JSON.stringify(originalPath)},notFoundPath:${JSON.stringify(notFoundRoutePath)}}</script>`;
               html = html.includes("</head>") ? html.replace("</head>", `${notFoundMarker}</head>`) : html.replace("<body", `${notFoundMarker}<body`);
             }
             return new Response(html, {
@@ -252,21 +298,25 @@ function createFileSystemRouterPlugin(options) {
           }
           return html;
         } catch (err) {
-          if ((0, import_isResponse.isResponse)(err)) return err;
+          if ((0, import_isResponse.isResponse)(err)) {
+            return err;
+          }
           console.error(`SSR error while loading file ${route.file} from URL ${url.href}
 `, err);
-          const title = `Error rendering ${url.pathname} on server`,
-            message = err instanceof Error ? err.message : `${err}`,
-            stack = err instanceof Error && err.stack || "",
-            subMessage = /at (useEffect|useState|useReducer|useContext|useLayoutEffect)\s*\(.*?react\.development\.js/g.test(stack) ? `
+          const title = `Error rendering ${url.pathname} on server`;
+          const message = err instanceof Error ? err.message : `${err}`;
+          const stack = err instanceof Error ? err.stack || "" : "";
+          const isDuplicateReactError = /at (useEffect|useState|useReducer|useContext|useLayoutEffect)\s*\(.*?react\.development\.js/g.test(stack);
+          const subMessage = isDuplicateReactError ? `
             <h2>Duplicate React Error</h2>
             <p style="font-size: 18px; line-height: 24px; max-width: 850px;">Note: These types of errors happen during SSR because One needs all dependencies that use React to be optimized. Find the dependency on the line after the react.development.js line below to find the failing dependency. So long as that dependency has "react" as a sub-dependency, you can add it to your package.json and One will optimize it automatically. If it doesn't list it properly, you can fix this manually by changing your vite.config.ts One plugin to add "one({ deps: { depName: true })" so One optimizes depName.</p>
-          ` : "";
-          return console.error(`${title}
+          ` : ``;
+          console.error(`${title}
  ${message}
 
 ${stack}
-`), `
+`);
+          return `
             <html>
               <body style="background: #000; color: #fff; padding: 5%; font-family: monospace; line-height: 2rem;">
                 <h1 style="display: inline-flex; background: red; color: white; padding: 5px; margin: -5px;">${title}</h1>
@@ -274,7 +324,7 @@ ${stack}
                 ${subMessage}
                 ${stack ? `<pre style="font-size: 15px; line-height: 24px; white-space: pre;">
                     ${stack}
-                </pre>` : ""}
+                </pre>` : ``}
               </body>
             </html>
           `;
@@ -289,45 +339,70 @@ ${stack}
       }) {
         const routeFile2 = import_node_path.default.join(routerRoot, route2.file);
         let transformedJS = (await server.transformRequest(routeFile2))?.code;
-        if (!transformedJS) throw new Error("No transformed js returned");
-        if (!/export function loader\(\)/.test(transformedJS)) return transformedJS;
-        const exported2 = await runner.import(routeFile2),
-          isDynamicRoute2 = Object.keys(route2.routeKeys || {}).length > 0;
+        if (!transformedJS) {
+          throw new Error(`No transformed js returned`);
+        }
+        if (!/export function loader\(\)/.test(transformedJS)) {
+          return transformedJS;
+        }
+        const exported2 = await runner.import(routeFile2);
+        const isDynamicRoute2 = Object.keys(route2.routeKeys || {}).length > 0;
         if (route2.type === "ssg" && isDynamicRoute2 && exported2.generateStaticParams) {
           const staticParams = await exported2.generateStaticParams({
-              params: loaderProps2?.params
-            }),
-            currentParams = loaderProps2?.params || {};
-          if (!staticParams.some(sp => Object.keys(sp).every(key => sp[key] === currentParams[key]))) {
+            params: loaderProps2?.params
+          });
+          const currentParams = loaderProps2?.params || {};
+          const isValidSlug = staticParams.some(sp => Object.keys(sp).every(key => sp[key] === currentParams[key]));
+          if (!isValidSlug) {
             const nfPath = await findNearestNotFoundPath(route2.file);
             return `export function loader(){return{__oneError:404,__oneErrorMessage:'Not Found',__oneNotFoundPath:${JSON.stringify(nfPath)}}}`;
           }
         }
         let loaderData2;
-        if (exported2.loader) try {
-          const tracked = await (0, import_trackLoaderDependencies.trackLoaderDependencies)(() => exported2.loader(loaderProps2));
-          if (loaderData2 = tracked.result, (0, import_isResponse.isResponse)(loaderData2)) throw loaderData2;
-          const routePath = loaderProps2?.path || "/";
-          for (const dep of tracked.dependencies) {
-            const absoluteDep = import_node_path.default.resolve(dep);
-            loaderFileDependencies.has(absoluteDep) || (loaderFileDependencies.set(absoluteDep, /* @__PURE__ */new Set()), server?.watcher.add(absoluteDep), debugLoaderDeps && console.info(` \u24F5  [loader-dep] watching: ${absoluteDep}`)), loaderFileDependencies.get(absoluteDep).add(routePath);
-          }
-        } catch (err) {
-          if ((0, import_isResponse.isResponse)(err)) throw err;
-          if (err?.code === "ENOENT") {
-            const nfPath = await findNearestNotFoundPath(route2.file);
-            return `export function loader(){return{__oneError:404,__oneErrorMessage:'Not Found',__oneNotFoundPath:${JSON.stringify(nfPath)}}}`;
+        if (exported2.loader) {
+          try {
+            const tracked = await (0, import_trackLoaderDependencies.trackLoaderDependencies)(() => exported2.loader(loaderProps2));
+            loaderData2 = tracked.result;
+            if ((0, import_isResponse.isResponse)(loaderData2)) {
+              throw loaderData2;
+            }
+            const routePath = loaderProps2?.path || "/";
+            for (const dep of tracked.dependencies) {
+              const absoluteDep = import_node_path.default.resolve(dep);
+              if (!loaderFileDependencies.has(absoluteDep)) {
+                loaderFileDependencies.set(absoluteDep, /* @__PURE__ */new Set());
+                server?.watcher.add(absoluteDep);
+                if (debugLoaderDeps) {
+                  console.info(` \u24F5  [loader-dep] watching: ${absoluteDep}`);
+                }
+              }
+              loaderFileDependencies.get(absoluteDep).add(routePath);
+            }
+          } catch (err) {
+            if ((0, import_isResponse.isResponse)(err)) {
+              throw err;
+            }
+            if (err?.code === "ENOENT") {
+              const nfPath = await findNearestNotFoundPath(route2.file);
+              return `export function loader(){return{__oneError:404,__oneErrorMessage:'Not Found',__oneNotFoundPath:${JSON.stringify(nfPath)}}}`;
+            }
+            throw err;
           }
-          throw err;
         }
-        loaderData2 && (transformedJS = (0, import_replaceLoader.replaceLoader)({
-          code: transformedJS,
-          loaderData: loaderData2
-        }));
+        if (loaderData2) {
+          transformedJS = (0, import_replaceLoader.replaceLoader)({
+            code: transformedJS,
+            loaderData: loaderData2
+          });
+        }
         const platform = url2.searchParams.get("platform");
         if (platform === "ios" || platform === "android" || platform === "native") {
-          if (!server.environments[platform === "native" ? "ios" : platform || ""]) throw new Error(`[handleLoader] No Vite environment found for platform '${platform}'`);
-          return `exports.loader = () => (${JSON.stringify(loaderData2)});`;
+          const environment = server.environments[platform === "native" ? "ios" : platform || ""];
+          if (!environment) {
+            throw new Error(`[handleLoader] No Vite environment found for platform '${platform}'`);
+          }
+          const nativeTransformedJS = `exports.loader = () => (${JSON.stringify(loaderData2)});`;
+          return nativeTransformedJS;
         }
         return transformedJS;
       },
@@ -345,43 +420,81 @@ ${stack}
     });
   }
   return {
-    name: "one-router-fs",
+    name: `one-router-fs`,
     enforce: "post",
     apply: "serve",
     async config() {
       const setting = options.optimization?.autoEntriesScanning ?? "flat";
-      if (setting !== !1 && handleRequest.manifest.pageRoutes) return {
-        optimizeDeps: {
-          /**
-           * This adds all our routes and layouts as entries which fixes initial load making
-           * optimizeDeps be triggered which causes hard refreshes (also on initial navigations)
-           *
-           * see: https://vitejs.dev/config/dep-optimization-options.html#optimizedeps-entries
-           * and: https://github.com/remix-run/remix/pull/9921
-           */
-          entries: [...new Set(handleRequest.manifest.pageRoutes.flatMap(route2 => route2.isNotFound ? [] : route2.file ? setting === "flat" && route2.file.split("/").filter(x => !x.startsWith("(")).length > 3 ? [] : [import_node_path.default.join("./app", route2.file), ...(route2.layouts?.flatMap(layout => layout.contextKey ? [import_node_path.default.join("./app", layout.contextKey)] : []) || [])] : []))]
-        }
-      };
+      if (setting === false) {
+        return;
+      }
+      if (handleRequest.manifest.pageRoutes) {
+        const routesAndLayouts = [...new Set(handleRequest.manifest.pageRoutes.flatMap(route2 => {
+          if (route2.isNotFound) return [];
+          if (!route2.file) return [];
+          if (setting === "flat" && route2.file.split("/").filter(x => !x.startsWith("(")).length > 3) {
+            return [];
+          }
+          return [import_node_path.default.join("./app", route2.file), ...(route2.layouts?.flatMap(layout => {
+            if (!layout.contextKey) return [];
+            return [import_node_path.default.join("./app", layout.contextKey)];
+          }) || [])];
+        }))];
+        return {
+          optimizeDeps: {
+            /**
+             * This adds all our routes and layouts as entries which fixes initial load making
+             * optimizeDeps be triggered which causes hard refreshes (also on initial navigations)
+             *
+             * see: https://vitejs.dev/config/dep-optimization-options.html#optimizedeps-entries
+             * and: https://github.com/remix-run/remix/pull/9921
+             */
+            entries: routesAndLayouts
+          }
+        };
+      }
     },
     configureServer(serverIn) {
-      server = serverIn, runner = (0, import_vite.createServerModuleRunner)(USE_SERVER_ENV ? server.environments.server : server.environments.ssr);
-      const appDir = import_node_path.default.join(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)),
-        fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, changedPath) => {
-          (type === "add" || type === "delete") && import_node_path.default.resolve(changedPath).startsWith(appDir) && (handleRequest = createRequestHandler());
-        }, 100);
+      server = serverIn;
+      runner = (0, import_vite.createServerModuleRunner)(USE_SERVER_ENV ? server.environments.server : server.environments.ssr);
+      const appDir = import_node_path.default.join(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options));
+      const fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, changedPath) => {
+        if (type === "add" || type === "delete") {
+          const absolutePath = import_node_path.default.resolve(changedPath);
+          if (absolutePath.startsWith(appDir)) {
+            handleRequest = createRequestHandler();
+          }
+        }
+      }, 100);
       server.watcher.addListener("all", fileWatcherChangeListener);
       const loaderDepChangeListener = (0, import_perfect_debounce.debounce)(changedPath => {
-        const absolutePath = import_node_path.default.resolve(changedPath),
-          routePaths = loaderFileDependencies.get(absolutePath);
-        routePaths && routePaths.size > 0 && (debugLoaderDeps && console.info(` \u24F5  [loader-dep] changed: ${absolutePath}, triggering loader refetch for routes:`, [...routePaths]), server.hot.send({
-          type: "custom",
-          event: "one:loader-data-update",
-          data: {
-            routePaths: [...routePaths]
+        const absolutePath = import_node_path.default.resolve(changedPath);
+        const routePaths = loaderFileDependencies.get(absolutePath);
+        if (routePaths && routePaths.size > 0) {
+          if (debugLoaderDeps) {
+            console.info(` \u24F5  [loader-dep] changed: ${absolutePath}, triggering loader refetch for routes:`, [...routePaths]);
           }
-        }));
+          server.hot.send({
+            type: "custom",
+            event: "one:loader-data-update",
+            data: {
+              routePaths: [...routePaths]
+            }
+          });
+        }
       }, 100);
-      return server.watcher.on("change", loaderDepChangeListener), () => {
+      server.watcher.on("change", loaderDepChangeListener);
+      return () => {
+        server.middlewares.use((req, res, next) => {
+          if (req.url === "/status" || req.url?.startsWith("/status?")) {
+            res.writeHead(200, {
+              "Content-Type": "text/plain"
+            });
+            res.end("packager-status:running");
+            return;
+          }
+          next();
+        });
         server.middlewares.use(async (req, res, next) => {
           res.setHeader("Cache-Control", "no-store");
           try {
@@ -389,67 +502,94 @@ ${stack}
             if (redirects) {
               const url2 = new URL(req.url || "", `http://${req.headers.host}`);
               for (const redirect of redirects) {
-                const regexStr = `^${redirect.source.replace(/:\w+/g, "([^/]+)")}$`,
-                  match = url2.pathname.match(new RegExp(regexStr));
+                const regexStr = `^${redirect.source.replace(/:\w+/g, "([^/]+)")}$`;
+                const match = url2.pathname.match(new RegExp(regexStr));
                 if (match) {
                   let destination = redirect.destination;
                   const params = redirect.source.match(/:\w+/g);
-                  params && params.forEach((param, index) => {
-                    destination = destination.replace(param, match[index + 1] || "");
-                  }), debugRouter && console.info(`[one] \u21AA redirect ${url2.pathname} \u2192 ${destination}`), res.writeHead(redirect.permanent ? 301 : 302, {
+                  if (params) {
+                    params.forEach((param, index) => {
+                      destination = destination.replace(param, match[index + 1] || "");
+                    });
+                  }
+                  if (debugRouter) {
+                    console.info(`[one] \u21AA redirect ${url2.pathname} \u2192 ${destination}`);
+                  }
+                  res.writeHead(redirect.permanent ? 301 : 302, {
                     Location: destination
-                  }), res.end();
+                  });
+                  res.end();
                   return;
                 }
               }
             }
             const reply = await handleRequest.handler(convertIncomingMessageToRequest(req));
-            if (!reply) return next();
-            if (typeof reply != "string" && (0, import_isResponse.isResponse)(reply)) {
+            if (!reply) {
+              return next();
+            }
+            if (typeof reply !== "string" && (0, import_isResponse.isResponse)(reply)) {
               if (debugRouter) {
                 const headers = {};
                 reply.headers.forEach((v, k) => {
                   headers[k] = v;
-                }), console.info(`[one] \u{1F4E4} response ${reply.status}`, headers);
+                });
+                console.info(`[one] \u{1F4E4} response ${reply.status}`, headers);
               }
-              if (reply.headers.forEach((value, key) => {
+              reply.headers.forEach((value, key) => {
                 if (key === "set-cookie") {
                   const cookies = value.split(", ");
-                  for (const cookie of cookies) res.appendHeader("Set-Cookie", cookie);
-                } else res.setHeader(key, value);
-              }), (0, import_isStatus.isStatusRedirect)(reply.status)) {
+                  for (const cookie of cookies) {
+                    res.appendHeader("Set-Cookie", cookie);
+                  }
+                } else {
+                  res.setHeader(key, value);
+                }
+              });
+              if ((0, import_isStatus.isStatusRedirect)(reply.status)) {
                 const location = `${reply.headers.get("location") || ""}`;
-                if (debugRouter && console.info(`[one] \u21AA response redirect \u2192 ${location}`), location) {
+                if (debugRouter) {
+                  console.info(`[one] \u21AA response redirect \u2192 ${location}`);
+                }
+                if (location) {
                   res.writeHead(reply.status, {
                     Location: location
-                  }), res.end();
+                  });
+                  res.end();
                   return;
                 }
-                console.error("No location provided to redirected status reply", reply);
+                console.error(`No location provided to redirected status reply`, reply);
               }
-              if (res.statusCode = reply.status, res.statusMessage = reply.statusText, reply.body) {
+              res.statusCode = reply.status;
+              res.statusMessage = reply.statusText;
+              if (reply.body) {
                 if (reply.body.locked) {
-                  console.warn("Body is locked??", req.url), res.end();
+                  console.warn(`Body is locked??`, req.url);
+                  res.end();
                   return;
                 }
                 try {
                   import_node_stream.Readable.fromWeb(reply.body).pipe(res);
                 } catch (err) {
-                  console.warn("Error piping reply body to response:", err), res.end();
+                  console.warn("Error piping reply body to response:", err);
+                  res.end();
                 }
                 return;
               }
               res.end();
               return;
             }
-            if (reply && typeof reply == "object") {
-              res.setHeader("Content-Type", "application/json"), res.write(JSON.stringify(reply)), res.end();
+            if (reply && typeof reply === "object") {
+              res.setHeader("Content-Type", "application/json");
+              res.write(JSON.stringify(reply));
+              res.end();
               return;
             }
-            res.write(reply), res.end();
+            res.write(reply);
+            res.end();
             return;
           } catch (error) {
-            console.error(`[one] routing error ${req.url}: ${error}`), next(error);
+            console.error(`[one] routing error ${req.url}: ${error}`);
+            next(error);
           }
           console.warn(`SSR handler didn't send a response for url: ${req.url}`);
         });
@@ -458,13 +598,20 @@ ${stack}
   };
 }
 const convertIncomingMessageToRequest = req => {
-  if (!req.originalUrl) throw new Error("Can't convert: originalUrl is missing");
-  const urlBase = `http://${req.headers.host}`,
-    urlString = req.originalUrl,
-    url2 = new URL(urlString, urlBase),
-    headers = new Headers();
-  for (const key in req.headers) req.headers[key] && headers.append(key, req.headers[key]);
-  const body = ["POST", "PUT", "PATCH", "DELETE"].includes(req.method || "") ? import_node_stream.Readable.toWeb(req) : null;
+  if (!req.originalUrl) {
+    throw new Error(`Can't convert: originalUrl is missing`);
+  }
+  const urlBase = `http://${req.headers.host}`;
+  const urlString = req.originalUrl;
+  const url2 = new URL(urlString, urlBase);
+  const headers = new Headers();
+  for (const key in req.headers) {
+    if (req.headers[key]) {
+      headers.append(key, req.headers[key]);
+    }
+  }
+  const hasBody = ["POST", "PUT", "PATCH", "DELETE"].includes(req.method || "");
+  const body = hasBody ? import_node_stream.Readable.toWeb(req) : null;
   return new Request(url2, {
     method: req.method,
     headers,