one 1.1.313 → 1.1.314
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/cjs/cleanUrl.cjs +1 -1
- package/dist/cjs/cleanUrl.cjs.map +1 -1
- package/dist/cjs/cleanUrl.native.js +1 -1
- package/dist/cjs/cleanUrl.native.js.map +2 -2
- package/dist/cjs/constants.cjs +2 -0
- package/dist/cjs/constants.cjs.map +1 -1
- package/dist/cjs/constants.native.js +3 -1
- package/dist/cjs/constants.native.js.map +2 -2
- package/dist/cjs/createHandleRequest.cjs +1 -1
- package/dist/cjs/createHandleRequest.cjs.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +1 -1
- package/dist/cjs/createHandleRequest.native.js.map +2 -2
- package/dist/cjs/serve.cjs +5 -1
- package/dist/cjs/serve.cjs.map +1 -1
- package/dist/cjs/serve.native.js +4 -0
- package/dist/cjs/serve.native.js.map +2 -2
- package/dist/esm/cleanUrl.js +2 -2
- package/dist/esm/cleanUrl.js.map +1 -1
- package/dist/esm/cleanUrl.mjs +2 -2
- package/dist/esm/cleanUrl.mjs.map +1 -1
- package/dist/esm/cleanUrl.native.js +2 -2
- package/dist/esm/cleanUrl.native.js.map +2 -2
- package/dist/esm/constants.js +2 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/constants.mjs +2 -1
- package/dist/esm/constants.mjs.map +1 -1
- package/dist/esm/constants.native.js +2 -1
- package/dist/esm/constants.native.js.map +2 -2
- package/dist/esm/createHandleRequest.js +1 -1
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +1 -1
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +1 -1
- package/dist/esm/createHandleRequest.native.js.map +2 -2
- package/dist/esm/serve.js +4 -1
- package/dist/esm/serve.js.map +1 -1
- package/dist/esm/serve.mjs +5 -1
- package/dist/esm/serve.mjs.map +1 -1
- package/dist/esm/serve.native.js +4 -0
- package/dist/esm/serve.native.js.map +2 -2
- package/package.json +7 -7
- package/src/cleanUrl.ts +2 -2
- package/src/constants.ts +1 -0
- package/src/createHandleRequest.ts +3 -1
- package/src/serve.ts +9 -0
- package/types/cleanUrl.d.ts.map +1 -1
- package/types/constants.d.ts +1 -0
- package/types/constants.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts.map +1 -1
package/dist/cjs/cleanUrl.cjs
CHANGED
|
@@ -44,5 +44,5 @@ function getLoaderPath(currentPath, includeUrl = import_constants.isNative) {
|
|
|
44
44
|
return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${import_constants.LOADER_JS_POSTFIX}`;
|
|
45
45
|
}
|
|
46
46
|
function getPathFromLoaderPath(loaderPath) {
|
|
47
|
-
return loaderPath.replace(import_constants.
|
|
47
|
+
return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
|
|
48
48
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/cleanUrl.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAMO,wBACP,gBAAuB,qBACvB,sBAA6B;AAE7B,SAAS,SAAS,MAAc;AAC9B,aACE,kCAAa,IAAI,EACd,WAAW,KAAK,GAAG,EAEnB,QAAQ,MAAM,EAAE;AAEvB;AAEA,MAAM,WAAW,OAAO,SAAW,KAC7B,gBAAgB,eAAW,sBAAO,IAAI;AAErC,SAAS,eAAe,aAAqB;AAClD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,mCAAkB;AACvF;AAEO,SAAS,cACd,aAEA,aAAa,2BACb;AACA,QAAM,UAAU,iBAAa,sBAAO,IAAI,IAClC,UAAU,QAAQ,IAAI,aAAa,gBAAgB,UAAU,IAE7D,iBAAiB,IAAI;AAAA,IACzB;AAAA,IACA;AAAA;AAAA,EACF;AAEA,SAAO,GAAG,OAAO,GAAG,OAAO,WAAW,SAAS,eAAe,SAAS,MAAM,CAAC,CAAC,CAAC,GAAG,kCAAiB;AACtG;AAEO,SAAS,sBAAsB,YAAoB;AACxD,SAAO,WACJ,QAAQ,0CAAyB,EAAE,EACnC,QAAQ,sBAAsB,EAAE,EAChC,WAAW,MAAM,GAAG;AACzB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -33,7 +33,7 @@ function getLoaderPath(currentPath) {
|
|
|
33
33
|
return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${import_constants.LOADER_JS_POSTFIX}`;
|
|
34
34
|
}
|
|
35
35
|
function getPathFromLoaderPath(loaderPath) {
|
|
36
|
-
return loaderPath.replace(import_constants.
|
|
36
|
+
return loaderPath.replace(import_constants.LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
|
|
37
37
|
}
|
|
38
38
|
// Annotate the CommonJS export names for ESM import in node:
|
|
39
39
|
0 && (module.exports = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/cleanUrl.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;
|
|
5
|
-
"names": ["cleanUrl", "path", "removeSearch", "replaceAll", "replace", "isClient", "window", "clientSideURL", "getURL", "getPreloadPath", "currentPath", "slice", "PRELOAD_JS_POSTFIX", "getLoaderPath", "includeUrl", "isNative", "baseURL", "devPath", "process", "env", "NODE_ENV", "currentPathUrl", "URL", "pathname", "LOADER_JS_POSTFIX", "getPathFromLoaderPath", "loaderPath", "
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;uBAMO,wBACP,gBAAuB,qBACvB,sBAA6B;AAE7B,SAASA,SAASC,MAAY;AAC5B,aACEC,kCAAaD,IAAAA,EACVE,WAAW,KAAK,GAAA,EAEhBC,QAAQ,MAAM,EAAA;AAErB;AAEA,IAAMC,WAAW,OAAOC,SAAW,KAC7BC,gBAAgBF,eAAWG,sBAAAA,IAAW;AAErC,SAASC,eAAeC,aAAmB;AAChD,SAAO,GAAGH,aAAAA,WAAwBP,SAASU,YAAYC,MAAM,CAAA,CAAA,CAAA,GAAMC,mCAAAA;AACrE;AAEO,SAASC,cACdH,aAAmB;MAEnBI,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAaC,2BAEPC,UAAUF,iBAAaN,sBAAAA,IAAW,IAClCS,UAAUC,QAAQC,IAAIC,aAAa,gBAAgB,UAAU,IAE7DC,iBAAiB,IAAIC,IACzBZ,aACA,oBAAA;AAGF,SAAO,GAAGM,OAAAA,GAAUC,OAAAA,WAAkBjB,SAASqB,eAAeE,SAASZ,MAAM,CAAA,CAAA,CAAA,GAAMa,kCAAAA;AACrF;AAEO,SAASC,sBAAsBC,YAAkB;AACtD,SAAOA,WACJtB,QAAQuB,0CAAyB,EAAA,EACjCvB,QAAQ,sBAAsB,EAAA,EAC9BD,WAAW,MAAM,GAAA;AACtB;",
|
|
5
|
+
"names": ["cleanUrl", "path", "removeSearch", "replaceAll", "replace", "isClient", "window", "clientSideURL", "getURL", "getPreloadPath", "currentPath", "slice", "PRELOAD_JS_POSTFIX", "getLoaderPath", "includeUrl", "isNative", "baseURL", "devPath", "process", "env", "NODE_ENV", "currentPathUrl", "URL", "pathname", "LOADER_JS_POSTFIX", "getPathFromLoaderPath", "loaderPath", "LOADER_JS_POSTFIX_REGEX"]
|
|
6
6
|
}
|
package/dist/cjs/constants.cjs
CHANGED
|
@@ -22,6 +22,7 @@ var constants_exports = {};
|
|
|
22
22
|
__export(constants_exports, {
|
|
23
23
|
CACHE_KEY: () => CACHE_KEY,
|
|
24
24
|
LOADER_JS_POSTFIX: () => LOADER_JS_POSTFIX,
|
|
25
|
+
LOADER_JS_POSTFIX_REGEX: () => LOADER_JS_POSTFIX_REGEX,
|
|
25
26
|
LOADER_JS_POSTFIX_UNCACHED: () => LOADER_JS_POSTFIX_UNCACHED,
|
|
26
27
|
PRELOAD_JS_POSTFIX: () => PRELOAD_JS_POSTFIX,
|
|
27
28
|
isNative: () => isNative,
|
|
@@ -34,5 +35,6 @@ const isWebClient = typeof window < "u",
|
|
|
34
35
|
isNative = !1,
|
|
35
36
|
CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 1e8)}`,
|
|
36
37
|
LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js",
|
|
38
|
+
LOADER_JS_POSTFIX_REGEX = new RegExp(`_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`),
|
|
37
39
|
LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`,
|
|
38
40
|
PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/constants.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAC9D,qBAAqB,IAAI,SAAS;",
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,0BAA0B,IAAI,OAAO,QAAQ,0BAA0B,GAAG,GAC1E,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAC9D,qBAAqB,IAAI,SAAS;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -17,6 +17,7 @@ var constants_exports = {};
|
|
|
17
17
|
__export(constants_exports, {
|
|
18
18
|
CACHE_KEY: () => CACHE_KEY,
|
|
19
19
|
LOADER_JS_POSTFIX: () => LOADER_JS_POSTFIX,
|
|
20
|
+
LOADER_JS_POSTFIX_REGEX: () => LOADER_JS_POSTFIX_REGEX,
|
|
20
21
|
LOADER_JS_POSTFIX_UNCACHED: () => LOADER_JS_POSTFIX_UNCACHED,
|
|
21
22
|
PRELOAD_JS_POSTFIX: () => PRELOAD_JS_POSTFIX,
|
|
22
23
|
isNative: () => isNative,
|
|
@@ -24,11 +25,12 @@ __export(constants_exports, {
|
|
|
24
25
|
isWebServer: () => isWebServer
|
|
25
26
|
});
|
|
26
27
|
module.exports = __toCommonJS(constants_exports);
|
|
27
|
-
var isWebClient = !1, isWebServer = !1, isNative = !0, _process_env_ONE_CACHE_KEY, CACHE_KEY = `${(_process_env_ONE_CACHE_KEY = process.env.ONE_CACHE_KEY) !== null && _process_env_ONE_CACHE_KEY !== void 0 ? _process_env_ONE_CACHE_KEY : Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
28
|
+
var isWebClient = !1, isWebServer = !1, isNative = !0, _process_env_ONE_CACHE_KEY, CACHE_KEY = `${(_process_env_ONE_CACHE_KEY = process.env.ONE_CACHE_KEY) !== null && _process_env_ONE_CACHE_KEY !== void 0 ? _process_env_ONE_CACHE_KEY : Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX_REGEX = new RegExp(`_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`), LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
28
29
|
// Annotate the CommonJS export names for ESM import in node:
|
|
29
30
|
0 && (module.exports = {
|
|
30
31
|
CACHE_KEY,
|
|
31
32
|
LOADER_JS_POSTFIX,
|
|
33
|
+
LOADER_JS_POSTFIX_REGEX,
|
|
32
34
|
LOADER_JS_POSTFIX_UNCACHED,
|
|
33
35
|
PRELOAD_JS_POSTFIX,
|
|
34
36
|
isNative,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/constants.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA
|
|
5
|
-
"names": ["isWebClient", "process", "isWebServer", "isNative", "CACHE_KEY", "env", "ONE_CACHE_KEY", "Math", "round", "random", "LOADER_JS_POSTFIX_UNCACHED", "LOADER_JS_POSTFIX", "PRELOAD_JS_POSTFIX"]
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;AAAO,IAAMA,cAAcC,IACdC,cAAcD,IACdE,WAAWF,IAEIA,4BAAfG,YAAY,IAAGH,6BAAAA,QAAQI,IAAIC,mBAAa,QAAzBL,+BAAAA,SAAAA,6BAA6BM,KAAKC,MAAMD,KAAKE,OAAM,IAAK,GAAA,CAAA,IAEvEC,6BAA6B,mBAC7BC,0BAA0B,IAAIC,OAAO,QAAQF,0BAAAA,GAA6B,GAC1EG,oBAAoB,IAAIT,SAAAA,GAAYM,0BAAAA,IACpCI,qBAAqB,IAAIV,SAAAA;",
|
|
5
|
+
"names": ["isWebClient", "process", "isWebServer", "isNative", "CACHE_KEY", "env", "ONE_CACHE_KEY", "Math", "round", "random", "LOADER_JS_POSTFIX_UNCACHED", "LOADER_JS_POSTFIX_REGEX", "RegExp", "LOADER_JS_POSTFIX", "PRELOAD_JS_POSTFIX"]
|
|
6
6
|
}
|
|
@@ -138,7 +138,7 @@ function createHandleRequest(options, handlers) {
|
|
|
138
138
|
function getLoaderParams(url, config) {
|
|
139
139
|
const params = {},
|
|
140
140
|
match = new RegExp(config.workingRegex).exec(url.pathname);
|
|
141
|
-
if (match?.groups) for (const [key, value] of Object.entries(match.groups)) {
|
|
141
|
+
if (console.log("getting loader params", url), match?.groups) for (const [key, value] of Object.entries(match.groups)) {
|
|
142
142
|
const namedKey = config.routeKeys[key];
|
|
143
143
|
params[namedKey] = value;
|
|
144
144
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAsC,uBACtC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -158,7 +158,7 @@ function createHandleRequest(options, handlers) {
|
|
|
158
158
|
}
|
|
159
159
|
function getLoaderParams(url, config) {
|
|
160
160
|
var params = {}, match = new RegExp(config.workingRegex).exec(url.pathname);
|
|
161
|
-
if (match != null && match.groups) {
|
|
161
|
+
if (console.log("getting loader params", url), match != null && match.groups) {
|
|
162
162
|
var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
|
|
163
163
|
try {
|
|
164
164
|
for (var _iterator = Object.entries(match.groups)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;sBAAsC,uBACtC,
|
|
5
|
-
"names": ["createHandleRequest", "options", "handlers", "manifest", "getManifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "isResponse", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "promiseWithResolvers", "ssrResponse", "config", "match", "exec", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["createHandleRequest", "options", "handlers", "manifest", "getManifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "isResponse", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "promiseWithResolvers", "ssrResponse", "config", "match", "exec", "log", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
|
|
6
6
|
}
|
package/dist/cjs/serve.cjs
CHANGED
|
@@ -102,7 +102,11 @@ async function oneServe(options, vxrnOptions, buildInfo, app) {
|
|
|
102
102
|
builtRoutes
|
|
103
103
|
} = buildInfo,
|
|
104
104
|
routeToBuildInfo = {};
|
|
105
|
-
for (const route of builtRoutes)
|
|
105
|
+
for (const route of builtRoutes) {
|
|
106
|
+
routeToBuildInfo[route.cleanPath] = route;
|
|
107
|
+
const bracketRoutePath = route.cleanPath.split("/").map(part => part[0] === ":" ? `[${part.slice(1)}]` : part).join("/");
|
|
108
|
+
routeToBuildInfo[bracketRoutePath] = route;
|
|
109
|
+
}
|
|
106
110
|
const serverOptions = {
|
|
107
111
|
...options,
|
|
108
112
|
root
|
package/dist/cjs/serve.cjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/serve.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,8BAAO,+BAEP,kBAAoB,iCAEpB,mBAAqB,sBAErB,cAA4D;AAK5D,QAAQ,GAAG,qBAAqB,CAAC,QAAQ;AACvC,UAAQ,MAAM,4BAA4B,KAAK,SAAS,GAAG;AAC7D,CAAC;AAED,eAAsB,MAAM,OAA8B,CAAC,GAAG;AAC5D,QAAM,YAAa,MAAM,gBAAAA,QAAQ,SAAS,qBAAqB;AAG/D,UAAQ,IAAI,gBAAgB,UAAU,UAAU;AAGhD,QAAM,EAAE,aAAa,IAAI,MAAM,OAAO,qBAAqB,GACrD,EAAE,gBAAgB,IAAI,MAAM,OAAO,yBAAyB,GAC5D,EAAE,mBAAmB,IAAI,MAAM,OAAO,YAAY;AAExD,eAAa,OAAO,OACpB,qBAAQ,YAAY;AAEpB,QAAM,aAAa,MAAM,mBAAmB,OAAO;AAGnD,iBAAQ,IAAI,gBAAgB,KAErB,UAAM,YAAAC,OAAU;AAAA,IACrB,QAAQ;AAAA;AAAA,MAEN,GAAG,WAAW;AAAA;AAAA,MAEd,GAAG,gBAAgB;AAAA,QACjB,MAAM,KAAK,OAAO,CAAC,KAAK,OAAO;AAAA,QAC/B,MAAM,KAAK;AAAA,QACX,UAAU,KAAK;AAAA,QACf,UAAU,KAAK;AAAA,QACf,cAAc,KAAK;AAAA,MACrB,CAAC;AAAA,MAED,MAAM,YAAY,SAAS,KAAK;AAC9B,cAAM,WAAW,QAAQ,cAAc,SAAS,GAAG,GACnD,MAAM,SAAS,YAAY,SAAS,WAAW,GAAG;AAAA,MACpD;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEA,eAAe,SACb,SACA,aACA,WACA,KACA;AACA,QAAM,EAAE,oBAAoB,IAAI,MAAM,OAAO,uBAAuB,GAC9D,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAoB,GAClD,EAAE,iBAAiB,IAAI,MAAM,OAAO,kBAAkB,GACtD,EAAE,kBAAkB,IAAI,MAAM,OAAO,0BAA0B,GAE/D,eAAe,oBAAI,QAAsB,GACzC,OAAO,YAAY,QAAQ,KAG3B,YAAY,QAAQ,KAAK;AAC/B,MAAI;AACF,eAAW,YAAY;AACrB,UAAI,IAAI,SAAS,QAAQ,CAAC,YAAY;AACpC,cAAM,iBAAiB,SAAS,YAAY,QAAQ,SAAS,CAAC,UAAU;AACtE,gBAAM,YAAY,MAAM,UAAU,CAAC;AACnC,iBAAO,QAAQ,IAAI,MAAM,SAAS,KAAK;AAAA,QACzC,CAAC;AACD,eAAO,QAAQ,SAAS,gBAAgB,SAAS,YAAY,MAAM,GAAG;AAAA,MACxE,CAAC;AAIL,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,0CAA0C;AAG5D,QAAM,EAAE,UAAU,YAAY,IAAI,WAE5B,mBAAuD,CAAC;AAC9D,aAAW,SAAS;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["FSExtra", "vxrnServe", "buildInfo"]
|
|
6
6
|
}
|
package/dist/cjs/serve.native.js
CHANGED
|
@@ -88,6 +88,10 @@ async function oneServe(options, vxrnOptions, buildInfo, app) {
|
|
|
88
88
|
for (var _iterator1 = builtRoutes[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
|
|
89
89
|
var route = _step1.value;
|
|
90
90
|
routeToBuildInfo[route.cleanPath] = route;
|
|
91
|
+
var bracketRoutePath = route.cleanPath.split("/").map(function(part) {
|
|
92
|
+
return part[0] === ":" ? `[${part.slice(1)}]` : part;
|
|
93
|
+
}).join("/");
|
|
94
|
+
routeToBuildInfo[bracketRoutePath] = route;
|
|
91
95
|
}
|
|
92
96
|
} catch (err) {
|
|
93
97
|
_didIteratorError1 = !0, _iteratorError1 = err;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/serve.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;8BAAO,+BAEP,kBAAoB,iCAEpB,mBAAqB,sBAErB,cAA4D;AAK5DA,QAAQC,GAAG,qBAAqB,SAACC,KAAAA;AAC/BC,UAAQC,MAAM,6BAA4BF,OAAAA,OAAAA,SAAAA,IAAKG,UAASH,GAAAA;AAC1D,CAAA;AAEA,eAAsBI,QAAAA;MAAMC,OAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAA8B,CAAC,GACnDC,YAAa,MAAMC,gBAAAA,QAAQC,SAAS,qBAAqB;AAG/DV,UAAQW,IAAIC,gBAAgBJ,UAAUK,UAAUC;AAGhD,MAAM,EAAEC,aAAY,IAAK,MAAM,OAAO,qBAAA,GAChC,EAAEC,gBAAe,IAAK,MAAM,OAAO,yBAAA,GACnC,EAAEC,mBAAkB,IAAK,MAAM,OAAO,YAAA;AAE5CF,eAAa,OAAA,OACbG,qBAAQ,YAAA;AAER,MAAMC,aAAa,MAAMF,mBAAmB,OAAA;AAG5CjB,iBAAQW,IAAIS,gBAAgB,KAErB,UAAMC,YAAAA,OAAU;IACrBC,QAAQ;;MAEN,GAAGH,WAAWG;;MAEd,GAAGN,gBAAgB;QACjBO,MAAMhB,KAAKgB,OAAO,CAAChB,KAAKgB,OAAOC;QAC/BC,MAAMlB,KAAKkB;QACXC,UAAUnB,KAAKmB;QACfC,UAAUpB,KAAKoB;QACfC,cAAcrB,KAAKqB;MACrB,CAAA;MAEA,MAAMC,YAAYC,SAASC,KAAG;YACtBZ,gCAAAA;AAAN,gBAAMA,qBAAAA,WAAWG,YAAM,QAAjBH,uBAAAA,WAAAA,iCAAAA,mBAAmBU,iBAAW,QAA9BV,mCAAAA,SAAAA,SAAAA,+BAAAA,KAAAA,oBAAiCW,SAASC,GAAAA,IAChD,MAAMC,SAASb,YAAYW,SAAStB,WAAWuB,GAAAA;MACjD;IACF;EACF,CAAA;AACF;AAEA,eAAeC,SACbF,SACAG,aACAzB,WACAuB,KAAS;MAWSD,
|
|
5
|
-
"names": ["process", "on", "err", "console", "error", "stack", "serve", "args", "buildInfo", "FSExtra", "readJSON", "env", "ONE_CACHE_KEY", "constants", "CACHE_KEY", "labelProcess", "removeUndefined", "loadUserOneOptions", "loadEnv", "oneOptions", "VXRN_REACT_19", "vxrnServe", "server", "port", "undefined", "host", "compress", "platform", "cacheHeaders", "beforeStart", "options", "app", "oneServe", "vxrnOptions", "createHandleRequest", "isResponse", "isStatusRedirect", "resolveAPIRequest", "isAPIRequest", "WeakMap", "root", "redirects", "web", "redirect", "get", "source", "context", "destinationUrl", "destination", "replace", "param", "paramName", "substring", "req", "permanent", "Error", "routeMap", "builtRoutes", "routeToBuildInfo", "route", "cleanPath", "serverOptions", "entryServer", "getServerEntry", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "handleRequest", "handleAPI", "request", "loaderProps", "apiFile", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["process", "on", "err", "console", "error", "stack", "serve", "args", "buildInfo", "FSExtra", "readJSON", "env", "ONE_CACHE_KEY", "constants", "CACHE_KEY", "labelProcess", "removeUndefined", "loadUserOneOptions", "loadEnv", "oneOptions", "VXRN_REACT_19", "vxrnServe", "server", "port", "undefined", "host", "compress", "platform", "cacheHeaders", "beforeStart", "options", "app", "oneServe", "vxrnOptions", "createHandleRequest", "isResponse", "isStatusRedirect", "resolveAPIRequest", "isAPIRequest", "WeakMap", "root", "redirects", "web", "redirect", "get", "source", "context", "destinationUrl", "destination", "replace", "param", "paramName", "substring", "req", "permanent", "Error", "routeMap", "builtRoutes", "routeToBuildInfo", "route", "cleanPath", "bracketRoutePath", "split", "map", "part", "slice", "join", "serverOptions", "entryServer", "getServerEntry", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "handleRequest", "handleAPI", "request", "loaderProps", "apiFile", "cwd", "page", "set", "params", "handleSSR", "url", "type", "Object", "keys", "exported", "serverJsPath", "loaderData", "loader", "preloads", "headers", "Headers", "Response", "path", "htmlFiles", "key", "info", "readFile", "use", "next", "html", "raw", "response", "handler", "status", "location", "json"]
|
|
6
6
|
}
|
package/dist/esm/cleanUrl.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
isNative,
|
|
3
3
|
LOADER_JS_POSTFIX,
|
|
4
|
-
|
|
4
|
+
LOADER_JS_POSTFIX_REGEX,
|
|
5
5
|
PRELOAD_JS_POSTFIX
|
|
6
6
|
} from "./constants";
|
|
7
7
|
import { getURL } from "./getURL";
|
|
@@ -22,7 +22,7 @@ function getLoaderPath(currentPath, includeUrl = isNative) {
|
|
|
22
22
|
return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${LOADER_JS_POSTFIX}`;
|
|
23
23
|
}
|
|
24
24
|
function getPathFromLoaderPath(loaderPath) {
|
|
25
|
-
return loaderPath.replace(
|
|
25
|
+
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
|
|
26
26
|
}
|
|
27
27
|
export {
|
|
28
28
|
getLoaderPath,
|
package/dist/esm/cleanUrl.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/cleanUrl.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,
|
|
4
|
+
"mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,oBAAoB;AAE7B,SAAS,SAAS,MAAc;AAC9B,SACE,aAAa,IAAI,EACd,WAAW,KAAK,GAAG,EAEnB,QAAQ,MAAM,EAAE;AAEvB;AAEA,MAAM,WAAW,OAAO,SAAW,KAC7B,gBAAgB,WAAW,OAAO,IAAI;AAErC,SAAS,eAAe,aAAqB;AAClD,SAAO,GAAG,aAAa,WAAW,SAAS,YAAY,MAAM,CAAC,CAAC,CAAC,GAAG,kBAAkB;AACvF;AAEO,SAAS,cACd,aAEA,aAAa,UACb;AACA,QAAM,UAAU,aAAa,OAAO,IAAI,IAClC,UAAU,QAAQ,IAAI,aAAa,gBAAgB,UAAU,IAE7D,iBAAiB,IAAI;AAAA,IACzB;AAAA,IACA;AAAA;AAAA,EACF;AAEA,SAAO,GAAG,OAAO,GAAG,OAAO,WAAW,SAAS,eAAe,SAAS,MAAM,CAAC,CAAC,CAAC,GAAG,iBAAiB;AACtG;AAEO,SAAS,sBAAsB,YAAoB;AACxD,SAAO,WACJ,QAAQ,yBAAyB,EAAE,EACnC,QAAQ,sBAAsB,EAAE,EAChC,WAAW,MAAM,GAAG;AACzB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/cleanUrl.mjs
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isNative, LOADER_JS_POSTFIX,
|
|
1
|
+
import { isNative, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_REGEX, PRELOAD_JS_POSTFIX } from "./constants.mjs";
|
|
2
2
|
import { getURL } from "./getURL.mjs";
|
|
3
3
|
import { removeSearch } from "./utils/removeSearch.mjs";
|
|
4
4
|
function cleanUrl(path) {
|
|
@@ -17,7 +17,7 @@ function getLoaderPath(currentPath, includeUrl = isNative) {
|
|
|
17
17
|
return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${LOADER_JS_POSTFIX}`;
|
|
18
18
|
}
|
|
19
19
|
function getPathFromLoaderPath(loaderPath) {
|
|
20
|
-
return loaderPath.replace(
|
|
20
|
+
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
|
|
21
21
|
}
|
|
22
22
|
export { getLoaderPath, getPathFromLoaderPath, getPreloadPath };
|
|
23
23
|
//# sourceMappingURL=cleanUrl.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isNative","LOADER_JS_POSTFIX","
|
|
1
|
+
{"version":3,"names":["isNative","LOADER_JS_POSTFIX","LOADER_JS_POSTFIX_REGEX","PRELOAD_JS_POSTFIX","getURL","removeSearch","cleanUrl","path","replaceAll","replace","isClient","window","clientSideURL","getPreloadPath","currentPath","slice","getLoaderPath","includeUrl","baseURL","devPath","process","env","NODE_ENV","currentPathUrl","URL","pathname","getPathFromLoaderPath","loaderPath"],"sources":["../../src/cleanUrl.ts"],"sourcesContent":[null],"mappings":"AAAA,SACEA,QAAA,EACAC,iBAAA,EACAC,uBAAA,EAEAC,kBAAA,QACK;AACP,SAASC,MAAA,QAAc;AACvB,SAASC,YAAA,QAAoB;AAE7B,SAASC,SAASC,IAAA,EAAc;EAC9B,OACEF,YAAA,CAAaE,IAAI,EACdC,UAAA,CAAW,KAAK,GAAG,EAEnBC,OAAA,CAAQ,MAAM,EAAE;AAEvB;AAEA,MAAMC,QAAA,GAAW,OAAOC,MAAA,GAAW;EAC7BC,aAAA,GAAgBF,QAAA,GAAWN,MAAA,CAAO,IAAI;AAErC,SAASS,eAAeC,WAAA,EAAqB;EAClD,OAAO,GAAGF,aAAa,WAAWN,QAAA,CAASQ,WAAA,CAAYC,KAAA,CAAM,CAAC,CAAC,CAAC,GAAGZ,kBAAkB;AACvF;AAEO,SAASa,cACdF,WAAA,EAEAG,UAAA,GAAajB,QAAA,EACb;EACA,MAAMkB,OAAA,GAAUD,UAAA,GAAab,MAAA,CAAO,IAAI;IAClCe,OAAA,GAAUC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBAAgB,UAAU;IAE7DC,cAAA,GAAiB,IAAIC,GAAA,CACzBV,WAAA,EACA;IAAA,iDACF;EAEA,OAAO,GAAGI,OAAO,GAAGC,OAAO,WAAWb,QAAA,CAASiB,cAAA,CAAeE,QAAA,CAASV,KAAA,CAAM,CAAC,CAAC,CAAC,GAAGd,iBAAiB;AACtG;AAEO,SAASyB,sBAAsBC,UAAA,EAAoB;EACxD,OAAOA,UAAA,CACJlB,OAAA,CAAQP,uBAAA,EAAyB,EAAE,EACnCO,OAAA,CAAQ,sBAAsB,EAAE,EAChCD,UAAA,CAAW,MAAM,GAAG;AACzB","ignoreList":[]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isNative, LOADER_JS_POSTFIX,
|
|
1
|
+
import { isNative, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_REGEX, PRELOAD_JS_POSTFIX } from "./constants";
|
|
2
2
|
import { getURL } from "./getURL";
|
|
3
3
|
import { removeSearch } from "./utils/removeSearch";
|
|
4
4
|
function cleanUrl(path) {
|
|
@@ -13,7 +13,7 @@ function getLoaderPath(currentPath) {
|
|
|
13
13
|
return `${baseURL}${devPath}/assets/${cleanUrl(currentPathUrl.pathname.slice(1))}${LOADER_JS_POSTFIX}`;
|
|
14
14
|
}
|
|
15
15
|
function getPathFromLoaderPath(loaderPath) {
|
|
16
|
-
return loaderPath.replace(
|
|
16
|
+
return loaderPath.replace(LOADER_JS_POSTFIX_REGEX, "").replace(/^(\/_one)?\/assets/, "").replaceAll(/_/g, "/");
|
|
17
17
|
}
|
|
18
18
|
export {
|
|
19
19
|
getLoaderPath,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/cleanUrl.ts"],
|
|
4
|
-
"mappings": "AAAA,SACEA,UACAC,mBACAC,
|
|
5
|
-
"names": ["isNative", "LOADER_JS_POSTFIX", "
|
|
4
|
+
"mappings": "AAAA,SACEA,UACAC,mBACAC,yBAEAC,0BACK;AACP,SAASC,cAAc;AACvB,SAASC,oBAAoB;AAE7B,SAASC,SAASC,MAAY;AAC5B,SACEF,aAAaE,IAAAA,EACVC,WAAW,KAAK,GAAA,EAEhBC,QAAQ,MAAM,EAAA;AAErB;AAEA,IAAMC,WAAW,OAAOC,SAAW,KAC7BC,gBAAgBF,WAAWN,OAAAA,IAAW;AAErC,SAASS,eAAeC,aAAmB;AAChD,SAAO,GAAGF,aAAAA,WAAwBN,SAASQ,YAAYC,MAAM,CAAA,CAAA,CAAA,GAAMZ,kBAAAA;AACrE;AAEO,SAASa,cACdF,aAAmB;MAEnBG,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAajB,UAEPkB,UAAUD,aAAab,OAAAA,IAAW,IAClCe,UAAUC,QAAQC,IAAIC,aAAa,gBAAgB,UAAU,IAE7DC,iBAAiB,IAAIC,IACzBV,aACA,oBAAA;AAGF,SAAO,GAAGI,OAAAA,GAAUC,OAAAA,WAAkBb,SAASiB,eAAeE,SAASV,MAAM,CAAA,CAAA,CAAA,GAAMd,iBAAAA;AACrF;AAEO,SAASyB,sBAAsBC,YAAkB;AACtD,SAAOA,WACJlB,QAAQP,yBAAyB,EAAA,EACjCO,QAAQ,sBAAsB,EAAA,EAC9BD,WAAW,MAAM,GAAA;AACtB;",
|
|
5
|
+
"names": ["isNative", "LOADER_JS_POSTFIX", "LOADER_JS_POSTFIX_REGEX", "PRELOAD_JS_POSTFIX", "getURL", "removeSearch", "cleanUrl", "path", "replaceAll", "replace", "isClient", "window", "clientSideURL", "getPreloadPath", "currentPath", "slice", "getLoaderPath", "includeUrl", "baseURL", "devPath", "process", "env", "NODE_ENV", "currentPathUrl", "URL", "pathname", "getPathFromLoaderPath", "loaderPath"]
|
|
6
6
|
}
|
package/dist/esm/constants.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
const isWebClient = typeof window < "u", isWebServer = typeof window > "u", isNative = !1, CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
1
|
+
const isWebClient = typeof window < "u", isWebServer = typeof window > "u", isNative = !1, CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX_REGEX = new RegExp(`_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`), LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
2
2
|
export {
|
|
3
3
|
CACHE_KEY,
|
|
4
4
|
LOADER_JS_POSTFIX,
|
|
5
|
+
LOADER_JS_POSTFIX_REGEX,
|
|
5
6
|
LOADER_JS_POSTFIX_UNCACHED,
|
|
6
7
|
PRELOAD_JS_POSTFIX,
|
|
7
8
|
isNative,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/constants.ts"],
|
|
4
|
-
"mappings": "AAAO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAC9D,qBAAqB,IAAI,SAAS;",
|
|
4
|
+
"mappings": "AAAO,MAAM,cAAyD,OAAO,SAAW,KAC3E,cAAyD,OAAO,SAAW,KAC3E,WAAW,IAEX,YAAY,GAAG,QAAQ,IAAI,iBAAiB,KAAK,MAAM,KAAK,OAAO,IAAI,GAAW,CAAC,IAEnF,6BAA6B,mBAC7B,0BAA0B,IAAI,OAAO,QAAQ,0BAA0B,GAAG,GAC1E,oBAAoB,IAAI,SAAS,GAAG,0BAA0B,IAC9D,qBAAqB,IAAI,SAAS;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/constants.mjs
CHANGED
|
@@ -3,7 +3,8 @@ const isWebClient = typeof window < "u",
|
|
|
3
3
|
isNative = !1,
|
|
4
4
|
CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 1e8)}`,
|
|
5
5
|
LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js",
|
|
6
|
+
LOADER_JS_POSTFIX_REGEX = new RegExp(`_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`),
|
|
6
7
|
LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`,
|
|
7
8
|
PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
8
|
-
export { CACHE_KEY, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX, isNative, isWebClient, isWebServer };
|
|
9
|
+
export { CACHE_KEY, LOADER_JS_POSTFIX, LOADER_JS_POSTFIX_REGEX, LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX, isNative, isWebClient, isWebServer };
|
|
9
10
|
//# sourceMappingURL=constants.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isWebClient","window","isWebServer","isNative","CACHE_KEY","process","env","ONE_CACHE_KEY","Math","round","random","LOADER_JS_POSTFIX_UNCACHED","LOADER_JS_POSTFIX","PRELOAD_JS_POSTFIX"],"sources":["../../src/constants.ts"],"sourcesContent":[null],"mappings":"AAAO,MAAMA,WAAA,GAAyD,OAAOC,MAAA,GAAW;EAC3EC,WAAA,GAAyD,OAAOD,MAAA,GAAW;EAC3EE,QAAA,GAAW;EAEXC,SAAA,GAAY,GAAGC,OAAA,CAAQC,GAAA,CAAIC,aAAA,IAAiBC,IAAA,CAAKC,KAAA,CAAMD,IAAA,CAAKE,MAAA,CAAO,IAAI,GAAW,CAAC;EAEnFC,0BAAA,GAA6B;EAC7BC,iBAAA,GAAoB,
|
|
1
|
+
{"version":3,"names":["isWebClient","window","isWebServer","isNative","CACHE_KEY","process","env","ONE_CACHE_KEY","Math","round","random","LOADER_JS_POSTFIX_UNCACHED","LOADER_JS_POSTFIX_REGEX","RegExp","LOADER_JS_POSTFIX","PRELOAD_JS_POSTFIX"],"sources":["../../src/constants.ts"],"sourcesContent":[null],"mappings":"AAAO,MAAMA,WAAA,GAAyD,OAAOC,MAAA,GAAW;EAC3EC,WAAA,GAAyD,OAAOD,MAAA,GAAW;EAC3EE,QAAA,GAAW;EAEXC,SAAA,GAAY,GAAGC,OAAA,CAAQC,GAAA,CAAIC,aAAA,IAAiBC,IAAA,CAAKC,KAAA,CAAMD,IAAA,CAAKE,MAAA,CAAO,IAAI,GAAW,CAAC;EAEnFC,0BAAA,GAA6B;EAC7BC,uBAAA,GAA0B,IAAIC,MAAA,CAAO,QAAQF,0BAA0B,GAAG;EAC1EG,iBAAA,GAAoB,IAAIV,SAAS,GAAGO,0BAA0B;EAC9DI,kBAAA,GAAqB,IAAIX,SAAS","ignoreList":[]}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
var isWebClient = !1, isWebServer = !1, isNative = !0, _process_env_ONE_CACHE_KEY, CACHE_KEY = `${(_process_env_ONE_CACHE_KEY = process.env.ONE_CACHE_KEY) !== null && _process_env_ONE_CACHE_KEY !== void 0 ? _process_env_ONE_CACHE_KEY : Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
1
|
+
var isWebClient = !1, isWebServer = !1, isNative = !0, _process_env_ONE_CACHE_KEY, CACHE_KEY = `${(_process_env_ONE_CACHE_KEY = process.env.ONE_CACHE_KEY) !== null && _process_env_ONE_CACHE_KEY !== void 0 ? _process_env_ONE_CACHE_KEY : Math.round(Math.random() * 1e8)}`, LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js", LOADER_JS_POSTFIX_REGEX = new RegExp(`_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`), LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`, PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`;
|
|
2
2
|
export {
|
|
3
3
|
CACHE_KEY,
|
|
4
4
|
LOADER_JS_POSTFIX,
|
|
5
|
+
LOADER_JS_POSTFIX_REGEX,
|
|
5
6
|
LOADER_JS_POSTFIX_UNCACHED,
|
|
6
7
|
PRELOAD_JS_POSTFIX,
|
|
7
8
|
isNative,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/constants.ts"],
|
|
4
|
-
"mappings": "AAAO,IAAMA,cAAcC,IACdC,cAAcD,IACdE,WAAWF,IAEIA,4BAAfG,YAAY,IAAGH,6BAAAA,QAAQI,IAAIC,mBAAa,QAAzBL,+BAAAA,SAAAA,6BAA6BM,KAAKC,MAAMD,KAAKE,OAAM,IAAK,GAAA,CAAA,IAEvEC,6BAA6B,mBAC7BC,oBAAoB,
|
|
5
|
-
"names": ["isWebClient", "process", "isWebServer", "isNative", "CACHE_KEY", "env", "ONE_CACHE_KEY", "Math", "round", "random", "LOADER_JS_POSTFIX_UNCACHED", "LOADER_JS_POSTFIX", "PRELOAD_JS_POSTFIX"]
|
|
4
|
+
"mappings": "AAAO,IAAMA,cAAcC,IACdC,cAAcD,IACdE,WAAWF,IAEIA,4BAAfG,YAAY,IAAGH,6BAAAA,QAAQI,IAAIC,mBAAa,QAAzBL,+BAAAA,SAAAA,6BAA6BM,KAAKC,MAAMD,KAAKE,OAAM,IAAK,GAAA,CAAA,IAEvEC,6BAA6B,mBAC7BC,0BAA0B,IAAIC,OAAO,QAAQF,0BAAAA,GAA6B,GAC1EG,oBAAoB,IAAIT,SAAAA,GAAYM,0BAAAA,IACpCI,qBAAqB,IAAIV,SAAAA;",
|
|
5
|
+
"names": ["isWebClient", "process", "isWebServer", "isNative", "CACHE_KEY", "env", "ONE_CACHE_KEY", "Math", "round", "random", "LOADER_JS_POSTFIX_UNCACHED", "LOADER_JS_POSTFIX_REGEX", "RegExp", "LOADER_JS_POSTFIX", "PRELOAD_JS_POSTFIX"]
|
|
6
6
|
}
|
|
@@ -107,7 +107,7 @@ function createHandleRequest(options, handlers) {
|
|
|
107
107
|
}
|
|
108
108
|
function getLoaderParams(url, config) {
|
|
109
109
|
const params = {}, match = new RegExp(config.workingRegex).exec(url.pathname);
|
|
110
|
-
if (match?.groups)
|
|
110
|
+
if (console.log("getting loader params", url), match?.groups)
|
|
111
111
|
for (const [key, value] of Object.entries(match.groups)) {
|
|
112
112
|
const namedKey = config.routeKeys[key];
|
|
113
113
|
params[namedKey] = value;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,6BAA6B;AACtC,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -113,7 +113,7 @@ function createHandleRequest(options, handlers) {
|
|
|
113
113
|
function getLoaderParams(url, config) {
|
|
114
114
|
const params = {},
|
|
115
115
|
match = new RegExp(config.workingRegex).exec(url.pathname);
|
|
116
|
-
if (match?.groups) for (const [key, value] of Object.entries(match.groups)) {
|
|
116
|
+
if (console.log("getting loader params", url), match?.groups) for (const [key, value] of Object.entries(match.groups)) {
|
|
117
117
|
const namedKey = config.routeKeys[key];
|
|
118
118
|
params[namedKey] = value;
|
|
119
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","isResponse","promiseWithResolvers","getManifest","createHandleRequest","options","handlers","manifest","Error","apiRoutesMap","apiRoutes","reduce","acc","cur","page","compiledRegex","RegExp","namedRegex","apiRoutesList","Object","values","activeRequests","pageRoutes","map","route","workingRegex","handler","request","urlString","url","URL","headers","get","pathname","search","process","env","NODE_ENV","startsWith","handleAPI","apiRoute","find","test","params","getRouteParams","loaderProps","path","err","method","handleLoader","endsWith","originalUrl","finalUrl","origin","file","console","info","Headers","set","loaderResponse","getLoaderParams","Response","error","routes","handleSSR","promise","reject","resolve","ssrResponse","config","match","exec","groups","key","value","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,
|
|
1
|
+
{"version":3,"names":["getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","isResponse","promiseWithResolvers","getManifest","createHandleRequest","options","handlers","manifest","Error","apiRoutesMap","apiRoutes","reduce","acc","cur","page","compiledRegex","RegExp","namedRegex","apiRoutesList","Object","values","activeRequests","pageRoutes","map","route","workingRegex","handler","request","urlString","url","URL","headers","get","pathname","search","process","env","NODE_ENV","startsWith","handleAPI","apiRoute","find","test","params","getRouteParams","loaderProps","path","err","method","handleLoader","endsWith","originalUrl","finalUrl","origin","file","console","info","Headers","set","loaderResponse","getLoaderParams","Response","error","routes","handleSSR","promise","reject","resolve","ssrResponse","config","match","exec","log","groups","key","value","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -142,7 +142,7 @@ function createHandleRequest(options, handlers) {
|
|
|
142
142
|
}
|
|
143
143
|
function getLoaderParams(url, config) {
|
|
144
144
|
var params = {}, match = new RegExp(config.workingRegex).exec(url.pathname);
|
|
145
|
-
if (match?.groups) {
|
|
145
|
+
if (console.log("getting loader params", url), match?.groups) {
|
|
146
146
|
var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
|
|
147
147
|
try {
|
|
148
148
|
for (var _iterator = Object.entries(match.groups)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "AAAA,SAASA,6BAA6B;AACtC,
|
|
5
|
-
"names": ["getPathFromLoaderPath", "LOADER_JS_POSTFIX_UNCACHED", "isResponse", "promiseWithResolvers", "getManifest", "createHandleRequest", "options", "handlers", "manifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "originalUrl", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "ssrResponse", "config", "match", "exec", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["getPathFromLoaderPath", "LOADER_JS_POSTFIX_UNCACHED", "isResponse", "promiseWithResolvers", "getManifest", "createHandleRequest", "options", "handlers", "manifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "originalUrl", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "ssrResponse", "config", "match", "exec", "log", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
|
|
6
6
|
}
|
package/dist/esm/serve.js
CHANGED
|
@@ -43,8 +43,11 @@ async function oneServe(options, vxrnOptions, buildInfo, app) {
|
|
|
43
43
|
if (!buildInfo)
|
|
44
44
|
throw new Error("No build info found, have you run build?");
|
|
45
45
|
const { routeMap, builtRoutes } = buildInfo, routeToBuildInfo = {};
|
|
46
|
-
for (const route of builtRoutes)
|
|
46
|
+
for (const route of builtRoutes) {
|
|
47
47
|
routeToBuildInfo[route.cleanPath] = route;
|
|
48
|
+
const bracketRoutePath = route.cleanPath.split("/").map((part) => part[0] === ":" ? `[${part.slice(1)}]` : part).join("/");
|
|
49
|
+
routeToBuildInfo[bracketRoutePath] = route;
|
|
50
|
+
}
|
|
48
51
|
const serverOptions = {
|
|
49
52
|
...options,
|
|
50
53
|
root
|
package/dist/esm/serve.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/serve.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO;AAEP,OAAO,aAAa;AAEpB,SAAS,YAAY;AAErB,SAAS,gBAAgB,SAAS,SAAS,iBAAiB;AAK5D,QAAQ,GAAG,qBAAqB,CAAC,QAAQ;AACvC,UAAQ,MAAM,4BAA4B,KAAK,SAAS,GAAG;AAC7D,CAAC;AAED,eAAsB,MAAM,OAA8B,CAAC,GAAG;AAC5D,QAAM,YAAa,MAAM,QAAQ,SAAS,qBAAqB;AAG/D,UAAQ,IAAI,gBAAgB,UAAU,UAAU;AAGhD,QAAM,EAAE,aAAa,IAAI,MAAM,OAAO,qBAAqB,GACrD,EAAE,gBAAgB,IAAI,MAAM,OAAO,yBAAyB,GAC5D,EAAE,mBAAmB,IAAI,MAAM,OAAO,YAAY;AAExD,eAAa,OAAO,GACpB,QAAQ,YAAY;AAEpB,QAAM,aAAa,MAAM,mBAAmB,OAAO;AAGnD,iBAAQ,IAAI,gBAAgB,KAErB,MAAM,UAAU;AAAA,IACrB,QAAQ;AAAA;AAAA,MAEN,GAAG,WAAW;AAAA;AAAA,MAEd,GAAG,gBAAgB;AAAA,QACjB,MAAM,KAAK,OAAO,CAAC,KAAK,OAAO;AAAA,QAC/B,MAAM,KAAK;AAAA,QACX,UAAU,KAAK;AAAA,QACf,UAAU,KAAK;AAAA,QACf,cAAc,KAAK;AAAA,MACrB,CAAC;AAAA,MAED,MAAM,YAAY,SAAS,KAAK;AAC9B,cAAM,WAAW,QAAQ,cAAc,SAAS,GAAG,GACnD,MAAM,SAAS,YAAY,SAAS,WAAW,GAAG;AAAA,MACpD;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEA,eAAe,SACb,SACA,aACA,WACA,KACA;AACA,QAAM,EAAE,oBAAoB,IAAI,MAAM,OAAO,uBAAuB,GAC9D,EAAE,WAAW,IAAI,MAAM,OAAO,oBAAoB,GAClD,EAAE,iBAAiB,IAAI,MAAM,OAAO,kBAAkB,GACtD,EAAE,kBAAkB,IAAI,MAAM,OAAO,0BAA0B,GAE/D,eAAe,oBAAI,QAAsB,GACzC,OAAO,YAAY,QAAQ,KAG3B,YAAY,QAAQ,KAAK;AAC/B,MAAI;AACF,eAAW,YAAY;AACrB,UAAI,IAAI,SAAS,QAAQ,CAAC,YAAY;AACpC,cAAM,iBAAiB,SAAS,YAAY,QAAQ,SAAS,CAAC,UAAU;AACtE,gBAAM,YAAY,MAAM,UAAU,CAAC;AACnC,iBAAO,QAAQ,IAAI,MAAM,SAAS,KAAK;AAAA,QACzC,CAAC;AACD,eAAO,QAAQ,SAAS,gBAAgB,SAAS,YAAY,MAAM,GAAG;AAAA,MACxE,CAAC;AAIL,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,0CAA0C;AAG5D,QAAM,EAAE,UAAU,YAAY,IAAI,WAE5B,mBAAuD,CAAC;AAC9D,aAAW,SAAS;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["buildInfo"]
|
|
6
6
|
}
|
package/dist/esm/serve.mjs
CHANGED
|
@@ -66,7 +66,11 @@ async function oneServe(options, vxrnOptions, buildInfo, app) {
|
|
|
66
66
|
builtRoutes
|
|
67
67
|
} = buildInfo,
|
|
68
68
|
routeToBuildInfo = {};
|
|
69
|
-
for (const route of builtRoutes)
|
|
69
|
+
for (const route of builtRoutes) {
|
|
70
|
+
routeToBuildInfo[route.cleanPath] = route;
|
|
71
|
+
const bracketRoutePath = route.cleanPath.split("/").map(part => part[0] === ":" ? `[${part.slice(1)}]` : part).join("/");
|
|
72
|
+
routeToBuildInfo[bracketRoutePath] = route;
|
|
73
|
+
}
|
|
70
74
|
const serverOptions = {
|
|
71
75
|
...options,
|
|
72
76
|
root
|
package/dist/esm/serve.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FSExtra","join","getServerEntry","loadEnv","serve","vxrnServe","process","on","err","console","error","stack","args","buildInfo","readJSON","env","ONE_CACHE_KEY","constants","CACHE_KEY","labelProcess","removeUndefined","loadUserOneOptions","oneOptions","VXRN_REACT_19","server","port","host","compress","platform","cacheHeaders","beforeStart","options","app","oneServe","vxrnOptions","createHandleRequest","isResponse","isStatusRedirect","resolveAPIRequest","isAPIRequest","WeakMap","root","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeMap","builtRoutes","routeToBuildInfo","route","cleanPath","serverOptions","render","default","apiCJS","build","api","outputFormat","handleRequest","handleAPI","request","loaderProps","apiFile","cwd","page","set","params","handleSSR","url","type","buildInfo2","Object","keys","loaderData","serverJsPath","loader","preloads","headers","Headers","Response","path","htmlFiles","key","readFile","use","next","html","raw","response","handler","status","location","info","json"],"sources":["../../src/serve.ts"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"names":["FSExtra","join","getServerEntry","loadEnv","serve","vxrnServe","process","on","err","console","error","stack","args","buildInfo","readJSON","env","ONE_CACHE_KEY","constants","CACHE_KEY","labelProcess","removeUndefined","loadUserOneOptions","oneOptions","VXRN_REACT_19","server","port","host","compress","platform","cacheHeaders","beforeStart","options","app","oneServe","vxrnOptions","createHandleRequest","isResponse","isStatusRedirect","resolveAPIRequest","isAPIRequest","WeakMap","root","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeMap","builtRoutes","routeToBuildInfo","route","cleanPath","bracketRoutePath","split","map","part","slice","serverOptions","render","default","apiCJS","build","api","outputFormat","handleRequest","handleAPI","request","loaderProps","apiFile","cwd","page","set","params","handleSSR","url","type","buildInfo2","Object","keys","loaderData","serverJsPath","loader","preloads","headers","Headers","Response","path","htmlFiles","key","readFile","use","next","html","raw","response","handler","status","location","info","json"],"sources":["../../src/serve.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/serve.native.js
CHANGED
|
@@ -63,6 +63,10 @@ async function oneServe(options, vxrnOptions, buildInfo, app) {
|
|
|
63
63
|
for (var _iterator1 = builtRoutes[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
|
|
64
64
|
var route = _step1.value;
|
|
65
65
|
routeToBuildInfo[route.cleanPath] = route;
|
|
66
|
+
var bracketRoutePath = route.cleanPath.split("/").map(function(part) {
|
|
67
|
+
return part[0] === ":" ? `[${part.slice(1)}]` : part;
|
|
68
|
+
}).join("/");
|
|
69
|
+
routeToBuildInfo[bracketRoutePath] = route;
|
|
66
70
|
}
|
|
67
71
|
} catch (err) {
|
|
68
72
|
_didIteratorError1 = !0, _iteratorError1 = err;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/serve.ts"],
|
|
4
|
-
"mappings": "AAAA,OAAO;AAEP,OAAOA,aAAa;AAEpB,SAASC,YAAY;AAErB,SAASC,gBAAgBC,SAASC,SAASC,iBAAiB;AAK5DC,QAAQC,GAAG,qBAAqB,SAACC,KAAAA;AAC/BC,UAAQC,MAAM,4BAA4BF,KAAKG,SAASH,GAAAA;AAC1D,CAAA;AAEA,eAAsBJ,QAAAA;MAAMQ,OAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAA8B,CAAC,GACnDC,YAAa,MAAMb,QAAQc,SAAS,qBAAqB;AAG/DR,UAAQS,IAAIC,gBAAgBH,UAAUI,UAAUC;AAGhD,MAAM,EAAEC,aAAY,IAAK,MAAM,OAAO,qBAAA,GAChC,EAAEC,gBAAe,IAAK,MAAM,OAAO,yBAAA,GACnC,EAAEC,mBAAkB,IAAK,MAAM,OAAO,YAAA;AAE5CF,eAAa,OAAA,GACbhB,QAAQ,YAAA;AAER,MAAMmB,aAAa,MAAMD,mBAAmB,OAAA;AAG5Cf,iBAAQS,IAAIQ,gBAAgB,KAErB,MAAMlB,UAAU;IACrBmB,QAAQ;;MAEN,GAAGF,WAAWE;;MAEd,GAAGJ,gBAAgB;QACjBK,MAAMb,KAAKa,OAAO,CAACb,KAAKa,OAAOC;QAC/BC,MAAMf,KAAKe;QACXC,UAAUhB,KAAKgB;QACfC,UAAUjB,KAAKiB;QACfC,cAAclB,KAAKkB;MACrB,CAAA;MAEA,MAAMC,YAAYC,SAASC,KAAG;YACtBX,gCAAAA;AAAN,gBAAMA,qBAAAA,WAAWE,YAAM,QAAjBF,uBAAAA,WAAAA,iCAAAA,mBAAmBS,iBAAW,QAA9BT,mCAAAA,SAAAA,SAAAA,+BAAAA,KAAAA,oBAAiCU,SAASC,GAAAA,IAChD,MAAMC,SAASZ,YAAYU,SAASnB,WAAWoB,GAAAA;MACjD;IACF;EACF,CAAA;AACF;AAEA,eAAeC,SACbF,SACAG,aACAtB,WACAoB,KAAS;MAWSD,
|
|
5
|
-
"names": ["FSExtra", "join", "getServerEntry", "loadEnv", "serve", "vxrnServe", "process", "on", "err", "console", "error", "stack", "args", "buildInfo", "readJSON", "env", "ONE_CACHE_KEY", "constants", "CACHE_KEY", "labelProcess", "removeUndefined", "loadUserOneOptions", "oneOptions", "VXRN_REACT_19", "server", "port", "undefined", "host", "compress", "platform", "cacheHeaders", "beforeStart", "options", "app", "oneServe", "vxrnOptions", "createHandleRequest", "isResponse", "isStatusRedirect", "resolveAPIRequest", "isAPIRequest", "WeakMap", "root", "redirects", "web", "redirect", "get", "source", "context", "destinationUrl", "destination", "replace", "param", "paramName", "substring", "req", "permanent", "Error", "routeMap", "builtRoutes", "routeToBuildInfo", "route", "cleanPath", "serverOptions", "entryServer", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "handleRequest", "handleAPI", "request", "loaderProps", "apiFile", "cwd", "page", "set", "params", "handleSSR", "url", "type", "Object", "keys", "exported", "serverJsPath", "loaderData", "loader", "preloads", "headers", "Headers", "Response", "path", "htmlFiles", "key", "info", "readFile", "use", "next", "html", "raw", "response", "handler", "status", "location", "json"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["FSExtra", "join", "getServerEntry", "loadEnv", "serve", "vxrnServe", "process", "on", "err", "console", "error", "stack", "args", "buildInfo", "readJSON", "env", "ONE_CACHE_KEY", "constants", "CACHE_KEY", "labelProcess", "removeUndefined", "loadUserOneOptions", "oneOptions", "VXRN_REACT_19", "server", "port", "undefined", "host", "compress", "platform", "cacheHeaders", "beforeStart", "options", "app", "oneServe", "vxrnOptions", "createHandleRequest", "isResponse", "isStatusRedirect", "resolveAPIRequest", "isAPIRequest", "WeakMap", "root", "redirects", "web", "redirect", "get", "source", "context", "destinationUrl", "destination", "replace", "param", "paramName", "substring", "req", "permanent", "Error", "routeMap", "builtRoutes", "routeToBuildInfo", "route", "cleanPath", "bracketRoutePath", "split", "map", "part", "slice", "serverOptions", "entryServer", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "handleRequest", "handleAPI", "request", "loaderProps", "apiFile", "cwd", "page", "set", "params", "handleSSR", "url", "type", "Object", "keys", "exported", "serverJsPath", "loaderData", "loader", "preloads", "headers", "Headers", "Response", "path", "htmlFiles", "key", "info", "readFile", "use", "next", "html", "raw", "response", "handler", "status", "location", "json"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.314",
|
|
4
4
|
"source": "src/index.ts",
|
|
5
5
|
"types": "./types/index.d.ts",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -91,14 +91,14 @@
|
|
|
91
91
|
"@react-navigation/native-stack": "~6.9.13",
|
|
92
92
|
"@react-navigation/routers": "~6.1.9",
|
|
93
93
|
"@ungap/structured-clone": "^1.2.0",
|
|
94
|
-
"@vxrn/resolve": "1.1.
|
|
95
|
-
"@vxrn/tslib-lite": "1.1.
|
|
96
|
-
"@vxrn/universal-color-scheme": "1.1.
|
|
97
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
|
94
|
+
"@vxrn/resolve": "1.1.314",
|
|
95
|
+
"@vxrn/tslib-lite": "1.1.314",
|
|
96
|
+
"@vxrn/universal-color-scheme": "1.1.314",
|
|
97
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.314",
|
|
98
98
|
"babel-dead-code-elimination": "^1.0.6",
|
|
99
99
|
"citty": "^0.1.6",
|
|
100
100
|
"core-js": "^3.38.1",
|
|
101
|
-
"create-vxrn": "1.1.
|
|
101
|
+
"create-vxrn": "1.1.314",
|
|
102
102
|
"escape-string-regexp": "^5.0.0",
|
|
103
103
|
"expo-linking": "~6.3.1",
|
|
104
104
|
"expo-modules-core": "^1.12.24",
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
"url-parse": "^1.5.10",
|
|
121
121
|
"vite": "6.0.0-beta.1",
|
|
122
122
|
"vite-tsconfig-paths": "^5.0.1",
|
|
123
|
-
"vxrn": "1.1.
|
|
123
|
+
"vxrn": "1.1.314",
|
|
124
124
|
"ws": "^8.18.0",
|
|
125
125
|
"xxhashjs": "^0.2.2"
|
|
126
126
|
},
|
package/src/cleanUrl.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
isNative,
|
|
3
3
|
LOADER_JS_POSTFIX,
|
|
4
|
+
LOADER_JS_POSTFIX_REGEX,
|
|
4
5
|
LOADER_JS_POSTFIX_UNCACHED,
|
|
5
6
|
PRELOAD_JS_POSTFIX,
|
|
6
7
|
} from './constants'
|
|
@@ -41,8 +42,7 @@ export function getLoaderPath(
|
|
|
41
42
|
|
|
42
43
|
export function getPathFromLoaderPath(loaderPath: string) {
|
|
43
44
|
return loaderPath
|
|
44
|
-
.replace(
|
|
45
|
-
.replace(/_\d+/, '')
|
|
45
|
+
.replace(LOADER_JS_POSTFIX_REGEX, '')
|
|
46
46
|
.replace(/^(\/_one)?\/assets/, '')
|
|
47
47
|
.replaceAll(/_/g, '/')
|
|
48
48
|
}
|
package/src/constants.ts
CHANGED
|
@@ -5,5 +5,6 @@ export const isNative = process.env.TAMAGUI_TARGET === 'native'
|
|
|
5
5
|
export const CACHE_KEY = `${process.env.ONE_CACHE_KEY ?? Math.round(Math.random() * 100_000_000)}`
|
|
6
6
|
|
|
7
7
|
export const LOADER_JS_POSTFIX_UNCACHED = `_vxrn_loader.js`
|
|
8
|
+
export const LOADER_JS_POSTFIX_REGEX = new RegExp(`_\\d+${LOADER_JS_POSTFIX_UNCACHED}$`)
|
|
8
9
|
export const LOADER_JS_POSTFIX = `_${CACHE_KEY}${LOADER_JS_POSTFIX_UNCACHED}`
|
|
9
10
|
export const PRELOAD_JS_POSTFIX = `_${CACHE_KEY}_preload.js`
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getPathFromLoaderPath } from './cleanUrl'
|
|
2
|
-
import {
|
|
2
|
+
import { LOADER_JS_POSTFIX_REGEX, LOADER_JS_POSTFIX_UNCACHED } from './constants'
|
|
3
3
|
import type { RouteInfo } from './server/createRoutesManifest'
|
|
4
4
|
import { isResponse } from './utils/isResponse'
|
|
5
5
|
import { promiseWithResolvers } from './utils/promiseWithResolvers'
|
|
@@ -104,6 +104,7 @@ export function createHandleRequest(
|
|
|
104
104
|
|
|
105
105
|
if (isClientRequestingNewRoute) {
|
|
106
106
|
const originalUrl = getPathFromLoaderPath(pathname)
|
|
107
|
+
|
|
107
108
|
const finalUrl = new URL(originalUrl, url.origin)
|
|
108
109
|
|
|
109
110
|
for (const route of pageRoutes) {
|
|
@@ -207,6 +208,7 @@ function getLoaderParams(
|
|
|
207
208
|
) {
|
|
208
209
|
const params: Record<string, string> = {}
|
|
209
210
|
const match = new RegExp(config.workingRegex).exec(url.pathname)
|
|
211
|
+
console.log('getting loader params', url)
|
|
210
212
|
if (match?.groups) {
|
|
211
213
|
for (const [key, value] of Object.entries(match.groups)) {
|
|
212
214
|
const namedKey = config.routeKeys[key]
|
package/src/serve.ts
CHANGED
|
@@ -90,6 +90,15 @@ async function oneServe(
|
|
|
90
90
|
const routeToBuildInfo: Record<string, One.RouteBuildInfo> = {}
|
|
91
91
|
for (const route of builtRoutes) {
|
|
92
92
|
routeToBuildInfo[route.cleanPath] = route
|
|
93
|
+
|
|
94
|
+
// temp - make it back into brackets style
|
|
95
|
+
const bracketRoutePath = route.cleanPath
|
|
96
|
+
.split('/')
|
|
97
|
+
.map((part) => {
|
|
98
|
+
return part[0] === ':' ? `[${part.slice(1)}]` : part
|
|
99
|
+
})
|
|
100
|
+
.join('/')
|
|
101
|
+
routeToBuildInfo[bracketRoutePath] = route
|
|
93
102
|
}
|
|
94
103
|
|
|
95
104
|
const serverOptions = {
|
package/types/cleanUrl.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleanUrl.d.ts","sourceRoot":"","sources":["../src/cleanUrl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cleanUrl.d.ts","sourceRoot":"","sources":["../src/cleanUrl.ts"],"names":[],"mappings":"AAsBA,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,UAEjD;AAED,wBAAgB,aAAa,CAC3B,WAAW,EAAE,MAAM,EAEnB,UAAU,UAAW,UAWtB;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,UAKvD"}
|
package/types/constants.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export declare const isWebServer: boolean;
|
|
|
3
3
|
export declare const isNative: boolean;
|
|
4
4
|
export declare const CACHE_KEY: string;
|
|
5
5
|
export declare const LOADER_JS_POSTFIX_UNCACHED = "_vxrn_loader.js";
|
|
6
|
+
export declare const LOADER_JS_POSTFIX_REGEX: RegExp;
|
|
6
7
|
export declare const LOADER_JS_POSTFIX: string;
|
|
7
8
|
export declare const PRELOAD_JS_POSTFIX: string;
|
|
8
9
|
//# sourceMappingURL=constants.d.ts.map
|
package/types/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,QAAQ,SAA0C,CAAA;AAE/D,eAAO,MAAM,SAAS,QAA4E,CAAA;AAElG,eAAO,MAAM,0BAA0B,oBAAoB,CAAA;AAC3D,eAAO,MAAM,iBAAiB,QAA+C,CAAA;AAC7E,eAAO,MAAM,kBAAkB,QAA6B,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,WAAW,SAA2E,CAAA;AACnG,eAAO,MAAM,QAAQ,SAA0C,CAAA;AAE/D,eAAO,MAAM,SAAS,QAA4E,CAAA;AAElG,eAAO,MAAM,0BAA0B,oBAAoB,CAAA;AAC3D,eAAO,MAAM,uBAAuB,QAAoD,CAAA;AACxF,eAAO,MAAM,iBAAiB,QAA+C,CAAA;AAC7E,eAAO,MAAM,kBAAkB,QAA6B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAI9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAA;CAC5D,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,CAAC,aAAa,EAC1B,QAAQ,EAAE;IACR,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACzD;;uBA4BgD,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAI9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAA;CAC5D,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,CAAC,aAAa,EAC1B,QAAQ,EAAE;IACR,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACzD;;uBA4BgD,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAuJ3F"}
|