one 1.1.465 → 1.1.466

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/dist/cjs/cli/build.cjs +18 -14
  2. package/dist/cjs/cli/build.js +10 -4
  3. package/dist/cjs/cli/build.js.map +2 -2
  4. package/dist/cjs/cli/build.native.js +18 -4
  5. package/dist/cjs/cli/build.native.js.map +2 -2
  6. package/dist/cjs/cli/buildPage.cjs +3 -1
  7. package/dist/cjs/cli/buildPage.js +2 -1
  8. package/dist/cjs/cli/buildPage.js.map +1 -1
  9. package/dist/cjs/cli/buildPage.native.js +2 -1
  10. package/dist/cjs/cli/buildPage.native.js.map +2 -2
  11. package/dist/cjs/router/router.cjs +2 -2
  12. package/dist/cjs/router/router.js +5 -5
  13. package/dist/cjs/router/router.js.map +1 -1
  14. package/dist/cjs/router/router.native.js +5 -6
  15. package/dist/cjs/router/router.native.js.map +2 -2
  16. package/dist/cjs/server/oneServe.cjs +11 -6
  17. package/dist/cjs/server/oneServe.js +21 -15
  18. package/dist/cjs/server/oneServe.js.map +2 -2
  19. package/dist/cjs/server/oneServe.native.js +31 -24
  20. package/dist/cjs/server/oneServe.native.js.map +2 -2
  21. package/dist/esm/cli/build.js +10 -4
  22. package/dist/esm/cli/build.js.map +2 -2
  23. package/dist/esm/cli/build.mjs +18 -14
  24. package/dist/esm/cli/build.mjs.map +1 -1
  25. package/dist/esm/cli/build.native.js +24 -14
  26. package/dist/esm/cli/build.native.js.map +1 -1
  27. package/dist/esm/cli/buildPage.js +2 -1
  28. package/dist/esm/cli/buildPage.js.map +1 -1
  29. package/dist/esm/cli/buildPage.mjs +3 -1
  30. package/dist/esm/cli/buildPage.mjs.map +1 -1
  31. package/dist/esm/cli/buildPage.native.js +2 -0
  32. package/dist/esm/cli/buildPage.native.js.map +1 -1
  33. package/dist/esm/router/router.js +5 -5
  34. package/dist/esm/router/router.js.map +1 -1
  35. package/dist/esm/router/router.mjs +2 -2
  36. package/dist/esm/router/router.mjs.map +1 -1
  37. package/dist/esm/router/router.native.js +2 -2
  38. package/dist/esm/router/router.native.js.map +1 -1
  39. package/dist/esm/server/oneServe.js +22 -16
  40. package/dist/esm/server/oneServe.js.map +2 -2
  41. package/dist/esm/server/oneServe.mjs +12 -7
  42. package/dist/esm/server/oneServe.mjs.map +1 -1
  43. package/dist/esm/server/oneServe.native.js +13 -7
  44. package/dist/esm/server/oneServe.native.js.map +1 -1
  45. package/package.json +8 -8
  46. package/src/cli/build.ts +14 -0
  47. package/src/cli/buildPage.ts +2 -0
  48. package/src/router/router.ts +4 -6
  49. package/src/server/oneServe.ts +43 -25
  50. package/src/types.ts +1 -1
  51. package/src/vite/types.ts +4 -0
  52. package/types/cli/build.d.ts.map +1 -1
  53. package/types/cli/buildPage.d.ts.map +1 -1
  54. package/types/router/router.d.ts.map +1 -1
  55. package/types/server/oneServe.d.ts.map +1 -1
  56. package/types/types.d.ts +1 -1
  57. package/types/types.d.ts.map +1 -1
  58. package/types/vite/types.d.ts +3 -0
  59. package/types/vite/types.d.ts.map +1 -1
@@ -1,7 +1,7 @@
1
1
  import { default as FSExtra } from "fs-extra";
2
2
  import { extname, join } from "node:path";
3
3
  import { getServerEntry } from "vxrn/serve";
4
- import { LOADER_JS_POSTFIX_UNCACHED } from "../constants.mjs";
4
+ import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.mjs";
5
5
  import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.mjs";
6
6
  import { getPathFromLoaderPath } from "../utils/cleanUrl.mjs";
7
7
  import { toAbsolute } from "../utils/toAbsolute.mjs";
