one 1.1.395 → 1.1.396
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/createHandleRequest.cjs +2 -1
- package/dist/cjs/createHandleRequest.js +2 -1
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +2 -1
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/useLoader.cjs +6 -7
- package/dist/cjs/useLoader.js +3 -3
- package/dist/cjs/useLoader.js.map +1 -1
- package/dist/cjs/useLoader.native.js +5 -5
- package/dist/cjs/useLoader.native.js.map +2 -2
- package/dist/esm/createHandleRequest.js +2 -1
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +2 -1
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +2 -1
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/useLoader.js +2 -3
- package/dist/esm/useLoader.js.map +1 -1
- package/dist/esm/useLoader.mjs +6 -7
- package/dist/esm/useLoader.mjs.map +1 -1
- package/dist/esm/useLoader.native.js +4 -5
- package/dist/esm/useLoader.native.js.map +2 -2
- package/package.json +8 -8
- package/src/createHandleRequest.ts +2 -1
- package/src/useLoader.ts +4 -4
- package/types/createHandleRequest.d.ts.map +1 -1
|
@@ -161,8 +161,9 @@ function createHandleRequest(handlers) {
|
|
|
161
161
|
const finalUrl = new URL(originalUrl, url.origin);
|
|
162
162
|
if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname)) return resolveLoaderRoute(handlers, request, finalUrl, route);
|
|
163
163
|
}
|
|
164
|
-
return process.env.NODE_ENV === "development" && console.error("No matching route found!", {
|
|
164
|
+
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
165
165
|
originalUrl,
|
|
166
|
+
pathname,
|
|
166
167
|
routes: manifest.pageRoutes
|
|
167
168
|
}), Response.error();
|
|
168
169
|
}
|
|
@@ -155,8 +155,9 @@ function createHandleRequest(handlers) {
|
|
|
155
155
|
if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname))
|
|
156
156
|
return resolveLoaderRoute(handlers, request, finalUrl, route);
|
|
157
157
|
}
|
|
158
|
-
return process.env.NODE_ENV === "development" && console.error("No matching route found!", {
|
|
158
|
+
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
159
159
|
originalUrl,
|
|
160
|
+
pathname,
|
|
160
161
|
routes: manifest.pageRoutes
|
|
161
162
|
}), Response.error();
|
|
162
163
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -180,8 +180,9 @@ function createHandleRequest(handlers) {
|
|
|
180
180
|
throw _iteratorError;
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
|
-
return process.env.NODE_ENV === "development" && console.error("No matching route found!", {
|
|
183
|
+
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
184
184
|
originalUrl,
|
|
185
|
+
pathname,
|
|
185
186
|
routes: manifest.pageRoutes
|
|
186
187
|
}), Response.error();
|
|
187
188
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["runMiddlewares", "handlers", "request", "route", "getResponse", "middlewares", "length", "loadMiddleware", "Error", "context", "dispatch", "index", "middlewareModule", "exported", "default", "contextKey", "next", "response", "resolveAPIRoute", "url", "pathname", "params", "getRouteParams", "resolveAPIEndpoint", "handleAPI", "loaderProps", "path", "err", "isResponse", "process", "env", "NODE_ENV", "console", "error", "resolveLoaderRoute", "resolveResponse", "headers", "Headers", "set", "loaderResponse", "handleLoader", "type", "undefined", "getLoaderParams", "Response", "resolvePageRoute", "search", "resolved", "handlePage", "getURLfromRequestURL", "urlString", "URL", "get", "compileRouteRegex", "compiledRegex", "RegExp", "namedRegex", "honoPath", "getHonoPath", "page", "compileManifest", "manifest", "pageRoutes", "map", "apiRoutes", "createHandleRequest", "getManifest", "compiledManifest", "handler", "startsWith", "apiRoute", "find", "test", "method", "isClientRequestingNewRoute", "endsWith", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "file", "finalUrl", "origin", "routes", "config", "match", "exec", "groups", "Object", "entries", "key", "value", "namedKey", "routeKeys", "regex", "fromEntries"]
|
|
6
6
|
}
|
package/dist/cjs/useLoader.cjs
CHANGED
|
@@ -26,7 +26,6 @@ module.exports = __toCommonJS(useLoader_exports);
|
|
|
26
26
|
var import_react = require("react"),
|
|
27
27
|
import_hooks = require("./hooks.cjs"),
|
|
28
28
|
import_href = require("./link/href.cjs"),
|
|
29
|
-
import_Route = require("./router/Route.cjs"),
|
|
30
29
|
import_router = require("./router/router.cjs"),
|
|
31
30
|
import_cleanUrl = require("./utils/cleanUrl.cjs"),
|
|
32
31
|
import_dynamicImport = require("./utils/dynamicImport.cjs"),
|
|
@@ -44,12 +43,12 @@ function useLoader(loader) {
|
|
|
44
43
|
path: (0, import_hooks.usePathname)(),
|
|
45
44
|
params: (0, import_hooks.useActiveParams)()
|
|
46
45
|
});
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
currentPath =
|
|
50
|
-
pathname
|
|
46
|
+
const params = (0, import_hooks.useParams)(),
|
|
47
|
+
pathname = (0, import_hooks.usePathname)(),
|
|
48
|
+
currentPath = (0, import_href.resolveHref)({
|
|
49
|
+
pathname,
|
|
51
50
|
params
|
|
52
|
-
}).replace(/index$/, ""),
|
|
51
|
+
}).replace(/index$/, "").replace(/\?.*/, ""),
|
|
53
52
|
preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
|
|
54
53
|
currentData = (0, import_react.useRef)(preloadedData);
|
|
55
54
|
if ((0, import_react.useEffect)(() => {
|
|
@@ -66,7 +65,7 @@ function useLoader(loader) {
|
|
|
66
65
|
const getData = async () => {
|
|
67
66
|
const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
|
|
68
67
|
try {
|
|
69
|
-
const response = await (async () =>
|
|
68
|
+
const response = await (async () => await (0, import_dynamicImport.dynamicImport)(loaderJSUrl))();
|
|
70
69
|
return loadedData[currentPath] = response.loader(), loadedData[currentPath];
|
|
71
70
|
} catch (err) {
|
|
72
71
|
return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
|
package/dist/cjs/useLoader.js
CHANGED
|
@@ -17,7 +17,7 @@ __export(useLoader_exports, {
|
|
|
17
17
|
useLoader: () => useLoader
|
|
18
18
|
});
|
|
19
19
|
module.exports = __toCommonJS(useLoader_exports);
|
|
20
|
-
var import_react = require("react"), import_hooks = require("./hooks"), import_href = require("./link/href"),
|
|
20
|
+
var import_react = require("react"), import_hooks = require("./hooks"), import_href = require("./link/href"), import_router = require("./router/router"), import_cleanUrl = require("./utils/cleanUrl"), import_dynamicImport = require("./utils/dynamicImport"), import_serverContext = require("./utils/serverContext"), import_weakKey = require("./utils/weakKey");
|
|
21
21
|
const promises = {}, errors = {}, loadedData = {};
|
|
22
22
|
function useLoader(loader) {
|
|
23
23
|
const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = (0, import_serverContext.getServerContext)() || {};
|
|
@@ -29,7 +29,7 @@ function useLoader(loader) {
|
|
|
29
29
|
params: (0, import_hooks.useActiveParams)()
|
|
30
30
|
}
|
|
31
31
|
);
|
|
32
|
-
const
|
|
32
|
+
const params = (0, import_hooks.useParams)(), pathname = (0, import_hooks.usePathname)(), currentPath = (0, import_href.resolveHref)({ pathname, params }).replace(/index$/, "").replace(/\?.*/, ""), preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, currentData = (0, import_react.useRef)(preloadedData);
|
|
33
33
|
if ((0, import_react.useEffect)(() => {
|
|
34
34
|
preloadedData && (loadedData[currentPath] = preloadedData);
|
|
35
35
|
}, [preloadedData]), errors[currentPath])
|
|
@@ -46,7 +46,7 @@ function useLoader(loader) {
|
|
|
46
46
|
const getData = async () => {
|
|
47
47
|
const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
|
|
48
48
|
try {
|
|
49
|
-
const response = await (async () =>
|
|
49
|
+
const response = await (async () => await (0, import_dynamicImport.dynamicImport)(loaderJSUrl))();
|
|
50
50
|
return loadedData[currentPath] = response.loader(), loadedData[currentPath];
|
|
51
51
|
} catch (err) {
|
|
52
52
|
return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useLoader.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAkC,kBAClC,eAAwD,oBACxD,cAA4B,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -18,7 +18,7 @@ __export(useLoader_exports, {
|
|
|
18
18
|
useLoader: () => useLoader
|
|
19
19
|
});
|
|
20
20
|
module.exports = __toCommonJS(useLoader_exports);
|
|
21
|
-
var import_react = require("react"), import_hooks = require("./hooks"), import_href = require("./link/href"),
|
|
21
|
+
var import_react = require("react"), import_hooks = require("./hooks"), import_href = require("./link/href"), import_router = require("./router/router"), import_cleanUrl = require("./utils/cleanUrl"), import_dynamicImport = require("./utils/dynamicImport"), import_serverContext = require("./utils/serverContext"), import_weakKey = require("./utils/weakKey"), promises = {}, errors = {}, loadedData = {};
|
|
22
22
|
function useLoader(loader) {
|
|
23
23
|
var { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = (0, import_serverContext.getServerContext)() || {};
|
|
24
24
|
if (typeof window > "u")
|
|
@@ -26,10 +26,10 @@ function useLoader(loader) {
|
|
|
26
26
|
path: (0, import_hooks.usePathname)(),
|
|
27
27
|
params: (0, import_hooks.useActiveParams)()
|
|
28
28
|
});
|
|
29
|
-
var
|
|
30
|
-
pathname
|
|
29
|
+
var params = (0, import_hooks.useParams)(), pathname = (0, import_hooks.usePathname)(), currentPath = (0, import_href.resolveHref)({
|
|
30
|
+
pathname,
|
|
31
31
|
params
|
|
32
|
-
}).replace(/index$/, ""), preloadedData = (loaderPropsFromServerContext == null ? void 0 : loaderPropsFromServerContext.path) === currentPath ? loaderDataFromServerContext : void 0, currentData = (0, import_react.useRef)(preloadedData);
|
|
32
|
+
}).replace(/index$/, "").replace(/\?.*/, ""), preloadedData = (loaderPropsFromServerContext == null ? void 0 : loaderPropsFromServerContext.path) === currentPath ? loaderDataFromServerContext : void 0, currentData = (0, import_react.useRef)(preloadedData);
|
|
33
33
|
if ((0, import_react.useEffect)(
|
|
34
34
|
function() {
|
|
35
35
|
preloadedData && (loadedData[currentPath] = preloadedData);
|
|
@@ -69,7 +69,7 @@ function useLoader(loader) {
|
|
|
69
69
|
}
|
|
70
70
|
};
|
|
71
71
|
}
|
|
72
|
-
return
|
|
72
|
+
return await (0, import_dynamicImport.dynamicImport)(loaderJSUrl);
|
|
73
73
|
}();
|
|
74
74
|
return loadedData[currentPath] = response.loader(), loadedData[currentPath];
|
|
75
75
|
} catch (err) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/useLoader.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AACA,mBAAkC,kBAClC,eAAwD,oBACxD,cAA4B,
|
|
5
|
-
"names": ["promises", "errors", "loadedData", "useLoader", "loader", "loaderProps", "loaderPropsFromServerContext", "loaderData", "loaderDataFromServerContext", "getServerContext", "window", "useAsyncFn", "path", "usePathname", "params", "useActiveParams", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["promises", "errors", "loadedData", "useLoader", "loader", "loaderProps", "loaderPropsFromServerContext", "loaderData", "loaderDataFromServerContext", "getServerContext", "window", "useAsyncFn", "path", "usePathname", "params", "useActiveParams", "useParams", "pathname", "currentPath", "resolveHref", "replace", "preloadedData", "undefined", "currentData", "useRef", "useEffect", "loaded", "preloadingLoader", "then", "val", "catch", "err", "console", "error", "getData", "loaderJSUrl", "getLoaderPath", "response", "nativeLoaderJSUrl", "loaderJsCodeResp", "fetch", "ok", "Error", "status", "loaderJsCode", "text", "result", "eval", "e", "dynamicImport", "current", "results", "Map", "started", "props", "key", "weakKey", "JSON", "stringify", "get", "set", "next", "Promise", "final"]
|
|
6
6
|
}
|
|
@@ -136,8 +136,9 @@ function createHandleRequest(handlers) {
|
|
|
136
136
|
if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname))
|
|
137
137
|
return resolveLoaderRoute(handlers, request, finalUrl, route);
|
|
138
138
|
}
|
|
139
|
-
return process.env.NODE_ENV === "development" && console.error("No matching route found!", {
|
|
139
|
+
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
140
140
|
originalUrl,
|
|
141
|
+
pathname,
|
|
141
142
|
routes: manifest.pageRoutes
|
|
142
143
|
}), Response.error();
|
|
143
144
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -131,8 +131,9 @@ function createHandleRequest(handlers) {
|
|
|
131
131
|
const finalUrl = new URL(originalUrl, url.origin);
|
|
132
132
|
if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname)) return resolveLoaderRoute(handlers, request, finalUrl, route);
|
|
133
133
|
}
|
|
134
|
-
return process.env.NODE_ENV === "development" && console.error("No matching route found!", {
|
|
134
|
+
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
135
135
|
originalUrl,
|
|
136
|
+
pathname,
|
|
136
137
|
routes: manifest.pageRoutes
|
|
137
138
|
}), Response.error();
|
|
138
139
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","getHonoPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","middlewareModule","exported","default","contextKey","response","next","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","search","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","honoPath","page","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","compiledManifest","handler","startsWith","apiRoute","find","test","method","endsWith","originalUrl","file","finalUrl","origin","routes","config","match","exec","groups","key","value","Object","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"names":["getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","getHonoPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","middlewareModule","exported","default","contextKey","response","next","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","search","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","honoPath","page","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","compiledManifest","handler","startsWith","apiRoute","find","test","method","endsWith","originalUrl","file","finalUrl","origin","routes","config","match","exec","groups","key","value","Object","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -160,8 +160,9 @@ function createHandleRequest(handlers) {
|
|
|
160
160
|
throw _iteratorError;
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
|
-
return process.env.NODE_ENV === "development" && console.error("No matching route found!", {
|
|
163
|
+
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
164
164
|
originalUrl,
|
|
165
|
+
pathname,
|
|
165
166
|
routes: manifest.pageRoutes
|
|
166
167
|
}), Response.error();
|
|
167
168
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["getPathFromLoaderPath", "LOADER_JS_POSTFIX_UNCACHED", "getHonoPath", "isResponse", "getManifest", "resolveAPIEndpoint", "resolveResponse", "runMiddlewares", "handlers", "request", "route", "getResponse", "middlewares", "length", "loadMiddleware", "Error", "context", "dispatch", "index", "middlewareModule", "exported", "default", "contextKey", "next", "response", "resolveAPIRoute", "url", "pathname", "params", "getRouteParams", "handleAPI", "loaderProps", "path", "err", "process", "env", "NODE_ENV", "console", "error", "resolveLoaderRoute", "headers", "Headers", "set", "loaderResponse", "handleLoader", "type", "undefined", "getLoaderParams", "Response", "resolvePageRoute", "search", "resolved", "handlePage", "getURLfromRequestURL", "urlString", "URL", "get", "compileRouteRegex", "compiledRegex", "RegExp", "namedRegex", "honoPath", "page", "compileManifest", "manifest", "pageRoutes", "map", "apiRoutes", "createHandleRequest", "compiledManifest", "handler", "startsWith", "apiRoute", "find", "test", "method", "isClientRequestingNewRoute", "endsWith", "originalUrl", "file", "finalUrl", "origin", "routes", "config", "match", "exec", "groups", "Object", "entries", "key", "value", "namedKey", "routeKeys", "regex", "fromEntries"]
|
|
6
6
|
}
|
package/dist/esm/useLoader.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useEffect, useRef } from "react";
|
|
2
2
|
import { useActiveParams, useParams, usePathname } from "./hooks";
|
|
3
3
|
import { resolveHref } from "./link/href";
|
|
4
|
-
import { useRouteNode } from "./router/Route";
|
|
5
4
|
import { preloadingLoader } from "./router/router";
|
|
6
5
|
import { getLoaderPath } from "./utils/cleanUrl";
|
|
7
6
|
import { dynamicImport } from "./utils/dynamicImport";
|
|
@@ -18,7 +17,7 @@ function useLoader(loader) {
|
|
|
18
17
|
params: useActiveParams()
|
|
19
18
|
}
|
|
20
19
|
);
|
|
21
|
-
const
|
|
20
|
+
const params = useParams(), pathname = usePathname(), currentPath = resolveHref({ pathname, params }).replace(/index$/, "").replace(/\?.*/, ""), preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, currentData = useRef(preloadedData);
|
|
22
21
|
if (useEffect(() => {
|
|
23
22
|
preloadedData && (loadedData[currentPath] = preloadedData);
|
|
24
23
|
}, [preloadedData]), errors[currentPath])
|
|
@@ -35,7 +34,7 @@ function useLoader(loader) {
|
|
|
35
34
|
const getData = async () => {
|
|
36
35
|
const loaderJSUrl = getLoaderPath(currentPath, !0);
|
|
37
36
|
try {
|
|
38
|
-
const response = await (async () =>
|
|
37
|
+
const response = await (async () => await dynamicImport(loaderJSUrl))();
|
|
39
38
|
return loadedData[currentPath] = response.loader(), loadedData[currentPath];
|
|
40
39
|
} catch (err) {
|
|
41
40
|
return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useLoader.ts"],
|
|
4
|
-
"mappings": "AACA,SAAS,WAAW,cAAc;AAClC,SAAS,iBAAiB,WAAW,mBAAmB;AACxD,SAAS,mBAAmB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/useLoader.mjs
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useEffect, useRef } from "react";
|
|
2
2
|
import { useActiveParams, useParams, usePathname } from "./hooks.mjs";
|
|
3
3
|
import { resolveHref } from "./link/href.mjs";
|
|
4
|
-
import { useRouteNode } from "./router/Route.mjs";
|
|
5
4
|
import { preloadingLoader } from "./router/router.mjs";
|
|
6
5
|
import { getLoaderPath } from "./utils/cleanUrl.mjs";
|
|
7
6
|
import { dynamicImport } from "./utils/dynamicImport.mjs";
|
|
@@ -19,12 +18,12 @@ function useLoader(loader) {
|
|
|
19
18
|
path: usePathname(),
|
|
20
19
|
params: useActiveParams()
|
|
21
20
|
});
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
currentPath =
|
|
25
|
-
pathname
|
|
21
|
+
const params = useParams(),
|
|
22
|
+
pathname = usePathname(),
|
|
23
|
+
currentPath = resolveHref({
|
|
24
|
+
pathname,
|
|
26
25
|
params
|
|
27
|
-
}).replace(/index$/, ""),
|
|
26
|
+
}).replace(/index$/, "").replace(/\?.*/, ""),
|
|
28
27
|
preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
|
|
29
28
|
currentData = useRef(preloadedData);
|
|
30
29
|
if (useEffect(() => {
|
|
@@ -41,7 +40,7 @@ function useLoader(loader) {
|
|
|
41
40
|
const getData = async () => {
|
|
42
41
|
const loaderJSUrl = getLoaderPath(currentPath, !0);
|
|
43
42
|
try {
|
|
44
|
-
const response = await (async () =>
|
|
43
|
+
const response = await (async () => await dynamicImport(loaderJSUrl))();
|
|
45
44
|
return loadedData[currentPath] = response.loader(), loadedData[currentPath];
|
|
46
45
|
} catch (err) {
|
|
47
46
|
return console.error(`Error calling loader: ${err}`), errors[currentPath] = err, delete promises[currentPath], null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useEffect","useRef","useActiveParams","useParams","usePathname","resolveHref","
|
|
1
|
+
{"version":3,"names":["useEffect","useRef","useActiveParams","useParams","usePathname","resolveHref","preloadingLoader","getLoaderPath","dynamicImport","getServerContext","weakKey","promises","errors","loadedData","useLoader","loader","loaderProps","loaderPropsFromServerContext","loaderData","loaderDataFromServerContext","window","useAsyncFn","path","params","pathname","currentPath","replace","preloadedData","currentData","loaded","then","val","catch","err","console","error","getData","loaderJSUrl","response","current","results","Map","started","props","key","JSON","stringify","get","set","next","Promise","final"],"sources":["../../src/useLoader.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useEffect, useRef } from "react";
|
|
2
2
|
import { useActiveParams, useParams, usePathname } from "./hooks";
|
|
3
3
|
import { resolveHref } from "./link/href";
|
|
4
|
-
import { useRouteNode } from "./router/Route";
|
|
5
4
|
import { preloadingLoader } from "./router/router";
|
|
6
5
|
import { getLoaderPath } from "./utils/cleanUrl";
|
|
7
6
|
import { dynamicImport } from "./utils/dynamicImport";
|
|
@@ -15,10 +14,10 @@ function useLoader(loader) {
|
|
|
15
14
|
path: usePathname(),
|
|
16
15
|
params: useActiveParams()
|
|
17
16
|
});
|
|
18
|
-
var
|
|
19
|
-
pathname
|
|
17
|
+
var params = useParams(), pathname = usePathname(), currentPath = resolveHref({
|
|
18
|
+
pathname,
|
|
20
19
|
params
|
|
21
|
-
}).replace(/index$/, ""), preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, currentData = useRef(preloadedData);
|
|
20
|
+
}).replace(/index$/, "").replace(/\?.*/, ""), preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, currentData = useRef(preloadedData);
|
|
22
21
|
if (useEffect(
|
|
23
22
|
function() {
|
|
24
23
|
preloadedData && (loadedData[currentPath] = preloadedData);
|
|
@@ -58,7 +57,7 @@ function useLoader(loader) {
|
|
|
58
57
|
}
|
|
59
58
|
};
|
|
60
59
|
}
|
|
61
|
-
return
|
|
60
|
+
return await dynamicImport(loaderJSUrl);
|
|
62
61
|
}();
|
|
63
62
|
return loadedData[currentPath] = response.loader(), loadedData[currentPath];
|
|
64
63
|
} catch (err) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/useLoader.ts"],
|
|
4
|
-
"mappings": "AACA,SAASA,WAAWC,cAAc;AAClC,SAASC,iBAAiBC,WAAWC,mBAAmB;AACxD,SAASC,mBAAmB;
|
|
5
|
-
"names": ["useEffect", "useRef", "useActiveParams", "useParams", "usePathname", "resolveHref", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["useEffect", "useRef", "useActiveParams", "useParams", "usePathname", "resolveHref", "preloadingLoader", "getLoaderPath", "dynamicImport", "getServerContext", "weakKey", "promises", "errors", "loadedData", "useLoader", "loader", "loaderProps", "loaderPropsFromServerContext", "loaderData", "loaderDataFromServerContext", "window", "useAsyncFn", "path", "params", "pathname", "currentPath", "replace", "preloadedData", "undefined", "currentData", "loaded", "then", "val", "catch", "err", "console", "error", "getData", "loaderJSUrl", "response", "nativeLoaderJSUrl", "loaderJsCodeResp", "fetch", "ok", "Error", "status", "loaderJsCode", "text", "result", "eval", "e", "current", "results", "Map", "started", "props", "key", "JSON", "stringify", "get", "set", "next", "Promise", "final"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.396",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -109,15 +109,15 @@
|
|
|
109
109
|
"@react-navigation/routers": "~7",
|
|
110
110
|
"@swc/core": "^1.10.4",
|
|
111
111
|
"@ungap/structured-clone": "^1.2.0",
|
|
112
|
-
"@vxrn/resolve": "1.1.
|
|
113
|
-
"@vxrn/tslib-lite": "1.1.
|
|
114
|
-
"@vxrn/universal-color-scheme": "1.1.
|
|
115
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
|
112
|
+
"@vxrn/resolve": "1.1.396",
|
|
113
|
+
"@vxrn/tslib-lite": "1.1.396",
|
|
114
|
+
"@vxrn/universal-color-scheme": "1.1.396",
|
|
115
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.396",
|
|
116
116
|
"babel-dead-code-elimination": "^1.0.6",
|
|
117
117
|
"babel-plugin-react-compiler": "^19.0.0-beta-201e55d-20241215",
|
|
118
118
|
"citty": "^0.1.6",
|
|
119
119
|
"core-js": "^3.38.1",
|
|
120
|
-
"create-vxrn": "1.1.
|
|
120
|
+
"create-vxrn": "1.1.396",
|
|
121
121
|
"escape-string-regexp": "^5.0.0",
|
|
122
122
|
"expo-linking": "~6.3.1",
|
|
123
123
|
"expo-modules-core": "2.1.2",
|
|
@@ -143,12 +143,12 @@
|
|
|
143
143
|
"vite": "^6.0.6",
|
|
144
144
|
"vite-plugin-barrel": "^0.4.1",
|
|
145
145
|
"vite-tsconfig-paths": "^5.0.1",
|
|
146
|
-
"vxrn": "1.1.
|
|
146
|
+
"vxrn": "1.1.396",
|
|
147
147
|
"ws": "^8.18.0",
|
|
148
148
|
"xxhashjs": "^0.2.2"
|
|
149
149
|
},
|
|
150
150
|
"devDependencies": {
|
|
151
|
-
"@tamagui/build": "^1.121.
|
|
151
|
+
"@tamagui/build": "^1.121.8",
|
|
152
152
|
"@types/node": "^22.1.0",
|
|
153
153
|
"@types/react-dom": "^18.2.25",
|
|
154
154
|
"@types/xxhashjs": "^0.2.4",
|
|
@@ -263,8 +263,9 @@ export function createHandleRequest(handlers: RequestHandlers) {
|
|
|
263
263
|
}
|
|
264
264
|
|
|
265
265
|
if (process.env.NODE_ENV === 'development') {
|
|
266
|
-
console.error(`No matching route found!`, {
|
|
266
|
+
console.error(`No matching route found for loader!`, {
|
|
267
267
|
originalUrl,
|
|
268
|
+
pathname,
|
|
268
269
|
routes: manifest.pageRoutes,
|
|
269
270
|
})
|
|
270
271
|
}
|
package/src/useLoader.ts
CHANGED
|
@@ -31,13 +31,14 @@ export function useLoader<
|
|
|
31
31
|
)
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
const routeNode = useRouteNode()
|
|
35
34
|
const params = useParams()
|
|
35
|
+
const pathname = usePathname()
|
|
36
36
|
|
|
37
37
|
// Cannot use usePathname() here since it will change every time the route changes,
|
|
38
38
|
// but here here we want to get the current local pathname which renders this screen.
|
|
39
|
-
const currentPath =
|
|
40
|
-
|
|
39
|
+
const currentPath = resolveHref({ pathname: pathname, params })
|
|
40
|
+
.replace(/index$/, '')
|
|
41
|
+
.replace(/\?.*/, '')
|
|
41
42
|
|
|
42
43
|
// only if it matches current route
|
|
43
44
|
const preloadedData =
|
|
@@ -113,7 +114,6 @@ export function useLoader<
|
|
|
113
114
|
}
|
|
114
115
|
|
|
115
116
|
// On web, we can use import to dynamically load the loader
|
|
116
|
-
console.warn('dyn import', loaderJSUrl)
|
|
117
117
|
return await dynamicImport(loaderJSUrl)
|
|
118
118
|
})()
|
|
119
119
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAM1C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,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;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,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,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAoDtD,wBAAsB,eAAe,CACnC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAqCzB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAkCzB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAkBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AAUD,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAC9F,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAC/B,CAKA;AAGD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,eAAe;;uBASV,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAM1C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,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;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,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,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAoDtD,wBAAsB,eAAe,CACnC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAqCzB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAkCzB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAkBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AAUD,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAC9F,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAC/B,CAKA;AAGD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,eAAe;;uBASV,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAqE3F"}
|