@modern-js/plugin-router-v5 0.0.0-next-20221221151319 → 2.0.0-beta.5

package/dist/js/modern/runtime/plugin.js

@@ -23,7 +23,12 @@ import {
   createBrowserHistory,
   createHashHistory
 } from "history";
-import { Router, StaticRouter } from "react-router-dom";
+import {
+  Router,
+  StaticRouter,
+  useRouteMatch,
+  useLocation
+} from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
@@ -40,6 +45,13 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
+        init({ context }, next) {
+          context.router = {
+            useRouteMatch,
+            useLocation
+          };
+          return next({ context });
+        },
         hoc: ({ App }, next) => {
           const getRouteApp = () => {
             var _a;

package/dist/js/node/runtime/plugin.js

@@ -63,6 +63,13 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
+        init({ context }, next) {
+          context.router = {
+            useRouteMatch: import_react_router_dom.useRouteMatch,
+            useLocation: import_react_router_dom.useLocation
+          };
+          return next({ context });
+        },
         hoc: ({ App }, next) => {
           const getRouteApp = () => {
             var _a;

package/dist/js/treeshaking/runtime/plugin.js

@@ -53,7 +53,7 @@ function _objectSpreadProps(target, source) {
 import { jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { createBrowserHistory, createHashHistory } from "history";
-import { Router, StaticRouter } from "react-router-dom";
+import { Router, StaticRouter, useRouteMatch, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
@@ -69,6 +69,16 @@ var routerPlugin = function(param) {
         name: "@modern-js/plugin-router",
         setup: function() {
             return {
+                init: function init(param, next) {
+                    var context = param.context;
+                    context.router = {
+                        useRouteMatch: useRouteMatch,
+                        useLocation: useLocation
+                    };
+                    return next({
+                        context: context
+                    });
+                },
                 hoc: function(param, next) {
                     var App = param.App;
                     var getRouteApp = function() {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-20221221151319",
+  "version": "2.0.0-beta.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/js/node/cli/index.js",
@@ -51,12 +51,12 @@
   "dependencies": {
     "history": "^4.7.9",
     "react-router-dom": "^5.1.2",
+    "@modern-js/plugin": "2.0.0-beta.4",
+    "@modern-js/utils": "2.0.0-beta.4",
+    "@modern-js/types": "2.0.0-beta.4",
     "hoist-non-react-statics": "^3.3.2",
     "@types/history": "^4.7.9",
-    "@types/react-router-dom": "^5.1.8",
-    "@modern-js/plugin": "0.0.0-next-20221221151319",
-    "@modern-js/utils": "0.0.0-next-20221221151319",
-    "@modern-js/types": "0.0.0-next-20221221151319"
+    "@types/react-router-dom": "^5.1.8"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -68,19 +68,19 @@
     "ts-jest": "^27.0.4",
     "typescript": "^4",
     "jest": "^27",
+    "@modern-js/runtime": "2.0.0-beta.5",
+    "@modern-js/core": "2.0.0-beta.4",
+    "@modern-js/utils": "2.0.0-beta.4",
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
     "@types/jest": "^27",
     "@types/node": "^14",
+    "@scripts/build": "2.0.0-beta.4",
+    "@modern-js/app-tools": "2.0.0-beta.4",
+    "@scripts/jest-config": "2.0.0-beta.4",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
-    "@types/invariant": "^2.2.30",
-    "@modern-js/runtime": "0.0.0-next-20221221151319",
-    "@modern-js/core": "0.0.0-next-20221221151319",
-    "@modern-js/utils": "0.0.0-next-20221221151319",
-    "@scripts/build": "0.0.0-next-20221221151319",
-    "@modern-js/app-tools": "0.0.0-next-20221221151319",
-    "@scripts/jest-config": "0.0.0-next-20221221151319"
+    "@types/invariant": "^2.2.30"
   },
   "sideEffects": false,
   "modernConfig": {},

package/CHANGELOG.md

@@ -1,51 +0,0 @@
-# @modern-js/plugin-router-v5
-
-## 0.0.0-next-20221221151319
-
-### Major Changes
-
-- dda38c9c3: chore: v2
-
-### Minor Changes
-
-- df7ee2d59: feat: runtime user config types extends
-  feat: runtime 用户配置类型扩展
-
-### Patch Changes
-
-- fe17f5105: fix: change plugin-router-legacy exports field for node environment
-  fix: 修改 plugin-router-legacy 的 exports 字段
-- 6bda14ed7: feat: refactor router with react-router@6.4
-
-  feat: 使用 react-router@6.4 重构路由模块
-
-- Updated dependencies [7879e8f71]
-- Updated dependencies [6aca87501]
-- Updated dependencies [2e6031955]
-- Updated dependencies [7b7d12cf8]
-- Updated dependencies [7efeed4a3]
-- Updated dependencies [92f0eade3]
-- Updated dependencies [edd1cfb1a]
-- Updated dependencies [cc971eabf]
-- Updated dependencies [5b9049f2e]
-- Updated dependencies [6bda14ed7]
-- Updated dependencies [92004d190]
-- Updated dependencies [b8bbe036c]
-- Updated dependencies [40ed5874c]
-- Updated dependencies [87c1ff86b]
-- Updated dependencies [d5a31df78]
-- Updated dependencies [dda38c9c3]
-- Updated dependencies [102d32e4b]
-- Updated dependencies [8b8e1bb57]
-- Updated dependencies [3bbea92b2]
-- Updated dependencies [b710adb84]
-- Updated dependencies [f17974937]
-- Updated dependencies [ea7cf0625]
-- Updated dependencies [bbe4c4ab6]
-- Updated dependencies [e4558a0bc]
-- Updated dependencies [abf3421a7]
-- Updated dependencies [543be9558]
-- Updated dependencies [14b712da8]
-  - @modern-js/types@0.0.0-next-20221221151319
-  - @modern-js/utils@0.0.0-next-20221221151319
-  - @modern-js/plugin@0.0.0-next-20221221151319