@modern-js/runtime 2.0.0-beta.6 → 2.0.0-beta.7

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @modern-js/runtime
 
+## 2.0.0-beta.7
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+
+### Patch Changes
+
+- 6bda14ed71: feat: refactor router with react-router@6.4
+
+  feat: 使用 react-router@6.4 重构路由模块
+
+- 8b8e1bb571: feat: support nested routes
+  feat: 支持嵌套路由
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [bbe4c4ab64]
+  - @modern-js/utils@2.0.0-beta.7
+  - @modern-js/types@2.0.0-beta.7
+  - @modern-js/plugin@2.0.0-beta.7
+
 ## 2.0.0-beta.6
 
 ### Major Changes

package/dist/js/modern/router/runtime/index.js

@@ -2,7 +2,6 @@ import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
 export * from "react-router-dom";
-export * from "react-router-dom/server";
 export * from "./withRouter";
 export {
   runtime_default as default,

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

@@ -22,7 +22,9 @@ import {
   createBrowserRouter,
   createHashRouter,
   RouterProvider,
-  createRoutesFromElements
+  createRoutesFromElements,
+  useMatches,
+  useLocation
 } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { renderRoutes, urlJoin } from "./utils";
@@ -54,6 +56,13 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
+        init({ context }, next) {
+          context.router = {
+            useMatches,
+            useLocation
+          };
+          return next({ context });
+        },
         hoc: ({ App }, next) => {
           if (!finalRouteConfig && !createRoutes) {
             return next({ App });

package/dist/js/node/router/runtime/index.js

@@ -25,7 +25,6 @@ module.exports = __toCommonJS(runtime_exports);
 var import_plugin = require("./plugin");
 var import_plugin2 = require("./plugin");
 __reExport(runtime_exports, require("react-router-dom"), module.exports);
-__reExport(runtime_exports, require("react-router-dom/server"), module.exports);
 __reExport(runtime_exports, require("./withRouter"), module.exports);
 var runtime_default = import_plugin.routerPlugin;
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -78,6 +78,13 @@ const routerPlugin = ({
     name: "@modern-js/plugin-router",
     setup: () => {
       return {
+        init({ context }, next) {
+          context.router = {
+            useMatches: import_react_router_dom.useMatches,
+            useLocation: import_react_router_dom.useLocation
+          };
+          return next({ context });
+        },
         hoc: ({ App }, next) => {
           if (!finalRouteConfig && !createRoutes) {
             return next({ App });

package/dist/js/treeshaking/router/runtime/index.js

@@ -2,6 +2,5 @@ import { routerPlugin } from "./plugin";
 var runtime_default = routerPlugin;
 import { modifyRoutes } from "./plugin";
 export * from "react-router-dom";
-export * from "react-router-dom/server";
 export * from "./withRouter";
 export { runtime_default as default, modifyRoutes };

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

@@ -51,7 +51,7 @@ function _objectSpreadProps(target, source) {
     return target;
 }
 import { jsx } from "react/jsx-runtime";
-import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements } from "react-router-dom";
+import { createBrowserRouter, createHashRouter, RouterProvider, createRoutesFromElements, useMatches, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { renderRoutes, urlJoin } from "./utils";
 var finalRouteConfig = {
@@ -79,6 +79,16 @@ var routerPlugin = function(param) {
         name: "@modern-js/plugin-router",
         setup: function() {
             return {
+                init: function init(param, next) {
+                    var context = param.context;
+                    context.router = {
+                        useMatches: useMatches,
+                        useLocation: useLocation
+                    };
+                    return next({
+                        context: context
+                    });
+                },
                 hoc: function(param, next) {
                     var App = param.App;
                     if (!finalRouteConfig && !createRoutes) {

package/dist/types/router/runtime/index.d.ts

@@ -4,5 +4,4 @@ export type { SingleRouteConfig, RouterConfig };
 export default routerPlugin;
 export { modifyRoutes } from './plugin';
 export * from 'react-router-dom';
-export * from 'react-router-dom/server';
 export * from './withRouter';

package/dist/types/router/runtime/plugin.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from '../../core';
+import { Plugin } from '../../core';
 import type { RouterConfig, Routes } from './types';
 export declare let finalRouteConfig: RouterConfig['routesConfig'];
 export declare let beforeCreateRouter: boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -155,9 +155,9 @@
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.0.0-beta.6",
-    "@modern-js/types": "2.0.0-beta.6",
-    "@modern-js/utils": "2.0.0-beta.6"
+    "@modern-js/plugin": "2.0.0-beta.7",
+    "@modern-js/types": "2.0.0-beta.7",
+    "@modern-js/utils": "2.0.0-beta.7"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -178,11 +178,11 @@
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.0.0-beta.6",
-    "@modern-js/core": "2.0.0-beta.6",
-    "@modern-js/server-core": "2.0.0-beta.6",
-    "@scripts/build": "2.0.0-beta.6",
-    "@scripts/jest-config": "2.0.0-beta.6"
+    "@modern-js/app-tools": "2.0.0-beta.7",
+    "@modern-js/core": "2.0.0-beta.7",
+    "@modern-js/server-core": "2.0.0-beta.7",
+    "@scripts/jest-config": "2.0.0-beta.7",
+    "@scripts/build": "2.0.0-beta.7"
   },
   "sideEffects": false,
   "modernConfig": {},