one 1.1.392 → 1.1.393
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/Root.cjs +25 -18
- package/dist/cjs/Root.js +7 -9
- package/dist/cjs/Root.js.map +1 -1
- package/dist/cjs/Root.native.js +44 -39
- package/dist/cjs/Root.native.js.map +2 -2
- package/dist/cjs/cli/build.cjs +19 -15
- package/dist/cjs/cli/build.js +14 -9
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +19 -14
- package/dist/cjs/cli/build.native.js.map +2 -2
- package/dist/cjs/createApp.cjs +21 -6
- package/dist/cjs/createApp.js +23 -6
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/fork/_shared.cjs +42 -0
- package/dist/cjs/fork/_shared.js +37 -0
- package/dist/cjs/fork/_shared.js.map +6 -0
- package/dist/cjs/fork/_shared.native.js +49 -0
- package/dist/cjs/fork/_shared.native.js.map +6 -0
- package/dist/cjs/fork/getPathFromState-mods.cjs +8 -10
- package/dist/cjs/fork/getPathFromState-mods.js +7 -6
- package/dist/cjs/fork/getPathFromState-mods.js.map +1 -1
- package/dist/cjs/fork/getPathFromState-mods.native.js +10 -14
- package/dist/cjs/fork/getPathFromState-mods.native.js.map +2 -2
- package/dist/cjs/fork/getPathFromState.cjs +19 -8
- package/dist/cjs/fork/getPathFromState.js +14 -6
- package/dist/cjs/fork/getPathFromState.js.map +1 -1
- package/dist/cjs/fork/getPathFromState.native.js +14 -8
- package/dist/cjs/fork/getPathFromState.native.js.map +2 -2
- package/dist/cjs/fork/getStateFromPath-mods.cjs +0 -8
- package/dist/cjs/fork/getStateFromPath-mods.js +0 -8
- package/dist/cjs/fork/getStateFromPath-mods.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath-mods.native.js +0 -11
- package/dist/cjs/fork/getStateFromPath-mods.native.js.map +2 -2
- package/dist/cjs/fork/getStateFromPath.cjs +6 -5
- package/dist/cjs/fork/getStateFromPath.js +5 -5
- package/dist/cjs/fork/getStateFromPath.js.map +1 -1
- package/dist/cjs/fork/getStateFromPath.native.js +5 -5
- package/dist/cjs/fork/getStateFromPath.native.js.map +2 -2
- package/dist/cjs/index.cjs +2 -0
- package/dist/cjs/index.js +2 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/index.native.js +3 -1
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +31 -3
- package/dist/cjs/server/oneServe.js +24 -3
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +37 -3
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/cjs/useServerHeadInsertion.cjs +40 -0
- package/dist/cjs/useServerHeadInsertion.js +32 -0
- package/dist/cjs/useServerHeadInsertion.js.map +6 -0
- package/dist/cjs/useServerHeadInsertion.native.js +38 -0
- package/dist/cjs/useServerHeadInsertion.native.js.map +6 -0
- package/dist/esm/Root.js +8 -9
- package/dist/esm/Root.js.map +1 -1
- package/dist/esm/Root.mjs +26 -19
- package/dist/esm/Root.mjs.map +1 -1
- package/dist/esm/Root.native.js +45 -39
- package/dist/esm/Root.native.js.map +2 -2
- package/dist/esm/cli/build.js +14 -9
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +19 -15
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +19 -14
- package/dist/esm/cli/build.native.js.map +2 -2
- package/dist/esm/createApp.js +25 -6
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +22 -7
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/fork/_shared.js +21 -0
- package/dist/esm/fork/_shared.js.map +6 -0
- package/dist/esm/fork/_shared.mjs +16 -0
- package/dist/esm/fork/_shared.mjs.map +1 -0
- package/dist/esm/fork/_shared.native.js +25 -0
- package/dist/esm/fork/_shared.native.js.map +6 -0
- package/dist/esm/fork/getPathFromState-mods.js +6 -4
- package/dist/esm/fork/getPathFromState-mods.js.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.mjs +7 -8
- package/dist/esm/fork/getPathFromState-mods.mjs.map +1 -1
- package/dist/esm/fork/getPathFromState-mods.native.js +9 -11
- package/dist/esm/fork/getPathFromState-mods.native.js.map +2 -2
- package/dist/esm/fork/getPathFromState.js +4 -3
- package/dist/esm/fork/getPathFromState.js.map +1 -1
- package/dist/esm/fork/getPathFromState.mjs +4 -4
- package/dist/esm/fork/getPathFromState.mjs.map +1 -1
- package/dist/esm/fork/getPathFromState.native.js +4 -5
- package/dist/esm/fork/getPathFromState.native.js.map +2 -2
- package/dist/esm/fork/getStateFromPath-mods.js +0 -8
- package/dist/esm/fork/getStateFromPath-mods.js.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.mjs +1 -8
- package/dist/esm/fork/getStateFromPath-mods.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath-mods.native.js +0 -10
- package/dist/esm/fork/getStateFromPath-mods.native.js.map +2 -2
- package/dist/esm/fork/getStateFromPath.js +4 -4
- package/dist/esm/fork/getStateFromPath.js.map +1 -1
- package/dist/esm/fork/getStateFromPath.mjs +5 -4
- package/dist/esm/fork/getStateFromPath.mjs.map +1 -1
- package/dist/esm/fork/getStateFromPath.native.js +5 -4
- package/dist/esm/fork/getStateFromPath.native.js.map +2 -2
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +2 -1
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +2 -0
- package/dist/esm/index.native.js.map +2 -2
- package/dist/esm/server/oneServe.js +24 -3
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +31 -3
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +37 -3
- package/dist/esm/server/oneServe.native.js.map +2 -2
- package/dist/esm/useServerHeadInsertion.js +16 -0
- package/dist/esm/useServerHeadInsertion.js.map +6 -0
- package/dist/esm/useServerHeadInsertion.mjs +15 -0
- package/dist/esm/useServerHeadInsertion.mjs.map +1 -0
- package/dist/esm/useServerHeadInsertion.native.js +16 -0
- package/dist/esm/useServerHeadInsertion.native.js.map +6 -0
- package/package.json +8 -8
- package/src/Root.tsx +44 -40
- package/src/cli/build.ts +15 -11
- package/src/createApp.tsx +35 -4
- package/src/fork/_shared.ts +22 -0
- package/src/fork/getPathFromState-mods.ts +22 -7
- package/src/fork/getPathFromState.ts +3 -2
- package/src/fork/getStateFromPath-mods.ts +0 -9
- package/src/fork/getStateFromPath.ts +8 -5
- package/src/index.ts +1 -0
- package/src/server/oneServe.ts +47 -4
- package/src/useServerHeadInsertion.tsx +25 -0
- package/types/Root.d.ts +1 -0
- package/types/Root.d.ts.map +1 -1
- package/types/cli/build.d.ts.map +1 -1
- package/types/createApp.d.ts.map +1 -1
- package/types/fork/_shared.d.ts +8 -0
- package/types/fork/_shared.d.ts.map +1 -0
- package/types/fork/getPathFromState-mods.d.ts +0 -1
- package/types/fork/getPathFromState-mods.d.ts.map +1 -1
- package/types/fork/getPathFromState.d.ts.map +1 -1
- package/types/fork/getStateFromPath-mods.d.ts +0 -1
- package/types/fork/getStateFromPath-mods.d.ts.map +1 -1
- package/types/fork/getStateFromPath.d.ts.map +1 -1
- package/types/index.d.ts +1 -0
- package/types/index.d.ts.map +1 -1
- package/types/serve.d.ts +6 -6
- package/types/serve.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/useServerHeadInsertion.d.ts +5 -0
- package/types/useServerHeadInsertion.d.ts.map +1 -0
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["extname","join","getServerEntry","getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","compileManifest","getURLfromRequestURL","toAbsolute","default","FSExtra","oneServe","oneOptions","buildInfo","app","serveStatic","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","
|
1
|
+
{"version":3,"names":["extname","join","getServerEntry","getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","compileManifest","getURLfromRequestURL","toAbsolute","default","FSExtra","oneServe","oneOptions","buildInfo","app","serveStatic","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","honoPath","put","post","delete","patch","pageRoutes","c","includes","compiledRegex","test"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
@@ -44,6 +44,10 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
44
44
|
async loadMiddleware(route2) {
|
45
45
|
return await import(toAbsolute(route2.contextKey));
|
46
46
|
},
|
47
|
+
async handleLoader(param) {
|
48
|
+
var { request, route: route2, url, loaderProps } = param;
|
49
|
+
return await import(toAbsolute(join("./", "dist/client", route2.file)));
|
50
|
+
},
|
47
51
|
async handlePage(param) {
|
48
52
|
var { route: route2, url, loaderProps } = param, _$buildInfo = routeToBuildInfo[route2.file];
|
49
53
|
if (route2.type === "ssr") {
|
@@ -86,7 +90,7 @@ url: ${url}`);
|
|
86
90
|
function createHonoHandler(route2) {
|
87
91
|
return async function(context, next) {
|
88
92
|
if (extname(context.req.path))
|
89
|
-
return
|
93
|
+
return next();
|
90
94
|
try {
|
91
95
|
var request = context.req.raw, url = getURLfromRequestURL(request), response = await function() {
|
92
96
|
if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
|
@@ -118,12 +122,12 @@ url: ${url}`);
|
|
118
122
|
}
|
119
123
|
return response;
|
120
124
|
}
|
121
|
-
return
|
125
|
+
return next();
|
122
126
|
}
|
123
127
|
} catch (err) {
|
124
128
|
console.error(` [one] Error handling request: ${err.stack}`);
|
125
129
|
}
|
126
|
-
return
|
130
|
+
return next();
|
127
131
|
};
|
128
132
|
}
|
129
133
|
var compiledManifest = compileManifest(buildInfo.manifest), _iteratorNormalCompletion1 = !0, _didIteratorError1 = !1, _iteratorError1 = void 0;
|
@@ -158,6 +162,36 @@ url: ${url}`);
|
|
158
162
|
throw _iteratorError2;
|
159
163
|
}
|
160
164
|
}
|
165
|
+
app.get("*", async function(c, next) {
|
166
|
+
if (c.req.path.endsWith(LOADER_JS_POSTFIX_UNCACHED) && // if it includes /assets its a static loader
|
167
|
+
!c.req.path.includes("/assets/")) {
|
168
|
+
var request = c.req.raw, url = getURLfromRequestURL(request), originalUrl = getPathFromLoaderPath(c.req.path), _iteratorNormalCompletion3 = !0, _didIteratorError3 = !1, _iteratorError3 = void 0;
|
169
|
+
try {
|
170
|
+
for (var _iterator3 = compiledManifest.pageRoutes[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
|
171
|
+
var route2 = _step3.value;
|
172
|
+
if (route2.file !== "" && route2.compiledRegex.test(originalUrl)) {
|
173
|
+
route2.file = c.req.path;
|
174
|
+
var finalUrl = new URL(originalUrl, url.origin);
|
175
|
+
try {
|
176
|
+
return resolveLoaderRoute(requestHandlers, request, finalUrl, route2);
|
177
|
+
} catch (err) {
|
178
|
+
return console.error(`Error running loader: ${err}`), next();
|
179
|
+
}
|
180
|
+
}
|
181
|
+
}
|
182
|
+
} catch (err) {
|
183
|
+
_didIteratorError3 = !0, _iteratorError3 = err;
|
184
|
+
} finally {
|
185
|
+
try {
|
186
|
+
!_iteratorNormalCompletion3 && _iterator3.return != null && _iterator3.return();
|
187
|
+
} finally {
|
188
|
+
if (_didIteratorError3)
|
189
|
+
throw _iteratorError3;
|
190
|
+
}
|
191
|
+
}
|
192
|
+
}
|
193
|
+
return next();
|
194
|
+
});
|
161
195
|
}
|
162
196
|
export {
|
163
197
|
oneServe
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/server/Users/n8/one/packages/one/src/server/oneServe.ts"],
|
4
|
-
"mappings": "AAEA,SAASA,SAASC,YAAY;AAC9B,SAASC,sBAAsB;AAC/B,SAASC,6BAA6B;AACtC,
|
5
|
-
"names": ["extname", "join", "getServerEntry", "getPathFromLoaderPath", "LOADER_JS_POSTFIX_UNCACHED", "compileManifest", "getURLfromRequestURL", "toAbsolute", "default", "FSExtra", "oneServe", "oneOptions", "buildInfo", "app", "serveStatic", "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", "entryServer", "entry", "render", "apiCJS", "build", "api", "outputFormat", "requestHandlers", "handleAPI", "route", "apiFile", "process", "cwd", "page", "loadMiddleware", "contextKey", "
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["extname", "join", "getServerEntry", "getPathFromLoaderPath", "LOADER_JS_POSTFIX_UNCACHED", "compileManifest", "getURLfromRequestURL", "toAbsolute", "default", "FSExtra", "oneServe", "oneOptions", "buildInfo", "app", "serveStatic", "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", "entryServer", "entry", "render", "apiCJS", "build", "api", "outputFormat", "requestHandlers", "handleAPI", "route", "apiFile", "process", "cwd", "page", "loadMiddleware", "contextKey", "handleLoader", "request", "url", "loaderProps", "file", "handlePage", "type", "Object", "keys", "exported", "serverJsPath", "loaderData", "loader", "preloads", "headers", "Headers", "set", "rendered", "mode", "path", "Response", "status", "isNotFound", "err", "console", "error", "htmlPath", "pathname", "cleanPath", "html", "readFile", "createHonoHandler", "next", "raw", "response", "endsWith", "originalUrl", "finalUrl", "URL", "origin", "location", "forEach", "value", "key", "header", "info", "compiledManifest", "manifest", "apiRoutes", "honoPath", "put", "post", "delete", "patch", "pageRoutes", "c", "includes", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "compiledRegex", "test"]
|
6
6
|
}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
import { createContext, useContext, useId } from "react";
|
2
|
+
const ServerHeadInsertions = {}, getServerHeadInsertions = (id) => {
|
3
|
+
if (ServerHeadInsertions[id])
|
4
|
+
return Object.values(ServerHeadInsertions[id]);
|
5
|
+
}, ServerRenderID = createContext(""), useServerHeadInsertion = (callback) => {
|
6
|
+
if (typeof window > "u") {
|
7
|
+
const insertionID = useId(), id = useContext(ServerRenderID);
|
8
|
+
ServerHeadInsertions[id] ||= {}, ServerHeadInsertions[id][insertionID] = callback;
|
9
|
+
}
|
10
|
+
};
|
11
|
+
export {
|
12
|
+
ServerRenderID,
|
13
|
+
getServerHeadInsertions,
|
14
|
+
useServerHeadInsertion
|
15
|
+
};
|
16
|
+
//# sourceMappingURL=useServerHeadInsertion.js.map
|
@@ -0,0 +1,6 @@
|
|
1
|
+
{
|
2
|
+
"version": 3,
|
3
|
+
"sources": ["../../src/useServerHeadInsertion.tsx"],
|
4
|
+
"mappings": "AAAA,SAAS,eAAe,YAAY,aAAa;AAIjD,MAAM,uBAGF,CAAC,GAEQ,0BAA0B,CAAC,OAAe;AACrD,MAAI,qBAAqB,EAAE;AACzB,WAAO,OAAO,OAAO,qBAAqB,EAAE,CAAC;AAEjD,GAEa,iBAAiB,cAAc,EAAE,GAEjC,yBAAyB,CAAC,aAA0C;AAC/E,MAAI,OAAO,SAAU,KAAa;AAChC,UAAM,cAAc,MAAM,GACpB,KAAK,WAAW,cAAc;AACpC,yBAAqB,EAAE,MAAM,CAAC,GAC9B,qBAAqB,EAAE,EAAE,WAAW,IAAI;AAAA,EAC1C;AACF;",
|
5
|
+
"names": []
|
6
|
+
}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
import { createContext, useContext, useId } from "react";
|
2
|
+
const ServerHeadInsertions = {},
|
3
|
+
getServerHeadInsertions = id => {
|
4
|
+
if (ServerHeadInsertions[id]) return Object.values(ServerHeadInsertions[id]);
|
5
|
+
},
|
6
|
+
ServerRenderID = createContext(""),
|
7
|
+
useServerHeadInsertion = callback => {
|
8
|
+
if (typeof window > "u") {
|
9
|
+
const insertionID = useId(),
|
10
|
+
id = useContext(ServerRenderID);
|
11
|
+
ServerHeadInsertions[id] ||= {}, ServerHeadInsertions[id][insertionID] = callback;
|
12
|
+
}
|
13
|
+
};
|
14
|
+
export { ServerRenderID, getServerHeadInsertions, useServerHeadInsertion };
|
15
|
+
//# sourceMappingURL=useServerHeadInsertion.mjs.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"names":["createContext","useContext","useId","ServerHeadInsertions","getServerHeadInsertions","id","Object","values","ServerRenderID","useServerHeadInsertion","callback","window","insertionID"],"sources":["../../src/useServerHeadInsertion.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,aAAA,EAAeC,UAAA,EAAYC,KAAA,QAAa;AAIjD,MAAMC,oBAAA,GAGF,CAAC;EAEQC,uBAAA,GAA2BC,EAAA,IAAe;IACrD,IAAIF,oBAAA,CAAqBE,EAAE,GACzB,OAAOC,MAAA,CAAOC,MAAA,CAAOJ,oBAAA,CAAqBE,EAAE,CAAC;EAEjD;EAEaG,cAAA,GAAiBR,aAAA,CAAc,EAAE;EAEjCS,sBAAA,GAA0BC,QAAA,IAA0C;IAC/E,IAAI,OAAOC,MAAA,GAAU,KAAa;MAChC,MAAMC,WAAA,GAAcV,KAAA,CAAM;QACpBG,EAAA,GAAKJ,UAAA,CAAWO,cAAc;MACpCL,oBAAA,CAAqBE,EAAE,MAAM,CAAC,GAC9BF,oBAAA,CAAqBE,EAAE,EAAEO,WAAW,IAAIF,QAAA;IAC1C;EACF","ignoreList":[]}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
import { createContext, useContext, useId } from "react";
|
2
|
+
var ServerHeadInsertions = {}, getServerHeadInsertions = function(id) {
|
3
|
+
if (ServerHeadInsertions[id])
|
4
|
+
return Object.values(ServerHeadInsertions[id]);
|
5
|
+
}, ServerRenderID = /* @__PURE__ */ createContext(""), useServerHeadInsertion = function(callback) {
|
6
|
+
if (typeof window > "u") {
|
7
|
+
var _ServerHeadInsertions, _id, insertionID = useId(), id = useContext(ServerRenderID);
|
8
|
+
(_ServerHeadInsertions = ServerHeadInsertions)[_id = id] || (_ServerHeadInsertions[_id] = {}), ServerHeadInsertions[id][insertionID] = callback;
|
9
|
+
}
|
10
|
+
};
|
11
|
+
export {
|
12
|
+
ServerRenderID,
|
13
|
+
getServerHeadInsertions,
|
14
|
+
useServerHeadInsertion
|
15
|
+
};
|
16
|
+
//# sourceMappingURL=useServerHeadInsertion.js.map
|
@@ -0,0 +1,6 @@
|
|
1
|
+
{
|
2
|
+
"version": 3,
|
3
|
+
"sources": ["../../src/Users/n8/one/packages/one/src/useServerHeadInsertion.tsx"],
|
4
|
+
"mappings": "AAAA,SAASA,eAAeC,YAAYC,aAAa;AAIjD,IAAMC,uBAGF,CAAC,GAEQC,0BAA0B,SAACC,IAAAA;AACtC,MAAIF,qBAAqBE,EAAAA;AACvB,WAAOC,OAAOC,OAAOJ,qBAAqBE,EAAAA,CAAG;AAEjD,GAEaG,iBAAiBR,8BAAc,EAAA,GAE/BS,yBAAyB,SAACC,UAAAA;AACrC,MAAI,OAAOC,SAAU,KAAa;QAGhCR,uBAAqBE,KAFfO,cAAcV,MAAAA,GACdG,KAAKJ,WAAWO,cAAAA;AACtBL,KAAAA,wBAAAA,sBAAqBE,MAAAA,EAAAA,MAArBF,sBAAqBE,GAAAA,IAAQ,CAAC,IAC9BF,qBAAqBE,EAAAA,EAAIO,WAAAA,IAAeF;EAC1C;AACF;",
|
5
|
+
"names": ["createContext", "useContext", "useId", "ServerHeadInsertions", "getServerHeadInsertions", "id", "Object", "values", "ServerRenderID", "useServerHeadInsertion", "callback", "window", "insertionID"]
|
6
|
+
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "one",
|
3
|
-
"version": "1.1.
|
3
|
+
"version": "1.1.393",
|
4
4
|
"license": "BSD-3-Clause",
|
5
5
|
"sideEffects": [
|
6
6
|
"setup.mjs",
|
@@ -109,22 +109,22 @@
|
|
109
109
|
"@react-navigation/routers": "~7",
|
110
110
|
"@swc/core": "^1.10.4",
|
111
111
|
"@ungap/structured-clone": "^1.2.0",
|
112
|
-
"@vxrn/resolve": "1.1.
|
113
|
-
"@vxrn/tslib-lite": "1.1.
|
114
|
-
"@vxrn/universal-color-scheme": "1.1.
|
115
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
112
|
+
"@vxrn/resolve": "1.1.393",
|
113
|
+
"@vxrn/tslib-lite": "1.1.393",
|
114
|
+
"@vxrn/universal-color-scheme": "1.1.393",
|
115
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.393",
|
116
116
|
"babel-dead-code-elimination": "^1.0.6",
|
117
117
|
"babel-plugin-react-compiler": "^19.0.0-beta-201e55d-20241215",
|
118
118
|
"citty": "^0.1.6",
|
119
119
|
"core-js": "^3.38.1",
|
120
|
-
"create-vxrn": "1.1.
|
120
|
+
"create-vxrn": "1.1.393",
|
121
121
|
"escape-string-regexp": "^5.0.0",
|
122
122
|
"expo-linking": "~6.3.1",
|
123
123
|
"expo-modules-core": "2.1.2",
|
124
124
|
"fast-deep-equal": "^3.1.3",
|
125
125
|
"fast-glob": "^3.2.11",
|
126
126
|
"fs-extra": "^11.2.0",
|
127
|
-
"hono": "^4.
|
127
|
+
"hono": "^4.6.16",
|
128
128
|
"lightningcss": "^1.27.0",
|
129
129
|
"micromatch": "^4.0.7",
|
130
130
|
"nanoid": "^3.3.7",
|
@@ -143,7 +143,7 @@
|
|
143
143
|
"vite": "^6.0.6",
|
144
144
|
"vite-plugin-barrel": "^0.4.1",
|
145
145
|
"vite-tsconfig-paths": "^5.0.1",
|
146
|
-
"vxrn": "1.1.
|
146
|
+
"vxrn": "1.1.393",
|
147
147
|
"ws": "^8.18.0",
|
148
148
|
"xxhashjs": "^0.2.2"
|
149
149
|
},
|
package/src/Root.tsx
CHANGED
@@ -5,7 +5,7 @@ import {
|
|
5
5
|
type NavigationContainerProps,
|
6
6
|
} from '@react-navigation/native'
|
7
7
|
import { useColorScheme } from '@vxrn/universal-color-scheme'
|
8
|
-
import { useEffect, useState, type FunctionComponent, type ReactNode } from 'react'
|
8
|
+
import { useEffect, useId, useState, type FunctionComponent, type ReactNode } from 'react'
|
9
9
|
import { NavigationContainer as UpstreamNavigationContainer } from './fork/NavigationContainer'
|
10
10
|
import { getURL } from './getURL'
|
11
11
|
import { ServerLocationContext } from './router/serverLocationContext'
|
@@ -17,18 +17,16 @@ import { PreloadLinks } from './views/PreloadLinks'
|
|
17
17
|
import { RootErrorBoundary } from './views/RootErrorBoundary'
|
18
18
|
import { ScrollRestoration } from './views/ScrollRestoration'
|
19
19
|
import type { One } from './vite/types'
|
20
|
+
import { ServerRenderID } from './useServerHeadInsertion'
|
20
21
|
// import { SplashScreen } from './views/Splash'
|
21
22
|
|
22
23
|
if (typeof window !== 'undefined') {
|
23
24
|
// @ts-ignore TODO: hard coded for demo app
|
24
|
-
window.__getReactRefreshIgnoredExports = () => [
|
25
|
-
'feedCardQuery',
|
26
|
-
'feedCardReplyQuery',
|
27
|
-
'loader',
|
28
|
-
]
|
25
|
+
window.__getReactRefreshIgnoredExports = () => ['feedCardQuery', 'feedCardReplyQuery', 'loader']
|
29
26
|
}
|
30
27
|
|
31
28
|
type RootProps = Omit<InnerProps, 'context'> & {
|
29
|
+
onRenderId?: (id: string) => void
|
32
30
|
path: string
|
33
31
|
isClient?: boolean
|
34
32
|
routes: GlobbedRouteImports
|
@@ -55,7 +53,7 @@ type InnerProps = {
|
|
55
53
|
}
|
56
54
|
|
57
55
|
export function Root(props: RootProps) {
|
58
|
-
const { path, routes, routeOptions, isClient, navigationContainerProps } = props
|
56
|
+
const { path, routes, routeOptions, isClient, navigationContainerProps, onRenderId } = props
|
59
57
|
|
60
58
|
// ⚠️ <StrictMode> breaks routing!
|
61
59
|
const context = useViteRoutes(routes, routeOptions, globalThis['__vxrnVersion'])
|
@@ -75,41 +73,47 @@ export function Root(props: RootProps) {
|
|
75
73
|
throw new Error(`No root component found`)
|
76
74
|
}
|
77
75
|
|
76
|
+
const id = useId()
|
77
|
+
|
78
|
+
onRenderId?.(id)
|
79
|
+
|
78
80
|
const contents = (
|
79
81
|
// <StrictMode>
|
80
|
-
<
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
82
|
+
<ServerRenderID.Provider value={id}>
|
83
|
+
<RootErrorBoundary>
|
84
|
+
{/* for some reason warning if no key here */}
|
85
|
+
<UpstreamNavigationContainer
|
86
|
+
ref={store.navigationRef}
|
87
|
+
initialState={store.initialState}
|
88
|
+
linking={store.linking}
|
89
|
+
onUnhandledAction={onUnhandledAction}
|
90
|
+
theme={colorScheme === 'dark' ? DarkTheme : DefaultTheme}
|
91
|
+
documentTitle={{
|
92
|
+
enabled: false,
|
93
|
+
}}
|
94
|
+
{...navigationContainerProps}
|
95
|
+
>
|
96
|
+
<ServerLocationContext.Provider value={location}>
|
97
|
+
{/* <GestureHandlerRootView> */}
|
98
|
+
{/*
|
99
|
+
* Due to static rendering we need to wrap these top level views in second wrapper
|
100
|
+
* View's like <GestureHandlerRootView /> generate a <div> so if the parent wrapper
|
101
|
+
* is a HTML document, we need to ensure its inside the <body>
|
102
|
+
*/}
|
103
|
+
<>
|
104
|
+
{/* default scroll restoration to on, but users can configure it by importing and using themselves */}
|
105
|
+
<ScrollRestoration />
|
106
|
+
<Component />
|
107
|
+
|
108
|
+
{/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
|
109
|
+
</>
|
110
|
+
{/* {!hasViewControllerBasedStatusBarAppearance && <StatusBar style="auto" />} */}
|
111
|
+
{/* </GestureHandlerRootView> */}
|
112
|
+
</ServerLocationContext.Provider>
|
113
|
+
</UpstreamNavigationContainer>
|
114
|
+
<PreloadLinks key="preload-links" />
|
115
|
+
</RootErrorBoundary>
|
116
|
+
</ServerRenderID.Provider>
|
113
117
|
// </StrictMode>
|
114
118
|
)
|
115
119
|
|
package/src/cli/build.ts
CHANGED
@@ -462,6 +462,21 @@ export async function build(args: {
|
|
462
462
|
preloads,
|
463
463
|
})
|
464
464
|
|
465
|
+
if (exported.loader) {
|
466
|
+
loaderData = (await exported.loader?.({ path, params })) ?? null
|
467
|
+
const code = await readFile(clientJsPath, 'utf-8')
|
468
|
+
const withLoader =
|
469
|
+
// super dirty to quickly make ssr loaders work until we have better
|
470
|
+
`
|
471
|
+
if (typeof document === 'undefined') globalThis.document = {}
|
472
|
+
` + replaceLoader({
|
473
|
+
code,
|
474
|
+
loaderData,
|
475
|
+
})
|
476
|
+
const loaderPartialPath = join(clientDir, getLoaderPath(path))
|
477
|
+
await outputFile(loaderPartialPath, withLoader)
|
478
|
+
}
|
479
|
+
|
465
480
|
// ssr, we basically skip at build-time and just compile it the js we need
|
466
481
|
if (foundRoute.type !== 'ssr') {
|
467
482
|
const loaderProps: LoaderProps = { path, params }
|
@@ -469,17 +484,6 @@ export async function build(args: {
|
|
469
484
|
// importing resetState causes issues :/
|
470
485
|
globalThis['__vxrnresetState']?.()
|
471
486
|
|
472
|
-
if (exported.loader) {
|
473
|
-
loaderData = (await exported.loader?.({ path, params })) ?? null
|
474
|
-
const code = await readFile(clientJsPath, 'utf-8')
|
475
|
-
const withLoader = replaceLoader({
|
476
|
-
code,
|
477
|
-
loaderData,
|
478
|
-
})
|
479
|
-
const loaderPartialPath = join(clientDir, getLoaderPath(path))
|
480
|
-
await outputFile(loaderPartialPath, withLoader)
|
481
|
-
}
|
482
|
-
|
483
487
|
if (foundRoute.type === 'ssg') {
|
484
488
|
const html = await render({
|
485
489
|
path,
|
package/src/createApp.tsx
CHANGED
@@ -13,6 +13,9 @@ import {
|
|
13
13
|
SERVER_CONTEXT_POST_RENDER_STRING,
|
14
14
|
setServerContext,
|
15
15
|
} from './utils/serverContext'
|
16
|
+
import { cloneElement, useId } from 'react'
|
17
|
+
import { ensureExists } from './utils/ensureExists'
|
18
|
+
import { getServerHeadInsertions } from './useServerHeadInsertion'
|
16
19
|
|
17
20
|
export type CreateAppProps = { routes: Record<string, () => Promise<unknown>> }
|
18
21
|
|
@@ -31,8 +34,18 @@ export function createApp(options: CreateAppProps) {
|
|
31
34
|
css,
|
32
35
|
})
|
33
36
|
|
37
|
+
let renderId: string | undefined
|
38
|
+
|
34
39
|
const App = () => {
|
35
|
-
return
|
40
|
+
return (
|
41
|
+
<Root
|
42
|
+
onRenderId={(id) => {
|
43
|
+
renderId = id
|
44
|
+
}}
|
45
|
+
routes={options.routes}
|
46
|
+
{...props}
|
47
|
+
/>
|
48
|
+
)
|
36
49
|
}
|
37
50
|
|
38
51
|
AppRegistry.registerComponent('App', () => App)
|
@@ -48,11 +61,29 @@ export function createApp(options: CreateAppProps) {
|
|
48
61
|
})
|
49
62
|
|
50
63
|
try {
|
64
|
+
const extraHeadElements: React.ReactElement[] = []
|
65
|
+
|
51
66
|
const styleTag = Application.getStyleElement({ nonce: process.env.ONE_NONCE })
|
52
67
|
if (styleTag) {
|
53
|
-
|
54
|
-
|
55
|
-
|
68
|
+
extraHeadElements.push(styleTag)
|
69
|
+
}
|
70
|
+
|
71
|
+
ensureExists(renderId)
|
72
|
+
const insertions = getServerHeadInsertions(renderId)
|
73
|
+
if (insertions) {
|
74
|
+
for (const insertion of insertions) {
|
75
|
+
const out = insertion()
|
76
|
+
if (out) {
|
77
|
+
extraHeadElements.push(out)
|
78
|
+
}
|
79
|
+
}
|
80
|
+
}
|
81
|
+
|
82
|
+
if (extraHeadElements.length) {
|
83
|
+
const extraHeadHTML = ReactDOMServer.renderToStaticMarkup(<>{extraHeadElements}</>)
|
84
|
+
|
85
|
+
if (extraHeadHTML) {
|
86
|
+
html = html.replace(`</head>`, `${extraHeadHTML}</head>`)
|
56
87
|
}
|
57
88
|
}
|
58
89
|
} catch (err) {
|
@@ -0,0 +1,22 @@
|
|
1
|
+
/**
|
2
|
+
* Shared utilities for modifications in the fork.
|
3
|
+
*/
|
4
|
+
|
5
|
+
export const getParamName = (pattern: string) => pattern.replace(/^[:*]/, '').replace(/\?$/, '')
|
6
|
+
|
7
|
+
export function getParamValue(p: string, value: string) {
|
8
|
+
if (p.startsWith('*')) {
|
9
|
+
const values = value.split('/').filter((v) => v !== '')
|
10
|
+
return values.length === 0 && p.endsWith('?') ? undefined : values
|
11
|
+
}
|
12
|
+
|
13
|
+
return value
|
14
|
+
}
|
15
|
+
|
16
|
+
export function isDynamicPart(p: string) {
|
17
|
+
return p.length > 1 && (p.startsWith(':') || p.startsWith('*'))
|
18
|
+
}
|
19
|
+
|
20
|
+
export function replacePart(p: string) {
|
21
|
+
return p.replace(/^[:*]/, '').replace(/\?$/, '')
|
22
|
+
}
|
@@ -7,6 +7,7 @@
|
|
7
7
|
import type { Route } from '@react-navigation/core'
|
8
8
|
|
9
9
|
import { matchDeepDynamicRouteName, matchDynamicName, matchGroupName } from '../router/matchers'
|
10
|
+
import { getParamName } from './_shared'
|
10
11
|
|
11
12
|
export type AdditionalOptions = {
|
12
13
|
preserveDynamicRoutes?: boolean
|
@@ -33,12 +34,12 @@ export function getPathWithConventionsCollapsed({
|
|
33
34
|
params: Record<string, any>
|
34
35
|
initialRouteName?: string
|
35
36
|
}) {
|
36
|
-
const segments = pattern.split('/')
|
37
|
-
|
37
|
+
const segments = pattern.split('/')
|
38
38
|
return segments
|
39
39
|
.map((p, i) => {
|
40
40
|
const name = getParamName(p)
|
41
41
|
|
42
|
+
// We don't know what to show for wildcard patterns
|
42
43
|
// Showing the route name seems ok, though whatever we show here will be incorrect
|
43
44
|
// Since the page doesn't actually exist
|
44
45
|
if (p.startsWith('*')) {
|
@@ -61,11 +62,21 @@ export function getPathWithConventionsCollapsed({
|
|
61
62
|
return ''
|
62
63
|
}
|
63
64
|
|
65
|
+
if (i === 0) {
|
66
|
+
// This can occur when a wildcard matches all routes and the given path was `/`.
|
67
|
+
return route
|
68
|
+
}
|
69
|
+
|
64
70
|
if (p === '*not-found') {
|
65
71
|
return ''
|
66
72
|
}
|
67
|
-
|
73
|
+
// remove existing segments from route.path and return it
|
74
|
+
// this is used for nested wildcard routes. Without this, the path would add
|
75
|
+
// all nested segments to the beginning of the wildcard route.
|
68
76
|
return route.name
|
77
|
+
?.split('/')
|
78
|
+
.slice(i + 1)
|
79
|
+
.join('/')
|
69
80
|
}
|
70
81
|
|
71
82
|
// If the path has a pattern for a param, put the param in the path
|
@@ -79,6 +90,7 @@ export function getPathWithConventionsCollapsed({
|
|
79
90
|
return
|
80
91
|
}
|
81
92
|
|
93
|
+
// return params[name]
|
82
94
|
return (shouldEncodeURISegment ? encodeURISegment(value) : value) ?? 'undefined'
|
83
95
|
}
|
84
96
|
|
@@ -92,21 +104,24 @@ export function getPathWithConventionsCollapsed({
|
|
92
104
|
if (segmentMatchesConvention(initialRouteName)) {
|
93
105
|
return ''
|
94
106
|
}
|
107
|
+
|
95
108
|
return shouldEncodeURISegment
|
96
|
-
?
|
109
|
+
? encodeURIComponentPreservingBrackets(initialRouteName)
|
97
110
|
: initialRouteName
|
98
111
|
}
|
99
112
|
}
|
100
113
|
return ''
|
101
114
|
}
|
102
|
-
|
103
|
-
return shouldEncodeURISegment ?
|
115
|
+
|
116
|
+
return shouldEncodeURISegment ? encodeURIComponentPreservingBrackets(p) : p
|
104
117
|
})
|
105
118
|
.map((v) => v ?? '')
|
106
119
|
.join('/')
|
107
120
|
}
|
108
121
|
|
109
|
-
|
122
|
+
function encodeURIComponentPreservingBrackets(str: string) {
|
123
|
+
return encodeURIComponent(str).replace(/%5B/g, '[').replace(/%5D/g, ']')
|
124
|
+
}
|
110
125
|
|
111
126
|
export function appendBaseUrl(
|
112
127
|
path: string,
|
@@ -13,6 +13,7 @@ import {
|
|
13
13
|
appendBaseUrl,
|
14
14
|
type AdditionalOptions,
|
15
15
|
} from './getPathFromState-mods'
|
16
|
+
import * as sharedModUtils from './_shared'
|
16
17
|
// @modified - end
|
17
18
|
|
18
19
|
import type { NavigationState, PartialState, Route } from '@react-navigation/routers'
|
@@ -198,10 +199,10 @@ export function getPathDataFromState<ParamList extends {}>(
|
|
198
199
|
|
199
200
|
pattern
|
200
201
|
?.split('/')
|
201
|
-
.filter((p) =>
|
202
|
+
.filter((p) => sharedModUtils.isDynamicPart(p)) // @modified
|
202
203
|
// eslint-disable-next-line no-loop-func
|
203
204
|
.forEach((p) => {
|
204
|
-
const name = getParamName(p)
|
205
|
+
const name = sharedModUtils.getParamName(p) // @modified: use our customized `getParamName`
|
205
206
|
|
206
207
|
// Remove the params present in the pattern since we'll only use the rest for query string
|
207
208
|
if (focusedParams) {
|