@modern-js/runtime 2.65.5 → 2.67.0

package/dist/esm-node/router/cli/index.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions, isRouterV5 as isV5 } from "@modern-js/utils";
+import { fs, NESTED_ROUTE_SPEC_FILE, createRuntimeExportsUtils, getEntryOptions } from "@modern-js/utils";
 import { filterRoutesForServer } from "@modern-js/utils";
 import { isRouteEntry } from "./entry";
 import { handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints } from "./handler";
@@ -13,16 +13,19 @@ const routerPlugin = () => ({
   setup: (api) => {
     const nestedRoutes = {};
     const nestedRoutesForServer = {};
+    const { metaName } = api.getAppContext();
+    const isRouterV5 = api.isPluginExists(`@${metaName}/plugin-router-v5`);
     api._internalRuntimePlugins(({ entrypoint, plugins }) => {
       var _getEntryOptions;
-      const { packageName, serverRoutes, metaName } = api.getAppContext();
+      const { nestedRoutesEntry, pageRoutesEntry } = entrypoint;
+      const { packageName, serverRoutes, metaName: metaName2 } = api.getAppContext();
       const serverBase = serverRoutes.filter((route) => route.entryName === entrypoint.entryName).map((route) => route.urlPath).sort((a, b) => a.length - b.length > 0 ? -1 : 1);
       const userConfig = api.getNormalizedConfig();
       const routerConfig = (_getEntryOptions = getEntryOptions(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-      if (routerConfig && !isV5(userConfig)) {
+      if ((nestedRoutesEntry || pageRoutesEntry) && !isRouterV5) {
         plugins.push({
           name: "router",
-          path: `@${metaName}/runtime/router`,
+          path: `@${metaName2}/runtime/router`,
           config: typeof routerConfig === "boolean" ? {
             serverBase
           } : {
@@ -57,24 +60,23 @@ const routerPlugin = () => ({
       };
     });
     api.modifyEntrypoints(async ({ entrypoints }) => {
-      const newEntryPoints = await handleModifyEntrypoints(api, entrypoints);
+      const newEntryPoints = await handleModifyEntrypoints(isRouterV5, entrypoints);
       return {
         entrypoints: newEntryPoints
       };
     });
     api.generateEntryCode(async ({ entrypoints }) => {
-      await handleGeneratorEntryCode(api, entrypoints);
+      await handleGeneratorEntryCode(api, entrypoints, isRouterV5);
     });
     api.addRuntimeExports(() => {
-      const userConfig = api.useResolvedConfigContext();
-      const { internalDirectory, metaName } = api.useAppContext();
+      const { internalDirectory, metaName: metaName2 } = api.useAppContext();
       const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-      if (!isV5(userConfig)) {
-        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/runtime/router'`);
+      if (!isRouterV5) {
+        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName2}/runtime/router'`);
       }
     });
     api.onFileChanged(async (e) => {
-      await handleFileChange(api, e);
+      await handleFileChange(api, isRouterV5, e);
     });
     api.modifyFileSystemRoutes(({ entrypoint, routes }) => {
       nestedRoutes[entrypoint.entryName] = routes;

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

@@ -1,3 +1,3 @@
 import type { AppToolsContext, AppToolsFeatureHooks, AppToolsNormalizedConfig } from '@modern-js/app-tools';
 import type { Entrypoint } from '@modern-js/types';
-export declare const generateCode: (entrypoints: Entrypoint[], appContext: AppToolsContext<'shared'>, config: AppToolsNormalizedConfig, hooks: AppToolsFeatureHooks<'shared'>) => Promise<void>;
+export declare const generateCode: (entrypoints: Entrypoint[], appContext: AppToolsContext<"shared">, config: AppToolsNormalizedConfig, hooks: AppToolsFeatureHooks<"shared">) => Promise<void>;

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

@@ -1,11 +1,10 @@
 import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
 import { documentPlugin } from '../document/cli';
 import { routerPlugin } from '../router/cli';
-import { statePlugin } from '../state/cli';
 import { ssrPlugin } from './ssr';
 export { isRuntimeEntry } from './entry';
-export { statePlugin, ssrPlugin, routerPlugin, documentPlugin };
+export { ssrPlugin, routerPlugin, documentPlugin };
 export declare const runtimePlugin: (params?: {
-    plugins?: CliPluginFuture<AppTools<'shared'>>[];
-}) => CliPluginFuture<AppTools<'shared'>>;
+    plugins?: CliPluginFuture<AppTools<"shared">>[];
+}) => CliPluginFuture<AppTools<"shared">>;
 export default runtimePlugin;

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

@@ -1,3 +1,3 @@
 import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
-export declare const ssrPlugin: () => CliPluginFuture<AppTools<'shared'>>;
+export declare const ssrPlugin: () => CliPluginFuture<AppTools<"shared">>;
 export default ssrPlugin;

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

@@ -2,8 +2,8 @@ import type { RuntimePluginConfig } from '@modern-js/app-tools';
 export declare const entryForCSRWithRSC: ({ metaName, entryName, urlPath, mountId, }: {
     metaName: string;
     entryName: string;
-    urlPath?: string | undefined;
-    mountId?: string | undefined;
+    urlPath?: string;
+    mountId?: string;
 }) => string;
 export declare const index: ({ srcDirectory, internalSrcAlias, metaName, entry, entryName, customEntry, customBootstrap, mountId, enableRsc, }: {
     srcDirectory: string;
@@ -11,10 +11,10 @@ export declare const index: ({ srcDirectory, internalSrcAlias, metaName, entry,
     metaName: string;
     entry: string;
     entryName: string;
-    customEntry?: boolean | undefined;
-    customBootstrap?: string | false | undefined;
-    mountId?: string | undefined;
-    enableRsc?: boolean | undefined;
+    customEntry?: boolean;
+    customBootstrap?: string | false;
+    mountId?: string;
+    enableRsc?: boolean;
 }) => string;
 export declare const register: () => string;
 export declare const runtimeRegister: ({ entryName, srcDirectory, internalSrcAlias, metaName, runtimeConfigFile, runtimePlugins, }: {
@@ -31,7 +31,7 @@ export declare const runtimeGlobalContext: ({ entryName, srcDirectory, internalS
     internalSrcAlias: string;
     metaName: string;
     entry: string;
-    customEntry?: boolean | undefined;
+    customEntry?: boolean;
 }) => string;
 export declare const runtimeGlobalContextForRSCServer: ({ metaName, }: {
     metaName: string;
@@ -43,5 +43,5 @@ export declare const AppProxyForRSC: ({ srcDirectory, internalSrcAlias, entry, c
     srcDirectory: string;
     internalSrcAlias: string;
     entry: string;
-    customEntry?: boolean | undefined;
+    customEntry?: boolean;
 }) => string;

package/dist/types/common.d.ts

@@ -1,18 +1,12 @@
-import type { Plugin } from './core/plugin';
+import type { Plugin, RuntimePluginFuture } from './core/plugin';
 import type { RouterConfig } from './router';
-import type { StateConfig } from './state';
 export declare const isBrowser: () => boolean;
 export interface AppConfig {
-    state?: StateConfig | boolean;
     router?: Pick<RouterConfig, 'future' | 'basename'>;
     [key: string]: any;
 }
 export interface RuntimeConfig {
-    state?: StateConfig;
-    stateByEntries?: {
-        [name: string]: StateConfig;
-    };
-    plugins?: Plugin[];
+    plugins?: (Plugin | RuntimePluginFuture)[];
     [key: string]: any;
 }
 export declare const JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";

package/dist/types/config.d.ts

@@ -1,8 +1,6 @@
 import type { RouterConfig } from './router';
-import type { StateConfig } from './state';
 export interface RuntimeUserConfig {
     runtime?: {
-        state?: boolean | StateConfig;
         router?: boolean | RouterConfig;
     };
 }

package/dist/types/core/compat/requestContext.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node/http" />
-/// <reference types="types" />
 import type { RuntimeContext } from '../context';
 import type { RuntimePluginFuture } from '../plugin/types';
 export declare const makeRequestContext: (context: RuntimeContext) => import("../types").ServerContext | import("../types").ClientContext | {
@@ -13,10 +10,10 @@ export declare const makeRequestContext: (context: RuntimeContext) => import("..
         headers: import("http").IncomingHttpHeaders;
         host: string;
         url: string;
-        referer?: string | undefined;
-        userAgent?: string | undefined;
-        cookie?: string | undefined;
-        cookieMap?: Record<string, string> | undefined;
+        referer?: string;
+        userAgent?: string;
+        cookie?: string;
+        cookieMap?: Record<string, string>;
     } & {
         baseUrl: string;
         raw: Request;

package/dist/types/core/context/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { InternalRuntimeContext } from '@modern-js/plugin-v2';
 import type { NestedRoute, PageRoute } from '@modern-js/types';
 import type { AppConfig } from '../../common';

package/dist/types/core/context/monitors/index.server.d.ts

@@ -1,2 +1,2 @@
 import type { Monitors } from '@modern-js/types';
-export declare const getMonitors: () => Omit<Monitors, 'push'>;
+export declare const getMonitors: () => Omit<Monitors, "push">;

package/dist/types/core/context/runtime.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="react" />
-import type { Store } from '@modern-js-reduck/store';
 import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
 import type { RouteManifest } from '../../router/runtime/types';
 import { createLoaderManager } from '../loader/loaderManager';
@@ -9,7 +7,6 @@ interface BaseRuntimeContext {
     loaderManager: ReturnType<typeof createLoaderManager>;
     isBrowser: boolean;
     ssrContext?: SSRServerContext;
-    store?: Store;
     routeManifest: RouteManifest;
     routerContext?: StaticHandlerContext;
     context?: TSSRContext;
@@ -31,7 +28,6 @@ export interface TRuntimeContext extends Partial<BaseRuntimeContext> {
     request?: SSRServerContext['request'];
     /** @deprecated use context.response field instead */
     response?: SSRServerContext['response'];
-    store?: Store;
     [key: string]: any;
 }
 export declare const getInitialContext: (isBrowser?: boolean, routeManifest?: RouteManifest) => RuntimeContext;

package/dist/types/core/loader/useLoader.d.ts

@@ -26,8 +26,8 @@ export interface LoaderOptions<Params = any, TData = any, TError extends Error =
      */
     static?: boolean;
 }
-declare const useLoader: <TData = any, Params = any, E = any>(loaderFn: LoaderFn<Params, TData>, options?: LoaderOptions<Params, any, any>) => {
-    reload: (params?: Params | undefined) => Promise<any> | undefined;
+declare const useLoader: <TData = any, Params = any, E = any>(loaderFn: LoaderFn<Params, TData>, options?: LoaderOptions<Params>) => {
+    reload: (params?: Params) => Promise<any> | undefined;
     loading: boolean;
     reloading: boolean;
     data: TData;

package/dist/types/core/plugin/base.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { AsyncInterruptWorkflow, PluginOptions, Setup, SyncParallelWorkflow, Waterfall } from '@modern-js/plugin';
 import type { RuntimeContext, TRuntimeContext } from '../context/runtime';
 import type { RuntimeConfig } from './types';

package/dist/types/core/server/shared.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { ServerUserConfig } from '@modern-js/app-tools';
 import type { HandleRequestOptions } from './requestHandler';
 export type RenderOptions = HandleRequestOptions;

package/dist/types/core/server/utils.d.ts

@@ -15,5 +15,13 @@ export declare function checkIsNode(): boolean;
  * license at https://github.com/remix-run/remix/blob/main/LICENSE.md
  */
 export declare function serializeErrors(errors: StaticHandlerContext['errors']): StaticHandlerContext['errors'];
-export declare function getSSRConfigByEntry(entryName: string, ssr?: ServerUserConfig['ssr'], ssrByEntries?: ServerUserConfig['ssrByEntries']): import("@modern-js/app-tools").SSR;
+export declare function getSSRConfigByEntry(entryName: string, ssr?: ServerUserConfig['ssr'], ssrByEntries?: ServerUserConfig['ssrByEntries']): true | {
+    forceCSR?: boolean;
+    mode?: import("@modern-js/types").SSRMode;
+    inlineScript?: boolean;
+    disablePrerender?: boolean;
+    unsafeHeaders?: string[];
+    scriptLoading?: "defer" | "blocking" | "module" | "async";
+    loaderFailureMode?: "clientRender" | "errorBoundary";
+};
 export declare function getSSRMode(ssrConfig?: SSRConfig): 'string' | 'stream' | false;

package/dist/types/document/Script.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare function Script(props: DocumentScriptProps): import("react").JSX.Element;
 export interface DocumentScriptProps extends Omit<React.ScriptHTMLAttributes<HTMLScriptElement>, 'content'> {
     content?: () => void;

package/dist/types/document/Title.d.ts

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

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

@@ -1,5 +1,5 @@
 import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
 import type { Entrypoint } from '@modern-js/types/cli';
 export declare const getDocumenByEntryName: (entrypoints: Entrypoint[], entryName: string, fallbackDir?: string) => string | undefined;
-export declare const documentPlugin: () => CliPluginFuture<AppTools<'shared'>>;
+export declare const documentPlugin: () => CliPluginFuture<AppTools<"shared">>;
 export default documentPlugin;

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
 import type { RouterConfig } from './router';
-import type { StateConfig } from './state';
 export type { Plugin, RuntimePluginFuture } from './core';
 export type { AppConfig, RuntimeConfig } from './common';
 export { isBrowser } from './common';
@@ -9,4 +8,4 @@ export { getMonitors } from './core/context/monitors';
 export { getRequest } from './core/context/request';
 export { setHeaders, setStatus, redirect } from './core/context/response';
 export { createApp, useLoader, bootstrap, RuntimeReactContext, defineConfig, defineRuntimeConfig, useRuntimeContext, } from './core';
-export type { StateConfig, RouterConfig };
+export type { RouterConfig };

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

@@ -1,5 +1,5 @@
 import type { AppNormalizedConfig, AppTools, AppToolsContext } from '@modern-js/app-tools';
 import type { CLIPluginAPI } from '@modern-js/plugin-v2';
 import type { Entrypoint } from '@modern-js/types';
-export declare const generateCode: (appContext: AppToolsContext<'shared'>, config: AppNormalizedConfig<'shared'>, entrypoints: Entrypoint[], api: CLIPluginAPI<AppTools<'shared'>>) => Promise<void>;
+export declare const generateCode: (appContext: AppToolsContext<"shared">, config: AppNormalizedConfig<"shared">, entrypoints: Entrypoint[], api: CLIPluginAPI<AppTools<"shared">>, isRouterV5: boolean) => Promise<void>;
 export declare function generatorRegisterCode(internalDirectory: string, entryName: string, code: string): void;

package/dist/types/router/cli/code/templates.d.ts

@@ -6,18 +6,18 @@ export declare const routesForServer: ({ routesForServerLoaderMatches, }: {
 export declare const fileSystemRoutes: ({ metaName, routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, splitRouteChunks, }: {
     metaName: string;
     routes: RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
-    ssrMode?: SSRMode | undefined;
-    nestedRoutesEntry?: string | undefined;
+    ssrMode?: SSRMode;
+    nestedRoutesEntry?: string;
     entryName: string;
     internalDirectory: string;
-    splitRouteChunks?: boolean | undefined;
+    splitRouteChunks?: boolean;
 }) => Promise<string>;
 export declare function ssrLoaderCombinedModule(entrypoints: Entrypoint[], entrypoint: Entrypoint, config: AppNormalizedConfig<'shared'>, appContext: AppToolsContext<'shared'>): string | null;
 export declare const runtimeGlobalContext: ({ entryName, metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp, }: {
     entryName: string;
     metaName: string;
     srcDirectory: string;
-    nestedRoutesEntry?: string | undefined;
+    nestedRoutesEntry?: string;
     internalSrcAlias: string;
-    globalApp?: string | false | undefined;
+    globalApp?: string | false;
 }) => Promise<string>;

package/dist/types/router/cli/code/utils.d.ts

@@ -4,7 +4,7 @@ export declare const replaceWithAlias: (base: string, filePath: string, alias: s
 export declare const parseModule: ({ source, filename, }: {
     source: string;
     filename: string;
-}) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean]>;
+}) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean, hasModuleSyntax: boolean]>;
 export declare const hasLoader: (filename: string, source?: string) => Promise<boolean>;
 export declare const hasAction: (filename: string, source?: string) => Promise<boolean>;
 export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;

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

@@ -2,4 +2,4 @@ import type { Entrypoint } from '@modern-js/types';
 export declare const hasPages: (dir: string) => boolean;
 export declare const hasNestedRoutes: (dir: string) => boolean;
 export declare const isRouteEntry: (dir: string) => string | false;
-export declare const modifyEntrypoints: (entrypoints: Entrypoint[], config?: Record<string, any>) => Entrypoint[];
+export declare const modifyEntrypoints: (entrypoints: Entrypoint[], isRouterV5: boolean) => Entrypoint[];

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

@@ -1,6 +1,6 @@
 import type { AppTools } from '@modern-js/app-tools';
 import type { CLIPluginAPI } from '@modern-js/plugin-v2';
 import type { Entrypoint } from '@modern-js/types';
-export declare function handleModifyEntrypoints(api: CLIPluginAPI<AppTools<'shared'>>, entrypoints: Entrypoint[]): Promise<Entrypoint[]>;
-export declare function handleGeneratorEntryCode(api: CLIPluginAPI<AppTools<'shared'>>, entrypoints: Entrypoint[]): Promise<Entrypoint[]>;
-export declare function handleFileChange(api: CLIPluginAPI<AppTools<'shared'>>, e: any): Promise<void>;
+export declare function handleModifyEntrypoints(isRouterV5: boolean, entrypoints: Entrypoint[]): Promise<Entrypoint[]>;
+export declare function handleGeneratorEntryCode(api: CLIPluginAPI<AppTools<'shared'>>, entrypoints: Entrypoint[], isRouterV5: boolean): Promise<Entrypoint[]>;
+export declare function handleFileChange(api: CLIPluginAPI<AppTools<'shared'>>, isRouterV5: boolean, e: any): Promise<void>;

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

@@ -1,5 +1,5 @@
 import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
 export { isRouteEntry } from './entry';
 export { handleFileChange, handleModifyEntrypoints } from './handler';
-export declare const routerPlugin: () => CliPluginFuture<AppTools<'shared'>>;
+export declare const routerPlugin: () => CliPluginFuture<AppTools<"shared">>;
 export default routerPlugin;

package/dist/types/router/runtime/DeferredDataScripts.node.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
 /**
  * DeferredDataScripts only renders in server side,

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

@@ -1,7 +1,7 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import type { RuntimeContext } from '../../core';
-declare const modifyRoutes: import("@modern-js/plugin-v2/src/types/hooks").SyncHook<(routes: RouteObject[]) => RouteObject[]>;
-declare const onBeforeCreateRoutes: import("@modern-js/plugin-v2/src/types/hooks").SyncHook<(context: RuntimeContext) => void>;
+declare const modifyRoutes: import("@modern-js/plugin-v2").SyncHook<(routes: RouteObject[]) => RouteObject[]>;
+declare const onBeforeCreateRoutes: import("@modern-js/plugin-v2").SyncHook<(context: RuntimeContext) => void>;
 export { modifyRoutes, onBeforeCreateRoutes };
 export type RouterExtendsHooks = {
     modifyRoutes: typeof modifyRoutes;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type Module from 'module';
 import type { ShouldRevalidateFunction } from '@modern-js/runtime-utils/remix-router';
 export declare const createShouldRevalidate: (routeId: string) => ShouldRevalidateFunction;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { RequestContext } from '@modern-js/runtime-utils/node';
 import type { Params, RouteObject, RouteProps } from '@modern-js/runtime-utils/router';
 import type { NestedRoute, PageRoute } from '@modern-js/types';

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

@@ -7,4 +7,4 @@ export interface WithRouterProps<Params extends {
     params: Params;
     navigate: ReturnType<typeof useNavigate>;
 }
-export declare const withRouter: <Props extends WithRouterProps<{}>>(Component: React.ComponentType<Props>) => (props: Omit<Props, keyof WithRouterProps<{}>>) => React.JSX.Element;
+export declare const withRouter: <Props extends WithRouterProps>(Component: React.ComponentType<Props>) => (props: Omit<Props, keyof WithRouterProps>) => React.JSX.Element;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.5",
+  "version": "2.67.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -34,7 +34,6 @@
     "./types": "./types/index.d.ts",
     "./types/index": "./types/index.d.ts",
     "./types/router": "./types/router.d.ts",
-    "./types/model": "./types/model.d.ts",
     "./context": {
       "types": "./dist/types/core/context/index.d.ts",
       "jsnext:source": "./src/core/context/index.ts",
@@ -92,11 +91,6 @@
       "node": "./dist/cjs/document/index.js",
       "default": "./dist/esm/document/index.js"
     },
-    "./model": {
-      "types": "./types/model.d.ts",
-      "jsnext:source": "./src/state/index.ts",
-      "default": "./dist/esm/state/index.js"
-    },
     "./cli": {
       "types": "./dist/types/cli/index.d.ts",
       "jsnext:source": "./src/cli/index.ts",
@@ -178,9 +172,6 @@
       "ssr/server": [
         "./dist/types/core/server/server.d.ts"
       ],
-      "model": [
-        "./types/model.d.ts"
-      ],
       "router": [
         "./dist/types/router/index.d.ts"
       ],
@@ -207,12 +198,6 @@
     "@loadable/babel-plugin": "5.15.3",
     "@loadable/component": "5.15.3",
     "@loadable/server": "5.15.3",
-    "@modern-js-reduck/plugin-auto-actions": "^1.1.10",
-    "@modern-js-reduck/plugin-devtools": "^1.1.10",
-    "@modern-js-reduck/plugin-effects": "^1.1.10",
-    "@modern-js-reduck/plugin-immutable": "^1.1.10",
-    "@modern-js-reduck/react": "^1.1.10",
-    "@modern-js-reduck/store": "^1.1.10",
     "@swc/helpers": "0.5.13",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
@@ -226,13 +211,13 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/render": "2.65.5",
-    "@modern-js/runtime-utils": "2.65.5",
-    "@modern-js/plugin-v2": "2.65.5",
-    "@modern-js/types": "2.65.5",
-    "@modern-js/plugin": "2.65.5",
-    "@modern-js/utils": "2.65.5",
-    "@modern-js/plugin-data-loader": "2.65.5"
+    "@modern-js/plugin": "2.67.0",
+    "@modern-js/plugin-data-loader": "2.67.0",
+    "@modern-js/plugin-v2": "2.67.0",
+    "@modern-js/runtime-utils": "2.67.0",
+    "@modern-js/render": "2.67.0",
+    "@modern-js/types": "2.67.0",
+    "@modern-js/utils": "2.67.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -240,7 +225,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.2.19",
+    "@rsbuild/core": "1.3.2",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -256,9 +241,9 @@
     "ts-node": "^10.9.1",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "@scripts/build": "2.65.5",
-    "@scripts/jest-config": "2.65.5",
-    "@modern-js/app-tools": "2.65.5"
+    "@modern-js/app-tools": "2.67.0",
+    "@scripts/build": "2.66.0",
+    "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/types/index.d.ts

@@ -1,16 +1,4 @@
-import type { StateConfig } from '../dist/types';
-
-declare module '@modern-js/app-tools' {
-  interface RuntimeUserConfig {
-    state?: StateConfig | boolean;
-  }
-}
-
-declare module '@modern-js/module-tools' {
-  interface RuntimeUserConfig {
-    state?: StateConfig | boolean;
-  }
-}
+/// <reference types='@modern-js/plugin-state/types' />
 
 declare module 'http' {
   interface ServerResponse {

package/types/router.d.ts

@@ -20,6 +20,5 @@ declare module '@modern-js/runtime' {
 
   interface RuntimeConfig {
     router?: Partial<RouterConfig>;
-    routerByEntries?: { [name: string]: Partial<RouterConfig> };
   }
 }

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

@@ -1,62 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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 cli_exports = {};
-__export(cli_exports, {
-  default: () => cli_default,
-  statePlugin: () => statePlugin
-});
-module.exports = __toCommonJS(cli_exports);
-var import_utils = require("@modern-js/utils");
-const PLUGIN_IDENTIFIER = "state";
-const statePlugin = () => ({
-  name: "@modern-js/plugin-state",
-  required: [
-    "@modern-js/runtime"
-  ],
-  setup: (api) => {
-    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
-      var _getEntryOptions;
-      const { entryName, isMainEntry } = entrypoint;
-      const userConfig = api.getNormalizedConfig();
-      const { packageName, metaName } = api.getAppContext();
-      const stateConfig = (_getEntryOptions = (0, import_utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
-      if (stateConfig) {
-        plugins.push({
-          name: PLUGIN_IDENTIFIER,
-          path: `@${metaName}/runtime/model`,
-          config: typeof stateConfig === "boolean" ? {} : stateConfig
-        });
-      }
-      return {
-        entrypoint,
-        plugins
-      };
-    });
-    api.addRuntimeExports(() => {
-      const { internalDirectory, metaName } = api.useAppContext();
-      const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
-      pluginsExportsUtils.addExport(`export { default as state } from '@${metaName}/runtime/model'`);
-    });
-  }
-});
-var cli_default = statePlugin;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  statePlugin
-});

package/dist/cjs/state/index.js

@@ -1,43 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var state_exports = {};
-__export(state_exports, {
-  default: () => import_runtime2.default,
-  state: () => import_runtime.default
-});
-module.exports = __toCommonJS(state_exports);
-var import_runtime = __toESM(require("./runtime"));
-var import_runtime2 = __toESM(require("./runtime"));
-__reExport(state_exports, require("./runtime"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  state,
-  ...require("./runtime")
-});