@shuvi/router-react 1.0.55 → 1.0.56

package/esm/contexts.d.ts

@@ -6,8 +6,8 @@ export declare const RouteContext: React.Context<IRoute<{
     path: string;
     component?: any;
     children?: any[] | undefined;
-    props?: import("@shuvi/router").IRouteComponentProps | undefined;
-    redirect?: string | undefined;
-    caseSensitive?: boolean | undefined;
+    props?: import("@shuvi/router").IRouteComponentProps;
+    redirect?: string;
+    caseSensitive?: boolean;
 }>>;
 export declare const MatchedRouteContext: React.Context<IRouteContextObject<{}>>;

package/esm/hooks.d.ts

@@ -7,9 +7,9 @@ export declare function useCurrentRoute(): import("@shuvi/router").IRoute<{
     path: string;
     component?: any;
     children?: any[] | undefined;
-    props?: import("@shuvi/router").IRouteComponentProps | undefined;
-    redirect?: string | undefined;
-    caseSensitive?: boolean | undefined;
+    props?: import("@shuvi/router").IRouteComponentProps;
+    redirect?: string;
+    caseSensitive?: boolean;
 }>;
 /**
  * Blocks all navigation attempts. This is useful for preventing the page from

package/esm/types.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="react" />
 import { IParams, InitialEntry, State, PathRecord, IRouteRecord as IOriginalRouteRecord, IRouter } from '@shuvi/router';
-export declare type IReactRouteRecord<T = {}> = IOriginalRouteRecord<React.ReactNode, T>;
-export declare type IReactPartialRouteRecord = Partial<IReactRouteRecord>;
+export type IReactRouteRecord<T = {}> = IOriginalRouteRecord<React.ReactNode, T>;
+export type IReactPartialRouteRecord = Partial<IReactRouteRecord>;
 export interface IRouterContextObject {
     static: boolean;
     router: IRouter;

package/lib/Link.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -12,8 +35,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Link = void 0;
-const React = require("react");
-const PropTypes = require("prop-types");
+const React = __importStar(require("react"));
+const PropTypes = __importStar(require("prop-types"));
 const _1 = require(".");
 const router_1 = require("@shuvi/router");
 const constants_1 = require("./constants");

package/lib/MemoryRouter.js

@@ -1,8 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MemoryRouter = void 0;
-const React = require("react");
-const PropTypes = require("prop-types");
+exports.MemoryRouter = MemoryRouter;
+const React = __importStar(require("react"));
+const PropTypes = __importStar(require("prop-types"));
 const router_1 = require("@shuvi/router");
 const Router_1 = require("./Router");
 const constants_1 = require("./constants");
@@ -19,7 +42,6 @@ function MemoryRouter({ basename, children, routes, initialEntries, initialIndex
     }
     return React.createElement(Router_1.Router, { children: children, router: routerRef.current });
 }
-exports.MemoryRouter = MemoryRouter;
 if (constants_1.__DEV__) {
     MemoryRouter.displayName = 'MemoryRouter';
     MemoryRouter.propTypes = {

package/lib/Router.js

@@ -1,9 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Router = void 0;
-const React = require("react");
-const PropTypes = require("prop-types");
-const invariant_1 = require("@shuvi/utils/invariant");
+exports.Router = Router;
+const React = __importStar(require("react"));
+const PropTypes = __importStar(require("prop-types"));
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const shim_1 = require("use-sync-external-store/shim");
 const contexts_1 = require("./contexts");
 const hooks_1 = require("./hooks");
@@ -32,7 +58,6 @@ function Router({ children = null, static: staticProp = false, router }) {
     return (React.createElement(contexts_1.RouterContext.Provider, { value: contextVal },
         React.createElement(contexts_1.RouteContext.Provider, { children: children, value: current })));
 }
-exports.Router = Router;
 if (constants_1.__DEV__) {
     Router.displayName = 'Router';
     Router.propTypes = {

package/lib/RouterView.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouterView = void 0;
-const React = require("react");
+exports.RouterView = RouterView;
+const React = __importStar(require("react"));
 const router_1 = require("@shuvi/router");
 const hooks_1 = require("./hooks");
 const constants_1 = require("./constants");
@@ -38,7 +61,6 @@ function RouterView() {
     }
     return (React.createElement(MatchedRoute, { match: matched, depth: depth, parentPathname: parentPathname, parentParams: parentParams }));
 }
-exports.RouterView = RouterView;
 if (constants_1.__DEV__) {
     RouterView.displayName = 'RouterView';
 }

package/lib/contexts.d.ts

@@ -6,8 +6,8 @@ export declare const RouteContext: React.Context<IRoute<{
     path: string;
     component?: any;
     children?: any[] | undefined;
-    props?: import("@shuvi/router").IRouteComponentProps | undefined;
-    redirect?: string | undefined;
-    caseSensitive?: boolean | undefined;
+    props?: import("@shuvi/router").IRouteComponentProps;
+    redirect?: string;
+    caseSensitive?: boolean;
 }>>;
 export declare const MatchedRouteContext: React.Context<IRouteContextObject<{}>>;

package/lib/contexts.js

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MatchedRouteContext = exports.RouteContext = exports.RouterContext = void 0;
-const React = require("react");
+const React = __importStar(require("react"));
 const utils_1 = require("./utils");
 const constants_1 = require("./constants");
 exports.RouterContext = React.createContext(null);

package/lib/hooks.d.ts

@@ -7,9 +7,9 @@ export declare function useCurrentRoute(): import("@shuvi/router").IRoute<{
     path: string;
     component?: any;
     children?: any[] | undefined;
-    props?: import("@shuvi/router").IRouteComponentProps | undefined;
-    redirect?: string | undefined;
-    caseSensitive?: boolean | undefined;
+    props?: import("@shuvi/router").IRouteComponentProps;
+    redirect?: string;
+    caseSensitive?: boolean;
 }>;
 /**
  * Blocks all navigation attempts. This is useful for preventing the page from

package/lib/hooks.js

@@ -1,10 +1,45 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useMatchedRoute = exports.useRouter = exports.useResolvedPath = exports.useParams = exports.useNavigate = exports.useMatch = exports.useInRouterContext = exports.useHref = exports.useBlocker = exports.useCurrentRoute = void 0;
-const React = require("react");
+exports.useCurrentRoute = useCurrentRoute;
+exports.useBlocker = useBlocker;
+exports.useHref = useHref;
+exports.useInRouterContext = useInRouterContext;
+exports.useMatch = useMatch;
+exports.useNavigate = useNavigate;
+exports.useParams = useParams;
+exports.useResolvedPath = useResolvedPath;
+exports.useRouter = useRouter;
+exports.useMatchedRoute = useMatchedRoute;
+const React = __importStar(require("react"));
 const react_1 = require("react");
 const router_1 = require("@shuvi/router");
-const invariant_1 = require("@shuvi/utils/invariant");
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const contexts_1 = require("./contexts");
 const utils_1 = require("./utils");
 /**
@@ -13,7 +48,6 @@ const utils_1 = require("./utils");
 function useCurrentRoute() {
     return (0, react_1.useContext)(contexts_1.RouteContext);
 }
-exports.useCurrentRoute = useCurrentRoute;
 /**
  * Blocks all navigation attempts. This is useful for preventing the page from
  * changing until some condition is met, like saving form data.
@@ -37,7 +71,6 @@ function useBlocker(blocker, when = true) {
         return unblock;
     }, [router, blocker, when]);
 }
-exports.useBlocker = useBlocker;
 /**
  * Returns the full href for the given "to" value. This is useful for building
  * custom links that are also accessible and preserve right-click behavior.
@@ -48,14 +81,12 @@ function useHref(to) {
     const path = useResolvedPath(to);
     return router.resolve(path).href;
 }
-exports.useHref = useHref;
 /**
  * Returns true if this component is a descendant of a <Router>.
  */
 function useInRouterContext() {
     return (0, react_1.useContext)(contexts_1.RouterContext) != null;
 }
