one 1.1.484 → 1.1.486
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 +4 -2
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/hooks.cjs +8 -5
- package/dist/cjs/hooks.js +7 -6
- package/dist/cjs/hooks.js.map +1 -1
- package/dist/cjs/hooks.native.js +7 -6
- package/dist/cjs/hooks.native.js.map +2 -2
- package/dist/cjs/router/Route.cjs +4 -1
- package/dist/cjs/router/Route.js +2 -2
- package/dist/cjs/router/Route.js.map +1 -1
- package/dist/cjs/router/Route.native.js +4 -2
- package/dist/cjs/router/Route.native.js.map +2 -2
- package/dist/cjs/router/RouteInfoContext.cjs +61 -0
- package/dist/cjs/router/RouteInfoContext.js +51 -0
- package/dist/cjs/router/RouteInfoContext.js.map +6 -0
- package/dist/cjs/router/RouteInfoContext.native.js +50 -0
- package/dist/cjs/router/RouteInfoContext.native.js.map +6 -0
- package/dist/cjs/server/oneServe.cjs +8 -13
- package/dist/cjs/server/oneServe.js +11 -14
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +20 -23
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.cjs +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +3 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.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 +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 +1 -1
- package/dist/esm/hooks.js +9 -7
- package/dist/esm/hooks.js.map +1 -1
- package/dist/esm/hooks.mjs +10 -7
- package/dist/esm/hooks.mjs.map +1 -1
- package/dist/esm/hooks.native.js +11 -7
- package/dist/esm/hooks.native.js.map +1 -1
- package/dist/esm/router/Route.js +2 -1
- package/dist/esm/router/Route.js.map +1 -1
- package/dist/esm/router/Route.mjs +4 -1
- package/dist/esm/router/Route.mjs.map +1 -1
- package/dist/esm/router/Route.native.js +4 -1
- package/dist/esm/router/Route.native.js.map +1 -1
- package/dist/esm/router/RouteInfoContext.js +38 -0
- package/dist/esm/router/RouteInfoContext.js.map +6 -0
- package/dist/esm/router/RouteInfoContext.mjs +37 -0
- package/dist/esm/router/RouteInfoContext.mjs.map +1 -0
- package/dist/esm/router/RouteInfoContext.native.js +39 -0
- package/dist/esm/router/RouteInfoContext.native.js.map +1 -0
- package/dist/esm/server/oneServe.js +17 -15
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +9 -14
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +21 -24
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js +2 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs +2 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +4 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
- package/package.json +15 -15
- package/src/createHandleRequest.ts +1 -1
- package/src/hooks.tsx +29 -8
- package/src/router/Route.tsx +7 -2
- package/src/router/RouteInfoContext.tsx +94 -0
- package/src/server/oneServe.ts +23 -18
- package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx +9 -2
- package/types/createHandleRequest.d.ts +1 -0
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/hooks.d.ts.map +1 -1
- package/types/layouts/Drawer.d.ts +14 -4
- package/types/layouts/Drawer.d.ts.map +1 -1
- package/types/layouts/Stack.d.ts +14 -4
- package/types/layouts/Stack.d.ts.map +1 -1
- package/types/layouts/Tabs.d.ts +14 -4
- package/types/layouts/Tabs.d.ts.map +1 -1
- package/types/router/Route.d.ts.map +1 -1
- package/types/router/RouteInfoContext.d.ts +27 -0
- package/types/router/RouteInfoContext.d.ts.map +1 -0
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/views/Navigator.d.ts +2 -2
- package/types/views/Navigator.d.ts.map +1 -1
- package/types/vite/plugins/generateFileSystemRouteTypesPlugin.d.ts.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAmC,iCAGnC,mBAA8B,sBAC9B,eAA4C,uBAC5C,mBAA+D,yBAC/D,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["buildInfo", "preloads", "FSExtra"]
|
|
6
6
|
}
|
|
@@ -26,7 +26,7 @@ __export(oneServe_exports, {
|
|
|
26
26
|
oneServe: () => oneServe
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(oneServe_exports);
|
|
29
|
-
var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_serve = require("vxrn/serve"), import_constants = require("../constants"), import_createHandleRequest = require("../createHandleRequest"), import_cleanUrl = require("../utils/cleanUrl"), import_toAbsolute = require("../utils/toAbsolute");
|
|
29
|
+
var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_serve = require("vxrn/serve"), import_constants = require("../constants"), import_createHandleRequest = require("../createHandleRequest"), import_cleanUrl = require("../utils/cleanUrl"), import_toAbsolute = require("../utils/toAbsolute"), import_vxrn = require("vxrn");
|
|
30
30
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
31
31
|
var _oneOptions_web, _oneOptions_build_api, _oneOptions_build, { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import("../createHandleRequest"), { isResponse } = await import("../utils/isResponse"), { isStatusRedirect } = await import("../utils/isStatus"), isAPIRequest = /* @__PURE__ */ new WeakMap(), redirects = (_oneOptions_web = oneOptions.web) === null || _oneOptions_web === void 0 ? void 0 : _oneOptions_web.redirects;
|
|
32
32
|
if (redirects) {
|
|
@@ -117,23 +117,20 @@ url: ${url}`);
|
|
|
117
117
|
};
|
|
118
118
|
function createHonoHandler(route2) {
|
|
119
119
|
return async function(context, next) {
|
|
120
|
-
if (route2.page.endsWith("/+not-found")) {
|
|
121
|
-
var didCallNext = !1, response = await (0, import_serve.serveStatic)({
|
|
122
|
-
root: "./dist/client",
|
|
123
|
-
onFound: function(_path, c) {
|
|
124
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
|
125
|
-
}
|
|
126
|
-
})(context, async function() {
|
|
127
|
-
didCallNext = !0;
|
|
128
|
-
});
|
|
129
|
-
if (response && !didCallNext)
|
|
130
|
-
return response;
|
|
131
|
-
}
|
|
132
120
|
try {
|
|
133
121
|
var request = context.req.raw;
|
|
122
|
+
if (route2.page.endsWith("/+not-found") || Reflect.ownKeys(route2.routeKeys).length > 0) {
|
|
123
|
+
var staticAssetResponse = await (0, import_vxrn.serveStaticAssets)({
|
|
124
|
+
context
|
|
125
|
+
});
|
|
126
|
+
if (staticAssetResponse)
|
|
127
|
+
return await (0, import_createHandleRequest.runMiddlewares)(requestHandlers, request, route2, async function() {
|
|
128
|
+
return staticAssetResponse;
|
|
129
|
+
});
|
|
130
|
+
}
|
|
134
131
|
if ((0, import_node_path.extname)(request.url) === ".js" || (0, import_node_path.extname)(request.url) === ".css")
|
|
135
132
|
return next();
|
|
136
|
-
var url = (0, import_createHandleRequest.getURLfromRequestURL)(request),
|
|
133
|
+
var url = (0, import_createHandleRequest.getURLfromRequestURL)(request), response = await function() {
|
|
137
134
|
if (url.pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {
|
|
138
135
|
var originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(url.pathname), finalUrl = new URL(originalUrl, url.origin);
|
|
139
136
|
return resolveLoaderRoute(requestHandlers, request, finalUrl, route2);
|
|
@@ -147,21 +144,21 @@ url: ${url}`);
|
|
|
147
144
|
return resolvePageRoute(requestHandlers, request, url, route2);
|
|
148
145
|
}
|
|
149
146
|
}();
|
|
150
|
-
if (
|
|
151
|
-
if (isResponse(
|
|
152
|
-
if (isStatusRedirect(
|
|
153
|
-
var location = `${
|
|
154
|
-
return
|
|
147
|
+
if (response) {
|
|
148
|
+
if (isResponse(response)) {
|
|
149
|
+
if (isStatusRedirect(response.status)) {
|
|
150
|
+
var location = `${response.headers.get("location") || ""}`;
|
|
151
|
+
return response.headers.forEach(function(value, key) {
|
|
155
152
|
context.header(key, value);
|
|
156
|
-
}), context.redirect(location,
|
|
153
|
+
}), context.redirect(location, response.status);
|
|
157
154
|
}
|
|
158
155
|
if (isAPIRequest.get(request))
|
|
159
156
|
try {
|
|
160
|
-
return !
|
|
157
|
+
return !response.headers.has("cache-control") && !response.headers.has("Cache-Control") && response.headers.set("cache-control", "no-store"), response;
|
|
161
158
|
} catch (err) {
|
|
162
|
-
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${
|
|
159
|
+
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
|
|
163
160
|
}
|
|
164
|
-
return
|
|
161
|
+
return response;
|
|
165
162
|
}
|
|
166
163
|
return next();
|
|
167
164
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;sBAAmC,iCAGnC,mBAA8B,sBAC9B,eAA4C,uBAC5C,mBAA+D,yBAC/D,
|
|
5
|
-
"names": ["oneServe", "oneOptions", "buildInfo", "app", "resolveAPIRoute", "resolveLoaderRoute", "resolvePageRoute", "isResponse", "isStatusRedirect", "isAPIRequest", "WeakMap", "redirects", "web", "redirect", "get", "source", "context", "destinationUrl", "destination", "replace", "param", "paramName", "substring", "req", "permanent", "Error", "routeToBuildInfo", "routeMap", "serverOptions", "root", "entryServer", "getServerEntry", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "requestHandlers", "handleAPI", "route", "apiFile", "join", "process", "cwd", "page", "loadMiddleware", "toAbsolute", "contextKey", "handleLoader", "request", "url", "loaderProps", "exports", "file", "loader", "console", "warn", "json", "JSON", "stringify", "handlePage", "type", "error", "Object", "keys", "exported", "serverJsPath", "loaderData", "preloads", "headers", "Headers", "set", "rendered", "mode", "path", "css", "Response", "status", "isNotFound", "err", "htmlPath", "pathname", "cleanPath", "html", "FSExtra", "readFile", "createHonoHandler", "next", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["oneServe", "oneOptions", "buildInfo", "app", "resolveAPIRoute", "resolveLoaderRoute", "resolvePageRoute", "isResponse", "isStatusRedirect", "isAPIRequest", "WeakMap", "redirects", "web", "redirect", "get", "source", "context", "destinationUrl", "destination", "replace", "param", "paramName", "substring", "req", "permanent", "Error", "routeToBuildInfo", "routeMap", "serverOptions", "root", "entryServer", "getServerEntry", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "requestHandlers", "handleAPI", "route", "apiFile", "join", "process", "cwd", "page", "loadMiddleware", "toAbsolute", "contextKey", "handleLoader", "request", "url", "loaderProps", "exports", "file", "loader", "console", "warn", "json", "JSON", "stringify", "handlePage", "type", "error", "Object", "keys", "exported", "serverJsPath", "loaderData", "preloads", "headers", "Headers", "set", "rendered", "mode", "path", "css", "Response", "status", "isNotFound", "err", "htmlPath", "pathname", "cleanPath", "html", "FSExtra", "readFile", "createHonoHandler", "next", "raw", "endsWith", "Reflect", "ownKeys", "routeKeys", "length", "staticAssetResponse", "serveStaticAssets", "runMiddlewares", "extname", "getURLfromRequestURL", "response", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "finalUrl", "URL", "origin", "location", "forEach", "value", "key", "header", "has", "info", "compiledManifest", "compileManifest", "manifest", "apiRoutes", "urlPath", "put", "post", "delete", "patch", "urlCleanPath", "pageRoutes", "c", "PRELOAD_JS_POSTFIX", "body", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "compiledRegex", "test", "loaderRoute", "loaderServerPath", "resolved"]
|
|
6
6
|
}
|
|
@@ -34,7 +34,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
34
34
|
apply: "serve",
|
|
35
35
|
configureServer(server) {
|
|
36
36
|
const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)),
|
|
37
|
-
outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"),
|
|
37
|
+
outFile = (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts"),
|
|
38
38
|
routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options),
|
|
39
39
|
fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
|
|
40
40
|
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
|
@@ -24,7 +24,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
24
24
|
enforce: "post",
|
|
25
25
|
apply: "serve",
|
|
26
26
|
configureServer(server) {
|
|
27
|
-
const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
|
|
27
|
+
const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
|
|
28
28
|
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
|
29
29
|
}, 100);
|
|
30
30
|
return server.watcher.addListener("all", fileWatcherChangeListener), () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAC9B,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,aAAS,uBAAK,QAAQ,IAAI,OAAG,gEAA4B,OAAO,CAAC,GACjE,cACA,0BAAQ,MAAM,MAAM,QAAQ,IAAI,KAClC,QAAQ,KAAK,8LAA8L,OACpM,2BAAK,0BAAQ,MAAM,GAAG,aAAa,SAGrC,uBAAK,QAAQ,IAAI,GAAG,aAAa,GAGpC,iBAAa,gEAA4B,OAAO,GAGhD,gCAA4B,kCAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,SAExB,8CAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,0DAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -25,7 +25,9 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
25
25
|
enforce: "post",
|
|
26
26
|
apply: "serve",
|
|
27
27
|
configureServer(server) {
|
|
28
|
-
var appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile =
|
|
28
|
+
var appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = function() {
|
|
29
|
+
return (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts");
|
|
30
|
+
}(), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async function(type, path) {
|
|
29
31
|
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
|
30
32
|
}, 100);
|
|
31
33
|
return server.watcher.addListener("all", fileWatcherChangeListener), function() {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;
|
|
5
|
-
"names": ["generateFileSystemRouteTypesPlugin", "options", "name", "enforce", "apply", "configureServer", "server", "appDir", "join", "process", "cwd", "getRouterRootFromOneOptions", "outFile", "routerRoot", "fileWatcherChangeListener", "debounce", "type", "path", "startsWith", "generateRouteTypes", "watcher", "addListener"]
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAA8B,sBAC9B,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAASA,mCAAmCC,SAA0B;AAC3E,SAAO;IACLC,MAAM;IACNC,SAAS;IACTC,OAAO;IAEPC,gBAAgBC,QAAM;AACpB,UAAMC,aAASC,uBAAKC,QAAQC,IAAG,OAAIC,gEAA4BV,OAAAA,CAAAA,GACzDW,UAAW,WAAA;AACf,mBAAIC,0BAAQN,MAAAA,MAAYE,QAAQC,IAAG,KACjCI,QAAQC,KAAK,8LAAA,OACNP,2BAAKK,0BAAQN,MAAAA,GAAS,aAAA,SAGxBC,uBAAKC,QAAQC,IAAG,GAAI,aAAA;MAC7B,EAAA,GAEMM,iBAAaL,gEAA4BV,OAAAA,GAGzCgB,gCAA4BC,kCAAS,eAAOC,MAAcC,MAAAA;AAC9D,SAAID,SAAS,SAASA,SAAS,aACzBC,KAAKC,WAAWd,MAAAA,SAElBe,8CAAmBV,SAASI,UAAAA;MAGlC,GAAG,GAAA;AAEHV,oBAAOiB,QAAQC,YAAY,OAAOP,yBAAAA,GAE3B,WAAA;AAGLK,0DAAmBV,SAASI,UAAAA;MAC9B;IACF;EACF;AACF;",
|
|
5
|
+
"names": ["generateFileSystemRouteTypesPlugin", "options", "name", "enforce", "apply", "configureServer", "server", "appDir", "join", "process", "cwd", "getRouterRootFromOneOptions", "outFile", "dirname", "console", "warn", "routerRoot", "fileWatcherChangeListener", "debounce", "type", "path", "startsWith", "generateRouteTypes", "watcher", "addListener"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,kCAAkC;AAK3C,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B,SAAS,oBAAoB,uBAAuB;AAmBpD,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -159,5 +159,5 @@ function getRouteParams(pathname, route) {
|
|
|
159
159
|
const match = new RegExp(route.namedRegex).exec(pathname);
|
|
160
160
|
return match ? Object.fromEntries(Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key] || ""])) : {};
|
|
161
161
|
}
|
|
162
|
-
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute };
|
|
162
|
+
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute, runMiddlewares };
|
|
163
163
|
//# sourceMappingURL=createHandleRequest.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","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","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","routerRoot","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":"AAAA,SAASA,0BAAA,QAAkC;AAK3C,SAASC,qBAAA,QAA6B;AACtC,SAASC,UAAA,QAAkB;AAC3B,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,EAAoBC,eAAA,QAAuB;AAmBpD,
|
|
1
|
+
{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","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","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","routerRoot","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":[]}
|
|
@@ -230,5 +230,5 @@ function getRouteParams(pathname, route) {
|
|
|
230
230
|
return [value, ((_match_groups = match.groups) === null || _match_groups === void 0 ? void 0 : _match_groups[key]) || ""];
|
|
231
231
|
})) : {};
|
|
232
232
|
}
|
|
233
|
-
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute };
|
|
233
|
+
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute, runMiddlewares };
|
|
234
234
|
//# sourceMappingURL=createHandleRequest.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","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","getLoaderParams","Response","resolvePageRoute","search","resolved","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","param","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","route2","test","method","isClientRequestingNewRoute","endsWith","originalUrl","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","value","file","finalUrl","origin","return","routes"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,0BAAA,QAAkC;AAK3C,SAASC,qBAAA,QAA6B;AACtC,SAASC,UAAA,QAAkB;AAC3B,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,EAAoBC,eAAA,QAAuB;AAmBpD,
|
|
1
|
+
{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","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","getLoaderParams","Response","resolvePageRoute","search","resolved","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","param","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","route2","test","method","isClientRequestingNewRoute","endsWith","originalUrl","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","value","file","finalUrl","origin","return","routes"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/hooks.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import React, { createContext } from "react";
|
|
1
|
+
import React, { createContext, useContext } from "react";
|
|
2
2
|
import { router } from "./router/imperative-api";
|
|
3
|
-
import { RouteParamsContext } from "./router/Route";
|
|
3
|
+
import { RouteParamsContext, useRouteNode } from "./router/Route";
|
|
4
4
|
import { navigationRef, useStoreRootState, useStoreRouteInfo } from "./router/router";
|
|
5
|
+
import { RouteInfoContext } from "./router/RouteInfoContext";
|
|
5
6
|
import { jsx } from "react/jsx-runtime";
|
|
6
7
|
function useRootNavigationState() {
|
|
7
8
|
return useStoreRootState();
|
|
8
9
|
}
|
|
9
10
|
function useRouteInfo() {
|
|
10
|
-
|
|
11
|
+
const routeInfoFromContext = useContext(RouteInfoContext), routeInfoFromRootState = useStoreRouteInfo();
|
|
12
|
+
return useRouteNode()?.type === "layout" ? routeInfoFromRootState : routeInfoFromContext || routeInfoFromRootState;
|
|
11
13
|
}
|
|
12
14
|
function useNavigationContainerRef() {
|
|
13
15
|
return navigationRef;
|
|
@@ -27,16 +29,16 @@ function useRouter() {
|
|
|
27
29
|
return router;
|
|
28
30
|
}
|
|
29
31
|
function useUnstableGlobalHref() {
|
|
30
|
-
return
|
|
32
|
+
return useRouteInfo().unstable_globalHref;
|
|
31
33
|
}
|
|
32
34
|
function useSegments() {
|
|
33
|
-
return
|
|
35
|
+
return useRouteInfo().segments;
|
|
34
36
|
}
|
|
35
37
|
function usePathname() {
|
|
36
|
-
return
|
|
38
|
+
return useRouteInfo().pathname;
|
|
37
39
|
}
|
|
38
40
|
function useActiveParams() {
|
|
39
|
-
return
|
|
41
|
+
return useRouteInfo().params;
|
|
40
42
|
}
|
|
41
43
|
const useLocalSearchParams = useParams, useGlobalSearchParams = useActiveParams;
|
|
42
44
|
function useParams() {
|
package/dist/esm/hooks.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/hooks.tsx"],
|
|
4
|
-
"mappings": "AAAA,OAAO,SAAS,
|
|
4
|
+
"mappings": "AAAA,OAAO,SAAS,eAAe,kBAAkC;AAEjE,SAAS,cAAc;AACvB,SAAS,oBAAoB,oBAAoB;AACjD,SAAS,eAAe,mBAAmB,yBAAyB;AACpE,SAAS,wBAAwB;AAoD3B;AAhDC,SAAS,yBAAyB;AACvC,SAAO,kBAAkB;AAC3B;AAEO,SAAS,eAAe;AAI7B,QAAM,uBAAuB,WAAW,gBAAgB,GAKlD,yBAAyB,kBAAkB;AAIjD,SAFkB,aAAa,GAEhB,SAAS,WAEf,yBAIF,wBAAwB;AACjC;AAGO,SAAS,4BAA4B;AAC1C,SAAO;AACT;AAEA,MAAM,eAAe,cAAc,EAAK;AAEjC,SAAS,OAAO,EAAE,KAAK,IAAO,SAAS,GAA0C;AAQtF,SAAI,OAAO,SAAW,MACb,WAIP,oBAAC,aAAa,UAAb,EAAsB,OAAO,IAE5B;AAAA,IAAC;AAAA;AAAA,MAEC,OAAK;AAAA,MACL,OAAO,EAAE,SAAS,WAAW;AAAA,MAE5B;AAAA;AAAA,EACH,GAEF;AAEJ;AAEO,SAAS,YAA8B;AAC5C,SAAO;AACT;AAMO,SAAS,wBAAgC;AAC9C,SAAO,aAAa,EAAE;AACxB;AAqBO,SAAS,cAAgE;AAC9E,SAAO,aAAa,EAAE;AACxB;AAGO,SAAS,cAAsB;AACpC,SAAO,aAAa,EAAE;AACxB;AAWO,SAAS,kBAEM;AACpB,SAAO,aAAa,EAAE;AACxB;AAGO,MAAM,uBAAuB,WAGvB,wBAAwB;AAS9B,SAAS,YAAqE;AACnF,QAAM,SAAS,MAAM,WAAW,kBAAkB,KAAK,CAAC;AAExD,SAAO,OAAO;AAAA,IACZ,OAAO,QAAQ,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,MAAM;AAC3C,UAAI,MAAM,QAAQ,KAAK;AACrB,eAAO;AAAA,UACL;AAAA,UACA,MAAM,IAAI,CAAC,MAAM;AACf,gBAAI;AACF,qBAAO,mBAAmB,CAAC;AAAA,YAC7B,QAAQ;AACN,qBAAO;AAAA,YACT;AAAA,UACF,CAAC;AAAA,QACH;AAEF,UAAI;AACF,eAAO,CAAC,KAAK,mBAAmB,KAAe,CAAC;AAAA,MAClD,QAAQ;AACN,eAAO,CAAC,KAAK,KAAK;AAAA,MACpB;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/hooks.mjs
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import React, { createContext } from "react";
|
|
1
|
+
import React, { createContext, useContext } from "react";
|
|
2
2
|
import { router } from "./router/imperative-api.mjs";
|
|
3
|
-
import { RouteParamsContext } from "./router/Route.mjs";
|
|
3
|
+
import { RouteParamsContext, useRouteNode } from "./router/Route.mjs";
|
|
4
4
|
import { navigationRef, useStoreRootState, useStoreRouteInfo } from "./router/router.mjs";
|
|
5
|
+
import { RouteInfoContext } from "./router/RouteInfoContext.mjs";
|
|
5
6
|
import { jsx } from "react/jsx-runtime";
|
|
6
7
|
function useRootNavigationState() {
|
|
7
8
|
return useStoreRootState();
|
|
8
9
|
}
|
|
9
10
|
function useRouteInfo() {
|
|
10
|
-
|
|
11
|
+
const routeInfoFromContext = useContext(RouteInfoContext),
|
|
12
|
+
routeInfoFromRootState = useStoreRouteInfo();
|
|
13
|
+
return useRouteNode()?.type === "layout" ? routeInfoFromRootState : routeInfoFromContext || routeInfoFromRootState;
|
|
11
14
|
}
|
|
12
15
|
function useNavigationContainerRef() {
|
|
13
16
|
return navigationRef;
|
|
@@ -32,16 +35,16 @@ function useRouter() {
|
|
|
32
35
|
return router;
|
|
33
36
|
}
|
|
34
37
|
function useUnstableGlobalHref() {
|
|
35
|
-
return
|
|
38
|
+
return useRouteInfo().unstable_globalHref;
|
|
36
39
|
}
|
|
37
40
|
function useSegments() {
|
|
38
|
-
return
|
|
41
|
+
return useRouteInfo().segments;
|
|
39
42
|
}
|
|
40
43
|
function usePathname() {
|
|
41
|
-
return
|
|
44
|
+
return useRouteInfo().pathname;
|
|
42
45
|
}
|
|
43
46
|
function useActiveParams() {
|
|
44
|
-
return
|
|
47
|
+
return useRouteInfo().params;
|
|
45
48
|
}
|
|
46
49
|
const useLocalSearchParams = useParams,
|
|
47
50
|
useGlobalSearchParams = useActiveParams;
|
package/dist/esm/hooks.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","createContext","router","RouteParamsContext","navigationRef","useStoreRootState","useStoreRouteInfo","jsx","useRootNavigationState","useRouteInfo","useNavigationContainerRef","FrozeContext","Frozen","on","children","window","Provider","value","inert","style","display","useRouter","useUnstableGlobalHref","unstable_globalHref","useSegments","segments","usePathname","pathname","useActiveParams","params","useLocalSearchParams","useParams","useGlobalSearchParams","
|
|
1
|
+
{"version":3,"names":["React","createContext","useContext","router","RouteParamsContext","useRouteNode","navigationRef","useStoreRootState","useStoreRouteInfo","RouteInfoContext","jsx","useRootNavigationState","useRouteInfo","routeInfoFromContext","routeInfoFromRootState","type","useNavigationContainerRef","FrozeContext","Frozen","on","children","window","Provider","value","inert","style","display","useRouter","useUnstableGlobalHref","unstable_globalHref","useSegments","segments","usePathname","pathname","useActiveParams","params","useLocalSearchParams","useParams","useGlobalSearchParams","Object","fromEntries","entries","map","key","Array","isArray","v","decodeURIComponent"],"sources":["../../src/hooks.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,IAASC,aAAA,EAAeC,UAAA,QAAkC;AAEjE,SAASC,MAAA,QAAc;AACvB,SAASC,kBAAA,EAAoBC,YAAA,QAAoB;AACjD,SAASC,aAAA,EAAeC,iBAAA,EAAmBC,iBAAA,QAAyB;AACpE,SAASC,gBAAA,QAAwB;AAoD3B,SAAAC,GAAA;AAhDC,SAASC,uBAAA,EAAyB;EACvC,OAAOJ,iBAAA,CAAkB;AAC3B;AAEO,SAASK,aAAA,EAAe;EAI7B,MAAMC,oBAAA,GAAuBX,UAAA,CAAWO,gBAAgB;IAKlDK,sBAAA,GAAyBN,iBAAA,CAAkB;EAIjD,OAFkBH,YAAA,CAAa,GAEhBU,IAAA,KAAS,WAEfD,sBAAA,GAIFD,oBAAA,IAAwBC,sBAAA;AACjC;AAGO,SAASE,0BAAA,EAA4B;EAC1C,OAAOV,aAAA;AACT;AAEA,MAAMW,YAAA,GAAehB,aAAA,CAAc,EAAK;AAEjC,SAASiB,OAAO;EAAEC,EAAA,GAAK;EAAOC;AAAS,GAA0C;EAQtF,OAAI,OAAOC,MAAA,GAAW,MACbD,QAAA,GAIP,eAAAV,GAAA,CAACO,YAAA,CAAaK,QAAA,EAAb;IAAsBC,KAAA,EAAOJ,EAAA;IAE5BC,QAAA,iBAAAV,GAAA,CAAC;MAECc,KAAA,EAAK;MACLC,KAAA,EAAO;QAAEC,OAAA,EAAS;MAAW;MAE5BN;IAAA,CACH;EAAA,CAEF;AAEJ;AAEO,SAASO,UAAA,EAA8B;EAC5C,OAAOxB,MAAA;AACT;AAMO,SAASyB,sBAAA,EAAgC;EAC9C,OAAOhB,YAAA,CAAa,EAAEiB,mBAAA;AACxB;AAqBO,SAASC,YAAA,EAAgE;EAC9E,OAAOlB,YAAA,CAAa,EAAEmB,QAAA;AACxB;AAGO,SAASC,YAAA,EAAsB;EACpC,OAAOpB,YAAA,CAAa,EAAEqB,QAAA;AACxB;AAWO,SAASC,gBAAA,EAEM;EACpB,OAAOtB,YAAA,CAAa,EAAEuB,MAAA;AACxB;AAGO,MAAMC,oBAAA,GAAuBC,SAAA;EAGvBC,qBAAA,GAAwBJ,eAAA;AAS9B,SAASG,UAAA,EAAqE;EACnF,MAAMF,MAAA,GAASnC,KAAA,CAAME,UAAA,CAAWE,kBAAkB,KAAK,CAAC;EAExD,OAAOmC,MAAA,CAAOC,WAAA,CACZD,MAAA,CAAOE,OAAA,CAAQN,MAAM,EAAEO,GAAA,CAAI,CAAC,CAACC,GAAA,EAAKpB,KAAK,MAAM;IAC3C,IAAIqB,KAAA,CAAMC,OAAA,CAAQtB,KAAK,GACrB,OAAO,CACLoB,GAAA,EACApB,KAAA,CAAMmB,GAAA,CAAKI,CAAA,IAAM;MACf,IAAI;QACF,OAAOC,kBAAA,CAAmBD,CAAC;MAC7B,QAAQ;QACN,OAAOA,CAAA;MACT;IACF,CAAC,EACH;IAEF,IAAI;MACF,OAAO,CAACH,GAAA,EAAKI,kBAAA,CAAmBxB,KAAe,CAAC;IAClD,QAAQ;MACN,OAAO,CAACoB,GAAA,EAAKpB,KAAK;IACpB;EACF,CAAC,CACH;AACF","ignoreList":[]}
|
package/dist/esm/hooks.native.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import React, { createContext } from "react";
|
|
2
|
+
import React, { createContext, useContext } from "react";
|
|
3
3
|
import { router } from "./router/imperative-api.native.js";
|
|
4
|
-
import { RouteParamsContext } from "./router/Route.native.js";
|
|
4
|
+
import { RouteParamsContext, useRouteNode } from "./router/Route.native.js";
|
|
5
5
|
import { navigationRef, useStoreRootState, useStoreRouteInfo } from "./router/router.native.js";
|
|
6
|
+
import { RouteInfoContext } from "./router/RouteInfoContext.native.js";
|
|
6
7
|
function useRootNavigationState() {
|
|
7
8
|
return useStoreRootState();
|
|
8
9
|
}
|
|
9
10
|
function useRouteInfo() {
|
|
10
|
-
|
|
11
|
+
var routeInfoFromContext = useContext(RouteInfoContext),
|
|
12
|
+
routeInfoFromRootState = useStoreRouteInfo(),
|
|
13
|
+
routeNode = useRouteNode();
|
|
14
|
+
return routeNode?.type === "layout" ? routeInfoFromRootState : routeInfoFromContext || routeInfoFromRootState;
|
|
11
15
|
}
|
|
12
16
|
function useNavigationContainerRef() {
|
|
13
17
|
return navigationRef;
|
|
@@ -35,16 +39,16 @@ function useRouter() {
|
|
|
35
39
|
return router;
|
|
36
40
|
}
|
|
37
41
|
function useUnstableGlobalHref() {
|
|
38
|
-
return
|
|
42
|
+
return useRouteInfo().unstable_globalHref;
|
|
39
43
|
}
|
|
40
44
|
function useSegments() {
|
|
41
|
-
return
|
|
45
|
+
return useRouteInfo().segments;
|
|
42
46
|
}
|
|
43
47
|
function usePathname() {
|
|
44
|
-
return
|
|
48
|
+
return useRouteInfo().pathname;
|
|
45
49
|
}
|
|
46
50
|
function useActiveParams() {
|
|
47
|
-
return
|
|
51
|
+
return useRouteInfo().params;
|
|
48
52
|
}
|
|
49
53
|
var useLocalSearchParams = useParams,
|
|
50
54
|
useGlobalSearchParams = useActiveParams;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","React","createContext","router","RouteParamsContext","navigationRef","useStoreRootState","useStoreRouteInfo","useRootNavigationState","useRouteInfo","useNavigationContainerRef","FrozeContext","Frozen","param","on","children","window","Provider","value","inert","style","display","useRouter","useUnstableGlobalHref","unstable_globalHref","useSegments","segments","usePathname","pathname","useActiveParams","params","useLocalSearchParams","useParams","useGlobalSearchParams","_React_useContext","
|
|
1
|
+
{"version":3,"names":["jsx","_jsx","React","createContext","useContext","router","RouteParamsContext","useRouteNode","navigationRef","useStoreRootState","useStoreRouteInfo","RouteInfoContext","useRootNavigationState","useRouteInfo","routeInfoFromContext","routeInfoFromRootState","routeNode","type","useNavigationContainerRef","FrozeContext","Frozen","param","on","children","window","Provider","value","inert","style","display","useRouter","useUnstableGlobalHref","unstable_globalHref","useSegments","segments","usePathname","pathname","useActiveParams","params","useLocalSearchParams","useParams","useGlobalSearchParams","_React_useContext","Object","fromEntries","entries","map","key","Array","isArray","v","decodeURIComponent"],"sources":["../../src/hooks.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAAOA,GAAA,IAASC,IAAA,2BAAe;AAE/B,OAAAC,KAAS,IAAAC,aAAc,EAAAC,UAAA;AACvB,SAASC,MAAA,2CAAoB;AAC7B,SAASC,kBAAe,EAAAC,YAAA,QAAmB;AAC3C,SAASC,aAAA,EAAAC,iBAAwB,EAAAC,iBAAA;AAoD3B,SAAAC,gBAAA;AAhDC,SAASC,uBAAA,EAAyB;EACvC,OAAOH,iBAAA,CAAkB;AAC3B;AAEO,SAASI,aAAA,EAAe;EAI7B,IAAAC,oBAAM,GAAAV,UAAuB,CAAAO,gBAAW;IAAgBI,sBAKlD,GAAAL,iBAAyB;IAAkBM,SAAA,GAAAT,YAAA;EAIjD,OAFkBS,SAAA,EAAAC,IAAa,KAEhB,QAAS,GAAAF,sBAEf,GAAAD,oBAIF,IAAAC,sBAAwB;AACjC;AAGO,SAASG,0BAAA,EAA4B;EAC1C,OAAOV,aAAA;AACT;AAEA,IAAAW,YAAM,kBAA6BhB,aAAK;AAEjC,SAASiB,OAAOC,KAAE,EAAK;EAQ5B;IAAAC,EAAI;IAAOC;EAAW,IAAAF,KACb;EAML,OAAC,OAAAG,MAAA,SAAAD,QAAA,kBAAAtB,IAAA,CAAAkB,YAAA,CAAAM,QAAA;IAAAC,KAAA,EAAAJ,EAAA;IAAAC,QAEC,GACA;IAEC,eAAAtB,IAAA;MAAA;MAGL0B,KAAA;MAEJC,KAAA;QAEgBC,OAAA;MACd,CAAO;MACTN;IAMO;EAEP;AAqBO;AACL,SAAOO,UAAA;EACT,OAAAzB,MAAA;AAGO;AACL,SAAO0B,qBAAeA,CAAA;EACxB,OAAAlB,YAAA,GAAAmB,mBAAA;AAWO;AAGL,SAAOC,YAAA,EAAa;EACtB,OAAApB,YAAA,GAAAqB,QAAA;AAGO;AAYA,SAASC,YAAA,EAAqE;EACnF,OAAMtB,YAAS,EAAM,CAAAuB,QAAA;AAErB;AAAc,SACZC,eAAeA,CAAA,EAAQ;EACrB,OAAAxB,YAAU,GAAQyB,MAAK;AACrB;AAAO,IAAAC,oBACL,GAAAC,SAAA;EAAAC,qBAAA,GAAAJ,eAAA;AAAA,SAAAG,SACMA,CAAA,EAAK;EACT,IAAAE,iBAAI;IAAAJ,MAAA,IAAAI,iBAAA,GAAAxC,KAAA,CAAAE,UAAA,CAAAE,kBAAA,eAAAoC,iBAAA,cAAAA,iBAAA;EACF,OAAAC,MAAA,CAAAC,WAAO,CAAAD,MAAA,CAAAE,OAAoB,CAAAP,MAAA,EAAAQ,GAAA,WAAAzB,KAAA;IAAA,KAAA0B,GAC7B,EAAArB,KAAA,CAAQ,GAAAL,KAAA;IACN,IAAA2B,KAAA,CAAAC,OAAO,CAAAvB,KAAA,UACT,CAAAqB,GACD,EACHrB,KAAA,CAAAoB,GAAA,WAAAI,CAAA;MAEE;QACF,OAAQC,kBAAK,CAAAD,CAAA,CAAmB;MAClC,QAAQ;QACN,OAAQA,CAAA;MACV;IACD,GACH;IACF","ignoreList":[]}
|
package/dist/esm/router/Route.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React, { createContext, useContext } from "react";
|
|
2
2
|
import { getContextKey } from "./matchers";
|
|
3
|
+
import { RouteInfoContextProvider } from "./RouteInfoContext";
|
|
3
4
|
import { jsx } from "react/jsx-runtime";
|
|
4
5
|
const RouteParamsContext = createContext({}), CurrentRouteContext = React.createContext(null);
|
|
5
6
|
process.env.NODE_ENV !== "production" && (CurrentRouteContext.displayName = "RouteNode");
|
|
@@ -17,7 +18,7 @@ function Route({
|
|
|
17
18
|
node,
|
|
18
19
|
route
|
|
19
20
|
}) {
|
|
20
|
-
return /* @__PURE__ */ jsx(RouteParamsContext.Provider, { value: route?.params, children: /* @__PURE__ */ jsx(CurrentRouteContext.Provider, { value: node, children }) });
|
|
21
|
+
return /* @__PURE__ */ jsx(RouteParamsContext.Provider, { value: route?.params, children: /* @__PURE__ */ jsx(CurrentRouteContext.Provider, { value: node, children: /* @__PURE__ */ jsx(RouteInfoContextProvider, { children }) }) });
|
|
21
22
|
}
|
|
22
23
|
export {
|
|
23
24
|
Route,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/router/Route.tsx"],
|
|
4
|
-
"mappings": "AAAA,OAAO,SAAS,eAAe,kBAAkC;AAGjE,SAAS,qBAAqB;
|
|
4
|
+
"mappings": "AAAA,OAAO,SAAS,eAAe,kBAAkC;AAGjE,SAAS,qBAAqB;AAC9B,SAAS,gCAAgC;AAgFjC;AApCD,MAAM,qBAAqB,cAEhC,CAAC,CAAC,GAEE,sBAAsB,MAAM,cAAgC,IAAI;AAElE,QAAQ,IAAI,aAAa,iBAC3B,oBAAoB,cAAc;AAI7B,SAAS,eAAiC;AAC/C,SAAO,WAAW,mBAAmB;AACvC;AAEO,SAAS,gBAAwB;AACtC,QAAM,OAAO,aAAa;AAC1B,MAAI,QAAQ;AACV,UAAM,IAAI,MAAM,oDAAoD;AAEtE,SAAO,cAAc,KAAK,UAAU;AACtC;AAGO,SAAS,MAAM;AAAA,EACpB;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,SACE,oBAAC,mBAAmB,UAAnB,EAA4B,OAAO,OAAO,QACzC,8BAAC,oBAAoB,UAApB,EAA6B,OAAO,MACnC,8BAAC,4BAA0B,UAAS,GACtC,GACF;AAEJ;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React, { createContext, useContext } from "react";
|
|
2
2
|
import { getContextKey } from "./matchers.mjs";
|
|
3
|
+
import { RouteInfoContextProvider } from "./RouteInfoContext.mjs";
|
|
3
4
|
import { jsx } from "react/jsx-runtime";
|
|
4
5
|
const RouteParamsContext = createContext({}),
|
|
5
6
|
CurrentRouteContext = React.createContext(null);
|
|
@@ -21,7 +22,9 @@ function Route({
|
|
|
21
22
|
value: route?.params,
|
|
22
23
|
children: /* @__PURE__ */jsx(CurrentRouteContext.Provider, {
|
|
23
24
|
value: node,
|
|
24
|
-
children
|
|
25
|
+
children: /* @__PURE__ */jsx(RouteInfoContextProvider, {
|
|
26
|
+
children
|
|
27
|
+
})
|
|
25
28
|
})
|
|
26
29
|
});
|
|
27
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","createContext","useContext","getContextKey","jsx","RouteParamsContext","CurrentRouteContext","process","env","NODE_ENV","displayName","useRouteNode","useContextKey","node","Error","contextKey","Route","children","route","Provider","value","params"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,IAASC,aAAA,EAAeC,UAAA,QAAkC;AAGjE,SAASC,aAAA,QAAqB;
|
|
1
|
+
{"version":3,"names":["React","createContext","useContext","getContextKey","RouteInfoContextProvider","jsx","RouteParamsContext","CurrentRouteContext","process","env","NODE_ENV","displayName","useRouteNode","useContextKey","node","Error","contextKey","Route","children","route","Provider","value","params"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,IAASC,aAAA,EAAeC,UAAA,QAAkC;AAGjE,SAASC,aAAA,QAAqB;AAC9B,SAASC,wBAAA,QAAgC;AAgFjC,SAAAC,GAAA;AApCD,MAAMC,kBAAA,GAAqBL,aAAA,CAEhC,CAAC,CAAC;EAEEM,mBAAA,GAAsBP,KAAA,CAAMC,aAAA,CAAgC,IAAI;AAElEO,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAC3BH,mBAAA,CAAoBI,WAAA,GAAc;AAI7B,SAASC,aAAA,EAAiC;EAC/C,OAAOV,UAAA,CAAWK,mBAAmB;AACvC;AAEO,SAASM,cAAA,EAAwB;EACtC,MAAMC,IAAA,GAAOF,YAAA,CAAa;EAC1B,IAAIE,IAAA,IAAQ,MACV,MAAM,IAAIC,KAAA,CAAM,oDAAoD;EAEtE,OAAOZ,aAAA,CAAcW,IAAA,CAAKE,UAAU;AACtC;AAGO,SAASC,MAAM;EACpBC,QAAA;EACAJ,IAAA;EACAK;AACF,GAIG;EACD,OACE,eAAAd,GAAA,CAACC,kBAAA,CAAmBc,QAAA,EAAnB;IAA4BC,KAAA,EAAOF,KAAA,EAAOG,MAAA;IACzCJ,QAAA,iBAAAb,GAAA,CAACE,mBAAA,CAAoBa,QAAA,EAApB;MAA6BC,KAAA,EAAOP,IAAA;MACnCI,QAAA,iBAAAb,GAAA,CAACD,wBAAA;QAA0Bc;MAAA,CAAS;IAAA,CACtC;EAAA,CACF;AAEJ","ignoreList":[]}
|