one 1.1.464 → 1.1.466

package/dist/esm/server/oneServe.native.js

@@ -1,7 +1,7 @@
 import { default as FSExtra } from "fs-extra";
 import { extname, join } from "node:path";
 import { getServerEntry } from "vxrn/serve";
-import { LOADER_JS_POSTFIX_UNCACHED } from "../constants.native.js";
+import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.native.js";
 import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.native.js";
 import { getPathFromLoaderPath } from "../utils/cleanUrl.native.js";
 import { toAbsolute } from "../utils/toAbsolute.native.js";
@@ -93,7 +93,7 @@ async function oneServe(oneOptions, buildInfo, app) {
             var _exported_loader,
               exported = await import(toAbsolute(_$buildInfo.serverJsPath)),
               loaderData = await ((_exported_loader = exported.loader) === null || _exported_loader === void 0 ? void 0 : _exported_loader.call(exported, loaderProps)),
-              preloads = _$buildInfo.preloads,
+              preloads2 = _$buildInfo.preloads,
               headers = new Headers();
             headers.set("content-type", "text/html");
             var rendered = await render({
@@ -101,7 +101,7 @@ async function oneServe(oneOptions, buildInfo, app) {
               loaderData,
               loaderProps,
               path: loaderProps?.path || "/",
-              preloads
+              preloads: preloads2
             });
             return new Response(rendered, {
               headers,
@@ -207,10 +207,15 @@ url: ${url}`);
       if (_didIteratorError2) throw _iteratorError2;
     }
   }
+  var {
+    preloads,
+    loaders
+  } = buildInfo;
   app.get("*", async function (c, next) {
-    if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED) &&
-    // if it includes /assets its a static loader
-    !c.req.path.includes("/assets/")) {
+    if (c.req.path.endsWith(PRELOAD_JS_POSTFIX) && !preloads[c.req.path]) return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
+    if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED)) if (c.req.path.includes("/assets/")) {
+      if (!loaders[c.req.path]) return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
+    } else {
       var request = c.req.raw,
         url = getURLfromRequestURL(request),
         originalUrl = getPathFromLoaderPath(c.req.path),
@@ -224,7 +229,8 @@ url: ${url}`);
             route2.file = c.req.path;
             var finalUrl = new URL(originalUrl, url.origin);
             try {
-              return resolveLoaderRoute(requestHandlers, request, finalUrl, route2);
+              var resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl, route2);
+              return resolved;
             } catch (err) {
               return console.error(`Error running loader: ${err}`), next();
             }

package/dist/esm/server/oneServe.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","route2","apiFile","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","file","handlePage","_$buildInfo","type","Object","keys","_exported_loader","exported","serverJsPath","loaderData","loader","call","preloads","headers","Headers","set","rendered","mode","path","Response","status","isNotFound","_err_stack","console","error","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","response","endsWith","originalUrl","finalUrl","URL","origin","location","forEach","key","header","info","compiledManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","route2","apiFile","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","file","handlePage","_$buildInfo","type","Object","keys","_exported_loader","exported","serverJsPath","loaderData","loader","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","Response","status","isNotFound","_err_stack","console","error","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","response","endsWith","originalUrl","finalUrl","URL","origin","location","forEach","key","header","info","compiledManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","pageRoutes","_step2"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.464",
+  "version": "1.1.466",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -94,15 +94,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/compiler": "1.1.464",
-    "@vxrn/resolve": "1.1.464",
-    "@vxrn/tslib-lite": "1.1.464",
-    "@vxrn/universal-color-scheme": "1.1.464",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.464",
+    "@vxrn/compiler": "1.1.466",
+    "@vxrn/resolve": "1.1.466",
+    "@vxrn/tslib-lite": "1.1.466",
+    "@vxrn/universal-color-scheme": "1.1.466",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.466",
     "babel-dead-code-elimination": "^1.0.9",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.464",
+    "create-vxrn": "1.1.466",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -128,12 +128,12 @@
     "vite": "^6.1.0",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.464",
+    "vxrn": "1.1.466",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.125.22",
+    "@tamagui/build": "^1.125.23",
     "@types/node": "^22.1.0",
     "@types/react-dom": "^18.2.25",
     "@types/xxhashjs": "^0.2.4",

package/src/cli/build.ts

@@ -480,6 +480,18 @@ export async function build(args: {
     return built
   }
 
+  const preloads = Object.fromEntries(
+    Object.entries(routeToBuildInfo).map(([_, val]) => {
+      return [val.preloadPath, true]
+    })
+  )
+
+  const loaders = Object.fromEntries(
+    Object.entries(routeToBuildInfo).map(([_, val]) => {
+      return [val.loaderPath, true]
+    })
+  )
+
   const buildInfoForWriting: One.BuildInfo = {
     oneOptions,
     routeToBuildInfo,
@@ -489,6 +501,8 @@ export async function build(args: {
     },
     routeMap,
     constants: JSON.parse(JSON.stringify({ ...constants })) as any,
+    preloads,
+    loaders,
   }
 
   await writeJSON(toAbsolute(`dist/buildInfo.json`), buildInfoForWriting)

package/src/cli/buildPage.ts

@@ -28,6 +28,7 @@ export async function buildPage(
   const clientJsPath = join(`dist/client`, clientManifestEntry.file)
   const htmlOutPath = toAbsolute(join(staticDir, htmlPath))
   const preloadPath = getPreloadPath(path)
+  const loaderPath = getLoaderPath(path)
 
   let loaderData = {}
 
@@ -110,6 +111,7 @@ params:\n\n${JSON.stringify(params || null, null, 2)}`
     middlewares,
     cleanPath,
     preloadPath,
+    loaderPath,
     clientJsPath,
     serverJsPath,
     htmlPath,

package/src/router/router.ts

@@ -407,12 +407,11 @@ export const preloadingLoader = {}
 function setupPreload(href: string) {
   if (preloadingLoader[href]) return
   preloadingLoader[href] = async () => {
-    const [_preload, loader] = await Promise.all([
-      dynamicImport(getPreloadPath(href)),
-      dynamicImport(getLoaderPath(href)),
-    ])
-
     try {
+      const [_preload, loader] = await Promise.all([
+        dynamicImport(getPreloadPath(href)),
+        dynamicImport(getLoaderPath(href)),
+      ])
       const response = await loader
       return await response.loader?.()
     } catch (err) {

package/src/server/oneServe.ts

@@ -3,7 +3,7 @@ import type { Hono, MiddlewareHandler } from 'hono'
 import type { BlankEnv } from 'hono/types'
 import { extname, join } from 'node:path'
 import { getServerEntry } from 'vxrn/serve'
-import { LOADER_JS_POSTFIX_UNCACHED } from '../constants'
+import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from '../constants'
 import { compileManifest, getURLfromRequestURL, type RequestHandlers } from '../createHandleRequest'
 import type { RenderAppProps } from '../types'
 import { getPathFromLoaderPath } from '../utils/cleanUrl'
@@ -207,36 +207,54 @@ url: ${url}`)
     app.get(route.urlPath, createHonoHandler(route))
   }
 
+  const { preloads, loaders } = buildInfo
+
   // TODO make this inside each page, need to make loader urls just be REGULAR_URL + loaderpostfix
   app.get('*', async (c, next) => {
-    if (
-      c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED) &&
-      // if it includes /assets its a static loader
-      !c.req.path.includes('/assets/')
-    ) {
-      const request = c.req.raw
-      const url = getURLfromRequestURL(request)
-      const originalUrl = getPathFromLoaderPath(c.req.path)
-
-      for (const route of compiledManifest.pageRoutes) {
-        if (route.file === '') {
-          // ignore not found route
-          continue
-        }
+    if (c.req.path.endsWith(PRELOAD_JS_POSTFIX)) {
+      // TODO handle dynamic segments (i think the below loader has some logic for this)
+      if (!preloads[c.req.path]) {
+        // no preload exists 200 gracefully
+        c.header('Content-Type', 'text/javascript')
+        c.status(200)
+        return c.body(``)
+      }
+    }
 
-        if (!route.compiledRegex.test(originalUrl)) {
-          continue
+    if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
+      if (c.req.path.includes('/assets/')) {
+        if (!loaders[c.req.path]) {
+          // no preload exists 200 gracefully
+          c.header('Content-Type', 'text/javascript')
+          c.status(200)
+          return c.body(``)
         }
+      } else {
+        const request = c.req.raw
+        const url = getURLfromRequestURL(request)
+        const originalUrl = getPathFromLoaderPath(c.req.path)
+
+        for (const route of compiledManifest.pageRoutes) {
+          if (route.file === '') {
+            // ignore not found route
+            continue
+          }
 
-        // for now just change this
-        route.file = c.req.path
+          if (!route.compiledRegex.test(originalUrl)) {
+            continue
+          }
 
-        const finalUrl = new URL(originalUrl, url.origin)
-        try {
-          return resolveLoaderRoute(requestHandlers, request, finalUrl, route)
-        } catch (err) {
-          console.error(`Error running loader: ${err}`)
-          return next()
+          // for now just change this
+          route.file = c.req.path
+
+          const finalUrl = new URL(originalUrl, url.origin)
+          try {
+            const resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl, route)
+            return resolved
+          } catch (err) {
+            console.error(`Error running loader: ${err}`)
+            return next()
+          }
         }
       }
     }

package/src/types.ts

@@ -9,7 +9,7 @@ export type Endpoint = (req: Request) => Response | string | Object | null
 
 export type RenderApp = (props: RenderAppProps) => Promise<string>
 
-export type LoaderProps<Params extends Object = Record<string, string>> = {
+export type LoaderProps<Params extends Object = Record<string, string | string[]>> = {
   path: string
   params: Params
   request?: Request

package/src/vite/types.ts

@@ -281,6 +281,9 @@ export namespace One {
       pageRoutes: RouteInfo[]
       apiRoutes: RouteInfo[]
     }
+    // for quick checking if preload exists
+    preloads: Record<string, boolean>
+    loaders: Record<string, boolean>
   }
 
   export type AfterBuildProps = VXRNAfterBuildProps & BuildInfo
@@ -291,6 +294,7 @@ export namespace One {
     routeFile: string
     middlewares: string[]
     preloadPath: string
+    loaderPath: string
     cleanPath: string
     htmlPath: string
     clientJsPath: string

package/types/cli/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAkCA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;CACrC,iBAmgBA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAkCA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;CACrC,iBAihBA"}

package/types/cli/buildPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPage.d.ts","sourceRoot":"","sources":["../../src/cli/buildPage.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAInD,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,GAAG,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAgG7B"}
+{"version":3,"file":"buildPage.d.ts","sourceRoot":"","sources":["../../src/cli/buildPage.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAInD,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,GAAG,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAkG7B"}

package/types/router/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}

package/types/server/oneServe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AASnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBAwOhG"}
+{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AASnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBA0PhG"}

package/types/types.d.ts

@@ -4,7 +4,7 @@ export type PickPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 export type GlobbedRouteImports = Record<string, () => Promise<unknown>>;
 export type Endpoint = (req: Request) => Response | string | Object | null;
 export type RenderApp = (props: RenderAppProps) => Promise<string>;
-export type LoaderProps<Params extends Object = Record<string, string>> = {
+export type LoaderProps<Params extends Object = Record<string, string | string[]>> = {
     path: string;
     params: Params;
     request?: Request;

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,yFAAyF;AACzF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAEhF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAExE,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE1E,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAElE,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,GAAG,CAAC,eAAe,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,GAAG,CAAA;IACtB,UAAU,CAAC,EAAE,GAAG,CAAA;IAChB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,yFAAyF;AACzF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAEhF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAExE,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE1E,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAElE,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI;IACnF,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,GAAG,CAAC,eAAe,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,GAAG,CAAA;IACtB,UAAU,CAAC,EAAE,GAAG,CAAA;IAChB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA"}

package/types/vite/types.d.ts

@@ -239,6 +239,8 @@ export declare namespace One {
             pageRoutes: RouteInfo[];
             apiRoutes: RouteInfo[];
         };
+        preloads: Record<string, boolean>;
+        loaders: Record<string, boolean>;
     };
     export type AfterBuildProps = VXRNAfterBuildProps & BuildInfo;
     export type RouteBuildInfo = {
@@ -247,6 +249,7 @@ export declare namespace One {
         routeFile: string;
         middlewares: string[];
         preloadPath: string;
+        loaderPath: string;
         cleanPath: string;
         htmlPath: string;
         clientJsPath: string;

package/types/vite/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/vite/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/vite/types.ts"],"names":[],"mappings":"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"}