@modern-js/plugin-router-v5 2.17.1 → 2.18.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/plugin-router-v5
 
+## 2.18.1
+
+### Patch Changes
+
+- @modern-js/types@2.18.1
+- @modern-js/utils@2.18.1
+
+## 2.18.0
+
+### Patch Changes
+
+- @modern-js/types@2.18.0
+- @modern-js/utils@2.18.0
+
 ## 2.17.1
 
 ### Patch Changes

package/dist/cjs/runtime/plugin.js

@@ -12,7 +12,7 @@ const _history = require("history");
 const _reactrouterdom = require("react-router-dom");
 const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
 const _runtime = require("@modern-js/runtime");
-const _runtime1 = require("@modern-js/utils/runtime");
+const _runtimebrowser = require("@modern-js/utils/runtime-browser");
 const _utils = require("./utils");
 function _interop_require_default(obj) {
   return obj && obj.__esModule ? obj : {
@@ -63,7 +63,7 @@ const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5His
   const isBrow = (0, _runtime.isBrowser)();
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   if (isBrow) {
-    window._SERVER_DATA = (0, _runtime1.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+    window._SERVER_DATA = (0, _runtimebrowser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
   }
   return {
     name: "@modern-js/plugin-router",

package/dist/esm/cli/index.js

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -101,8 +101,8 @@ export default function() {
             throw new Error("should enable runtime.router.mode for entry ".concat(entryName));
           }
           return {
-            entrypoint,
-            imports
+            entrypoint: entrypoint,
+            imports: imports
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
@@ -122,15 +122,15 @@ export default function() {
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify(_object_spread_props(_object_spread({
-                serverBase
+                serverBase: serverBase
               }, runtimeConfig.router), {
                 routesConfig: fileSystemRoutes ? "{ ".concat(ROUTES_IDENTIFIER, ", globalApp: App }") : void 0
               })).replace(/"routesConfig"\s*:\s*"((\S|\s)+)"/g, '"routesConfig": $1,')
             });
           }
           return {
-            entrypoint,
-            plugins
+            entrypoint: entrypoint,
+            plugins: plugins
           };
         },
         addRuntimeExports: function addRuntimeExports() {

package/dist/esm/runtime/plugin.js

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -56,7 +56,7 @@ import { createBrowserHistory, createHashHistory } from "history";
 import { Router, StaticRouter, useRouteMatch, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime";
+import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
 export var routerPlugin = function(param) {
   var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, customHistory = param.history, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, routesConfig = param.routesConfig, createRoutes = param.createRoutes, _param_historyOptions = param.historyOptions, historyOptions = _param_historyOptions === void 0 ? {} : _param_historyOptions;
@@ -76,11 +76,11 @@ export var routerPlugin = function(param) {
         init: function init(param2, next) {
           var context = param2.context;
           context.router = {
-            useRouteMatch,
-            useLocation
+            useRouteMatch: useRouteMatch,
+            useLocation: useLocation
           };
           return next({
-            context
+            context: context
           });
         },
         hoc: function(param2, next) {
@@ -93,7 +93,7 @@ export var routerPlugin = function(param) {
               var history = customHistory || (supportHtml5History ? createBrowserHistory(historyOptions) : createHashHistory(historyOptions));
               return function(props) {
                 return /* @__PURE__ */ _jsx(Router, {
-                  history,
+                  history: history,
                   children: createRoutes ? /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {
                     Component: createRoutes()
                   })) : /* @__PURE__ */ _jsx(App, _object_spread_props(_object_spread({}, props), {

package/dist/esm/runtime/utils.js

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -75,7 +75,7 @@ export function renderRoutes(routesConfig) {
       return /* @__PURE__ */ _jsx(Component, _object_spread({}, props));
     }
     return /* @__PURE__ */ _jsx(GlobalLayout, _object_spread({
-      Component
+      Component: Component
     }, props));
   };
   var findMatchedRoute = function(pathname) {

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

@@ -4,7 +4,7 @@ import { createBrowserHistory, createHashHistory } from "history";
 import { Router, StaticRouter, useRouteMatch, useLocation } from "react-router-dom";
 import hoistNonReactStatics from "hoist-non-react-statics";
 import { RuntimeReactContext, isBrowser } from "@modern-js/runtime";
-import { parsedJSONFromElement } from "@modern-js/utils/runtime";
+import { parsedJSONFromElement } from "@modern-js/utils/runtime-browser";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
 export const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {
   const isBrow = isBrowser();

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.17.1",
+  "version": "2.18.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -59,8 +59,8 @@
     "history": "^4.7.9",
     "hoist-non-react-statics": "^3.3.2",
     "react-router-dom": "^5.3.4",
-    "@modern-js/types": "2.17.1",
-    "@modern-js/utils": "2.17.1"
+    "@modern-js/types": "2.18.1",
+    "@modern-js/utils": "2.18.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -78,12 +78,12 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.4",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.17.1",
-    "@modern-js/core": "2.17.1",
-    "@modern-js/runtime": "2.17.1",
-    "@modern-js/utils": "2.17.1",
-    "@scripts/build": "2.17.1",
-    "@scripts/jest-config": "2.17.1"
+    "@modern-js/app-tools": "2.18.1",
+    "@modern-js/core": "2.18.1",
+    "@modern-js/runtime": "2.18.1",
+    "@modern-js/utils": "2.18.1",
+    "@scripts/build": "2.18.1",
+    "@scripts/jest-config": "2.18.1"
   },
   "sideEffects": false,
   "modernConfig": {},