one 1.14.4 → 1.15.0

package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js

@@ -16,116 +16,146 @@ import { replaceLoader } from "../../vite/replaceLoader.native.js";
 import { setServerContext } from "../one-server-only.native.js";
 import { virtalEntryIdClient, virtualEntryId } from "./virtualEntryConstants.native.js";
 function _instanceof(left, right) {
-  return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+    return !!right[Symbol.hasInstance](left);
+  } else {
+    return left instanceof right;
+  }
 }
 function _type_of(obj) {
   "@swc/helpers - typeof";
 
-  return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
+  return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-var debugRouter = process.env.ONE_DEBUG_ROUTER,
-  debugLoaderDeps = process.env.ONE_DEBUG_LOADER_DEPS,
-  routeTypeColors = {
-    ssg: colors.green,
-    ssr: colors.blue,
-    spa: colors.yellow,
-    api: colors.magenta
-  },
-  USE_SERVER_ENV = !1;
+var debugRouter = process.env.ONE_DEBUG_ROUTER;
+var debugLoaderDeps = process.env.ONE_DEBUG_LOADER_DEPS;
+var routeTypeColors = {
+  ssg: colors.green,
+  ssr: colors.blue,
+  spa: colors.yellow,
+  api: colors.magenta
+};
+var USE_SERVER_ENV = false;
 //!!process.env.USE_SERVER_ENV
 function createFileSystemRouterPlugin(options) {
-  var preloads = ["/@vite/client", virtalEntryIdClient],
-    runner,
-    server,
-    loaderFileDependencies = /* @__PURE__ */new Map(),
-    handleRequest = createRequestHandler(),
-    renderPromise = null;
+  var preloads = ["/@vite/client", virtalEntryIdClient];
+  var runner;
+  var server;
+  var loaderFileDependencies = /* @__PURE__ */new Map();
+  var handleRequest = createRequestHandler();
+  var renderPromise = null;
   function createRequestHandler() {
-    var _options_router,
-      routerRoot = getRouterRootFromOneOptions(options);
+    var _options_router;
+    var routerRoot = getRouterRootFromOneOptions(options);
     async function findNearestNotFoundPath(routeFile2) {
-      for (var routeDir2 = routeFile2.replace(/\/[^/]+$/, ""), searchDir2 = routeDir2;;) {
+      var routeDir2 = routeFile2.replace(/\/[^/]+$/, "");
+      var searchDir2 = routeDir2;
+      while (true) {
         for (var _i2 = 0, _iter2 = [".tsx", ".ts", ".jsx", ".js"]; _i2 < _iter2.length; _i2++) {
-          var ext2 = _iter2[_i2],
-            candidate2 = path.join(routerRoot, searchDir2, `+not-found${ext2}`);
+          var ext2 = _iter2[_i2];
+          var candidate2 = path.join(routerRoot, searchDir2, `+not-found${ext2}`);
           try {
             var mod = await runner.import(candidate2);
-            if (mod?.default) return searchDir2 ? `/${searchDir2}/+not-found` : "/+not-found";
-          } catch {}
+            if (mod === null || mod === void 0 ? void 0 : mod.default) {
+              return searchDir2 ? `/${searchDir2}/+not-found` : "/+not-found";
+            }
+          } catch (unused) {}
         }
         if (!searchDir2) break;
         var parent2 = searchDir2.replace(/\/[^/]+$/, "");
-        parent2 === searchDir2 ? searchDir2 = "" : searchDir2 = parent2;
+        if (parent2 === searchDir2) {
+          searchDir2 = "";
+        } else {
+          searchDir2 = parent2;
+        }
       }
       return "/+not-found";
     }
     return createHandleRequest({
       async handlePage(param) {
         var {
-            route,
-            url,
-            loaderProps
-          } = param,
-          _options_server;
-        if (((_options_server = options.server) === null || _options_server === void 0 ? void 0 : _options_server.loggingEnabled) !== !1) {
-          var colorType = routeTypeColors[route.type] || colors.white,
-            pathname = typeof url == "string" ? new URL(url).pathname : url.pathname,
-            file = route.isNotFound ? colors.red("404") : colors.dim(`app/${route.file.slice(2)}`);
+          route,
+          url,
+          loaderProps
+        } = param;
+        var _options_server;
+        if (((_options_server = options.server) === null || _options_server === void 0 ? void 0 : _options_server.loggingEnabled) !== false) {
+          var colorType = routeTypeColors[route.type] || colors.white;
+          var pathname = typeof url === "string" ? new URL(url).pathname : url.pathname;
+          var file = route.isNotFound ? colors.red("404") : colors.dim(`app/${route.file.slice(2)}`);
           console.info(` \u24F5  ${colorType(`[${route.type}]`)} ${pathname} ${colors.dim("\u2192")} ${file}`);
         }
-        var layouts = route.layouts || [],
-          isSpaShell = route.type === "spa" && layouts.some(function (layout) {
-            return layout.layoutRenderMode === "ssg" || layout.layoutRenderMode === "ssr";
-          });
-        if (route.type === "spa" && !isSpaShell) return `<!DOCTYPE html><html><head>
+        var layouts = route.layouts || [];
+        var isSpaShell = route.type === "spa" && layouts.some(function (layout) {
+          return layout.layoutRenderMode === "ssg" || layout.layoutRenderMode === "ssr";
+        });
+        if (route.type === "spa" && !isSpaShell) {
+          return `<!DOCTYPE html><html><head>
             ${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;
+        }
         var {
           promise,
           resolve: resolveRender
         } = promiseWithResolvers();
         renderPromise = promise;
         try {
-          var _globalThis___vxrnresetState,
-            _globalThis,
-            routeFile = path.join(routerRoot, route.file);
-          runner.clearCache(), (_globalThis___vxrnresetState = (_globalThis = globalThis).__vxrnresetState) === null || _globalThis___vxrnresetState === void 0 || _globalThis___vxrnresetState.call(_globalThis);
+          var _globalThis___vxrnresetState, _globalThis;
+          var routeFile = path.join(routerRoot, route.file);
+          runner.clearCache();
+          (_globalThis___vxrnresetState = (_globalThis = globalThis)["__vxrnresetState"]) === null || _globalThis___vxrnresetState === void 0 ? void 0 : _globalThis___vxrnresetState.call(_globalThis);
           var exported = routeFile === "" ? {} : await runner.import(routeFile);
           async function runLoaderWithTracking(routeNode, loaderFn) {
             var routeId = routeNode.contextKey;
-            if (!loaderFn) return {
-              loaderData: void 0,
-              routeId
-            };
+            if (!loaderFn) {
+              return {
+                loaderData: void 0,
+                routeId
+              };
+            }
             try {
               var tracked = await trackLoaderDependencies(function () {
-                  return loaderFn(loaderProps);
-                }),
-                routePath = loaderProps?.path || "/",
-                _iteratorNormalCompletion = !0,
-                _didIteratorError = !1,
+                return loaderFn(loaderProps);
+              });
+              var routePath = (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.path) || "/";
+              var _iteratorNormalCompletion = true,
+                _didIteratorError = false,
                 _iteratorError = void 0;
               try {
-                for (var _iterator = tracked.dependencies[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-                  var dep = _step.value,
-                    absoluteDep = path.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);
+                for (var _iterator = tracked.dependencies[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                  var dep = _step.value;
+                  var absoluteDep = path.resolve(dep);
+                  if (!loaderFileDependencies.has(absoluteDep)) {
+                    loaderFileDependencies.set(absoluteDep, /* @__PURE__ */new Set());
+                    server === null || server === void 0 ? void 0 : server.watcher.add(absoluteDep);
+                    if (debugLoaderDeps) {
+                      console.info(` \u24F5  [loader-dep] watching: ${absoluteDep}`);
+                    }
+                  }
+                  loaderFileDependencies.get(absoluteDep).add(routePath);
                 }
               } catch (err) {
-                _didIteratorError = !0, _iteratorError = err;
+                _didIteratorError = true;
+                _iteratorError = err;
               } finally {
                 try {
-                  !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+                  if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                  }
                 } finally {
-                  if (_didIteratorError) throw _iteratorError;
+                  if (_didIteratorError) {
+                    throw _iteratorError;
+                  }
                 }
               }
               return {
@@ -133,121 +163,141 @@ function createFileSystemRouterPlugin(options) {
                 routeId
               };
             } catch (err) {
-              if (isResponse(err)) throw err;
-              return err?.code === "ENOENT" ? {
-                loaderData: void 0,
-                routeId,
-                isEnoent: !0
-              } : (console.error(`[one] Error running loader for ${routeId}:`, err), {
+              if (isResponse(err)) {
+                throw err;
+              }
+              if ((err === null || err === void 0 ? void 0 : err.code) === "ENOENT") {
+                return {
+                  loaderData: void 0,
+                  routeId,
+                  isEnoent: true
+                };
+              }
+              console.error(`[one] Error running loader for ${routeId}:`, err);
+              return {
                 loaderData: void 0,
                 routeId
-              });
+              };
             }
           }
-          var loaderData, matches, pageResult;
+          var loaderData;
+          var matches;
+          var pageResult;
           if (isSpaShell) {
             var layoutLoaderPromises = layouts.map(async function (layout) {
-                var layoutFile = path.join(routerRoot, layout.contextKey),
-                  layoutExported = await runner.import(layoutFile);
-                return runLoaderWithTracking(layout, layoutExported.loader);
-              }),
-              layoutResults = await Promise.all(layoutLoaderPromises);
+              var layoutFile = path.join(routerRoot, layout.contextKey);
+              var layoutExported = await runner.import(layoutFile);
+              return runLoaderWithTracking(layout, layoutExported.loader);
+            });
+            var layoutResults = await Promise.all(layoutLoaderPromises);
             matches = layoutResults.map(function (result) {
               return {
                 routeId: result.routeId,
-                pathname: loaderProps?.path || "/",
-                params: loaderProps?.params || {},
+                pathname: (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.path) || "/",
+                params: (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.params) || {},
                 loaderData: result.loaderData
               };
-            }), loaderData = void 0;
+            });
+            loaderData = void 0;
           } else {
-            var layoutRoutes = route.layouts || [],
-              pageRoute = {
-                contextKey: route.file,
-                file: route.file
-              },
-              layoutLoaderPromises = layoutRoutes.map(async function (layout) {
-                var layoutFile = path.join(routerRoot, layout.contextKey),
-                  layoutExported = await runner.import(layoutFile);
-                return runLoaderWithTracking(layout, layoutExported.loader);
-              }),
-              pageLoaderPromise = runLoaderWithTracking(pageRoute, exported.loader),
-              layoutResults;
-            [layoutResults, pageResult] = await Promise.all([Promise.all(layoutLoaderPromises), pageLoaderPromise]), matches = [...layoutResults.map(function (result) {
+            var layoutRoutes = route.layouts || [];
+            var pageRoute = {
+              contextKey: route.file,
+              file: route.file
+            };
+            var layoutLoaderPromises = layoutRoutes.map(async function (layout) {
+              var layoutFile = path.join(routerRoot, layout.contextKey);
+              var layoutExported = await runner.import(layoutFile);
+              return runLoaderWithTracking(layout, layoutExported.loader);
+            });
+            var pageLoaderPromise = runLoaderWithTracking(pageRoute, exported.loader);
+            var layoutResults;
+            [layoutResults, pageResult] = await Promise.all([Promise.all(layoutLoaderPromises), pageLoaderPromise]);
+            matches = [...layoutResults.map(function (result) {
               return {
                 routeId: result.routeId,
-                pathname: loaderProps?.path || "/",
-                params: loaderProps?.params || {},
+                pathname: (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.path) || "/",
+                params: (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.params) || {},
                 loaderData: result.loaderData
               };
             }), {
               routeId: pageResult.routeId,
-              pathname: loaderProps?.path || "/",
-              params: loaderProps?.params || {},
+              pathname: (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.path) || "/",
+              params: (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.params) || {},
               loaderData: pageResult.loaderData
-            }], loaderData = pageResult.loaderData;
+            }];
+            loaderData = pageResult.loaderData;
           }
-          eval("process.env.TAMAGUI_IS_SERVER = '1'");
-          var entry = await runner.import(virtualEntryId),
-            render = entry.default.render;
+          eval(`process.env.TAMAGUI_IS_SERVER = '1'`);
+          var entry = await runner.import(virtualEntryId);
+          var render = entry.default.render;
           setServerContext({
             loaderData,
             loaderProps,
             matches
-          }), LoaderDataCache[route.file] = loaderData;
-          var isDynamicRoute = Object.keys(route.routeKeys || {}).length > 0,
-            isMissingSsgSlug = !1;
+          });
+          LoaderDataCache[route.file] = loaderData;
+          var isDynamicRoute = Object.keys(route.routeKeys || {}).length > 0;
+          var isMissingSsgSlug = false;
           if (route.type === "ssg" && isDynamicRoute && exported.generateStaticParams) {
             var staticParams = await exported.generateStaticParams({
-                params: loaderProps?.params
-              }),
-              currentParams = loaderProps?.params || {};
+              params: loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.params
+            });
+            var currentParams = (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.params) || {};
             isMissingSsgSlug = !staticParams.some(function (sp) {
               return Object.keys(sp).every(function (key) {
                 return sp[key] === currentParams[key];
               });
             });
           }
