@modern-js/plugin-router-v5 2.41.0 → 2.42.1

package/dist/cjs/runtime/plugin.js

@@ -37,7 +37,7 @@ var import_history = require("history");
 var import_react_router_dom = require("react-router-dom");
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
 var import_runtime = require("@modern-js/runtime");
-var import_browser = require("@modern-js/runtime-utils/browser");
+var import_parsed = require("@modern-js/runtime-utils/parsed");
 var import_utils = require("./utils");
 var import_hooks = require("./hooks");
 const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {
@@ -46,7 +46,7 @@ const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5His
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   if (isBrow) {
-    window._SERVER_DATA = (0, import_browser.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
+    window._SERVER_DATA = (0, import_parsed.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
   }
   return {
     name: "@modern-js/plugin-router",

package/dist/esm/runtime/plugin.js

@@ -6,7 +6,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/runtime-utils/browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
 import { modifyRoutesHook } from "./hooks";
 var routerPlugin = function(param) {

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/runtime-utils/browser";
+import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { renderRoutes, getLocation, urlJoin } from "./utils";
 import { modifyRoutesHook } from "./hooks";
 const routerPlugin = ({ serverBase = [], history: customHistory, supportHtml5History = true, routesConfig, createRoutes, historyOptions = {} }) => {

package/dist/types/cli/index.d.ts

@@ -1,4 +1,4 @@
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import './types';
 export declare const routerPlugin: () => CliPlugin<AppTools>;
-export default routerPlugin;
+export default routerPlugin;

package/dist/types/cli/types.d.ts

@@ -1,6 +1,6 @@
 import { RouterConfig } from '../runtime/plugin';
 declare module '@modern-js/app-tools' {
-  interface RuntimeUserConfig {
-    router?: RouterConfig | boolean;
-  }
-}
+    interface RuntimeUserConfig {
+        router?: RouterConfig | boolean;
+    }
+}

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { default } from './runtime';
-export * from './runtime';
+export * from './runtime';

package/dist/types/runtime/DefaultNotFound.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="react" />
-export declare const DefaultNotFound: () => JSX.Element;
+export declare const DefaultNotFound: () => JSX.Element;

package/dist/types/runtime/hooks.d.ts

@@ -1,5 +1,5 @@
 import { RouteProps } from 'react-router-dom';
 declare const modifyRoutesHook: import("@modern-js/plugin").Waterfall<RouteProps<string, {
-  [x: string]: string | undefined;
+    [x: string]: string | undefined;
 }>[]>;
-export { modifyRoutesHook };
+export { modifyRoutesHook };

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

@@ -3,4 +3,4 @@ import type { SingleRouteConfig, HistoryConfig, RouterConfig } from './plugin';
 export type { SingleRouteConfig, HistoryConfig, RouterConfig };
 export default routerPlugin;
 export * from 'react-router-dom';
-export * from 'history';
+export * from 'history';

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

@@ -3,50 +3,43 @@ import { History, BrowserHistoryBuildOptions, HashHistoryBuildOptions } from 'hi
 import { RouteProps } from 'react-router-dom';
 import type { Plugin } from '@modern-js/runtime';
 declare global {
-  interface Window {
-    _SERVER_DATA?: {
-      router: {
-        baseUrl: string;
-        params: Record<string, string>;
-      };
-    };
-  }
+    interface Window {
+        _SERVER_DATA?: {
+            router: {
+                baseUrl: string;
+                params: Record<string, string>;
+            };
+        };
+    }
 }
 export type SingleRouteConfig = RouteProps & {
-  redirect?: string;
-  routes?: SingleRouteConfig[];
-  key?: string;
-  /**
-   * layout component
-   */
-  layout?: React.ComponentType;
-  /**
-   * component would be rendered when route macthed.
-   */
-  component?: React.ComponentType;
+    redirect?: string;
+    routes?: SingleRouteConfig[];
+    key?: string;
+    /**
+     * layout component
+     */
+    layout?: React.ComponentType;
+    /**
+     * component would be rendered when route macthed.
+     */
+    component?: React.ComponentType;
 };
 export type HistoryConfig = {
-  supportHtml5History: true;
-  historyOptions: BrowserHistoryBuildOptions;
+    supportHtml5History: true;
+    historyOptions: BrowserHistoryBuildOptions;
 } | {
-  supportHtml5History: false;
-  historyOptions: HashHistoryBuildOptions;
+    supportHtml5History: false;
+    historyOptions: HashHistoryBuildOptions;
 };
 export type RouterConfig = Partial<HistoryConfig> & {
-  mode?: 'react-router-5';
-  routesConfig?: {
-    globalApp?: React.ComponentType<any>;
-    routes?: SingleRouteConfig[];
-  };
-  createRoutes?: () => React.ComponentType<any> | null;
-  history?: History;
-  serverBase?: string[];
+    mode?: 'react-router-5';
+    routesConfig?: {
+        globalApp?: React.ComponentType<any>;
+        routes?: SingleRouteConfig[];
+    };
+    createRoutes?: () => React.ComponentType<any> | null;
+    history?: History;
+    serverBase?: string[];
 };
-export declare const routerPlugin: ({
-  serverBase,
-  history: customHistory,
-  supportHtml5History,
-  routesConfig,
-  createRoutes,
-  historyOptions
-}: RouterConfig) => Plugin;
+export declare const routerPlugin: ({ serverBase, history: customHistory, supportHtml5History, routesConfig, createRoutes, historyOptions, }: RouterConfig) => Plugin;

package/dist/types/runtime/utils.d.ts

@@ -3,4 +3,4 @@ import { RouterConfig } from './plugin';
 export declare function renderRoutes(routesConfig?: RouterConfig['routesConfig'], extraProps?: any): JSX.Element | null;
 export declare function getLocation(serverContext: any): string;
 export declare const urlJoin: (...parts: string[]) => string;
-export declare function standardSlash(str: string): string;
+export declare function standardSlash(str: string): string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.41.0",
+  "version": "2.42.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -60,9 +60,9 @@
     "hoist-non-react-statics": "^3.3.2",
     "react-router-dom": "^5.3.4",
     "@swc/helpers": "0.5.3",
-    "@modern-js/plugin": "2.41.0",
-    "@modern-js/types": "2.41.0",
-    "@modern-js/utils": "2.41.0"
+    "@modern-js/types": "2.42.1",
+    "@modern-js/plugin": "2.42.1",
+    "@modern-js/utils": "2.42.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -78,13 +78,13 @@
     "react-dom": "^18",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.41.0",
-    "@modern-js/core": "2.41.0",
-    "@modern-js/utils": "2.41.0",
-    "@modern-js/runtime": "2.41.0",
-    "@scripts/build": "2.41.0",
-    "@scripts/jest-config": "2.41.0",
-    "@modern-js/runtime-utils": "2.41.0"
+    "@modern-js/app-tools": "2.42.1",
+    "@modern-js/runtime": "2.42.1",
+    "@modern-js/core": "2.42.1",
+    "@modern-js/utils": "2.42.1",
+    "@modern-js/runtime-utils": "2.42.1",
+    "@scripts/build": "2.42.1",
+    "@scripts/jest-config": "2.42.1"
   },
   "sideEffects": false,
   "publishConfig": {