one 1.12.1 → 1.12.3
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 +7 -1
- package/dist/cjs/Root.js +7 -2
- package/dist/cjs/Root.js.map +1 -1
- package/dist/cjs/Root.native.js +8 -2
- package/dist/cjs/Root.native.js.map +1 -1
- package/dist/cjs/cli/build.cjs +24 -10
- package/dist/cjs/cli/build.js +24 -9
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +29 -14
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/createApp.cjs +2 -2
- package/dist/cjs/createApp.js +2 -2
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/createHandleRequest.cjs +5 -1
- package/dist/cjs/createHandleRequest.js +6 -2
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +5 -1
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/fork/SSRNavigationContainer.cjs +18 -9
- package/dist/cjs/fork/SSRNavigationContainer.js +17 -6
- package/dist/cjs/fork/SSRNavigationContainer.js.map +1 -1
- package/dist/cjs/fork/SSRNavigationContainer.native.js +21 -10
- package/dist/cjs/fork/SSRNavigationContainer.native.js.map +1 -1
- package/dist/cjs/router/linkingConfig.cjs +2 -1
- package/dist/cjs/router/linkingConfig.js +2 -2
- package/dist/cjs/router/linkingConfig.js.map +1 -1
- package/dist/cjs/router/linkingConfig.native.js +2 -1
- package/dist/cjs/router/linkingConfig.native.js.map +1 -1
- package/dist/cjs/serve.cjs +67 -28
- package/dist/cjs/serve.js +68 -28
- package/dist/cjs/serve.js.map +1 -1
- package/dist/cjs/serve.native.js +96 -35
- package/dist/cjs/serve.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +112 -39
- package/dist/cjs/server/oneServe.js +94 -41
- package/dist/cjs/server/oneServe.js.map +2 -2
- package/dist/cjs/server/oneServe.native.js +180 -80
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/utils/evictOldest.cjs +34 -0
- package/dist/cjs/utils/evictOldest.js +29 -0
- package/dist/cjs/utils/evictOldest.js.map +6 -0
- package/dist/cjs/utils/evictOldest.native.js +34 -0
- package/dist/cjs/utils/evictOldest.native.js.map +1 -0
- package/dist/cjs/utils/isResponse.cjs +1 -1
- package/dist/cjs/utils/isResponse.js +1 -1
- package/dist/cjs/utils/isResponse.js.map +1 -1
- package/dist/cjs/utils/isResponse.native.js +1 -1
- package/dist/cjs/utils/isResponse.native.js.map +1 -1
- package/dist/cjs/vite/one-server-only.cjs +9 -6
- package/dist/cjs/vite/one-server-only.js +8 -7
- package/dist/cjs/vite/one-server-only.js.map +1 -1
- package/dist/cjs/vite/resolveResponse.cjs +17 -4
- package/dist/cjs/vite/resolveResponse.js +15 -2
- package/dist/cjs/vite/resolveResponse.js.map +1 -1
- package/dist/cjs/vite/resolveResponse.native.js +17 -4
- package/dist/cjs/vite/resolveResponse.native.js.map +1 -1
- package/dist/esm/Root.js +7 -1
- package/dist/esm/Root.js.map +1 -1
- package/dist/esm/Root.mjs +7 -1
- package/dist/esm/Root.mjs.map +1 -1
- package/dist/esm/Root.native.js +7 -1
- package/dist/esm/Root.native.js.map +1 -1
- package/dist/esm/cli/build.js +24 -9
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +26 -12
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +29 -14
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/createApp.js +2 -2
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +2 -2
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/createHandleRequest.js +6 -2
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +5 -2
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +5 -2
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/fork/SSRNavigationContainer.js +17 -6
- package/dist/esm/fork/SSRNavigationContainer.js.map +1 -1
- package/dist/esm/fork/SSRNavigationContainer.mjs +18 -9
- package/dist/esm/fork/SSRNavigationContainer.mjs.map +1 -1
- package/dist/esm/fork/SSRNavigationContainer.native.js +21 -10
- package/dist/esm/fork/SSRNavigationContainer.native.js.map +1 -1
- package/dist/esm/router/linkingConfig.js +2 -1
- package/dist/esm/router/linkingConfig.js.map +1 -1
- package/dist/esm/router/linkingConfig.mjs +2 -1
- package/dist/esm/router/linkingConfig.mjs.map +1 -1
- package/dist/esm/router/linkingConfig.native.js +2 -1
- package/dist/esm/router/linkingConfig.native.js.map +1 -1
- package/dist/esm/serve.js +68 -28
- package/dist/esm/serve.js.map +1 -1
- package/dist/esm/serve.mjs +67 -28
- package/dist/esm/serve.mjs.map +1 -1
- package/dist/esm/serve.native.js +96 -35
- package/dist/esm/serve.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +95 -42
- package/dist/esm/server/oneServe.js.map +2 -2
- package/dist/esm/server/oneServe.mjs +113 -40
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +181 -81
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/utils/evictOldest.js +13 -0
- package/dist/esm/utils/evictOldest.js.map +6 -0
- package/dist/esm/utils/evictOldest.mjs +11 -0
- package/dist/esm/utils/evictOldest.mjs.map +1 -0
- package/dist/esm/utils/evictOldest.native.js +8 -0
- package/dist/esm/utils/evictOldest.native.js.map +1 -0
- package/dist/esm/utils/isResponse.js +1 -1
- package/dist/esm/utils/isResponse.js.map +1 -1
- package/dist/esm/utils/isResponse.mjs +1 -1
- package/dist/esm/utils/isResponse.mjs.map +1 -1
- package/dist/esm/utils/isResponse.native.js +1 -1
- package/dist/esm/utils/isResponse.native.js.map +1 -1
- package/dist/esm/vite/one-server-only.js +8 -7
- package/dist/esm/vite/one-server-only.js.map +1 -1
- package/dist/esm/vite/one-server-only.mjs +9 -6
- package/dist/esm/vite/one-server-only.mjs.map +1 -1
- package/dist/esm/vite/resolveResponse.js +15 -2
- package/dist/esm/vite/resolveResponse.js.map +1 -1
- package/dist/esm/vite/resolveResponse.mjs +16 -4
- package/dist/esm/vite/resolveResponse.mjs.map +1 -1
- package/dist/esm/vite/resolveResponse.native.js +16 -4
- package/dist/esm/vite/resolveResponse.native.js.map +1 -1
- package/package.json +13 -11
- package/src/Root.tsx +14 -1
- package/src/cli/build.ts +38 -12
- package/src/createApp.tsx +8 -2
- package/src/createHandleRequest.ts +9 -2
- package/src/fork/SSRNavigationContainer.tsx +30 -7
- package/src/router/linkingConfig.ts +2 -2
- package/src/serve.ts +134 -48
- package/src/server/oneServe.ts +153 -47
- package/src/utils/evictOldest.ts +13 -0
- package/src/utils/isResponse.ts +4 -4
- package/src/vite/one-server-only.tsx +25 -11
- package/src/vite/resolveResponse.ts +20 -1
- package/src/vite/types.ts +20 -2
- 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/createHandleRequest.d.ts +4 -0
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/fork/SSRNavigationContainer.d.ts.map +1 -1
- package/types/router/linkingConfig.d.ts.map +1 -1
- package/types/serve.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/utils/evictOldest.d.ts +6 -0
- package/types/utils/evictOldest.d.ts.map +1 -0
- package/types/vite/one-server-only.d.ts +9 -3
- package/types/vite/one-server-only.d.ts.map +1 -1
- package/types/vite/resolveResponse.d.ts +4 -0
- package/types/vite/resolveResponse.d.ts.map +1 -1
- package/types/vite/types.d.ts +18 -2
- package/types/vite/types.d.ts.map +1 -1
|
@@ -18,6 +18,6 @@ __export(isResponse_exports, {
|
|
|
18
18
|
});
|
|
19
19
|
module.exports = __toCommonJS(isResponse_exports);
|
|
20
20
|
function isResponse(res) {
|
|
21
|
-
return res instanceof Response
|
|
21
|
+
return res instanceof Response ? !0 : res != null && typeof res.status == "number" && typeof res.ok == "boolean";
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=isResponse.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/utils/isResponse.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACO,SAAS,WAAW,KAA2B;
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACO,SAAS,WAAW,KAA2B;AAEpD,SAAI,eAAe,WAAiB,KAE7B,OAAO,QAAQ,OAAO,IAAI,UAAW,YAAY,OAAO,IAAI,MAAO;AAC5E;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -29,6 +29,6 @@ function _instanceof(left, right) {
|
|
|
29
29
|
return right != null && typeof Symbol < "u" && right[Symbol.hasInstance] ? !!right[Symbol.hasInstance](left) : left instanceof right;
|
|
30
30
|
}
|
|
31
31
|
function isResponse(res) {
|
|
32
|
-
return _instanceof(res, Response)
|
|
32
|
+
return _instanceof(res, Response) ? !0 : res != null && typeof res.status == "number" && typeof res.ok == "boolean";
|
|
33
33
|
}
|
|
34
34
|
//# sourceMappingURL=isResponse.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","isResponse_exports","__export","isResponse","module","exports","_instanceof","left","right","Symbol","hasInstance"],"sources":["../../../src/utils/isResponse.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AACOC,MAAA,CAAAC,OAAS,GAAAT,YAAsC,CAAAK,kBAAA;
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","isResponse_exports","__export","isResponse","module","exports","_instanceof","left","right","Symbol","hasInstance"],"sources":["../../../src/utils/isResponse.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AACOC,MAAA,CAAAC,OAAS,GAAAT,YAAsC,CAAAK,kBAAA;AAEpD,SAAIK,YAAAC,IAAe,EAAAC,KAAA;EAGrB,OAAAA,KAAA,mBAAAC,MAAA,UAAAD,KAAA,CAAAC,MAAA,CAAAC,WAAA,MAAAF,KAAA,CAAAC,MAAA,CAAAC,WAAA,EAAAH,IAAA,IAAAA,IAAA,YAAAC,KAAA","ignoreList":[]}
|
|
@@ -35,7 +35,8 @@ __export(one_server_only_exports, {
|
|
|
35
35
|
module.exports = __toCommonJS(one_server_only_exports);
|
|
36
36
|
var import_node_async_hooks = require("node:async_hooks"),
|
|
37
37
|
import_constants = require("../constants.cjs");
|
|
38
|
-
const
|
|
38
|
+
const _ctxKey = Symbol.for("__oneCtx"),
|
|
39
|
+
key = "__vxrnrequestAsyncLocalStore",
|
|
39
40
|
read = () => globalThis[key],
|
|
40
41
|
ASYNC_LOCAL_STORE = {
|
|
41
42
|
get current() {
|
|
@@ -86,16 +87,15 @@ const serverContexts = globalThis[SERVER_CONTEXTS_KEY];
|
|
|
86
87
|
function setServerContext(data) {
|
|
87
88
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
88
89
|
const id = ensureAsyncLocalID();
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
Object.assign(context, data);
|
|
90
|
+
let context = id[_ctxKey];
|
|
91
|
+
context || (context = {}, id[_ctxKey] = context, serverContexts.set(id, context)), Object.assign(context, data);
|
|
92
92
|
} else throw new Error("Don't call setServerContext on client");
|
|
93
93
|
}
|
|
94
94
|
function getServerContext() {
|
|
95
95
|
return (() => {
|
|
96
96
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
97
97
|
const id = ensureAsyncLocalID();
|
|
98
|
-
return serverContexts.get(id);
|
|
98
|
+
return id[_ctxKey] || serverContexts.get(id);
|
|
99
99
|
}
|
|
100
100
|
return globalThis[import_constants.SERVER_CONTEXT_KEY];
|
|
101
101
|
})();
|
|
@@ -103,7 +103,10 @@ function getServerContext() {
|
|
|
103
103
|
function useServerContext() {
|
|
104
104
|
if (process.env.VITE_ENVIRONMENT === "ssr") try {
|
|
105
105
|
const useContext = globalThis.__vxrnGetContextFromReactContext;
|
|
106
|
-
if (useContext)
|
|
106
|
+
if (useContext) {
|
|
107
|
+
const id = useContext();
|
|
108
|
+
if (id) return id[_ctxKey] || serverContexts.get(id);
|
|
109
|
+
}
|
|
107
110
|
} catch {}
|
|
108
111
|
return getServerContext();
|
|
109
112
|
}
|
|
@@ -28,7 +28,7 @@ __export(one_server_only_exports, {
|
|
|
28
28
|
});
|
|
29
29
|
module.exports = __toCommonJS(one_server_only_exports);
|
|
30
30
|
var import_node_async_hooks = require("node:async_hooks"), import_constants = require("../constants");
|
|
31
|
-
const key = "__vxrnrequestAsyncLocalStore", read = () => globalThis[key], ASYNC_LOCAL_STORE = {
|
|
31
|
+
const _ctxKey = Symbol.for("__oneCtx"), key = "__vxrnrequestAsyncLocalStore", read = () => globalThis[key], ASYNC_LOCAL_STORE = {
|
|
32
32
|
get current() {
|
|
33
33
|
if (read()) return read();
|
|
34
34
|
const _ = new import_node_async_hooks.AsyncLocalStorage();
|
|
@@ -66,9 +66,8 @@ const serverContexts = globalThis[SERVER_CONTEXTS_KEY];
|
|
|
66
66
|
function setServerContext(data) {
|
|
67
67
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
68
68
|
const id = ensureAsyncLocalID();
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
Object.assign(context, data);
|
|
69
|
+
let context = id[_ctxKey];
|
|
70
|
+
context || (context = {}, id[_ctxKey] = context, serverContexts.set(id, context)), Object.assign(context, data);
|
|
72
71
|
} else
|
|
73
72
|
throw new Error("Don't call setServerContext on client");
|
|
74
73
|
}
|
|
@@ -76,7 +75,7 @@ function getServerContext() {
|
|
|
76
75
|
return (() => {
|
|
77
76
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
78
77
|
const id = ensureAsyncLocalID();
|
|
79
|
-
return serverContexts.get(id);
|
|
78
|
+
return id[_ctxKey] || serverContexts.get(id);
|
|
80
79
|
}
|
|
81
80
|
return globalThis[import_constants.SERVER_CONTEXT_KEY];
|
|
82
81
|
})();
|
|
@@ -85,8 +84,10 @@ function useServerContext() {
|
|
|
85
84
|
if (process.env.VITE_ENVIRONMENT === "ssr")
|
|
86
85
|
try {
|
|
87
86
|
const useContext = globalThis.__vxrnGetContextFromReactContext;
|
|
88
|
-
if (useContext)
|
|
89
|
-
|
|
87
|
+
if (useContext) {
|
|
88
|
+
const id = useContext();
|
|
89
|
+
if (id) return id[_ctxKey] || serverContexts.get(id);
|
|
90
|
+
}
|
|
90
91
|
} catch {
|
|
91
92
|
}
|
|
92
93
|
return getServerContext();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/vite/one-server-only.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA,8BAAkC,6BAClC,mBAAmC;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["key"]
|
|
6
6
|
}
|
|
@@ -21,17 +21,22 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
21
21
|
var resolveResponse_exports = {};
|
|
22
22
|
__export(resolveResponse_exports, {
|
|
23
23
|
resolveAPIEndpoint: () => resolveAPIEndpoint,
|
|
24
|
-
resolveResponse: () => resolveResponse
|
|
24
|
+
resolveResponse: () => resolveResponse,
|
|
25
|
+
withRequestContext: () => withRequestContext
|
|
25
26
|
});
|
|
26
27
|
module.exports = __toCommonJS(resolveResponse_exports);
|
|
27
28
|
var import_isResponse = require("../utils/isResponse.cjs"),
|
|
28
29
|
import_one_server_only = require("./one-server-only.cjs");
|
|
30
|
+
let _nextId = 1;
|
|
31
|
+
function createId() {
|
|
32
|
+
return {
|
|
33
|
+
_id: _nextId++
|
|
34
|
+
};
|
|
35
|
+
}
|
|
29
36
|
async function resolveResponse(getResponse) {
|
|
30
37
|
const store = import_one_server_only.requestAsyncLocalStore;
|
|
31
38
|
if (store) {
|
|
32
|
-
const id =
|
|
33
|
-
_id: Math.random()
|
|
34
|
-
};
|
|
39
|
+
const id = createId();
|
|
35
40
|
let response;
|
|
36
41
|
return await store.run(id, async () => {
|
|
37
42
|
try {
|
|
@@ -51,6 +56,14 @@ async function resolveResponse(getResponse) {
|
|
|
51
56
|
}
|
|
52
57
|
});
|
|
53
58
|
}
|
|
59
|
+
function withRequestContext(fn) {
|
|
60
|
+
const store = import_one_server_only.requestAsyncLocalStore;
|
|
61
|
+
if (store) {
|
|
62
|
+
const id = createId();
|
|
63
|
+
return store.run(id, fn);
|
|
64
|
+
}
|
|
65
|
+
return fn();
|
|
66
|
+
}
|
|
54
67
|
function resolveAPIEndpoint(runEndpoint, request, params) {
|
|
55
68
|
return resolveResponse(async () => {
|
|
56
69
|
const imported = await runEndpoint(),
|
|
@@ -15,14 +15,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0
|
|
|
15
15
|
var resolveResponse_exports = {};
|
|
16
16
|
__export(resolveResponse_exports, {
|
|
17
17
|
resolveAPIEndpoint: () => resolveAPIEndpoint,
|
|
18
|
-
resolveResponse: () => resolveResponse
|
|
18
|
+
resolveResponse: () => resolveResponse,
|
|
19
|
+
withRequestContext: () => withRequestContext
|
|
19
20
|
});
|
|
20
21
|
module.exports = __toCommonJS(resolveResponse_exports);
|
|
21
22
|
var import_isResponse = require("../utils/isResponse"), import_one_server_only = require("./one-server-only");
|
|
23
|
+
let _nextId = 1;
|
|
24
|
+
function createId() {
|
|
25
|
+
return { _id: _nextId++ };
|
|
26
|
+
}
|
|
22
27
|
async function resolveResponse(getResponse) {
|
|
23
28
|
const store = import_one_server_only.requestAsyncLocalStore;
|
|
24
29
|
if (store) {
|
|
25
|
-
const id =
|
|
30
|
+
const id = createId();
|
|
26
31
|
let response;
|
|
27
32
|
return await store.run(id, async () => {
|
|
28
33
|
try {
|
|
@@ -46,6 +51,14 @@ async function resolveResponse(getResponse) {
|
|
|
46
51
|
}
|
|
47
52
|
});
|
|
48
53
|
}
|
|
54
|
+
function withRequestContext(fn) {
|
|
55
|
+
const store = import_one_server_only.requestAsyncLocalStore;
|
|
56
|
+
if (store) {
|
|
57
|
+
const id = createId();
|
|
58
|
+
return store.run(id, fn);
|
|
59
|
+
}
|
|
60
|
+
return fn();
|
|
61
|
+
}
|
|
49
62
|
function resolveAPIEndpoint(runEndpoint, request, params) {
|
|
50
63
|
return resolveResponse(async () => {
|
|
51
64
|
const imported = await runEndpoint(), requestType = request.method || "GET", handler = imported[requestType] || imported.default;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/vite/resolveResponse.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAA2B,gCAC3B,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -23,7 +23,8 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
23
23
|
var resolveResponse_exports = {};
|
|
24
24
|
__export(resolveResponse_exports, {
|
|
25
25
|
resolveAPIEndpoint: () => resolveAPIEndpoint,
|
|
26
|
-
resolveResponse: () => resolveResponse
|
|
26
|
+
resolveResponse: () => resolveResponse,
|
|
27
|
+
withRequestContext: () => withRequestContext
|
|
27
28
|
});
|
|
28
29
|
module.exports = __toCommonJS(resolveResponse_exports);
|
|
29
30
|
var import_isResponse = require("../utils/isResponse.native.js"),
|
|
@@ -36,12 +37,16 @@ function _type_of(obj) {
|
|
|
36
37
|
|
|
37
38
|
return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
38
39
|
}
|
|
40
|
+
var _nextId = 1;
|
|
41
|
+
function createId() {
|
|
42
|
+
return {
|
|
43
|
+
_id: _nextId++
|
|
44
|
+
};
|
|
45
|
+
}
|
|
39
46
|
async function resolveResponse(getResponse) {
|
|
40
47
|
var store = import_one_server_only.requestAsyncLocalStore;
|
|
41
48
|
if (store) {
|
|
42
|
-
var id =
|
|
43
|
-
_id: Math.random()
|
|
44
|
-
},
|
|
49
|
+
var id = createId(),
|
|
45
50
|
response;
|
|
46
51
|
return await store.run(id, async function () {
|
|
47
52
|
try {
|
|
@@ -61,6 +66,14 @@ async function resolveResponse(getResponse) {
|
|
|
61
66
|
}
|
|
62
67
|
});
|
|
63
68
|
}
|
|
69
|
+
function withRequestContext(fn) {
|
|
70
|
+
var store = import_one_server_only.requestAsyncLocalStore;
|
|
71
|
+
if (store) {
|
|
72
|
+
var id = createId();
|
|
73
|
+
return store.run(id, fn);
|
|
74
|
+
}
|
|
75
|
+
return fn();
|
|
76
|
+
}
|
|
64
77
|
function resolveAPIEndpoint(runEndpoint, request, params) {
|
|
65
78
|
return resolveResponse(async function () {
|
|
66
79
|
var imported = await runEndpoint(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","resolveResponse_exports","__export","resolveAPIEndpoint","resolveResponse","module","exports","import_isResponse","require","import_one_server_only","_instanceof","left","right","Symbol","hasInstance","_type_of","obj","constructor","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","resolveResponse_exports","__export","resolveAPIEndpoint","resolveResponse","withRequestContext","module","exports","import_isResponse","require","import_one_server_only","_instanceof","left","right","Symbol","hasInstance","_type_of","obj","constructor","_nextId","createId","_id","getResponse","store","requestAsyncLocalStore","id","response","run","getResponseWithAddedHeaders","err","isResponse","runWithAsyncLocalContext","id2","response2","fn","runEndpoint","request","params","imported","requestType","method","handler","default","console","warn","asyncHeaders","asyncHeadersCache","get","Response","mergeHeaders","headers","json","Headers","has","set","includes","body","streamToString","status","statusText","error","stream"],"sources":["../../../src/vite/resolveResponse.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/Root.js
CHANGED
|
@@ -22,11 +22,17 @@ import { handleNavigationContainerStateChange } from "./router/router";
|
|
|
22
22
|
import { ServerLocationContext } from "./router/serverLocationContext";
|
|
23
23
|
import { useInitializeOneRouter } from "./router/useInitializeOneRouter";
|
|
24
24
|
import { useViteRoutes } from "./router/useViteRoutes";
|
|
25
|
+
import { evictOldest } from "./utils/evictOldest";
|
|
25
26
|
import { ServerRenderID } from "./useServerHeadInsertion";
|
|
26
27
|
import { PreloadLinks } from "./views/PreloadLinks";
|
|
27
28
|
import { RootErrorBoundary } from "./views/RootErrorBoundary";
|
|
28
29
|
import { ScrollBehavior } from "./views/ScrollBehavior";
|
|
29
30
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
31
|
+
const ssrLocationCache = /* @__PURE__ */ new Map();
|
|
32
|
+
function getCachedSSRLocation(path) {
|
|
33
|
+
let url = ssrLocationCache.get(path);
|
|
34
|
+
return url || (url = new URL(path, getURL()), evictOldest(ssrLocationCache, 5e3, 1e3), ssrLocationCache.set(path, url), url);
|
|
35
|
+
}
|
|
30
36
|
const ServerAsyncLocalIDContext = createContext(null);
|
|
31
37
|
globalThis.__vxrnGetContextFromReactContext = () => useContext(ServerAsyncLocalIDContext);
|
|
32
38
|
function Root(props) {
|
|
@@ -36,7 +42,7 @@ function Root(props) {
|
|
|
36
42
|
props.routerRoot,
|
|
37
43
|
routeOptions,
|
|
38
44
|
globalThis.__vxrnVersion
|
|
39
|
-
), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) :
|
|
45
|
+
), location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : getCachedSSRLocation(path || "/"), store = useInitializeOneRouter(context, location), userScheme = useUserScheme(), Component = store.rootComponent;
|
|
40
46
|
if (!Component)
|
|
41
47
|
throw new Error("No root component found");
|
|
42
48
|
const id = useId();
|
package/dist/esm/Root.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Root.tsx"],
|
|
4
|
-
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,qBAAqB;AAC9B;AAAA,EACE;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,oBAAoB,gBAAgB;AAC7C,SAAS,+BAA+B;AACxC,SAAS,uBAAuB;AAChC,SAAS,uBAAuB,mCAAmC;AACnE,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAC7B,SAAS,kBAAkB;AAC3B,SAAS,4CAA4C;AACrD,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AACvC,SAAS,qBAAqB;AAE9B,SAAS,sBAAsB;AAC/B,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,sBAAsB;
|
|
4
|
+
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,qBAAqB;AAC9B;AAAA,EACE;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,oBAAoB,gBAAgB;AAC7C,SAAS,+BAA+B;AACxC,SAAS,uBAAuB;AAChC,SAAS,uBAAuB,mCAAmC;AACnE,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAC7B,SAAS,kBAAkB;AAC3B,SAAS,4CAA4C;AACrD,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AACvC,SAAS,qBAAqB;AAE9B,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B,SAAS,oBAAoB;AAC7B,SAAS,yBAAyB;AAClC,SAAS,sBAAsB;AAoGnB,SAeA,UAfA,KAeA,YAfA;AA/FZ,MAAM,mBAAmB,oBAAI,IAAiB;AAC9C,SAAS,qBAAqB,MAAmB;AAC/C,MAAI,MAAM,iBAAiB,IAAI,IAAI;AACnC,SAAI,QACJ,MAAM,IAAI,IAAI,MAAM,OAAO,CAAC,GAC5B,YAAY,kBAAkB,KAAM,GAAI,GACxC,iBAAiB,IAAI,MAAM,GAAG,GACvB;AACT;AAiCA,MAAM,4BAA4B,cAAwC,IAAI;AAE9E,WAAW,mCAAsC,MAC/C,WAAW,yBAAyB;AAE/B,SAAS,KAAK,OAAkB;AAErC,EAAI,YACF,wBAAwB;AAG1B,QAAM,EAAE,MAAM,QAAQ,cAAc,UAAU,0BAA0B,WAAW,IACjF,OAEI,UAAU;AAAA,IACd;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA,WAAW;AAAA,EACb,GACM,WACJ,OAAO,SAAW,OAAe,OAAO,WACpC,IAAI,IAAI,QAAQ,OAAO,SAAS,QAAQ,KAAK,OAAO,SAAS,IAAI,IACjE,qBAAqB,QAAQ,GAAG,GAEhC,QAAQ,uBAAuB,SAAS,QAAQ,GAChD,aAAa,cAAc,GAI3B,YAAY,MAAM;AAExB,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yBAAyB;AAG3C,QAAM,KAAK,MAAM;AAEjB,eAAa,EAAE;AAGf,QAAM,QAAQ,QAAQ,IAAI,SACtB,WAAW,uBACX,WAAW,8BAAiC,SAAS,KAAK,MAIxD,mBAAoB,MAAc;AAExC,MAAI,WACF,oBAAC,0BAA0B,UAA1B,EAAmC,OAClC,+BAAC,eAAe,UAAf,EAAwB,OAAO,IAC7B;AAAA,WAAO,SAAW,OACjB,kBAAkB,IAAI,CAAC,QACrB,oBAAC,UAAe,KAAI,iBAAgB,eAAc,OAAM,MAAM,OAAnD,GAAwD,CACpE;AAAA,IACH;AAAA,MAAC;AAAA;AAAA,QACC,KAAK,MAAM;AAAA,QACX,cAAc,MAAM;AAAA,QACpB,SAAS,WAAW;AAAA,QACpB;AAAA,QACA,eAAe;AAAA,QACf,OAAO,WAAW,UAAU,SAAS,YAAY;AAAA,QACjD,eAAe;AAAA,UACb,SAAS;AAAA,QACX;AAAA,QACC,GAAG;AAAA,QAEJ,8BAAC,sBAAsB,UAAtB,EAA+B,OAAO,UACrC,2CACE;AAAA,8BAAC,kBAAe;AAAA,UAEhB,oBAAC,qBACC,8BAAC,aAAU,GACb;AAAA,WACF,GACF;AAAA;AAAA,IACF;AAAA,IACC,OAAO,SAAW,OAAe,oBAAC,kBAAiB,eAAgB;AAAA,KACtE,GACF;AAaF,MAVI,MAAM,UACR,WACE,oBAAC,aAAa,UAAb,EAAsB,OAAO,MAAM,OAAQ,oBAAS,IAIpD,QAAQ,IAAI,4BACf,WAAW,oBAAC,cAAY,oBAAS,IAG/B,UAAU;AAEZ,UAAM,aAAa,WAAW,kBAAkB,GAAG;AAEnD,QAAI,eAAe,OAAO;AAExB,YAAM,CAAC,MAAM,OAAO,IAAI,SAAS,EAAK;AAGtC,6BAAgB,MAAM;AACpB,gBAAQ,EAAI;AAAA,MACd,GAAG,CAAC,CAAC,GAEE,OAAO,WAAW;AAAA,IAC3B;AAEA,QAAI,eAAe,aAAa;AAG9B,YAAM,CAAC,YAAY,aAAa,IAAI,SAAS,EAAI;AAGjD,6BAAgB,MAAM;AACpB,sBAAc,EAAK;AAAA,MACrB,GAAG,CAAC,CAAC,GAGH,oBAAC,gBAAgB,UAAhB,EAAyB,OAAO,YAAa,oBAAS;AAAA,IAE3D;AAEA,WAAO;AAAA,EACT;AAGA,SAAI,MAAM,SAAS,cACV,oBAAC,gBAAgB,UAAhB,EAAyB,OAAO,IAAO,oBAAS,IAGnD;AACT;AAqCA,IAAI;AAEA,QAAQ,IAAI,aAAa,eAC3B,oBAAoB,CAAC,WAA6B;AAChD,QAAM,UAA2C,OAAO;AAExD,MAAI,UAAU,eAAe,OAAO,IAAI,IACtC,UAAU,iBAAiB,KAAK,UAAU,OAAO,OAAO,CAAC,KAAK,EAChE;AAEA,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,MAAI,SAAS,OACX,WAAW;AAAA;AAAA,6BAAkC,QAAQ,IAAI,OAEzD,WAAW;AAAA;AAAA;AAGb;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,IACF,KAAK;AAAA,IACL,KAAK;AAAA,IACL,KAAK;AACH,iBAAW;AAAA;AAAA;AACX;AAAA,EACJ;AAIA,MAFA,WAAW;AAAA;AAAA,uEAEP,QAAQ,IAAI,aAAa;AAC3B,UAAM,IAAI,MAAM,OAAO;AAEzB,UAAQ,MAAM,OAAO;AACvB,IAEA,oBAAoB,MAAM;AAAC;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/Root.mjs
CHANGED
|
@@ -12,11 +12,17 @@ import { handleNavigationContainerStateChange } from "./router/router.mjs";
|
|
|
12
12
|
import { ServerLocationContext } from "./router/serverLocationContext.mjs";
|
|
13
13
|
import { useInitializeOneRouter } from "./router/useInitializeOneRouter.mjs";
|
|
14
14
|
import { useViteRoutes } from "./router/useViteRoutes.mjs";
|
|
15
|
+
import { evictOldest } from "./utils/evictOldest.mjs";
|
|
15
16
|
import { ServerRenderID } from "./useServerHeadInsertion.mjs";
|
|
16
17
|
import { PreloadLinks } from "./views/PreloadLinks.mjs";
|
|
17
18
|
import { RootErrorBoundary } from "./views/RootErrorBoundary.mjs";
|
|
18
19
|
import { ScrollBehavior } from "./views/ScrollBehavior.mjs";
|
|
19
20
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
21
|
+
const ssrLocationCache = /* @__PURE__ */new Map();
|
|
22
|
+
function getCachedSSRLocation(path) {
|
|
23
|
+
let url = ssrLocationCache.get(path);
|
|
24
|
+
return url || (url = new URL(path, getURL()), evictOldest(ssrLocationCache, 5e3, 1e3), ssrLocationCache.set(path, url), url);
|
|
25
|
+
}
|
|
20
26
|
const ServerAsyncLocalIDContext = createContext(null);
|
|
21
27
|
globalThis.__vxrnGetContextFromReactContext = () => useContext(ServerAsyncLocalIDContext);
|
|
22
28
|
function Root(props) {
|
|
@@ -30,7 +36,7 @@ function Root(props) {
|
|
|
30
36
|
onRenderId
|
|
31
37
|
} = props,
|
|
32
38
|
context = useViteRoutes(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion),
|
|
33
|
-
location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) :
|
|
39
|
+
location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : getCachedSSRLocation(path || "/"),
|
|
34
40
|
store = useInitializeOneRouter(context, location),
|
|
35
41
|
userScheme = useUserScheme(),
|
|
36
42
|
Component = store.rootComponent;
|
package/dist/esm/Root.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["DarkTheme","DefaultTheme","useUserScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","isNative","initScreensFeatureFlags","SpaShellContext","NavigationContainer","UpstreamNavigationContainer","getURL","FlagsContext","getLinking","handleNavigationContainerStateChange","ServerLocationContext","useInitializeOneRouter","useViteRoutes","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","Fragment","jsx","jsxs","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","
|
|
1
|
+
{"version":3,"names":["DarkTheme","DefaultTheme","useUserScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","isNative","initScreensFeatureFlags","SpaShellContext","NavigationContainer","UpstreamNavigationContainer","getURL","FlagsContext","getLinking","handleNavigationContainerStateChange","ServerLocationContext","useInitializeOneRouter","useViteRoutes","evictOldest","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","Fragment","jsx","jsxs","ssrLocationCache","Map","getCachedSSRLocation","path","url","get","URL","set","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","routes","routeOptions","isClient","navigationContainerProps","onRenderId","context","routerRoot","__vxrnVersion","location","window","href","store","userScheme","Component","rootComponent","Error","id","value","process","env","VERCEL","__oneGlobalContextId","__vxrnrequestAsyncLocalStore","getStore","deferredPreloads","contents","Provider","children","map","src","rel","fetchPriority","ref","navigationRef","initialState","linking","onUnhandledAction","onStateChange","theme","documentTitle","enabled","flags","ONE_DISABLE_STRICT_MODE","serverMode","mode","show","setShow","isSpaShell","setIsSpaShell","NODE_ENV","action","payload","message","type","JSON","stringify","name","console","error"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"AAAA,SACEA,SAAA,EACAC,YAAA,QAGK;AACP,SAASC,aAAA,QAAqB;AAC9B,SACEC,aAAA,EAGAC,UAAA,EACAC,UAAA,EACAC,KAAA,EACAC,eAAA,EACAC,QAAA,QACK;AACP,SAASC,kBAAA,EAAoBC,QAAA,QAAgB;AAC7C,SAASC,uBAAA,QAA+B;AACxC,SAASC,eAAA,QAAuB;AAChC,SAASC,mBAAA,IAAuBC,2BAAA,QAAmC;AACnE,SAASC,MAAA,QAAc;AACvB,SAASC,YAAA,QAAoB;AAC7B,SAASC,UAAA,QAAkB;AAC3B,SAASC,oCAAA,QAA4C;AACrD,SAASC,qBAAA,QAA6B;AACtC,SAASC,sBAAA,QAA8B;AACvC,SAASC,aAAA,QAAqB;AAE9B,SAASC,WAAA,QAAmB;AAC5B,SAASC,cAAA,QAAsB;AAC/B,SAASC,YAAA,QAAoB;AAC7B,SAASC,iBAAA,QAAyB;AAClC,SAASC,cAAA,QAAsB;AAoGnB,SAeAC,QAAA,EAfAC,GAAA,EAeAC,IAAA,QAfA;AA/FZ,MAAMC,gBAAA,GAAmB,mBAAIC,GAAA,CAAiB;AAC9C,SAASC,qBAAqBC,IAAA,EAAmB;EAC/C,IAAIC,GAAA,GAAMJ,gBAAA,CAAiBK,GAAA,CAAIF,IAAI;EACnC,OAAIC,GAAA,KACJA,GAAA,GAAM,IAAIE,GAAA,CAAIH,IAAA,EAAMlB,MAAA,CAAO,CAAC,GAC5BO,WAAA,CAAYQ,gBAAA,EAAkB,KAAM,GAAI,GACxCA,gBAAA,CAAiBO,GAAA,CAAIJ,IAAA,EAAMC,GAAG,GACvBA,GAAA;AACT;AAiCA,MAAMI,yBAAA,GAA4BnC,aAAA,CAAwC,IAAI;AAE9EoC,UAAA,CAAWC,gCAAA,GAAsC,MAC/CnC,UAAA,CAAWiC,yBAAyB;AAE/B,SAASG,KAAKC,KAAA,EAAkB;EAEjChC,QAAA,IACFC,uBAAA,CAAwB;EAG1B,MAAM;MAAEsB,IAAA;MAAMU,MAAA;MAAQC,YAAA;MAAcC,QAAA;MAAUC,wBAAA;MAA0BC;IAAW,IACjFL,KAAA;IAEIM,OAAA,GAAU3B,aAAA,CACdsB,MAAA,EACAD,KAAA,CAAMO,UAAA,EACNL,YAAA,EACAL,UAAA,CAAWW,aACb;IACMC,QAAA,GACJ,OAAOC,MAAA,GAAW,OAAeA,MAAA,CAAOD,QAAA,GACpC,IAAIf,GAAA,CAAIH,IAAA,IAAQmB,MAAA,CAAOD,QAAA,CAASE,IAAA,IAAQ,KAAKD,MAAA,CAAOD,QAAA,CAASE,IAAI,IACjErB,oBAAA,CAAqBC,IAAA,IAAQ,GAAG;IAEhCqB,KAAA,GAAQlC,sBAAA,CAAuB4B,OAAA,EAASG,QAAQ;IAChDI,UAAA,GAAarD,aAAA,CAAc;IAI3BsD,SAAA,GAAYF,KAAA,CAAMG,aAAA;EAExB,IAAI,CAACD,SAAA,EACH,MAAM,IAAIE,KAAA,CAAM,yBAAyB;EAG3C,MAAMC,EAAA,GAAKrD,KAAA,CAAM;EAEjByC,UAAA,GAAaY,EAAE;EAGf,MAAMC,KAAA,GAAQC,OAAA,CAAQC,GAAA,CAAIC,MAAA,GACtBxB,UAAA,CAAWyB,oBAAA,GACXzB,UAAA,CAAW0B,4BAAA,EAAiCC,QAAA,CAAS,KAAK;IAIxDC,gBAAA,GAAoBzB,KAAA,CAAcyB,gBAAA;EAExC,IAAIC,QAAA,GACF,eAAAxC,GAAA,CAACU,yBAAA,CAA0B+B,QAAA,EAA1B;IAAmCT,KAAA;IAClCU,QAAA,iBAAAzC,IAAA,CAACN,cAAA,CAAe8C,QAAA,EAAf;MAAwBT,KAAA,EAAOD,EAAA;MAC7BW,QAAA,UAAOlB,MAAA,GAAW,OACjBe,gBAAA,EAAkBI,GAAA,CAAKC,GAAA,IACrB,eAAA5C,GAAA,CAAC;QAAe6C,GAAA,EAAI;QAAgBC,aAAA,EAAc;QAAMrB,IAAA,EAAMmB;MAAA,GAAnDA,GAAwD,CACpE,GACH,eAAA5C,GAAA,CAACd,2BAAA;QACC6D,GAAA,EAAKrB,KAAA,CAAMsB,aAAA;QACXC,YAAA,EAAcvB,KAAA,CAAMuB,YAAA;QACpBC,OAAA,EAAS7D,UAAA,CAAW;QACpB8D,iBAAA;QACAC,aAAA,EAAe9D,oCAAA;QACf+D,KAAA,EAAO1B,UAAA,CAAWK,KAAA,KAAU,SAAS5D,SAAA,GAAYC,YAAA;QACjDiF,aAAA,EAAe;UACbC,OAAA,EAAS;QACX;QACC,GAAGrC,wBAAA;QAEJwB,QAAA,iBAAA1C,GAAA,CAACT,qBAAA,CAAsBkD,QAAA,EAAtB;UAA+BT,KAAA,EAAOT,QAAA;UACrCmB,QAAA,iBAAAzC,IAAA,CAAAF,QAAA;YACE2C,QAAA,kBAAA1C,GAAA,CAACF,cAAA,IAAe,GAEhB,eAAAE,GAAA,CAACH,iBAAA;cACC6C,QAAA,iBAAA1C,GAAA,CAAC4B,SAAA,IAAU;YAAA,CACb;UAAA,CACF;QAAA,CACF;MAAA,CACF,GACC,OAAOJ,MAAA,GAAW,OAAe,eAAAxB,GAAA,CAACJ,YAAA,MAAiB,eAAgB;IAAA,CACtE;EAAA,CACF;EAaF,IAVIkB,KAAA,CAAM0C,KAAA,KACRhB,QAAA,GACE,eAAAxC,GAAA,CAACZ,YAAA,CAAaqD,QAAA,EAAb;IAAsBT,KAAA,EAAOlB,KAAA,CAAM0C,KAAA;IAAQd,QAAA,EAAAF;EAAA,CAAS,IAIpDP,OAAA,CAAQC,GAAA,CAAIuB,uBAAA,KACfjB,QAAA,GAAW,eAAAxC,GAAA,CAACxB,UAAA;IAAYkE,QAAA,EAAAF;EAAA,CAAS,IAG/BvB,QAAA,EAAU;IAEZ,MAAMyC,UAAA,GAAa/C,UAAA,CAAW9B,kBAAkB,GAAG8E,IAAA;IAEnD,IAAID,UAAA,KAAe,OAAO;MAExB,MAAM,CAACE,IAAA,EAAMC,OAAO,IAAIjF,QAAA,CAAS,EAAK;MAGtC,OAAAD,eAAA,CAAgB,MAAM;QACpBkF,OAAA,CAAQ,EAAI;MACd,GAAG,EAAE,GAEED,IAAA,GAAOpB,QAAA,GAAW;IAC3B;IAEA,IAAIkB,UAAA,KAAe,aAAa;MAG9B,MAAM,CAACI,UAAA,EAAYC,aAAa,IAAInF,QAAA,CAAS,EAAI;MAGjD,OAAAD,eAAA,CAAgB,MAAM;QACpBoF,aAAA,CAAc,EAAK;MACrB,GAAG,EAAE,GAGH,eAAA/D,GAAA,CAAChB,eAAA,CAAgByD,QAAA,EAAhB;QAAyBT,KAAA,EAAO8B,UAAA;QAAapB,QAAA,EAAAF;MAAA,CAAS;IAE3D;IAEA,OAAOA,QAAA;EACT;EAGA,OAAI1B,KAAA,CAAM6C,IAAA,KAAS,cACV,eAAA3D,GAAA,CAAChB,eAAA,CAAgByD,QAAA,EAAhB;IAAyBT,KAAA,EAAO;IAAOU,QAAA,EAAAF;EAAA,CAAS,IAGnDA,QAAA;AACT;AAqCA,IAAIW,iBAAA;AAEAlB,OAAA,CAAQC,GAAA,CAAI8B,QAAA,KAAa,eAC3Bb,iBAAA,GAAqBc,MAAA,IAA6B;EAChD,MAAMC,OAAA,GAA2CD,MAAA,CAAOC,OAAA;EAExD,IAAIC,OAAA,GAAU,eAAeF,MAAA,CAAOG,IAAI,IACtCF,OAAA,GAAU,iBAAiBG,IAAA,CAAKC,SAAA,CAAUL,MAAA,CAAOC,OAAO,CAAC,KAAK,EAChE;EAEA,QAAQD,MAAA,CAAOG,IAAA;IACb,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;MACCF,OAAA,EAASK,IAAA,GACXJ,OAAA,IAAW;AAAA;AAAA,6BAAkCD,OAAA,CAAQK,IAAI,OAEzDJ,OAAA,IAAW;AAAA;AAAA;MAGb;IACF,KAAK;IACL,KAAK;IACL,KAAK;MACHA,OAAA,IAAW;AAAA;AAAA;MACX;IACF,KAAK;IACL,KAAK;IACL,KAAK;MACHA,OAAA,IAAW;AAAA;AAAA;MACX;EACJ;EAIA,IAFAA,OAAA,IAAW;AAAA;AAAA,uEAEPlC,OAAA,CAAQC,GAAA,CAAI8B,QAAA,KAAa,QAC3B,MAAM,IAAIlC,KAAA,CAAMqC,OAAO;EAEzBK,OAAA,CAAQC,KAAA,CAAMN,OAAO;AACvB,IAEAhB,iBAAA,GAAoBA,CAAA,KAAM,CAAC","ignoreList":[]}
|
package/dist/esm/Root.native.js
CHANGED
|
@@ -13,10 +13,16 @@ import { handleNavigationContainerStateChange } from "./router/router.native.js"
|
|
|
13
13
|
import { ServerLocationContext } from "./router/serverLocationContext.native.js";
|
|
14
14
|
import { useInitializeOneRouter } from "./router/useInitializeOneRouter.native.js";
|
|
15
15
|
import { useViteRoutes } from "./router/useViteRoutes.native.js";
|
|
16
|
+
import { evictOldest } from "./utils/evictOldest.native.js";
|
|
16
17
|
import { ServerRenderID } from "./useServerHeadInsertion.native.js";
|
|
17
18
|
import { PreloadLinks } from "./views/PreloadLinks.native.js";
|
|
18
19
|
import { RootErrorBoundary } from "./views/RootErrorBoundary.native.js";
|
|
19
20
|
import { ScrollBehavior } from "./views/ScrollBehavior.native.js";
|
|
21
|
+
var ssrLocationCache = /* @__PURE__ */new Map();
|
|
22
|
+
function getCachedSSRLocation(path) {
|
|
23
|
+
var url = ssrLocationCache.get(path);
|
|
24
|
+
return url || (url = new URL(path, getURL()), evictOldest(ssrLocationCache, 5e3, 1e3), ssrLocationCache.set(path, url), url);
|
|
25
|
+
}
|
|
20
26
|
var ServerAsyncLocalIDContext = /* @__PURE__ */createContext(null);
|
|
21
27
|
globalThis.__vxrnGetContextFromReactContext = function () {
|
|
22
28
|
return useContext(ServerAsyncLocalIDContext);
|
|
@@ -33,7 +39,7 @@ function Root(props) {
|
|
|
33
39
|
onRenderId
|
|
34
40
|
} = props,
|
|
35
41
|
context = useViteRoutes(routes, props.routerRoot, routeOptions, globalThis.__vxrnVersion),
|
|
36
|
-
location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) :
|
|
42
|
+
location = typeof window < "u" && window.location ? new URL(path || window.location.href || "/", window.location.href) : getCachedSSRLocation(path || "/"),
|
|
37
43
|
store = useInitializeOneRouter(context, location),
|
|
38
44
|
userScheme = useUserScheme(),
|
|
39
45
|
Component = store.rootComponent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","DarkTheme","DefaultTheme","useUserScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","isNative","initScreensFeatureFlags","SpaShellContext","NavigationContainer","UpstreamNavigationContainer","getURL","FlagsContext","getLinking","handleNavigationContainerStateChange","ServerLocationContext","useInitializeOneRouter","useViteRoutes","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","_globalThis___vxrnrequestAsyncLocalStore","
|
|
1
|
+
{"version":3,"names":["jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","DarkTheme","DefaultTheme","useUserScheme","createContext","StrictMode","useContext","useId","useLayoutEffect","useState","SERVER_CONTEXT_KEY","isNative","initScreensFeatureFlags","SpaShellContext","NavigationContainer","UpstreamNavigationContainer","getURL","FlagsContext","getLinking","handleNavigationContainerStateChange","ServerLocationContext","useInitializeOneRouter","useViteRoutes","evictOldest","ServerRenderID","PreloadLinks","RootErrorBoundary","ScrollBehavior","ssrLocationCache","Map","getCachedSSRLocation","path","url","get","URL","set","ServerAsyncLocalIDContext","globalThis","__vxrnGetContextFromReactContext","Root","props","_globalThis___vxrnrequestAsyncLocalStore","routes","routeOptions","isClient","navigationContainerProps","onRenderId","context","routerRoot","__vxrnVersion","location","window","href","store","userScheme","Component","rootComponent","Error","id","value","process","env","VERCEL","__oneGlobalContextId","__vxrnrequestAsyncLocalStore","getStore","deferredPreloads","contents","Provider","children","map","src","rel","fetchPriority","ref","navigationRef","initialState","linking","onUnhandledAction","onStateChange","theme","documentTitle","enabled","flags","ONE_DISABLE_STRICT_MODE","_globalThis_SERVER_CONTEXT_KEY","serverMode","mode","show","setShow","isSpaShell","setIsSpaShell","NODE_ENV","action","payload","message","type","JSON","stringify","name"],"sources":["../../src/Root.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/cli/build.js
CHANGED
|
@@ -28,7 +28,21 @@ import { generateSitemap } from "./generateSitemap";
|
|
|
28
28
|
import { labelProcess } from "./label-process";
|
|
29
29
|
import { pLimit } from "../utils/pLimit";
|
|
30
30
|
import { getCriticalCSSOutputPaths } from "../vite/plugins/criticalCSSPlugin";
|
|
31
|
-
const { ensureDir, writeJSON } = FSExtra
|
|
31
|
+
const { ensureDir, writeJSON } = FSExtra;
|
|
32
|
+
function normalizeDeploy(deploy) {
|
|
33
|
+
if (deploy)
|
|
34
|
+
return typeof deploy == "string" ? { target: deploy } : deploy;
|
|
35
|
+
}
|
|
36
|
+
async function getCloudflareProjectName(root) {
|
|
37
|
+
try {
|
|
38
|
+
const pkg = JSON.parse(await FSExtra.readFile(join(root, "package.json"), "utf-8"));
|
|
39
|
+
if (pkg.name)
|
|
40
|
+
return pkg.name.replace(/^@[^/]+\//, "");
|
|
41
|
+
} catch {
|
|
42
|
+
}
|
|
43
|
+
return "one-app";
|
|
44
|
+
}
|
|
45
|
+
const BUILD_CONCURRENCY = process.env.ONE_BUILD_CONCURRENCY ? Math.max(1, parseInt(process.env.ONE_BUILD_CONCURRENCY, 10)) : Math.max(1, Math.min(cpus().length, 8));
|
|
32
46
|
function shouldUseWorkers(oneOptions) {
|
|
33
47
|
return process.env.ONE_BUILD_WORKERS === "0" ? !1 : process.env.ONE_BUILD_WORKERS === "1" ? !0 : oneOptions?.build?.workers !== !1;
|
|
34
48
|
}
|
|
@@ -66,6 +80,13 @@ async function build(args) {
|
|
|
66
80
|
) : process.env.NODE_ENV = "production", labelProcess("build"), checkNodeVersion(), setServerGlobals();
|
|
67
81
|
const { oneOptions, config: viteLoadedConfig } = await loadUserOneOptions("build"), routerRoot = getRouterRootFromOneOptions(oneOptions);
|
|
68
82
|
oneOptions.web?.defaultRenderMode && (process.env.ONE_DEFAULT_RENDER_MODE = oneOptions.web.defaultRenderMode);
|
|
83
|
+
const deployConfig = normalizeDeploy(oneOptions.web?.deploy);
|
|
84
|
+
if (!process.env.ONE_SERVER_URL && deployConfig) {
|
|
85
|
+
const url = deployConfig.url ?? (deployConfig.target === "cloudflare" ? `https://${await getCloudflareProjectName(process.cwd())}.workers.dev` : void 0);
|
|
86
|
+
url && (process.env.ONE_SERVER_URL = url, console.info(`
|
|
87
|
+
\u2601\uFE0F ONE_SERVER_URL: ${url}
|
|
88
|
+
`));
|
|
89
|
+
}
|
|
69
90
|
const outDir = viteLoadedConfig?.config?.build?.outDir ?? "dist", manifest = getManifest({ routerRoot }), serverOutputFormat = oneOptions.build?.server === !1 ? "esm" : oneOptions.build?.server?.outputFormat ?? "esm", buildStartTime = performance.now(), vxrnOutput = await vxrnBuild(
|
|
70
91
|
{
|
|
71
92
|
skipEnv: args.skipEnv ?? oneOptions.skipEnv,
|
|
@@ -513,7 +534,7 @@ async function build(args) {
|
|
|
513
534
|
\u{1F4C4} generated sitemap.xml (${sitemapData.length} URLs)
|
|
514
535
|
`);
|
|
515
536
|
}
|
|
516
|
-
const postBuildLogs = [], platform =
|
|
537
|
+
const postBuildLogs = [], platform = deployConfig?.target;
|
|
517
538
|
switch (platform && postBuildLogs.push(`[one.build] platform ${platform}`), platform) {
|
|
518
539
|
case "vercel": {
|
|
519
540
|
const vercelJsonPath = join(options.root, "vercel.json");
|
|
@@ -696,13 +717,7 @@ export default {
|
|
|
696
717
|
noExternal: !0
|
|
697
718
|
}
|
|
698
719
|
}), await FSExtra.remove(workerSrcPath);
|
|
699
|
-
|
|
700
|
-
try {
|
|
701
|
-
const pkgPath = join(options.root, "package.json"), pkg = JSON.parse(await FSExtra.readFile(pkgPath, "utf-8"));
|
|
702
|
-
pkg.name && (projectName = pkg.name.replace(/^@[^/]+\//, ""));
|
|
703
|
-
} catch {
|
|
704
|
-
}
|
|
705
|
-
const wranglerConfig = `{
|
|
720
|
+
const projectName = await getCloudflareProjectName(options.root), wranglerConfig = `{
|
|
706
721
|
"name": ${JSON.stringify(projectName)},
|
|
707
722
|
"main": "worker.js",
|
|
708
723
|
"compatibility_date": "2024-12-05",
|