@shuvi/router-react 0.0.1-rc.9 → 1.0.0-rc.10

package/lib/index.js

@@ -1,16 +1,32 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Link = exports.Router = exports.RouterView = exports.MemoryRouter = exports.useIsomorphicEffect = exports.generatePath = void 0;
 var utils_1 = require("./utils");
-exports.generatePath = utils_1.generatePath;
+Object.defineProperty(exports, "generatePath", { enumerable: true, get: function () { return utils_1.generatePath; } });
+Object.defineProperty(exports, "useIsomorphicEffect", { enumerable: true, get: function () { return utils_1.useIsomorphicEffect; } });
 var MemoryRouter_1 = require("./MemoryRouter");
-exports.MemoryRouter = MemoryRouter_1.MemoryRouter;
+Object.defineProperty(exports, "MemoryRouter", { enumerable: true, get: function () { return MemoryRouter_1.MemoryRouter; } });
 var RouterView_1 = require("./RouterView");
-exports.RouterView = RouterView_1.RouterView;
+Object.defineProperty(exports, "RouterView", { enumerable: true, get: function () { return RouterView_1.RouterView; } });
 var Router_1 = require("./Router");
-exports.Router = Router_1.Router;
+Object.defineProperty(exports, "Router", { enumerable: true, get: function () { return Router_1.Router; } });
 var Link_1 = require("./Link");
-exports.Link = Link_1.Link;
-__export(require("./hooks"));
+Object.defineProperty(exports, "Link", { enumerable: true, get: function () { return Link_1.Link; } });
+__exportStar(require("./hooks"), exports);
+__exportStar(require("./contexts"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("@shuvi/router"), exports);

package/lib/types.d.ts

@@ -1,21 +1,21 @@
 /// <reference types="react" />
-import { IParams, InitialEntry, State, PathRecord, IRouteRecord as IOriginRouteRecord, IPartialRouteRecord as IOriginalRouteRecord, IRouter } from '@shuvi/router';
-export declare type IRouteRecord = IOriginRouteRecord<React.ReactNode>;
-export declare type IPartialRouteRecord = IOriginalRouteRecord;
+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 interface IRouterContextObject {
     static: boolean;
     router: IRouter;
 }
-export interface IRouteContextObject {
+export interface IRouteContextObject<ExtendedTypes = {}> {
     depth: number;
     params: IParams;
     pathname: string;
-    route: IRouteRecord | null;
+    route: IReactRouteRecord<ExtendedTypes> | null;
 }
 export interface IMemoryRouterProps {
     basename?: string;
     children?: React.ReactNode;
-    routes?: IRouteRecord[];
+    routes?: IReactRouteRecord[];
     initialEntries?: InitialEntry[];
     initialIndex?: number;
 }
@@ -26,12 +26,6 @@ export interface INavigateProps {
 }
 export interface IOutletProps {
 }
-export interface IRouteProps {
-    caseSensitive?: boolean;
-    children?: React.ReactNode;
-    element?: React.ReactElement | null;
-    path?: string;
-}
 export interface IRouterProps {
     children?: React.ReactNode;
     static?: boolean;

package/lib/utils.d.ts

@@ -1,5 +1,4 @@
 import { IParams } from '@shuvi/router';
-import invariant from '@shuvi/utils/lib/invariant';
 export declare function useIsomorphicEffect(cb: any, deps: any): void;
 export declare const readOnly: <T extends unknown>(obj: T) => T;
 export declare function warning(cond: boolean, message: string): void;
@@ -8,4 +7,3 @@ export declare function warningOnce(key: string, cond: boolean, message: string)
  * Returns a path with params interpolated.
  */
 export declare function generatePath(path: string, params?: IParams): string;
-export { invariant };

package/lib/utils.js

@@ -1,18 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.generatePath = exports.warningOnce = exports.warning = exports.readOnly = exports.useIsomorphicEffect = void 0;
+const router_1 = require("@shuvi/router");
 const react_1 = require("react");
 const constants_1 = require("./constants");
-const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
-exports.invariant = invariant_1.default;
 function useIsomorphicEffect(cb, deps) {
     if (typeof window !== 'undefined') {
-        react_1.useLayoutEffect(cb, deps);
+        (0, react_1.useLayoutEffect)(cb, deps);
     }
     else {
-        react_1.useEffect(cb, deps);
+        (0, react_1.useEffect)(cb, deps);
     }
 }
 exports.useIsomorphicEffect = useIsomorphicEffect;
@@ -47,11 +44,6 @@ exports.warningOnce = warningOnce;
  * Returns a path with params interpolated.
  */
 function generatePath(path, params = {}) {
-    return path
-        .replace(/:(\w+)/g, (_, key) => {
-        invariant_1.default(params[key] != null, `Missing ":${key}" param`);
-        return params[key];
-    })
-        .replace(/\/*\*$/, _ => params['*'] == null ? '' : params['*'].replace(/^\/*/, '/'));
+    return (0, router_1.matchStringify)(path, params);
 }
 exports.generatePath = generatePath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/router-react",
-  "version": "0.0.1-rc.9",
+  "version": "1.0.0-rc.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -12,30 +12,38 @@
   "module": "esm/index.js",
   "types": "lib/index.d.ts",
   "files": [
-    "lib"
+    "lib",
+    "esm"
   ],
   "scripts": {
     "dev": "run-p watch:*",
-    "watch:esm": "tsc -p tsconfig.build.esm.json -w",
-    "watch:cjs": "tsc -p tsconfig.build.cjs.json -w",
+    "watch:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm -w",
+    "watch:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib -w",
     "prebuild": "rimraf lib esm",
     "build": "run-p build:*",
-    "build:esm": "tsc -p tsconfig.build.esm.json",
-    "build:cjs": "tsc -p tsconfig.build.cjs.json"
+    "build:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm",
+    "build:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib"
   },
   "engines": {
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/router": "^0.0.1-rc.9"
+    "@shuvi/router": "1.0.0-rc.10",
+    "@shuvi/platform-shared": "1.0.0-rc.10",
+    "@shuvi/utils": "1.0.0-rc.10",
+    "prop-types": "^15.8.1",
+    "use-sync-external-store": "1.1.0"
   },
   "devDependencies": {
-    "@types/react": "^16.9.43",
-    "@types/react-test-renderer": "^16.9.2",
-    "react-test-renderer": "^16.13.1"
+    "@types/prop-types": "^15.7.5",
+    "@types/react": "18.0.9",
+    "@types/react-test-renderer": "18.0.0",
+    "@types/use-sync-external-store": "0.0.3",
+    "react-test-renderer": "^18.1.0",
+    "react": "18.1.0",
+    "react-dom": "18.1.0"
   },
   "peerDependencies": {
-    "react": ">=16.8"
-  },
-  "gitHead": "b0c352fb22c6f707e96c786d1d001c0588fc2833"
+    "react": ">=16.8.0"
+  }
 }