one 1.1.465 → 1.1.467
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.
- package/dist/cjs/cli/build.cjs +10 -7
- package/dist/cjs/cli/build.js +7 -8
- package/dist/cjs/cli/build.js.map +2 -2
- package/dist/cjs/cli/build.native.js +21 -35
- package/dist/cjs/cli/build.native.js.map +2 -2
- package/dist/cjs/cli/buildPage.cjs +4 -2
- package/dist/cjs/cli/buildPage.js +3 -2
- package/dist/cjs/cli/buildPage.js.map +1 -1
- package/dist/cjs/cli/buildPage.native.js +3 -2
- package/dist/cjs/cli/buildPage.native.js.map +2 -2
- package/dist/cjs/router/router.cjs +2 -2
- package/dist/cjs/router/router.js +5 -5
- package/dist/cjs/router/router.js.map +1 -1
- package/dist/cjs/router/router.native.js +5 -6
- package/dist/cjs/router/router.native.js.map +2 -2
- package/dist/cjs/server/oneServe.cjs +11 -6
- package/dist/cjs/server/oneServe.js +21 -15
- package/dist/cjs/server/oneServe.js.map +2 -2
- package/dist/cjs/server/oneServe.native.js +31 -24
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/esm/cli/build.js +7 -8
- package/dist/esm/cli/build.js.map +2 -2
- package/dist/esm/cli/build.mjs +10 -7
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +25 -38
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/cli/buildPage.js +3 -2
- package/dist/esm/cli/buildPage.js.map +1 -1
- package/dist/esm/cli/buildPage.mjs +4 -2
- package/dist/esm/cli/buildPage.mjs.map +1 -1
- package/dist/esm/cli/buildPage.native.js +3 -1
- package/dist/esm/cli/buildPage.native.js.map +1 -1
- package/dist/esm/router/router.js +5 -5
- package/dist/esm/router/router.js.map +1 -1
- package/dist/esm/router/router.mjs +2 -2
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +2 -2
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +22 -16
- package/dist/esm/server/oneServe.js.map +2 -2
- package/dist/esm/server/oneServe.mjs +12 -7
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +13 -7
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/package.json +8 -8
- package/src/cli/build.ts +8 -4
- package/src/cli/buildPage.ts +4 -0
- package/src/router/router.ts +4 -6
- package/src/server/oneServe.ts +43 -25
- package/src/types.ts +1 -1
- package/src/vite/types.ts +4 -0
- package/types/cli/build.d.ts.map +1 -1
- package/types/cli/buildPage.d.ts.map +1 -1
- package/types/router/router.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/types.d.ts +1 -1
- package/types/types.d.ts.map +1 -1
- package/types/vite/types.d.ts +3 -0
- package/types/vite/types.d.ts.map +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["StackActions","Linking","nanoid","Fragment","startTransition","useSyncExternalStore","Platform","getPathDataFromState","stripBaseUrl","resolveHref","resolve","assertIsReady","getLoaderPath","getPreloadPath","dynamicImport","shouldLinkExternally","getLinkingConfig","getNormalizedStatePath","getRoutes","setLastAction","matchDynamicName","sortRoutes","getQualifiedRouteComponent","routeNode","rootComponent","linking","hasAttemptedToHideSplash","initialState","rootState","nextState","routeInfo","splashScreenAnimationFrame","navigationRef","navigationRefSubscription","rootStateSubscribers","Set","loadingStateSubscribers","storeSubscribers","initialize","context","ref","initialLocation","cleanUpState","ignoreEntryPoints","platform","OS","process","env","NODE_ENV","Error","setupLinking","subscribeToNavigationChanges","clear","_linking_getStateFromPath","getInitialURL","toString","getStateFromPath","call","pathname","search","config","getRouteInfo","unstable_globalHref","isIndex","params","segments","addListener","data","state","key","hashes","hash","requestAnimationFrame","nextOptions","linkOptions","shouldUpdateSubscribers","updateState","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","subscriber","value","err","return","updateSnapshot","navigate","url","options","linkTo","push","dismiss","count","dispatch","pop","replace","setParams","arguments","length","_navigationRef_current","current","dismissAll","popToTop","goBack","canGoBack","isReady","_navigationRef_current_canGoBack","canDismiss","_state_routes_state_index","_state_routes","type","routes","index","getSortedRoutes","children","filter","route","internal","sort","nextStateParam","nextRouteInfo","deepEqual","getRouteInfoFromState","state2","asPath","screens","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","split","isIndexPath","subscribeToRootState","add","delete","subscribeToStore","subscribeToLoadingState","setLoadingState","listener","currentSnapshot","getSnapshot","snapshot","rootStateSnapshot","routeInfoSnapshot","useOneRouter","syncStoreRootState","currentState","getRootState","useStoreRootState","useStoreRouteInfo","_state_index","getActualLastRoute","name","screen","match","routeLike","_routeLike_state","cleanup","cancelAnimationFrame","preloadingLoader","setupPreload","href","_preload","loader","Promise","all","_response_loader","response","console","error","preloadRoute","event","openURL","startsWith","_routeInfo_segments","_routeInfo_segments_map_filter_join","base","map","segment","_routeInfo_params","_routeInfo_params1","_params_split","slice","Array","isArray","join","_params_split_join","Boolean","rootState2","indexOf","action","getNavigateAction","current2","getCurrentRoute","warningTm","interval","setInterval"],"sources":["../../../src/router/router.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
1
|
+
{"version":3,"names":["StackActions","Linking","nanoid","Fragment","startTransition","useSyncExternalStore","Platform","getPathDataFromState","stripBaseUrl","resolveHref","resolve","assertIsReady","getLoaderPath","getPreloadPath","dynamicImport","shouldLinkExternally","getLinkingConfig","getNormalizedStatePath","getRoutes","setLastAction","matchDynamicName","sortRoutes","getQualifiedRouteComponent","routeNode","rootComponent","linking","hasAttemptedToHideSplash","initialState","rootState","nextState","routeInfo","splashScreenAnimationFrame","navigationRef","navigationRefSubscription","rootStateSubscribers","Set","loadingStateSubscribers","storeSubscribers","initialize","context","ref","initialLocation","cleanUpState","ignoreEntryPoints","platform","OS","process","env","NODE_ENV","Error","setupLinking","subscribeToNavigationChanges","clear","_linking_getStateFromPath","getInitialURL","toString","getStateFromPath","call","pathname","search","config","getRouteInfo","unstable_globalHref","isIndex","params","segments","addListener","data","state","key","hashes","hash","requestAnimationFrame","nextOptions","linkOptions","shouldUpdateSubscribers","updateState","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","subscriber","value","err","return","updateSnapshot","navigate","url","options","linkTo","push","dismiss","count","dispatch","pop","replace","setParams","arguments","length","_navigationRef_current","current","dismissAll","popToTop","goBack","canGoBack","isReady","_navigationRef_current_canGoBack","canDismiss","_state_routes_state_index","_state_routes","type","routes","index","getSortedRoutes","children","filter","route","internal","sort","nextStateParam","nextRouteInfo","deepEqual","getRouteInfoFromState","state2","asPath","screens","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","split","isIndexPath","subscribeToRootState","add","delete","subscribeToStore","subscribeToLoadingState","setLoadingState","listener","currentSnapshot","getSnapshot","snapshot","rootStateSnapshot","routeInfoSnapshot","useOneRouter","syncStoreRootState","currentState","getRootState","useStoreRootState","useStoreRouteInfo","_state_index","getActualLastRoute","name","screen","match","routeLike","_routeLike_state","cleanup","cancelAnimationFrame","preloadingLoader","setupPreload","href","_response_loader","_preload","loader","Promise","all","response","console","error","preloadRoute","event","openURL","startsWith","_routeInfo_segments","_routeInfo_segments_map_filter_join","base","map","segment","_routeInfo_params","_routeInfo_params1","_params_split","slice","Array","isArray","join","_params_split_join","Boolean","rootState2","indexOf","action","getNavigateAction","current2","getCurrentRoute","warningTm","interval","setInterval","setTimeout"],"sources":["../../../src/router/router.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";
|
4
|
+
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants";
|
5
5
|
import { compileManifest, getURLfromRequestURL } from "../createHandleRequest";
|
6
6
|
import { getPathFromLoaderPath } from "../utils/cleanUrl";
|
7
7
|
import { toAbsolute } from "../utils/toAbsolute";
|
@@ -44,14 +44,14 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
44
44
|
`No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`
|
45
45
|
);
|
46
46
|
try {
|
47
|
-
const loaderData = await (await import(toAbsolute(buildInfo2.serverJsPath))).loader?.(loaderProps),
|
47
|
+
const loaderData = await (await import(toAbsolute(buildInfo2.serverJsPath))).loader?.(loaderProps), preloads2 = buildInfo2.preloads, headers = new Headers();
|
48
48
|
headers.set("content-type", "text/html");
|
49
49
|
const rendered = await render({
|
50
50
|
mode: route.type,
|
51
51
|
loaderData,
|
52
52
|
loaderProps,
|
53
53
|
path: loaderProps?.path || "/",
|
54
|
-
preloads
|
54
|
+
preloads: preloads2
|
55
55
|
});
|
56
56
|
return new Response(rendered, {
|
57
57
|
headers,
|
@@ -124,22 +124,28 @@ url: ${url}`);
|
|
124
124
|
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));
|
125
125
|
for (const route of compiledManifest.pageRoutes)
|
126
126
|
app.get(route.urlPath, createHonoHandler(route));
|
127
|
+
const { preloads, loaders } = buildInfo;
|
127
128
|
app.get("*", async (c, next) => {
|
128
|
-
if (c.req.path.endsWith(
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
if (
|
133
|
-
|
134
|
-
|
135
|
-
const
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
129
|
+
if (c.req.path.endsWith(PRELOAD_JS_POSTFIX) && !preloads[c.req.path])
|
130
|
+
return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
|
131
|
+
if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED))
|
132
|
+
if (c.req.path.includes("/assets/")) {
|
133
|
+
if (!loaders[c.req.path])
|
134
|
+
return c.header("Content-Type", "text/javascript"), c.status(200), c.body("");
|
135
|
+
} else {
|
136
|
+
const request = c.req.raw, url = getURLfromRequestURL(request), originalUrl = getPathFromLoaderPath(c.req.path);
|
137
|
+
for (const route of compiledManifest.pageRoutes) {
|
138
|
+
if (route.file === "" || !route.compiledRegex.test(originalUrl))
|
139
|
+
continue;
|
140
|
+
route.file = c.req.path;
|
141
|
+
const finalUrl = new URL(originalUrl, url.origin);
|
142
|
+
try {
|
143
|
+
return await resolveLoaderRoute(requestHandlers, request, finalUrl, route);
|
144
|
+
} catch (err) {
|
145
|
+
return console.error(`Error running loader: ${err}`), next();
|
146
|
+
}
|
140
147
|
}
|
141
148
|
}
|
142
|
-
}
|
143
149
|
return next();
|
144
150
|
});
|
145
151
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
4
|
-
"mappings": "AAAA,SAAS,WAAW,eAAe;AAGnC,SAAS,SAAS,YAAY;AAC9B,SAAS,sBAAsB;AAC/B,SAAS,
|
5
|
-
"names": ["buildInfo"]
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["buildInfo", "preloads"]
|
6
6
|
}
|
@@ -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
|
-
|
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(
|
150
|
-
|
151
|
-
|
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":"AAAA,SAASA,OAAA,IAAWC,OAAA,QAAe;AAGnC,SAASC,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,cAAA,QAAsB;AAC/B,SAASC,0BAAA,
|
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
|
-
|
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(
|
212
|
-
|
213
|
-
|
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
|
-
|
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":"AAAA,SAASA,OAAA,IAAWC,OAAA,QAAe;AAGnC,SAASC,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,cAAA,QAAsB;AAC/B,SAASC,0BAAA,
|
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.
|
3
|
+
"version": "1.1.467",
|
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.
|
98
|
-
"@vxrn/resolve": "1.1.
|
99
|
-
"@vxrn/tslib-lite": "1.1.
|
100
|
-
"@vxrn/universal-color-scheme": "1.1.
|
101
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
97
|
+
"@vxrn/compiler": "1.1.467",
|
98
|
+
"@vxrn/resolve": "1.1.467",
|
99
|
+
"@vxrn/tslib-lite": "1.1.467",
|
100
|
+
"@vxrn/universal-color-scheme": "1.1.467",
|
101
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.467",
|
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.
|
105
|
+
"create-vxrn": "1.1.467",
|
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.
|
131
|
+
"vxrn": "1.1.467",
|
132
132
|
"ws": "^8.18.0",
|
133
133
|
"xxhashjs": "^0.2.2"
|
134
134
|
},
|
package/src/cli/build.ts
CHANGED
@@ -453,15 +453,17 @@ export async function build(args: {
|
|
453
453
|
|
454
454
|
// write out the static paths (pathname => html) for the server
|
455
455
|
const routeMap: Record<string, string> = {}
|
456
|
+
const routeToBuildInfo: Record<string, One.RouteBuildInfo> = {}
|
457
|
+
const preloads: Record<string, boolean> = {}
|
458
|
+
const loaders: Record<string, boolean> = {}
|
459
|
+
|
456
460
|
for (const route of builtRoutes) {
|
457
461
|
if (!route.cleanPath.includes('*')) {
|
458
462
|
routeMap[route.cleanPath] = route.htmlPath
|
459
463
|
}
|
460
|
-
}
|
461
|
-
|
462
|
-
const routeToBuildInfo: Record<string, One.RouteBuildInfo> = {}
|
463
|
-
for (const route of builtRoutes) {
|
464
464
|
routeToBuildInfo[route.routeFile] = route
|
465
|
+
preloads[route.preloadPath] = true
|
466
|
+
loaders[route.loaderPath] = true
|
465
467
|
}
|
466
468
|
|
467
469
|
function createBuildManifestRoute(route: RouteInfo) {
|
@@ -489,6 +491,8 @@ export async function build(args: {
|
|
489
491
|
},
|
490
492
|
routeMap,
|
491
493
|
constants: JSON.parse(JSON.stringify({ ...constants })) as any,
|
494
|
+
preloads,
|
495
|
+
loaders,
|
492
496
|
}
|
493
497
|
|
494
498
|
await writeJSON(toAbsolute(`dist/buildInfo.json`), buildInfoForWriting)
|
package/src/cli/buildPage.ts
CHANGED
@@ -29,6 +29,8 @@ export async function buildPage(
|
|
29
29
|
const htmlOutPath = toAbsolute(join(staticDir, htmlPath))
|
30
30
|
const preloadPath = getPreloadPath(path)
|
31
31
|
|
32
|
+
let loaderPath = ''
|
33
|
+
|
32
34
|
let loaderData = {}
|
33
35
|
|
34
36
|
try {
|
@@ -54,6 +56,7 @@ if (typeof document === 'undefined') globalThis.document = {}
|
|
54
56
|
})
|
55
57
|
const loaderPartialPath = join(clientDir, getLoaderPath(path))
|
56
58
|
await outputFile(loaderPartialPath, withLoader)
|
59
|
+
loaderPath = getLoaderPath(path)
|
57
60
|
}
|
58
61
|
|
59
62
|
// ssr, we basically skip at build-time and just compile it the js we need
|
@@ -110,6 +113,7 @@ params:\n\n${JSON.stringify(params || null, null, 2)}`
|
|
110
113
|
middlewares,
|
111
114
|
cleanPath,
|
112
115
|
preloadPath,
|
116
|
+
loaderPath,
|
113
117
|
clientJsPath,
|
114
118
|
serverJsPath,
|
115
119
|
htmlPath,
|
package/src/router/router.ts
CHANGED
@@ -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])
|
package/src/server/oneServe.ts
CHANGED
@@ -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
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
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
|
-
|
228
|
-
|
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
|
-
|
232
|
-
|
243
|
+
if (!route.compiledRegex.test(originalUrl)) {
|
244
|
+
continue
|
245
|
+
}
|
233
246
|
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
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
|