-exports.useInRouterContext = useInRouterContext;
 /**
  * Returns true if the URL for the given "to" value matches the current URL.
  * This is useful for components that need to know "active" state, e.g.
@@ -66,7 +97,6 @@ function useMatch(pattern) {
     const { pathname } = useCurrentRoute();
     return (0, router_1.matchPathname)(pattern, pathname);
 }
-exports.useMatch = useMatch;
 /**
  * Returns an imperative method for changing the location. Used by <Link>s, but
  * may also be used by other elements to change the location.
@@ -96,7 +126,6 @@ function useNavigate() {
     }, [router, pathname]);
     return navigate;
 }
-exports.useNavigate = useNavigate;
 /**
  * Returns an object of key/value pairs of the dynamic params from the current
  * URL that were matched by the route path.
@@ -104,7 +133,6 @@ exports.useNavigate = useNavigate;
 function useParams() {
     return (0, react_1.useContext)(contexts_1.RouteContext).params;
 }
-exports.useParams = useParams;
 /**
  * Resolves the pathname of the given `to` value against the current location.
  */
@@ -113,7 +141,6 @@ function useResolvedPath(to) {
     const { pathname } = (0, react_1.useContext)(contexts_1.MatchedRouteContext);
     return React.useMemo(() => router.resolve(to, pathname).path, [to, pathname]);
 }