@@ -64,7 +64,7 @@ async function oneServe(oneOptions, buildInfo, app) {
64
64
  if (!buildInfo2) throw new Error(`No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`);
65
65
  try {
66
66
  const loaderData = await (await import(toAbsolute(buildInfo2.serverJsPath))).loader?.(loaderProps),
67
- preloads = buildInfo2.preloads,
67
+ preloads2 = buildInfo2.preloads,
68
68
  headers = new Headers();
69
69
  headers.set("content-type", "text/html");
70
70
  const rendered = await render({
@@ -72,7 +72,7 @@ async function oneServe(oneOptions, buildInfo, app) {
72
72
  loaderData,
73
73
  loaderProps,
74
74
  path: loaderProps?.path || "/",
75
- preloads
75
+ preloads: preloads2
76
76
  });
77
77
  return new Response(rendered, {
78
78
  headers,
@@ -145,10 +145,15 @@ url: ${url}`);
145
145
  const compiledManifest = compileManifest(buildInfo.manifest);
146
146
  for (const route of compiledManifest.apiRoutes) app.get(route.urlPath, createHonoHandler(route)), app.put(route.urlPath, createHonoHandler(route)), app.post(route.urlPath, createHonoHandler(route)), app.delete(route.urlPath, createHonoHandler(route)), app.patch(route.urlPath, createHonoHandler(route));
147
147
  for (const route of compiledManifest.pageRoutes) app.get(route.urlPath, createHonoHandler(route));
148
+ const {
149
+ preloads,
150
+ loaders
151
+ } = buildInfo;
148
152
  app.get("*", async (c, next) => {
149
- if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED) &&
150
- // if it includes /assets its a static loader
151
- !c.req.path.includes("/assets/")) {
153
+ if (c.req.path.endsWith(PRELOAD_JS_POSTFIX) && !preloads[c.req.path]) return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
154
+ if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED)) if (c.req.path.includes("/assets/")) {
155
+ if (!loaders[c.req.path]) return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
156
+ } else {
152
157
  const request = c.req.raw,
153
158
  url = getURLfromRequestURL(request),
154
159
  originalUrl = getPathFromLoaderPath(c.req.path);
@@ -157,7 +162,7 @@ url: ${url}`);
157
162
  route.file = c.req.path;
158
163
  const finalUrl = new URL(originalUrl, url.origin);
159
164
  try {
160
- return resolveLoaderRoute(requestHandlers, request, finalUrl, route);
165
+ return await resolveLoaderRoute(requestHandlers, request, finalUrl, route);
161
166
  } catch (err) {
162
167
  return console.error(`Error running loader: ${err}`), next();
163
168
  }
@@ -1 +1 @@
1
- {"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","file","handlePage","buildInfo2","type","Object","keys","loaderData","serverJsPath","loader","preloads","headers","Headers","set","rendered","mode","path","Response","status","isNotFound","err","console","error","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","raw","response","endsWith","originalUrl","finalUrl","URL","origin","location","forEach","value","key","header","info","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","pageRoutes","c","includes","compiledRegex","test"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","file","handlePage","buildInfo2","type","Object","keys","loaderData","serverJsPath","loader","preloads2","preloads","headers","Headers","set","rendered","mode","path","Response","status","isNotFound","err","console","error","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","raw","response","endsWith","originalUrl","finalUrl","URL","origin","location","forEach","value","key","header","info","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","pageRoutes","loaders","c","body","includes","compiledRegex","test"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,7 +1,7 @@
1
1
  import { default as FSExtra } from "fs-extra";
2
2
  import { extname, join } from "node:path";
3
3
  import { getServerEntry } from "vxrn/serve";
4
- import { LOADER_JS_POSTFIX_UNCACHED } from "../constants.native.js";
4
+ import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.native.js";
5
5
  import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.native.js";
6
6
  import { getPathFromLoaderPath } from "../utils/cleanUrl.native.js";
7
7
  import { toAbsolute } from "../utils/toAbsolute.native.js";
@@ -93,7 +93,7 @@ async function oneServe(oneOptions, buildInfo, app) {
93
93
  var _exported_loader,
94
94
  exported = await import(toAbsolute(_$buildInfo.serverJsPath)),
95
95
  loaderData = await ((_exported_loader = exported.loader) === null || _exported_loader === void 0 ? void 0 : _exported_loader.call(exported, loaderProps)),
96
- preloads = _$buildInfo.preloads,
96
+ preloads2 = _$buildInfo.preloads,
97
97
  headers = new Headers();
98
98
  headers.set("content-type", "text/html");
99
99
  var rendered = await render({
@@ -101,7 +101,7 @@ async function oneServe(oneOptions, buildInfo, app) {
101
101
  loaderData,
102
102
  loaderProps,
103
103
  path: loaderProps?.path || "/",
104
- preloads
104
+ preloads: preloads2
105
105
  });
106
106
  return new Response(rendered, {
107
107
  headers,
@@ -207,10 +207,15 @@ url: ${url}`);
207
207
  if (_didIteratorError2) throw _iteratorError2;
208
208
  }
209
209
  }
210
+ var {
211
+ preloads,
212
+ loaders
213
+ } = buildInfo;
210
214
  app.get("*", async function (c, next) {
211
- if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED) &&
212
- // if it includes /assets its a static loader
213
- !c.req.path.includes("/assets/")) {
215
+ if (c.req.path.endsWith(PRELOAD_JS_POSTFIX) && !preloads[c.req.path]) return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
216
+ if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED)) if (c.req.path.includes("/assets/")) {
217
+ if (!loaders[c.req.path]) return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
218
+ } else {
214
219
  var request = c.req.raw,
215
220
  url = getURLfromRequestURL(request),
216
221
  originalUrl = getPathFromLoaderPath(c.req.path),
@@ -224,7 +229,8 @@ url: ${url}`);
224
229
  route2.file = c.req.path;
225
230
  var finalUrl = new URL(originalUrl, url.origin);
226
231
  try {
227
- return resolveLoaderRoute(requestHandlers, request, finalUrl, route2);
232
+ var resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl, route2);
233
+ return resolved;
228
234
  } catch (err) {
229
235
  return console.error(`Error running loader: ${err}`), next();
230
236
  }
@@ -1 +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":[]}
1
+ {"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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "one",
3
- "version": "1.1.465",
3
+ "version": "1.1.466",
4
4
  "license": "BSD-3-Clause",
5
5
  "sideEffects": [
6
6
  "setup.mjs",
@@ -94,15 +94,15 @@
94
94
  "@react-navigation/routers": "~7",
95
95
  "@swc/core": "^1.10.4",
96
96
  "@ungap/structured-clone": "^1.2.0",
97
- "@vxrn/compiler": "1.1.465",
98
- "@vxrn/resolve": "1.1.465",
99
- "@vxrn/tslib-lite": "1.1.465",
100
- "@vxrn/universal-color-scheme": "1.1.465",
101
- "@vxrn/use-isomorphic-layout-effect": "1.1.465",
97
+ "@vxrn/compiler": "1.1.466",
98
+ "@vxrn/resolve": "1.1.466",
99
+ "@vxrn/tslib-lite": "1.1.466",
100
+ "@vxrn/universal-color-scheme": "1.1.466",
101
+ "@vxrn/use-isomorphic-layout-effect": "1.1.466",
102
102
  "babel-dead-code-elimination": "^1.0.9",
103
103
  "citty": "^0.1.6",
104
104
  "core-js": "^3.38.1",
105
- "create-vxrn": "1.1.465",
105
+ "create-vxrn": "1.1.466",
106
106
  "escape-string-regexp": "^5.0.0",
107
107
  "expo-linking": "~6.3.1",
108
108
  "expo-modules-core": "2.1.2",
@@ -128,7 +128,7 @@
128
128
  "vite": "^6.1.0",
129
129
  "vite-plugin-barrel": "^0.4.1",
130
130
  "vite-tsconfig-paths": "^5.0.1",
131
- "vxrn": "1.1.465",
131
+ "vxrn": "1.1.466",
132
132
  "ws": "^8.18.0",
133
133
  "xxhashjs": "^0.2.2"
134
134
  },
package/src/cli/build.ts CHANGED
@@ -480,6 +480,18 @@ export async function build(args: {
480
480
  return built
481
481
  }
482
482
 
483
+ const preloads = Object.fromEntries(
484
+ Object.entries(routeToBuildInfo).map(([_, val]) => {
485
+ return [val.preloadPath, true]
486
+ })
487
+ )
488
+
489
+ const loaders = Object.fromEntries(
490
+ Object.entries(routeToBuildInfo).map(([_, val]) => {
491
+ return [val.loaderPath, true]
492
+ })
493
+ )
494
+
483
495
  const buildInfoForWriting: One.BuildInfo = {
484
496
  oneOptions,
485
497
  routeToBuildInfo,
@@ -489,6 +501,8 @@ export async function build(args: {
489
501
  },
490
502
  routeMap,
491
503
  constants: JSON.parse(JSON.stringify({ ...constants })) as any,
504
+ preloads,
505
+ loaders,
492
506
  }
493
507
 
494
508
  await writeJSON(toAbsolute(`dist/buildInfo.json`), buildInfoForWriting)
@@ -28,6 +28,7 @@ export async function buildPage(
28
28
  const clientJsPath = join(`dist/client`, clientManifestEntry.file)
29
29
  const htmlOutPath = toAbsolute(join(staticDir, htmlPath))
30
30
  const preloadPath = getPreloadPath(path)
31
+ const loaderPath = getLoaderPath(path)
31
32
 
32
33
  let loaderData = {}
33
34
 
@@ -110,6 +111,7 @@ params:\n\n${JSON.stringify(params || null, null, 2)}`
110
111
  middlewares,
111
112
  cleanPath,
112
113
  preloadPath,
114
+ loaderPath,
113
115
  clientJsPath,
114
116
  serverJsPath,
115
117
  htmlPath,
@@ -407,12 +407,11 @@ export const preloadingLoader = {}
407
407
  function setupPreload(href: string) {
408
408
  if (preloadingLoader[href]) return
409
409
  preloadingLoader[href] = async () => {
410
- const [_preload, loader] = await Promise.all([
411
- dynamicImport(getPreloadPath(href)),
412
- dynamicImport(getLoaderPath(href)),
413
- ])
414
-
415
410
  try {
411
+ const [_preload, loader] = await Promise.all([
412
+ dynamicImport(getPreloadPath(href)),
413
+ dynamicImport(getLoaderPath(href)),
414
+ ])
416
415
  const response = await loader
417
416
  return await response.loader?.()
418
417
  } catch (err) {
@@ -585,7 +584,6 @@ function getNavigateAction(
585
584
 
586
585
  const didActionAndCurrentStateDiverge =
587
586
  actionStateRoute.name !== stateRoute.name ||
588
- !deepEqual(actionStateRoute.params, stateRoute.params) ||
589
587
  !childState ||
590
588
  !nextNavigationState ||
591
589
  (dynamicName && actionStateRoute.params?.[dynamicName] !== stateRoute.params?.[dynamicName])
@@ -3,7 +3,7 @@ import type { Hono, MiddlewareHandler } from 'hono'
3
3
  import type { BlankEnv } from 'hono/types'
4
4
  import { extname, join } from 'node:path'
5
5
  import { getServerEntry } from 'vxrn/serve'
6
- import { LOADER_JS_POSTFIX_UNCACHED } from '../constants'
6
+ import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from '../constants'
7
7
  import { compileManifest, getURLfromRequestURL, type RequestHandlers } from '../createHandleRequest'
8
8
  import type { RenderAppProps } from '../types'
9
9
  import { getPathFromLoaderPath } from '../utils/cleanUrl'
@@ -207,36 +207,54 @@ url: ${url}`)
207
207
  app.get(route.urlPath, createHonoHandler(route))
208
208
  }
209
209
 
210
+ const { preloads, loaders } = buildInfo
211
+
210
212
  // TODO make this inside each page, need to make loader urls just be REGULAR_URL + loaderpostfix
211
213
  app.get('*', async (c, next) => {
212
- if (
213
- c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED) &&
214
- // if it includes /assets its a static loader
215
- !c.req.path.includes('/assets/')
216
- ) {
217
- const request = c.req.raw
218
- const url = getURLfromRequestURL(request)
219
- const originalUrl = getPathFromLoaderPath(c.req.path)
220
-
221
- for (const route of compiledManifest.pageRoutes) {
222
- if (route.file === '') {
223
- // ignore not found route
224
- continue
225
- }
214
+ if (c.req.path.endsWith(PRELOAD_JS_POSTFIX)) {
215
+ // TODO handle dynamic segments (i think the below loader has some logic for this)
216
+ if (!preloads[c.req.path]) {
217
+ // no preload exists 200 gracefully
218
+ c.header('Content-Type', 'text/javascript')
219
+ c.status(200)
220
+ return c.body(``)
221
+ }
222
+ }
226
223
 
227
- if (!route.compiledRegex.test(originalUrl)) {
228
- continue
224
+ if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
225
+ if (c.req.path.includes('/assets/')) {
226
+ if (!loaders[c.req.path]) {
227
+ // no preload exists 200 gracefully
228
+ c.header('Content-Type', 'text/javascript')
229
+ c.status(200)
230
+ return c.body(``)
229
231
  }
232
+ } else {
233
+ const request = c.req.raw
234
+ const url = getURLfromRequestURL(request)
235
+ const originalUrl = getPathFromLoaderPath(c.req.path)
236
+
237
+ for (const route of compiledManifest.pageRoutes) {
238
+ if (route.file === '') {
239
+ // ignore not found route
240
+ continue
241
+ }
230
242
 
231
- // for now just change this
232
- route.file = c.req.path
243
+ if (!route.compiledRegex.test(originalUrl)) {
244
+ continue
245
+ }
233
246
 
234
- const finalUrl = new URL(originalUrl, url.origin)
235
- try {
236
- return resolveLoaderRoute(requestHandlers, request, finalUrl, route)
237
- } catch (err) {
238
- console.error(`Error running loader: ${err}`)
239
- return next()
247
+ // for now just change this
248
+ route.file = c.req.path
249
+
250
+ const finalUrl = new URL(originalUrl, url.origin)
251
+ try {
252
+ const resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl, route)
253
+ return resolved
254
+ } catch (err) {
255
+ console.error(`Error running loader: ${err}`)
256
+ return next()
257
+ }
240
258
  }
241
259
  }
242
260
  }
package/src/types.ts CHANGED
@@ -9,7 +9,7 @@ export type Endpoint = (req: Request) => Response | string | Object | null
9
9
 
10
10
  export type RenderApp = (props: RenderAppProps) => Promise<string>
11
11
 
12
- export type LoaderProps<Params extends Object = Record<string, string>> = {
12
+ export type LoaderProps<Params extends Object = Record<string, string | string[]>> = {
13
13
  path: string
14
14
  params: Params
15
15
  request?: Request
package/src/vite/types.ts CHANGED
@@ -281,6 +281,9 @@ export namespace One {
281
281
  pageRoutes: RouteInfo[]
282
282
  apiRoutes: RouteInfo[]
283
283
  }
284
+ // for quick checking if preload exists
285
+ preloads: Record<string, boolean>
286
+ loaders: Record<string, boolean>
284
287
  }
285
288
 
286
289
  export type AfterBuildProps = VXRNAfterBuildProps & BuildInfo
@@ -291,6 +294,7 @@ export namespace One {
291
294
  routeFile: string
292
295
  middlewares: string[]
293
296
  preloadPath: string
297
+ loaderPath: string
294
298
  cleanPath: string
295
299
  htmlPath: string
296
300
  clientJsPath: string
@@ -1 +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"}
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,iBAihBA"}
@@ -1 +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"}
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,CAkG7B"}
@@ -1 +1 @@
1
- {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}
@@ -1 +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"}
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,iBA0PhG"}
package/types/types.d.ts CHANGED
@@ -4,7 +4,7 @@ export type PickPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
4
4
  export type GlobbedRouteImports = Record<string, () => Promise<unknown>>;
5
5
  export type Endpoint = (req: Request) => Response | string | Object | null;
6
6
  export type RenderApp = (props: RenderAppProps) => Promise<string>;
7
- export type LoaderProps<Params extends Object = Record<string, string>> = {
7
+ export type LoaderProps<Params extends Object = Record<string, string | string[]>> = {
8
8
  path: string;
9
9
  params: Params;
10
10
  request?: Request;
@@ -1 +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"}
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,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"}
@@ -239,6 +239,8 @@ export declare namespace One {
239
239
  pageRoutes: RouteInfo[];
240
240
  apiRoutes: RouteInfo[];
241
241
  };
242
+ preloads: Record<string, boolean>;
243
+ loaders: Record<string, boolean>;
242
244
  };
243
245
  export type AfterBuildProps = VXRNAfterBuildProps & BuildInfo;
244
246
  export type RouteBuildInfo = {
@@ -247,6 +249,7 @@ export declare namespace One {
247
249
  routeFile: string;
248
250
  middlewares: string[];
249
251
  preloadPath: string;
252
+ loaderPath: string;
250
253
  cleanPath: string;
251
254
  htmlPath: string;
252
255
  clientJsPath: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/vite/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/vite/types.ts"],"names":[],"mappings":"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"}