-          var isLoaderEnoent = !isSpaShell && pageResult?.isEnoent,
-            is404 = route.isNotFound || !getPageExport(exported) || isMissingSsgSlug || isLoaderEnoent,
-            notFoundRoutePath = null;
+          var isLoaderEnoent = !isSpaShell && (pageResult === null || pageResult === void 0 ? void 0 : pageResult.isEnoent);
+          var is404 = route.isNotFound || !getPageExport(exported) || isMissingSsgSlug || isLoaderEnoent;
+          var notFoundRoutePath = null;
           if (isMissingSsgSlug || isLoaderEnoent) {
-            for (var routeDir = route.file.replace(/^\.\//, "").replace(/\/[^/]+$/, ""), searchDir = routeDir;;) {
+            var routeDir = route.file.replace(/^\.\//, "").replace(/\/[^/]+$/, "");
+            var searchDir = routeDir;
+            while (true) {
               for (var _i = 0, _iter = [".tsx", ".ts", ".jsx", ".js"]; _i < _iter.length; _i++) {
-                var ext = _iter[_i],
-                  candidate = path.join(routerRoot, searchDir, `+not-found${ext}`);
+                var ext = _iter[_i];
+                var candidate = path.join(routerRoot, searchDir, `+not-found${ext}`);
                 try {
                   var notFoundExported = await runner.import(candidate);
-                  if (notFoundExported?.default) {
+                  if (notFoundExported === null || notFoundExported === void 0 ? void 0 : notFoundExported.default) {
                     notFoundRoutePath = searchDir ? `/${searchDir}/+not-found` : "/+not-found";
                     break;
                   }
-                } catch {}
+                } catch (unused) {}
               }
               if (notFoundRoutePath || !searchDir) break;
               var 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"
+                }
+              });
+            }
           }