-exports.useResolvedPath = useResolvedPath;
 /**
  * Returns the current router object
  * two parts, one is router behavior(browser history mode, hash history mode), another is router content
@@ -122,8 +149,6 @@ function useRouter() {
     (0, invariant_1.default)(useInRouterContext(), `useRouter() may be used only in the context of a <Router> component.`);
     return (0, react_1.useContext)(contexts_1.RouterContext).router;
 }
-exports.useRouter = useRouter;
 function useMatchedRoute() {
     return (0, react_1.useContext)(contexts_1.MatchedRouteContext);
 }
-exports.useMatchedRoute = useMatchedRoute;

package/lib/types.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="react" />
 import { IParams, InitialEntry, State, PathRecord, IRouteRecord as IOriginalRouteRecord, IRouter } from '@shuvi/router';
-export declare type IReactRouteRecord<T = {}> = IOriginalRouteRecord<React.ReactNode, T>;
-export declare type IReactPartialRouteRecord = Partial<IReactRouteRecord>;
+export type IReactRouteRecord<T = {}> = IOriginalRouteRecord<React.ReactNode, T>;
+export type IReactPartialRouteRecord = Partial<IReactRouteRecord>;
 export interface IRouterContextObject {
     static: boolean;
     router: IRouter;

package/lib/utils.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePath = exports.warningOnce = exports.warning = exports.readOnly = exports.useIsomorphicEffect = void 0;
+exports.readOnly = void 0;
+exports.useIsomorphicEffect = useIsomorphicEffect;
+exports.warning = warning;
+exports.warningOnce = warningOnce;
+exports.generatePath = generatePath;
 const router_1 = require("@shuvi/router");
 const react_1 = require("react");
 const constants_1 = require("./constants");
@@ -12,7 +16,6 @@ function useIsomorphicEffect(cb, deps) {
         (0, react_1.useEffect)(cb, deps);
     }
 }
-exports.useIsomorphicEffect = useIsomorphicEffect;
 exports.readOnly = constants_1.__DEV__
     ? obj => Object.freeze(obj)
     : obj => obj;
@@ -31,7 +34,6 @@ function warning(cond, message) {
         catch (e) { }
     }
 }
-exports.warning = warning;
 const alreadyWarned = {};
 function warningOnce(key, cond, message) {
     if (!cond && !alreadyWarned[key]) {
@@ -39,11 +41,9 @@ function warningOnce(key, cond, message) {
         warning(false, message);
     }
 }
-exports.warningOnce = warningOnce;
 /**
  * Returns a path with params interpolated.
  */
 function generatePath(path, params = {}) {
     return (0, router_1.matchStringify)(path, params);
 }
-exports.generatePath = generatePath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/router-react",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -17,20 +17,20 @@
   ],
   "scripts": {
     "dev": "run-p watch:*",
-    "watch:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm -w",
-    "watch:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib -w",
+    "watch:esm": "tsc -p tsconfig.build.esm.json -w",
+    "watch:cjs": "tsc -p tsconfig.build.cjs.json -w",
     "prebuild": "rimraf lib esm",
     "build": "run-p build:*",
-    "build:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm",
-    "build:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib"
+    "build:esm": "tsc -p tsconfig.build.esm.json",
+    "build:cjs": "tsc -p tsconfig.build.cjs.json"
   },
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/router": "1.0.55",
-    "@shuvi/platform-shared": "1.0.55",
-    "@shuvi/utils": "1.0.55",
+    "@shuvi/router": "1.0.56",
+    "@shuvi/platform-shared": "1.0.56",
+    "@shuvi/utils": "1.0.56",
     "prop-types": "^15.8.1",
     "use-sync-external-store": "1.2.0"
   },