@modern-js/runtime 2.0.0-beta.4 → 2.0.0-beta.5

package/dist/js/node/ssr/utils.js

@@ -1,7 +1,21 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -15,31 +29,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var utils_exports = {};
+__export(utils_exports, {
   formatClient: () => formatClient,
   formatServer: () => formatServer,
   isCrossOrigin: () => isCrossOrigin,
   isReact18: () => isReact18,
   mockResponse: () => mockResponse
 });
-module.exports = __toCommonJS(stdin_exports);
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
+module.exports = __toCommonJS(utils_exports);
 const isReact18 = () => process.env.IS_REACT18 === "true";
 const formatServer = (request) => {
   const {
@@ -98,3 +96,11 @@ const isCrossOrigin = (url = "", base) => {
     return false;
   }
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatClient,
+  formatServer,
+  isCrossOrigin,
+  isReact18,
+  mockResponse
+});

package/dist/js/node/state/cli/index.js

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var cli_exports = {};
+__export(cli_exports, {
   default: () => cli_default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(cli_exports);
 var import_utils = require("@modern-js/utils");
 const PLUGIN_IDENTIFIER = "state";
 var cli_default = () => ({
@@ -96,3 +96,5 @@ var cli_default = () => ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/state/index.js

@@ -22,12 +22,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var state_exports = {};
+__export(state_exports, {
   default: () => import_runtime2.default,
   state: () => import_runtime.default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(state_exports);
 var import_runtime = __toESM(require("./runtime"));
 var import_runtime2 = __toESM(require("./runtime"));
-__reExport(stdin_exports, require("./runtime"), module.exports);
+__reExport(state_exports, require("./runtime"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  state
+});

package/dist/js/node/state/plugins.js

@@ -21,14 +21,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var plugins_exports = {};
+__export(plugins_exports, {
   autoActions: () => autoActions,
   devtools: () => import_plugin_devtools.default,
   effects: () => effects,
   immer: () => immer
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(plugins_exports);
 var import_plugin_effects = require("@modern-js-reduck/plugin-effects");
 var import_plugin_auto_actions = __toESM(require("@modern-js-reduck/plugin-auto-actions"));
 var import_plugin_immutable = __toESM(require("@modern-js-reduck/plugin-immutable"));
@@ -36,3 +36,10 @@ var import_plugin_devtools = __toESM(require("@modern-js-reduck/plugin-devtools"
 const effects = () => import_plugin_effects.plugin;
 const immer = () => import_plugin_immutable.default;
 const autoActions = () => import_plugin_auto_actions.default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  autoActions,
+  devtools,
+  effects,
+  immer
+});

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

@@ -22,14 +22,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var runtime_exports = {};
+__export(runtime_exports, {
   createStore: () => import_store.createStore,
   default: () => import_plugin.default,
   model: () => import_store.model
 });
-module.exports = __toCommonJS(stdin_exports);
-__reExport(stdin_exports, require("@modern-js-reduck/react"), module.exports);
+module.exports = __toCommonJS(runtime_exports);
+__reExport(runtime_exports, require("@modern-js-reduck/react"), module.exports);
 var import_store = require("@modern-js-reduck/store");
 var import_plugin = __toESM(require("./plugin"));
-__reExport(stdin_exports, require("./plugin"), module.exports);
+__reExport(runtime_exports, require("./plugin"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createStore,
+  model
+});

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

@@ -1,9 +1,26 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -22,11 +39,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var plugin_exports = {};
+__export(plugin_exports, {
   default: () => plugin_default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_store = require("@modern-js-reduck/store");
@@ -35,26 +52,7 @@ var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"))
 var import_plugins = require("../plugins");
 var import_core = require("../../core");
 var import_common = require("../../common");
-__reExport(stdin_exports, require("../plugins"), module.exports);
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+__reExport(plugin_exports, require("../plugins"), module.exports);
 const StatePluginHandleMap = {
   immer: import_plugins.immer,
   effects: import_plugins.effects,
@@ -119,3 +117,5 @@ const state = (config) => ({
   }
 });
 var plugin_default = state;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/state/types.js

@@ -0,0 +1,15 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/js/treeshaking/document/Body.js

@@ -1,4 +1,4 @@
-import { jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 import { useContext } from "react";
 import { DOCUMENT_CHUNKSMAP_PLACEHOLDER, DOCUMENT_SSRDATASCRIPT_PLACEHOLDER } from "./constants";
 import { DocumentStructrueContext } from "./DocumentStructrueContext";
@@ -8,7 +8,7 @@ function Body(props) {
     var children = props.children;
     return /* @__PURE__ */ jsxs("body", {
         children: [
-            hasSetRoot ? null : DefaultRoot,
+            hasSetRoot ? null : /* @__PURE__ */ jsx(DefaultRoot, {}),
             children,
             "".concat(DOCUMENT_CHUNKSMAP_PLACEHOLDER),
             "".concat(DOCUMENT_SSRDATASCRIPT_PLACEHOLDER)

package/dist/js/treeshaking/document/Root.js

@@ -14,7 +14,7 @@ function Root(props) {
     });
 }
 function DefaultRoot(props) {
-    var ref = useContext(DocumentContext), mountId = ref.templateParams.mountId;
+    var ref = useContext(DocumentContext), _templateParams = ref.templateParams, _mountId = _templateParams.mountId, mountId = _mountId === void 0 ? "root" : _mountId;
     return /* @__PURE__ */ jsxs("div", {
         id: "".concat(mountId),
         children: [

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

@@ -53,6 +53,10 @@ function _objectSpreadProps(target, source) {
 import { getEntryOptions, createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
 var PLUGIN_IDENTIFIER = "router";
 var ROUTES_IDENTIFIER = "routes";
+var isV5 = function(config) {
+    var ref, ref1;
+    return (config === null || config === void 0 ? void 0 : (ref = config.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5";
+};
 var cli_default = function() {
     return {
         name: "@modern-js/plugin-router",
@@ -79,15 +83,13 @@ var cli_default = function() {
                 },
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;
-                    var ref, ref1;
                     var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
                     var userConfig = api.useResolvedConfigContext();
-                    var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.legacy);
                     var packageName = api.useAppContext().packageName;
                     var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
                     runtimeConfigMap.set(entryName, runtimeConfig);
                     if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
-                        if (!isLegacy) {
+                        if (!isV5(userConfig)) {
                             imports.push({
                                 value: "@modern-js/runtime/plugins",
                                 specifiers: [
@@ -107,13 +109,11 @@ var cli_default = function() {
                 },
                 modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
                     var entrypoint = param.entrypoint, plugins = param.plugins;
-                    var ref, ref1;
                     var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
                     var serverRoutes = api.useAppContext().serverRoutes;
                     var userConfig = api.useResolvedConfigContext();
-                    var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.legacy);
                     var runtimeConfig = runtimeConfigMap.get(entryName);
-                    if (runtimeConfig.router && !isLegacy) {
+                    if (runtimeConfig.router && !isV5(userConfig)) {
                         var serverBase = serverRoutes.filter(function(route) {
                             return route.entryName === entryName;
                         }).map(function(route) {
@@ -136,10 +136,8 @@ var cli_default = function() {
                     };
                 },
                 addRuntimeExports: function addRuntimeExports() {
-                    var ref, ref1;
                     var userConfig = api.useResolvedConfigContext();
-                    var isLegacy = Boolean(userConfig === null || userConfig === void 0 ? void 0 : (ref = userConfig.runtime) === null || ref === void 0 ? void 0 : (ref1 = ref.router) === null || ref1 === void 0 ? void 0 : ref1.legacy);
-                    if (!isLegacy) {
+                    if (!isV5(userConfig)) {
                         pluginsExportsUtils.addExport("export { default as router } from '@modern-js/runtime/router'");
                     }
                 }

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/js/treeshaking/router/runtime/utils.js

@@ -84,9 +84,6 @@ import { DefaultNotFound } from "./DefaultNotFound";
 import { RootLayout } from "./root";
 var renderNestedRoute = function(nestedRoute, parent) {
     var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, Component = nestedRoute.component;
-    var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
-        return renderNestedRoute(childRoute, nestedRoute);
-    });
     var routeProps = {
         caseSensitive: nestedRoute.caseSensitive,
         path: nestedRoute.path,
@@ -112,11 +109,15 @@ var renderNestedRoute = function(nestedRoute, parent) {
                 fallback: /* @__PURE__ */ jsx(Loading, {}),
                 children: /* @__PURE__ */ jsx(Component, {})
             });
-        } else {
+        } else if (!(parent === null || parent === void 0 ? void 0 : parent.index)) {
             element = /* @__PURE__ */ jsx(Suspense, {
                 children: /* @__PURE__ */ jsx(Component, {})
             });
+        } else {
+            element = /* @__PURE__ */ jsx(Component, {});
         }
+    } else {
+        nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
     }
     if (!parent && element) {
         element = /* @__PURE__ */ jsx(RootLayout, {
@@ -129,6 +130,9 @@ var renderNestedRoute = function(nestedRoute, parent) {
     if (element) {
         routeProps.element = element;
     }
+    var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
+        return renderNestedRoute(childRoute, nestedRoute);
+    });
     var routeElement = index ? /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {
         index: true
     }), id) : /* @__PURE__ */ jsx(Route, _objectSpreadProps(_objectSpread({}, routeProps), {

package/dist/js/treeshaking/ssr/cli/index.js

@@ -157,8 +157,8 @@ var cli_default = function() {
                     if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
                         var ref1;
                         var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
-                        if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (ref1 = runtimeConfig.router) === null || ref1 === void 0 ? void 0 : ref1.legacy) {
-                            throw new Error("Legacy router plugin doesn't support streaming SSR, check your config 'runtime.router'");
+                        if ((runtimeConfig === null || runtimeConfig === void 0 ? void 0 : (ref1 = runtimeConfig.router) === null || ref1 === void 0 ? void 0 : ref1.mode) === "react-router-5") {
+                            throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
                         }
                         if (fileSystemRoutes && !entrypoint.nestedRoutesEntry) {
                             throw new Error("You should switch to file-system based router to support streaming SSR.");

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/dist/types/router/runtime/types.d.ts

@@ -27,7 +27,7 @@ export declare type SingleRouteConfig = RouteProps & {
   component?: React.ComponentType;
 };
 export declare type RouterConfig = {
-  legacy?: boolean;
+  mode?: 'react-router-5';
   routesConfig: {
     globalApp?: React.ComponentType<any>;
     routes: (NestedRoute | PageRoute)[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -94,6 +94,9 @@
       "loadable": [
         "./dist/types/exports/loadable.d.ts"
       ],
+      "cli": [
+        "./dist/types/cli/index.d.ts"
+      ],
       "head": [
         "./dist/types/exports/head.d.ts"
       ],
@@ -137,6 +140,9 @@
     "@modern-js-reduck/plugin-immutable": "^1.1.4",
     "@modern-js-reduck/react": "^1.1.4",
     "@modern-js-reduck/store": "^1.1.4",
+    "@modern-js/plugin": "2.0.0-beta.4",
+    "@modern-js/types": "2.0.0-beta.4",
+    "@modern-js/utils": "2.0.0-beta.4",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
@@ -151,16 +157,18 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "serialize-javascript": "^6.0.0",
-    "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4"
+    "styled-components": "^5.3.1"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
+    "@modern-js/core": "2.0.0-beta.4",
+    "@modern-js/server-core": "2.0.0-beta.4",
+    "@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",
     "@remix-run/web-fetch": "^4.1.3",
@@ -174,12 +182,7 @@
     "react": "^18",
     "react-dom": "^18",
     "ts-jest": "^27.0.4",
-    "typescript": "^4",
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@modern-js/app-tools": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "typescript": "^4"
   },
   "sideEffects": false,
   "modernConfig": {},

package/types/index.d.ts

@@ -1,7 +1,7 @@
 import { StateConfig } from '../dist/types';
 
-declare module '@modern-js/core/config' {
-  interface RuntimeConfig {
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
     state?: StateConfig | boolean;
   }
 }

package/types/router.d.ts

@@ -1,8 +1,8 @@
 import { RouterConfig } from '../dist/types';
 import '../dist/types/router';
 
-declare module '@modern-js/core/config' {
-  interface RuntimeConfig {
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
     router?: RouterConfig | boolean;
   }
 }