-          var renderPath = notFoundRoutePath || loaderProps?.path || "/",
-            html = await render({
-              mode: isSpaShell ? "spa-shell" : route.type === "ssg" ? "ssg" : route.type === "ssr" ? "ssr" : "spa",
-              loaderData,
-              loaderProps,
-              path: renderPath,
-              preloads,
-              matches
-            });
+          var renderPath = notFoundRoutePath || (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.path) || "/";
+          var html = await render({
+            mode: isSpaShell ? "spa-shell" : route.type === "ssg" ? "ssg" : route.type === "ssr" ? "ssr" : "spa",
+            loaderData,
+            loaderProps,
+            path: renderPath,
+            preloads,
+            matches
+          });
           if (is404) {
             if (notFoundRoutePath) {
-              var originalPath = loaderProps?.path || "/",
-                notFoundMarker = `<script>window.__one404={originalPath:${JSON.stringify(originalPath)},notFoundPath:${JSON.stringify(notFoundRoutePath)}}</script>`;
+              var originalPath = (loaderProps === null || loaderProps === void 0 ? void 0 : loaderProps.path) || "/";
+              var 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, {
@@ -259,22 +309,25 @@ function createFileSystemRouterPlugin(options) {
           }
           return html;
         } catch (err) {
-          if (isResponse(err)) return err;
+          if (isResponse(err)) {
+            return err;
+          }
           console.error(`SSR error while loading file ${route.file} from URL ${url.href}
 `, err);
-          var title = `Error rendering ${url.pathname} on server`,
-            message = _instanceof(err, Error) ? err.message : `${err}`,
-            stack = _instanceof(err, Error) && err.stack || "",
-            isDuplicateReactError = /at (useEffect|useState|useReducer|useContext|useLayoutEffect)\s*\(.*?react\.development\.js/g.test(stack),
-            subMessage = isDuplicateReactError ? `
+          var title = `Error rendering ${url.pathname} on server`;
+          var message = _instanceof(err, Error) ? err.message : `${err}`;
+          var stack = _instanceof(err, Error) ? err.stack || "" : "";
+          var isDuplicateReactError = /at (useEffect|useState|useReducer|useContext|useLayoutEffect)\s*\(.*?react\.development\.js/g.test(stack);
+          var 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>
@@ -282,7 +335,7 @@ ${stack}
                 ${subMessage}
                 ${stack ? `<pre style="font-size: 15px; line-height: 24px; white-space: pre;">
                     ${stack}
-                </pre>` : ""}
+                </pre>` : ``}
               </body>
             </html>
           `;
@@ -292,73 +345,100 @@ ${stack}
       },
       async handleLoader(param2) {
         var {
-            route: route2,
-            url: url2,
-            loaderProps: loaderProps2
-          } = param2,
-          _this,
-          routeFile2 = path.join(routerRoot, route2.file),
-          transformedJS = (_this = await server.transformRequest(routeFile2)) === null || _this === void 0 ? void 0 : _this.code;
-        if (!transformedJS) throw new Error("No transformed js returned");
-        if (!/export function loader\(\)/.test(transformedJS)) return transformedJS;
-        var exported2 = await runner.import(routeFile2),
-          isDynamicRoute2 = Object.keys(route2.routeKeys || {}).length > 0;
+          route: route2,
+          url: url2,
+          loaderProps: loaderProps2
+        } = param2;
+        var _this;
+        var routeFile2 = path.join(routerRoot, route2.file);
+        var transformedJS = (_this = await server.transformRequest(routeFile2)) === null || _this === void 0 ? void 0 : _this.code;
+        if (!transformedJS) {
+          throw new Error(`No transformed js returned`);
+        }
+        if (!/export function loader\(\)/.test(transformedJS)) {
+          return transformedJS;
+        }
+        var exported2 = await runner.import(routeFile2);
+        var isDynamicRoute2 = Object.keys(route2.routeKeys || {}).length > 0;
         if (route2.type === "ssg" && isDynamicRoute2 && exported2.generateStaticParams) {
           var staticParams2 = await exported2.generateStaticParams({
-              params: loaderProps2?.params
-            }),
-            currentParams2 = loaderProps2?.params || {},
-            isValidSlug = staticParams2.some(function (sp) {
-              return Object.keys(sp).every(function (key) {
-                return sp[key] === currentParams2[key];
-              });
+            params: loaderProps2 === null || loaderProps2 === void 0 ? void 0 : loaderProps2.params
+          });
+          var currentParams2 = (loaderProps2 === null || loaderProps2 === void 0 ? void 0 : loaderProps2.params) || {};
+          var isValidSlug = staticParams2.some(function (sp) {
+            return Object.keys(sp).every(function (key) {
+              return sp[key] === currentParams2[key];
             });
+          });
           if (!isValidSlug) {
             var nfPath = await findNearestNotFoundPath(route2.file);
             return `export function loader(){return{__oneError:404,__oneErrorMessage:'Not Found',__oneNotFoundPath:${JSON.stringify(nfPath)}}}`;
           }
         }
         var loaderData2;
-        if (exported2.loader) try {
-          var tracked = await trackLoaderDependencies(function () {
-            return exported2.loader(loaderProps2);
-          });
-          if (loaderData2 = tracked.result, isResponse(loaderData2)) throw loaderData2;
-          var routePath = loaderProps2?.path || "/",
-            _iteratorNormalCompletion = !0,
-            _didIteratorError = !1,
-            _iteratorError = void 0;
+        if (exported2.loader) {
           try {
-            for (var _iterator = tracked.dependencies[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-              var dep = _step.value,
-                absoluteDep = path.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);
+            var tracked = await trackLoaderDependencies(function () {
+              return exported2.loader(loaderProps2);
+            });
+            loaderData2 = tracked.result;
+            if (isResponse(loaderData2)) {
+              throw loaderData2;
             }
-          } catch (err) {
-            _didIteratorError = !0, _iteratorError = err;
-          } finally {
+            var routePath = (loaderProps2 === null || loaderProps2 === void 0 ? void 0 : loaderProps2.path) || "/";
+            var _iteratorNormalCompletion = true,
+              _didIteratorError = false,
+              _iteratorError = void 0;
             try {
-              !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+              for (var _iterator = tracked.dependencies[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                var dep = _step.value;
+                var absoluteDep = path.resolve(dep);
+                if (!loaderFileDependencies.has(absoluteDep)) {
+                  loaderFileDependencies.set(absoluteDep, /* @__PURE__ */new Set());
+                  server === null || server === void 0 ? void 0 : server.watcher.add(absoluteDep);
+                  if (debugLoaderDeps) {
+                    console.info(` \u24F5  [loader-dep] watching: ${absoluteDep}`);
+                  }
+                }
+                loaderFileDependencies.get(absoluteDep).add(routePath);
+              }
+            } catch (err) {
+              _didIteratorError = true;
+              _iteratorError = err;
             } finally {
-              if (_didIteratorError) throw _iteratorError;
+              try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                  _iterator.return();
+                }
+              } finally {
+                if (_didIteratorError) {
+                  throw _iteratorError;
+                }
+              }
             }
+          } catch (err) {
+            if (isResponse(err)) {
+              throw err;
+            }
+            if ((err === null || err === void 0 ? void 0 : err.code) === "ENOENT") {
+              var nfPath1 = await findNearestNotFoundPath(route2.file);
+              return `export function loader(){return{__oneError:404,__oneErrorMessage:'Not Found',__oneNotFoundPath:${JSON.stringify(nfPath1)}}}`;
+            }
+            throw err;
           }
-        } catch (err) {
-          if (isResponse(err)) throw err;
-          if (err?.code === "ENOENT") {
-            var nfPath1 = await findNearestNotFoundPath(route2.file);
-            return `export function loader(){return{__oneError:404,__oneErrorMessage:'Not Found',__oneNotFoundPath:${JSON.stringify(nfPath1)}}}`;
-          }
-          throw err;
         }
-        loaderData2 && (transformedJS = replaceLoader({
-          code: transformedJS,
-          loaderData: loaderData2
-        }));
+        if (loaderData2) {
+          transformedJS = replaceLoader({
+            code: transformedJS,
+            loaderData: loaderData2
+          });
+        }
         var platform = url2.searchParams.get("platform");
         if (platform === "ios" || platform === "android" || platform === "native") {
           var environment = server.environments[platform === "native" ? "ios" : platform || ""];
-          if (!environment) throw new Error(`[handleLoader] No Vite environment found for platform '${platform}'`);
+          if (!environment) {
+            throw new Error(`[handleLoader] No Vite environment found for platform '${platform}'`);
+          }
           var nativeTransformedJS = `exports.loader = () => (${JSON.stringify(loaderData2)});`;
           return nativeTransformedJS;
         }
@@ -379,21 +459,30 @@ ${stack}
     });
   }
   return {
-    name: "one-router-fs",
+    name: `one-router-fs`,
     enforce: "post",
     apply: "serve",
     async config() {
-      var _ref,
-        _options_optimization,
-        setting = (_ref = (_options_optimization = options.optimization) === null || _options_optimization === void 0 ? void 0 : _options_optimization.autoEntriesScanning) !== null && _ref !== void 0 ? _ref : "flat";
-      if (setting !== !1 && handleRequest.manifest.pageRoutes) {
+      var _ref;
+      var _options_optimization;
+      var setting = (_ref = (_options_optimization = options.optimization) === null || _options_optimization === void 0 ? void 0 : _options_optimization.autoEntriesScanning) !== null && _ref !== void 0 ? _ref : "flat";
+      if (setting === false) {
+        return;
+      }
+      if (handleRequest.manifest.pageRoutes) {
         var routesAndLayouts = [...new Set(handleRequest.manifest.pageRoutes.flatMap(function (route2) {
           var _route_layouts;
-          return route2.isNotFound ? [] : route2.file ? setting === "flat" && route2.file.split("/").filter(function (x) {
+          if (route2.isNotFound) return [];
+          if (!route2.file) return [];
+          if (setting === "flat" && route2.file.split("/").filter(function (x) {
             return !x.startsWith("(");
-          }).length > 3 ? [] : [path.join("./app", route2.file), ...(((_route_layouts = route2.layouts) === null || _route_layouts === void 0 ? void 0 : _route_layouts.flatMap(function (layout) {
-            return layout.contextKey ? [path.join("./app", layout.contextKey)] : [];
-          })) || [])] : [];
+          }).length > 3) {
+            return [];
+          }
+          return [path.join("./app", route2.file), ...(((_route_layouts = route2.layouts) === null || _route_layouts === void 0 ? void 0 : _route_layouts.flatMap(function (layout) {
+            if (!layout.contextKey) return [];
+            return [path.join("./app", layout.contextKey)];
+          })) || [])];
         }))];
         return {
           optimizeDeps: {
@@ -410,130 +499,187 @@ ${stack}
       }
     },
     configureServer(serverIn) {
-      server = serverIn, runner = createServerModuleRunner(USE_SERVER_ENV ? server.environments.server : server.environments.ssr);
-      var appDir = path.join(process.cwd(), getRouterRootFromOneOptions(options)),
-        fileWatcherChangeListener = debounce(async function (type, changedPath) {
-          if (type === "add" || type === "delete") {
-            var absolutePath = path.resolve(changedPath);
-            absolutePath.startsWith(appDir) && (handleRequest = createRequestHandler());
+      server = serverIn;
+      runner = createServerModuleRunner(USE_SERVER_ENV ? server.environments.server : server.environments.ssr);
+      var appDir = path.join(process.cwd(), getRouterRootFromOneOptions(options));
+      var fileWatcherChangeListener = debounce(async function (type, changedPath) {
+        if (type === "add" || type === "delete") {
+          var absolutePath = path.resolve(changedPath);
+          if (absolutePath.startsWith(appDir)) {
+            handleRequest = createRequestHandler();
           }
-        }, 100);
+        }
+      }, 100);
       server.watcher.addListener("all", fileWatcherChangeListener);
       var loaderDepChangeListener = debounce(function (changedPath) {
-        var absolutePath = path.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]
+        var absolutePath = path.resolve(changedPath);
+        var 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), function () {
+      server.watcher.on("change", loaderDepChangeListener);
+      return function () {
+        server.middlewares.use(function (req, res, next) {
+          var _req_url;
+          if (req.url === "/status" || ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.startsWith("/status?"))) {
+            res.writeHead(200, {
+              "Content-Type": "text/plain"
+            });
+            res.end("packager-status:running");
+            return;
+          }
+          next();
+        });
         server.middlewares.use(async function (req, res, next) {
           res.setHeader("Cache-Control", "no-store");
           try {
-            var _options_web,
-              redirects = (_options_web = options.web) === null || _options_web === void 0 ? void 0 : _options_web.redirects;
+            var _options_web;
+            var redirects = (_options_web = options.web) === null || _options_web === void 0 ? void 0 : _options_web.redirects;
             if (redirects) {
-              var url2 = new URL(req.url || "", `http://${req.headers.host}`),
-                _iteratorNormalCompletion = !0,
-                _didIteratorError = !1,
+              var url2 = new URL(req.url || "", `http://${req.headers.host}`);
+              var _iteratorNormalCompletion = true,
+                _didIteratorError = false,
                 _iteratorError = void 0;
               try {
-                for (var _loop = function () {
-                    var redirect = _step.value,
-                      regexStr = `^${redirect.source.replace(/:\w+/g, "([^/]+)")}$`,
-                      match = url2.pathname.match(new RegExp(regexStr));
-                    if (match) {
-                      var destination = redirect.destination,
-                        params = redirect.source.match(/:\w+/g);
-                      return params && params.forEach(function (param2, index) {
+                var _loop = function () {
+                  var redirect = _step.value;
+                  var regexStr = `^${redirect.source.replace(/:\w+/g, "([^/]+)")}$`;
+                  var match = url2.pathname.match(new RegExp(regexStr));
+                  if (match) {
+                    var destination = redirect.destination;
+                    var params = redirect.source.match(/:\w+/g);
+                    if (params) {
+                      params.forEach(function (param2, index) {
                         destination = destination.replace(param2, match[index + 1] || "");
-                      }), debugRouter && console.info(`[one] \u21AA redirect ${url2.pathname} \u2192 ${destination}`), res.writeHead(redirect.permanent ? 301 : 302, {
-                        Location: destination
-                      }), res.end(), {
-                        v: void 0
-                      };
+                      });
                     }
-                  }, _iterator = redirects[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+                    if (debugRouter) {
+                      console.info(`[one] \u21AA redirect ${url2.pathname} \u2192 ${destination}`);
+                    }
+                    res.writeHead(redirect.permanent ? 301 : 302, {
+                      Location: destination
+                    });
+                    res.end();
+                    return {
+                      v: void 0
+                    };
+                  }
+                };
+                for (var _iterator = redirects[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
                   var _ret = _loop();
                   if (_type_of(_ret) === "object") return _ret.v;
                 }
               } catch (err) {
-                _didIteratorError = !0, _iteratorError = err;
+                _didIteratorError = true;
+                _iteratorError = err;
               } finally {
                 try {
-                  !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+                  if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                  }
                 } finally {
-                  if (_didIteratorError) throw _iteratorError;
+                  if (_didIteratorError) {
+                    throw _iteratorError;
+                  }
                 }
               }
             }
             var reply = await handleRequest.handler(convertIncomingMessageToRequest(req));
-            if (!reply) return next();
-            if (typeof reply != "string" && isResponse(reply)) {
+            if (!reply) {
+              return next();
+            }
+            if (typeof reply !== "string" && isResponse(reply)) {
               if (debugRouter) {
                 var headers = {};
                 reply.headers.forEach(function (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(function (value, key) {
+              reply.headers.forEach(function (value, key) {
                 if (key === "set-cookie") {
-                  var cookies = value.split(", "),
-                    _iteratorNormalCompletion2 = !0,
-                    _didIteratorError2 = !1,
+                  var cookies = value.split(", ");
+                  var _iteratorNormalCompletion2 = true,
+                    _didIteratorError2 = false,
                     _iteratorError2 = void 0;
                   try {
-                    for (var _iterator2 = cookies[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
+                    for (var _iterator2 = cookies[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
                       var cookie = _step2.value;
                       res.appendHeader("Set-Cookie", cookie);
                     }
                   } catch (err) {
-                    _didIteratorError2 = !0, _iteratorError2 = err;
+                    _didIteratorError2 = true;
+                    _iteratorError2 = err;
                   } finally {
                     try {
-                      !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
+                      if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                        _iterator2.return();
+                      }
                     } finally {
-                      if (_didIteratorError2) throw _iteratorError2;
+                      if (_didIteratorError2) {
+                        throw _iteratorError2;
+                      }
                     }
                   }
-                } else res.setHeader(key, value);
-              }), isStatusRedirect(reply.status)) {
+                } else {
+                  res.setHeader(key, value);
+                }
+              });
+              if (isStatusRedirect(reply.status)) {
                 var 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 {
                   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 > "u" ? "undefined" : _type_of(reply)) === "object") {
-              res.setHeader("Content-Type", "application/json"), res.write(JSON.stringify(reply)), res.end();
+            if (reply && (typeof reply === "undefined" ? "undefined" : _type_of(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}`);
         });
@@ -542,14 +688,20 @@ ${stack}
   };
 }
 var convertIncomingMessageToRequest = function (req) {
-  if (!req.originalUrl) throw new Error("Can't convert: originalUrl is missing");
-  var urlBase = `http://${req.headers.host}`,
-    urlString = req.originalUrl,
-    url2 = new URL(urlString, urlBase),
-    headers = new Headers();
-  for (var key in req.headers) req.headers[key] && headers.append(key, req.headers[key]);
-  var hasBody = ["POST", "PUT", "PATCH", "DELETE"].includes(req.method || ""),
-    body = hasBody ? Readable.toWeb(req) : null;
+  if (!req.originalUrl) {
+    throw new Error(`Can't convert: originalUrl is missing`);
+  }
+  var urlBase = `http://${req.headers.host}`;
+  var urlString = req.originalUrl;
+  var url2 = new URL(urlString, urlBase);
+  var headers = new Headers();
+  for (var key in req.headers) {
+    if (req.headers[key]) {
+      headers.append(key, req.headers[key]);
+    }
+  }
+  var hasBody = ["POST", "PUT", "PATCH", "DELETE"].includes(req.method || "");
+  var body = hasBody ? Readable.toWeb(req) : null;
   return new Request(url2, {
     method: req.method,
     headers,