@tanstack/solid-router 1.162.1 → 1.162.4
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/RouterProvider.cjs +1 -2
- package/dist/cjs/RouterProvider.cjs.map +1 -1
- package/dist/cjs/index.cjs +0 -2
- package/dist/cjs/index.cjs.map +1 -1
- package/dist/cjs/index.d.cts +0 -1
- package/dist/cjs/index.dev.cjs +0 -2
- package/dist/cjs/index.dev.cjs.map +1 -1
- package/dist/cjs/routerContext.cjs +1 -11
- package/dist/cjs/routerContext.cjs.map +1 -1
- package/dist/cjs/routerContext.d.cts +1 -6
- package/dist/cjs/useRouter.cjs +1 -1
- package/dist/cjs/useRouter.cjs.map +1 -1
- package/dist/esm/RouterProvider.js +1 -2
- package/dist/esm/RouterProvider.js.map +1 -1
- package/dist/esm/index.d.ts +0 -1
- package/dist/esm/index.dev.js +0 -2
- package/dist/esm/index.dev.js.map +1 -1
- package/dist/esm/index.js +0 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/routerContext.d.ts +1 -6
- package/dist/esm/routerContext.js +1 -11
- package/dist/esm/routerContext.js.map +1 -1
- package/dist/esm/useRouter.js +2 -2
- package/dist/esm/useRouter.js.map +1 -1
- package/dist/source/RouterProvider.jsx +1 -2
- package/dist/source/RouterProvider.jsx.map +1 -1
- package/dist/source/index.d.ts +0 -1
- package/dist/source/index.jsx +0 -2
- package/dist/source/index.jsx.map +1 -1
- package/dist/source/routerContext.d.ts +1 -6
- package/dist/source/routerContext.jsx +1 -11
- package/dist/source/routerContext.jsx.map +1 -1
- package/dist/source/useRouter.jsx +2 -2
- package/dist/source/useRouter.jsx.map +1 -1
- package/package.json +3 -3
- package/src/RouterProvider.tsx +1 -3
- package/src/index.tsx +0 -4
- package/src/routerContext.tsx +1 -21
- package/src/useRouter.tsx +2 -2
|
@@ -17,11 +17,10 @@ function RouterContextProvider({
|
|
|
17
17
|
...rest.context
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
|
-
const routerContext$1 = routerContext.getRouterContext();
|
|
21
20
|
const OptionalWrapper = router.options.Wrap || SafeFragment.SafeFragment;
|
|
22
21
|
return Solid.createComponent(OptionalWrapper, {
|
|
23
22
|
get children() {
|
|
24
|
-
return Solid.createComponent(routerContext
|
|
23
|
+
return Solid.createComponent(routerContext.routerContext.Provider, {
|
|
25
24
|
value: router,
|
|
26
25
|
get children() {
|
|
27
26
|
return children();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterProvider.cjs","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"RouterProvider.cjs","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { routerContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n AnyRouter,\n RegisteredRouter,\n RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nexport function RouterContextProvider<\n TRouter extends AnyRouter = RegisteredRouter,\n TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n router,\n children,\n ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n children: () => Solid.JSX.Element\n}) {\n // Allow the router to update options on the router instance\n router.update({\n ...router.options,\n ...rest,\n context: {\n ...router.options.context,\n ...rest.context,\n },\n })\n\n const OptionalWrapper = router.options.Wrap || SafeFragment\n\n return (\n <OptionalWrapper>\n <routerContext.Provider value={router as AnyRouter}>\n {children()}\n </routerContext.Provider>\n </OptionalWrapper>\n )\n}\n\nexport function RouterProvider<\n TRouter extends AnyRouter = RegisteredRouter,\n TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n return (\n <RouterContextProvider router={router} {...rest}>\n {() => <Matches />}\n </RouterContextProvider>\n )\n}\n\nexport type RouterProps<\n TRouter extends AnyRouter = RegisteredRouter,\n TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n RouterOptions<\n TRouter['routeTree'],\n NonNullable<TRouter['options']['trailingSlash']>,\n false,\n TRouter['history'],\n TDehydrated\n >,\n 'context'\n> & {\n router: TRouter\n context?: Partial<\n RouterOptions<\n TRouter['routeTree'],\n NonNullable<TRouter['options']['trailingSlash']>,\n false,\n TRouter['history'],\n TDehydrated\n >['context']\n >\n}\n"],"names":["RouterContextProvider","router","children","rest","update","options","context","OptionalWrapper","Wrap","SafeFragment","_$createComponent","routerContext","Provider","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;;;AAUO,SAASA,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACD;AAED,QAAMC,kBAAkBN,OAAOI,QAAQG,QAAQC,aAAAA;AAE/C,SAAAC,MAAAA,gBACGH,iBAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAQ,MAAAA,gBACbC,cAAAA,cAAcC,UAAQ;AAAA,QAACC,OAAOZ;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAC/CA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,SAASY,eAGd;AAAA,EAAEb;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAO,MAAAA,gBACGV,uBAAqBe,iBAAA;AAAA,IAACd;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAQ,sBAAOM,QAAAA,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;;;"}
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -22,7 +22,6 @@ const useBlocker = require("./useBlocker.cjs");
|
|
|
22
22
|
const useNavigate = require("./useNavigate.cjs");
|
|
23
23
|
const useParams = require("./useParams.cjs");
|
|
24
24
|
const useSearch = require("./useSearch.cjs");
|
|
25
|
-
const routerContext = require("./routerContext.cjs");
|
|
26
25
|
const useRouteContext = require("./useRouteContext.cjs");
|
|
27
26
|
const useRouter = require("./useRouter.cjs");
|
|
28
27
|
const useRouterState = require("./useRouterState.cjs");
|
|
@@ -246,7 +245,6 @@ exports.Navigate = useNavigate.Navigate;
|
|
|
246
245
|
exports.useNavigate = useNavigate.useNavigate;
|
|
247
246
|
exports.useParams = useParams.useParams;
|
|
248
247
|
exports.useSearch = useSearch.useSearch;
|
|
249
|
-
exports.getRouterContext = routerContext.getRouterContext;
|
|
250
248
|
exports.useRouteContext = useRouteContext.useRouteContext;
|
|
251
249
|
exports.useRouter = useRouter.useRouter;
|
|
252
250
|
exports.useRouterState = useRouterState.useRouterState;
|
package/dist/cjs/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
package/dist/cjs/index.d.cts
CHANGED
|
@@ -31,7 +31,6 @@ export { useBlocker, Block } from './useBlocker.cjs';
|
|
|
31
31
|
export { useNavigate, Navigate } from './useNavigate.cjs';
|
|
32
32
|
export { useParams } from './useParams.cjs';
|
|
33
33
|
export { useSearch } from './useSearch.cjs';
|
|
34
|
-
export { getRouterContext, } from './routerContext.cjs';
|
|
35
34
|
export { useRouteContext } from './useRouteContext.cjs';
|
|
36
35
|
export { useRouter } from './useRouter.cjs';
|
|
37
36
|
export { useRouterState } from './useRouterState.cjs';
|
package/dist/cjs/index.dev.cjs
CHANGED
|
@@ -22,7 +22,6 @@ const useBlocker = require("./useBlocker.cjs");
|
|
|
22
22
|
const useNavigate = require("./useNavigate.cjs");
|
|
23
23
|
const useParams = require("./useParams.cjs");
|
|
24
24
|
const useSearch = require("./useSearch.cjs");
|
|
25
|
-
const routerContext = require("./routerContext.cjs");
|
|
26
25
|
const useRouteContext = require("./useRouteContext.cjs");
|
|
27
26
|
const useRouter = require("./useRouter.cjs");
|
|
28
27
|
const useRouterState = require("./useRouterState.cjs");
|
|
@@ -246,7 +245,6 @@ exports.Navigate = useNavigate.Navigate;
|
|
|
246
245
|
exports.useNavigate = useNavigate.useNavigate;
|
|
247
246
|
exports.useParams = useParams.useParams;
|
|
248
247
|
exports.useSearch = useSearch.useSearch;
|
|
249
|
-
exports.getRouterContext = routerContext.getRouterContext;
|
|
250
248
|
exports.useRouteContext = useRouteContext.useRouteContext;
|
|
251
249
|
exports.useRouter = useRouter.useRouter;
|
|
252
250
|
exports.useRouterState = useRouterState.useRouterState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.dev.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.dev.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -19,15 +19,5 @@ function _interopNamespaceDefault(e) {
|
|
|
19
19
|
}
|
|
20
20
|
const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
|
|
21
21
|
const routerContext = Solid__namespace.createContext(null);
|
|
22
|
-
|
|
23
|
-
if (typeof document === "undefined") {
|
|
24
|
-
return routerContext;
|
|
25
|
-
}
|
|
26
|
-
if (window.__TSR_ROUTER_CONTEXT__) {
|
|
27
|
-
return window.__TSR_ROUTER_CONTEXT__;
|
|
28
|
-
}
|
|
29
|
-
window.__TSR_ROUTER_CONTEXT__ = routerContext;
|
|
30
|
-
return routerContext;
|
|
31
|
-
}
|
|
32
|
-
exports.getRouterContext = getRouterContext;
|
|
22
|
+
exports.routerContext = routerContext;
|
|
33
23
|
//# sourceMappingURL=routerContext.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerContext.cjs","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\
|
|
1
|
+
{"version":3,"file":"routerContext.cjs","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const routerContext = Solid.createContext<AnyRouter>(\n null as unknown as AnyRouter,\n)\n"],"names":["routerContext","Solid","createContext"],"mappings":";;;;;;;;;;;;;;;;;;;;AAGO,MAAMA,gBAAgBC,iBAAMC,cACjC,IACF;;"}
|
|
@@ -1,8 +1,3 @@
|
|
|
1
1
|
import { AnyRouter } from '@tanstack/router-core';
|
|
2
2
|
import * as Solid from 'solid-js';
|
|
3
|
-
declare
|
|
4
|
-
interface Window {
|
|
5
|
-
__TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>;
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
export declare function getRouterContext(): Solid.Context<AnyRouter>;
|
|
3
|
+
export declare const routerContext: Solid.Context<AnyRouter>;
|
package/dist/cjs/useRouter.cjs
CHANGED
|
@@ -21,7 +21,7 @@ function _interopNamespaceDefault(e) {
|
|
|
21
21
|
}
|
|
22
22
|
const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
|
|
23
23
|
function useRouter(opts) {
|
|
24
|
-
const value = Solid__namespace.useContext(routerContext.
|
|
24
|
+
const value = Solid__namespace.useContext(routerContext.routerContext);
|
|
25
25
|
warning(!((opts?.warn ?? true) && !value), "useRouter must be used inside a <RouterProvider> component!");
|
|
26
26
|
return value;
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRouter.cjs","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport {
|
|
1
|
+
{"version":3,"file":"useRouter.cjs","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport { routerContext } from './routerContext'\nimport type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'\n\nexport function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {\n warn?: boolean\n}): TRouter {\n const value = Solid.useContext(routerContext as any)\n warning(\n !((opts?.warn ?? true) && !value),\n 'useRouter must be used inside a <RouterProvider> component!',\n )\n return value as any\n}\n"],"names":["useRouter","opts","value","Solid","useContext","routerContext","warning","warn"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAKO,SAASA,UAAwDC,MAE5D;AACV,QAAMC,QAAQC,iBAAMC,WAAWC,2BAAoB;AACnDC,UACE,GAAGL,MAAMM,QAAQ,SAAS,CAACL,QAC3B,6DACF;AACA,SAAOA;AACT;;"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createComponent, mergeProps } from "solid-js/web";
|
|
2
|
-
import {
|
|
2
|
+
import { routerContext } from "./routerContext.js";
|
|
3
3
|
import { SafeFragment } from "./SafeFragment.js";
|
|
4
4
|
import { Matches } from "./Matches.js";
|
|
5
5
|
function RouterContextProvider({
|
|
@@ -15,7 +15,6 @@ function RouterContextProvider({
|
|
|
15
15
|
...rest.context
|
|
16
16
|
}
|
|
17
17
|
});
|
|
18
|
-
const routerContext = getRouterContext();
|
|
19
18
|
const OptionalWrapper = router.options.Wrap || SafeFragment;
|
|
20
19
|
return createComponent(OptionalWrapper, {
|
|
21
20
|
get children() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"RouterProvider.js","sources":["../../src/RouterProvider.tsx"],"sourcesContent":["import { routerContext } from './routerContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Matches } from './Matches'\nimport type {\n AnyRouter,\n RegisteredRouter,\n RouterOptions,\n} from '@tanstack/router-core'\nimport type * as Solid from 'solid-js'\n\nexport function RouterContextProvider<\n TRouter extends AnyRouter = RegisteredRouter,\n TDehydrated extends Record<string, any> = Record<string, any>,\n>({\n router,\n children,\n ...rest\n}: RouterProps<TRouter, TDehydrated> & {\n children: () => Solid.JSX.Element\n}) {\n // Allow the router to update options on the router instance\n router.update({\n ...router.options,\n ...rest,\n context: {\n ...router.options.context,\n ...rest.context,\n },\n })\n\n const OptionalWrapper = router.options.Wrap || SafeFragment\n\n return (\n <OptionalWrapper>\n <routerContext.Provider value={router as AnyRouter}>\n {children()}\n </routerContext.Provider>\n </OptionalWrapper>\n )\n}\n\nexport function RouterProvider<\n TRouter extends AnyRouter = RegisteredRouter,\n TDehydrated extends Record<string, any> = Record<string, any>,\n>({ router, ...rest }: RouterProps<TRouter, TDehydrated>) {\n return (\n <RouterContextProvider router={router} {...rest}>\n {() => <Matches />}\n </RouterContextProvider>\n )\n}\n\nexport type RouterProps<\n TRouter extends AnyRouter = RegisteredRouter,\n TDehydrated extends Record<string, any> = Record<string, any>,\n> = Omit<\n RouterOptions<\n TRouter['routeTree'],\n NonNullable<TRouter['options']['trailingSlash']>,\n false,\n TRouter['history'],\n TDehydrated\n >,\n 'context'\n> & {\n router: TRouter\n context?: Partial<\n RouterOptions<\n TRouter['routeTree'],\n NonNullable<TRouter['options']['trailingSlash']>,\n false,\n TRouter['history'],\n TDehydrated\n >['context']\n >\n}\n"],"names":["RouterContextProvider","router","children","rest","update","options","context","OptionalWrapper","Wrap","SafeFragment","_$createComponent","routerContext","Provider","value","RouterProvider","_$mergeProps","Matches"],"mappings":";;;;AAUO,SAASA,sBAGd;AAAA,EACAC;AAAAA,EACAC;AAAAA,EACA,GAAGC;AAGL,GAAG;AAEDF,SAAOG,OAAO;AAAA,IACZ,GAAGH,OAAOI;AAAAA,IACV,GAAGF;AAAAA,IACHG,SAAS;AAAA,MACP,GAAGL,OAAOI,QAAQC;AAAAA,MAClB,GAAGH,KAAKG;AAAAA,IAAAA;AAAAA,EACV,CACD;AAED,QAAMC,kBAAkBN,OAAOI,QAAQG,QAAQC;AAE/C,SAAAC,gBACGH,iBAAe;AAAA,IAAA,IAAAL,WAAA;AAAA,aAAAQ,gBACbC,cAAcC,UAAQ;AAAA,QAACC,OAAOZ;AAAAA,QAAmB,IAAAC,WAAA;AAAA,iBAC/CA,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,SAASY,eAGd;AAAA,EAAEb;AAAAA,EAAQ,GAAGE;AAAwC,GAAG;AACxD,SAAAO,gBACGV,uBAAqBe,WAAA;AAAA,IAACd;AAAAA,EAAAA,GAAoBE,MAAI;AAAA,IAAAD,UAC5CA,MAAAQ,gBAAOM,SAAO,CAAA,CAAA;AAAA,EAAA,CAAG,CAAA;AAGxB;"}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -31,7 +31,6 @@ export { useBlocker, Block } from './useBlocker.js';
|
|
|
31
31
|
export { useNavigate, Navigate } from './useNavigate.js';
|
|
32
32
|
export { useParams } from './useParams.js';
|
|
33
33
|
export { useSearch } from './useSearch.js';
|
|
34
|
-
export { getRouterContext, } from './routerContext.js';
|
|
35
34
|
export { useRouteContext } from './useRouteContext.js';
|
|
36
35
|
export { useRouter } from './useRouter.js';
|
|
37
36
|
export { useRouterState } from './useRouterState.js';
|
package/dist/esm/index.dev.js
CHANGED
|
@@ -20,7 +20,6 @@ import { Block, useBlocker } from "./useBlocker.js";
|
|
|
20
20
|
import { Navigate, useNavigate } from "./useNavigate.js";
|
|
21
21
|
import { useParams } from "./useParams.js";
|
|
22
22
|
import { useSearch } from "./useSearch.js";
|
|
23
|
-
import { getRouterContext } from "./routerContext.js";
|
|
24
23
|
import { useRouteContext } from "./useRouteContext.js";
|
|
25
24
|
import { useRouter } from "./useRouter.js";
|
|
26
25
|
import { useRouterState } from "./useRouterState.js";
|
|
@@ -92,7 +91,6 @@ export {
|
|
|
92
91
|
functionalUpdate,
|
|
93
92
|
getInitialRouterState,
|
|
94
93
|
getRouteApi,
|
|
95
|
-
getRouterContext,
|
|
96
94
|
interpolatePath,
|
|
97
95
|
isMatch,
|
|
98
96
|
isNotFound,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.dev.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.dev.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
package/dist/esm/index.js
CHANGED
|
@@ -20,7 +20,6 @@ import { Block, useBlocker } from "./useBlocker.js";
|
|
|
20
20
|
import { Navigate, useNavigate } from "./useNavigate.js";
|
|
21
21
|
import { useParams } from "./useParams.js";
|
|
22
22
|
import { useSearch } from "./useSearch.js";
|
|
23
|
-
import { getRouterContext } from "./routerContext.js";
|
|
24
23
|
import { useRouteContext } from "./useRouteContext.js";
|
|
25
24
|
import { useRouter } from "./useRouter.js";
|
|
26
25
|
import { useRouterState } from "./useRouterState.js";
|
|
@@ -92,7 +91,6 @@ export {
|
|
|
92
91
|
functionalUpdate,
|
|
93
92
|
getInitialRouterState,
|
|
94
93
|
getRouteApi,
|
|
95
|
-
getRouterContext,
|
|
96
94
|
interpolatePath,
|
|
97
95
|
isMatch,
|
|
98
96
|
isNotFound,
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -1,8 +1,3 @@
|
|
|
1
1
|
import { AnyRouter } from '@tanstack/router-core';
|
|
2
2
|
import * as Solid from 'solid-js';
|
|
3
|
-
declare
|
|
4
|
-
interface Window {
|
|
5
|
-
__TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>;
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
export declare function getRouterContext(): Solid.Context<AnyRouter>;
|
|
3
|
+
export declare const routerContext: Solid.Context<AnyRouter>;
|
|
@@ -1,16 +1,6 @@
|
|
|
1
1
|
import * as Solid from "solid-js";
|
|
2
2
|
const routerContext = Solid.createContext(null);
|
|
3
|
-
function getRouterContext() {
|
|
4
|
-
if (typeof document === "undefined") {
|
|
5
|
-
return routerContext;
|
|
6
|
-
}
|
|
7
|
-
if (window.__TSR_ROUTER_CONTEXT__) {
|
|
8
|
-
return window.__TSR_ROUTER_CONTEXT__;
|
|
9
|
-
}
|
|
10
|
-
window.__TSR_ROUTER_CONTEXT__ = routerContext;
|
|
11
|
-
return routerContext;
|
|
12
|
-
}
|
|
13
3
|
export {
|
|
14
|
-
|
|
4
|
+
routerContext
|
|
15
5
|
};
|
|
16
6
|
//# sourceMappingURL=routerContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\
|
|
1
|
+
{"version":3,"file":"routerContext.js","sources":["../../src/routerContext.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport type { AnyRouter } from '@tanstack/router-core'\n\nexport const routerContext = Solid.createContext<AnyRouter>(\n null as unknown as AnyRouter,\n)\n"],"names":["routerContext","Solid","createContext"],"mappings":";AAGO,MAAMA,gBAAgBC,MAAMC,cACjC,IACF;"}
|
package/dist/esm/useRouter.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as Solid from "solid-js";
|
|
2
2
|
import warning from "tiny-warning";
|
|
3
|
-
import {
|
|
3
|
+
import { routerContext } from "./routerContext.js";
|
|
4
4
|
function useRouter(opts) {
|
|
5
|
-
const value = Solid.useContext(
|
|
5
|
+
const value = Solid.useContext(routerContext);
|
|
6
6
|
warning(!((opts?.warn ?? true) && !value), "useRouter must be used inside a <RouterProvider> component!");
|
|
7
7
|
return value;
|
|
8
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRouter.js","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport {
|
|
1
|
+
{"version":3,"file":"useRouter.js","sources":["../../src/useRouter.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport warning from 'tiny-warning'\nimport { routerContext } from './routerContext'\nimport type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'\n\nexport function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {\n warn?: boolean\n}): TRouter {\n const value = Solid.useContext(routerContext as any)\n warning(\n !((opts?.warn ?? true) && !value),\n 'useRouter must be used inside a <RouterProvider> component!',\n )\n return value as any\n}\n"],"names":["useRouter","opts","value","Solid","useContext","routerContext","warning","warn"],"mappings":";;;AAKO,SAASA,UAAwDC,MAE5D;AACV,QAAMC,QAAQC,MAAMC,WAAWC,aAAoB;AACnDC,UACE,GAAGL,MAAMM,QAAQ,SAAS,CAACL,QAC3B,6DACF;AACA,SAAOA;AACT;"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { routerContext } from './routerContext';
|
|
2
2
|
import { SafeFragment } from './SafeFragment';
|
|
3
3
|
import { Matches } from './Matches';
|
|
4
4
|
export function RouterContextProvider({ router, children, ...rest }) {
|
|
@@ -11,7 +11,6 @@ export function RouterContextProvider({ router, children, ...rest }) {
|
|
|
11
11
|
...rest.context,
|
|
12
12
|
},
|
|
13
13
|
});
|
|
14
|
-
const routerContext = getRouterContext();
|
|
15
14
|
const OptionalWrapper = router.options.Wrap || SafeFragment;
|
|
16
15
|
return (<OptionalWrapper>
|
|
17
16
|
<routerContext.Provider value={router}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterProvider.jsx","sourceRoot":"","sources":["../../src/RouterProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"RouterProvider.jsx","sourceRoot":"","sources":["../../src/RouterProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAQnC,MAAM,UAAU,qBAAqB,CAGnC,EACA,MAAM,EACN,QAAQ,EACR,GAAG,IAAI,EAGR;IACC,4DAA4D;IAC5D,MAAM,CAAC,MAAM,CAAC;QACZ,GAAG,MAAM,CAAC,OAAO;QACjB,GAAG,IAAI;QACP,OAAO,EAAE;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO;YACzB,GAAG,IAAI,CAAC,OAAO;SAChB;KACF,CAAC,CAAA;IAEF,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,YAAY,CAAA;IAE3D,OAAO,CACL,CAAC,eAAe,CACd;MAAA,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAmB,CAAC,CACjD;QAAA,CAAC,QAAQ,EAAE,CACb;MAAA,EAAE,aAAa,CAAC,QAAQ,CAC1B;IAAA,EAAE,eAAe,CAAC,CACnB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAG5B,EAAE,MAAM,EAAE,GAAG,IAAI,EAAqC;IACtD,OAAO,CACL,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,CAC9C;MAAA,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,AAAD,EAAG,CACpB;IAAA,EAAE,qBAAqB,CAAC,CACzB,CAAA;AACH,CAAC"}
|
package/dist/source/index.d.ts
CHANGED
|
@@ -31,7 +31,6 @@ export { useBlocker, Block } from './useBlocker';
|
|
|
31
31
|
export { useNavigate, Navigate } from './useNavigate';
|
|
32
32
|
export { useParams } from './useParams';
|
|
33
33
|
export { useSearch } from './useSearch';
|
|
34
|
-
export { getRouterContext, } from './routerContext';
|
|
35
34
|
export { useRouteContext } from './useRouteContext';
|
|
36
35
|
export { useRouter } from './useRouter';
|
|
37
36
|
export { useRouterState } from './useRouterState';
|
package/dist/source/index.jsx
CHANGED
|
@@ -23,8 +23,6 @@ export { useBlocker, Block } from './useBlocker';
|
|
|
23
23
|
export { useNavigate, Navigate } from './useNavigate';
|
|
24
24
|
export { useParams } from './useParams';
|
|
25
25
|
export { useSearch } from './useSearch';
|
|
26
|
-
export { getRouterContext, // SSR
|
|
27
|
-
} from './routerContext';
|
|
28
26
|
export { useRouteContext } from './useRouteContext';
|
|
29
27
|
export { useRouter } from './useRouter';
|
|
30
28
|
export { useRouterState } from './useRouterState';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,SAAS,EACT,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,WAAW,EACX,eAAe,EACf,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,SAAS,EACT,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAA;AAqK9B,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,mBAAmB,CAAA;AAU1B,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAG7C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAEtD,OAAO,EACL,SAAS,EACT,eAAe,EACf,eAAe,EACf,SAAS,EACT,eAAe,EACf,mBAAmB,GACpB,MAAM,aAAa,CAAA;AAEpB,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAUpE,OAAO,EACL,OAAO,EACP,aAAa,EACb,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,eAAe,GAChB,MAAM,WAAW,CAAA;AAIlB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EACL,QAAQ,EACR,UAAU,EACV,0BAA0B,GAC3B,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EACL,QAAQ,EACR,WAAW,EACX,KAAK,EACL,WAAW,EACX,SAAS,EACT,oBAAoB,EACpB,eAAe,EACf,0BAA0B,EAC1B,eAAe,EACf,aAAa,GACd,MAAM,SAAS,CAAA;AAUhB,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAE/C,OAAO,EACL,cAAc,EACd,MAAM,EACN,gBAAgB,EAChB,cAAc,EACd,qBAAqB,GACtB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAGxE,OAAO,EACL,2BAA2B,EAC3B,iBAAiB,GAClB,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,3 @@
|
|
|
1
1
|
import * as Solid from 'solid-js';
|
|
2
2
|
import type { AnyRouter } from '@tanstack/router-core';
|
|
3
|
-
declare
|
|
4
|
-
interface Window {
|
|
5
|
-
__TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>;
|
|
6
|
-
}
|
|
7
|
-
}
|
|
8
|
-
export declare function getRouterContext(): Solid.Context<AnyRouter>;
|
|
3
|
+
export declare const routerContext: Solid.Context<AnyRouter>;
|
|
@@ -1,13 +1,3 @@
|
|
|
1
1
|
import * as Solid from 'solid-js';
|
|
2
|
-
const routerContext = Solid.createContext(null);
|
|
3
|
-
export function getRouterContext() {
|
|
4
|
-
if (typeof document === 'undefined') {
|
|
5
|
-
return routerContext;
|
|
6
|
-
}
|
|
7
|
-
if (window.__TSR_ROUTER_CONTEXT__) {
|
|
8
|
-
return window.__TSR_ROUTER_CONTEXT__;
|
|
9
|
-
}
|
|
10
|
-
window.__TSR_ROUTER_CONTEXT__ = routerContext;
|
|
11
|
-
return routerContext;
|
|
12
|
-
}
|
|
2
|
+
export const routerContext = Solid.createContext(null);
|
|
13
3
|
//# sourceMappingURL=routerContext.jsx.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routerContext.jsx","sourceRoot":"","sources":["../../src/routerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"routerContext.jsx","sourceRoot":"","sources":["../../src/routerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAC9C,IAA4B,CAC7B,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as Solid from 'solid-js';
|
|
2
2
|
import warning from 'tiny-warning';
|
|
3
|
-
import {
|
|
3
|
+
import { routerContext } from './routerContext';
|
|
4
4
|
export function useRouter(opts) {
|
|
5
|
-
const value = Solid.useContext(
|
|
5
|
+
const value = Solid.useContext(routerContext);
|
|
6
6
|
warning(!((opts?.warn ?? true) && !value), 'useRouter must be used inside a <RouterProvider> component!');
|
|
7
7
|
return value;
|
|
8
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRouter.jsx","sourceRoot":"","sources":["../../src/useRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useRouter.jsx","sourceRoot":"","sources":["../../src/useRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,MAAM,UAAU,SAAS,CAA+C,IAEvE;IACC,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,aAAoB,CAAC,CAAA;IACpD,OAAO,CACL,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EACjC,6DAA6D,CAC9D,CAAA;IACD,OAAO,KAAY,CAAA;AACrB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/solid-router",
|
|
3
|
-
"version": "1.162.
|
|
3
|
+
"version": "1.162.4",
|
|
4
4
|
"description": "Modern and scalable routing for Solid applications",
|
|
5
5
|
"author": "Tanner Linsley",
|
|
6
6
|
"license": "MIT",
|
|
@@ -91,8 +91,8 @@
|
|
|
91
91
|
"isbot": "^5.1.22",
|
|
92
92
|
"tiny-invariant": "^1.3.3",
|
|
93
93
|
"tiny-warning": "^1.0.3",
|
|
94
|
-
"@tanstack/
|
|
95
|
-
"@tanstack/
|
|
94
|
+
"@tanstack/history": "1.161.4",
|
|
95
|
+
"@tanstack/router-core": "1.162.2"
|
|
96
96
|
},
|
|
97
97
|
"devDependencies": {
|
|
98
98
|
"@solidjs/testing-library": "^0.8.10",
|
package/src/RouterProvider.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { routerContext } from './routerContext'
|
|
2
2
|
import { SafeFragment } from './SafeFragment'
|
|
3
3
|
import { Matches } from './Matches'
|
|
4
4
|
import type {
|
|
@@ -28,8 +28,6 @@ export function RouterContextProvider<
|
|
|
28
28
|
},
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
-
const routerContext = getRouterContext()
|
|
32
|
-
|
|
33
31
|
const OptionalWrapper = router.options.Wrap || SafeFragment
|
|
34
32
|
|
|
35
33
|
return (
|
package/src/index.tsx
CHANGED
|
@@ -304,10 +304,6 @@ export { useNavigate, Navigate } from './useNavigate'
|
|
|
304
304
|
export { useParams } from './useParams'
|
|
305
305
|
export { useSearch } from './useSearch'
|
|
306
306
|
|
|
307
|
-
export {
|
|
308
|
-
getRouterContext, // SSR
|
|
309
|
-
} from './routerContext'
|
|
310
|
-
|
|
311
307
|
export { useRouteContext } from './useRouteContext'
|
|
312
308
|
export { useRouter } from './useRouter'
|
|
313
309
|
export { useRouterState } from './useRouterState'
|
package/src/routerContext.tsx
CHANGED
|
@@ -1,26 +1,6 @@
|
|
|
1
1
|
import * as Solid from 'solid-js'
|
|
2
2
|
import type { AnyRouter } from '@tanstack/router-core'
|
|
3
3
|
|
|
4
|
-
|
|
5
|
-
interface Window {
|
|
6
|
-
__TSR_ROUTER_CONTEXT__?: Solid.Context<AnyRouter>
|
|
7
|
-
}
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
const routerContext = Solid.createContext<AnyRouter>(
|
|
4
|
+
export const routerContext = Solid.createContext<AnyRouter>(
|
|
11
5
|
null as unknown as AnyRouter,
|
|
12
6
|
)
|
|
13
|
-
|
|
14
|
-
export function getRouterContext() {
|
|
15
|
-
if (typeof document === 'undefined') {
|
|
16
|
-
return routerContext
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
if (window.__TSR_ROUTER_CONTEXT__) {
|
|
20
|
-
return window.__TSR_ROUTER_CONTEXT__
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
window.__TSR_ROUTER_CONTEXT__ = routerContext as any
|
|
24
|
-
|
|
25
|
-
return routerContext
|
|
26
|
-
}
|
package/src/useRouter.tsx
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import * as Solid from 'solid-js'
|
|
2
2
|
import warning from 'tiny-warning'
|
|
3
|
-
import {
|
|
3
|
+
import { routerContext } from './routerContext'
|
|
4
4
|
import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'
|
|
5
5
|
|
|
6
6
|
export function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {
|
|
7
7
|
warn?: boolean
|
|
8
8
|
}): TRouter {
|
|
9
|
-
const value = Solid.useContext(
|
|
9
|
+
const value = Solid.useContext(routerContext as any)
|
|
10
10
|
warning(
|
|
11
11
|
!((opts?.warn ?? true) && !value),
|
|
12
12
|
'useRouter must be used inside a <RouterProvider> component!',
|