@modern-js/runtime 2.63.3 → 2.63.4

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

@@ -13,87 +13,85 @@ const routerPlugin = () => ({
   setup: (api) => {
     const nestedRoutes = {};
     const nestedRoutesForServer = {};
-    return {
-      _internalRuntimePlugins({ entrypoint, plugins }) {
-        var _getEntryOptions;
-        const { packageName, serverRoutes, metaName } = api.useAppContext();
-        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.useResolvedConfigContext();
-        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)) {
-          plugins.push({
-            name: "router",
-            path: `@${metaName}/runtime/router`,
-            config: typeof routerConfig === "boolean" ? {
-              serverBase
-            } : {
-              ...routerConfig,
-              serverBase
-            }
-          });
-        }
-        return {
-          entrypoint,
-          plugins
-        };
-      },
-      checkEntryPoint({ path: path2, entry }) {
-        return {
-          path: path2,
-          entry: entry || isRouteEntry(path2)
-        };
-      },
-      config() {
-        return {
-          source: {
-            include: [
-              // react-router v6 is no longer support ie 11
-              // so we need to compile these packages to ensure the compatibility
-              // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
-              /node_modules\/react-router/,
-              /node_modules\/react-router-dom/,
-              /node_modules\/@remix-run\/router/
-            ]
+    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
+      var _getEntryOptions;
+      const { packageName, serverRoutes, metaName } = 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)) {
+        plugins.push({
+          name: "router",
+          path: `@${metaName}/runtime/router`,
+          config: typeof routerConfig === "boolean" ? {
+            serverBase
+          } : {
+            ...routerConfig,
+            serverBase
           }
-        };
-      },
-      async modifyEntrypoints({ entrypoints }) {
-        const newEntryPoints = await handleModifyEntrypoints(api, entrypoints);
-        return {
-          entrypoints: newEntryPoints
-        };
-      },
-      async generateEntryCode({ entrypoints }) {
-        await handleGeneratorEntryCode(api, entrypoints);
-      },
-      addRuntimeExports() {
-        const userConfig = api.useResolvedConfigContext();
-        const { internalDirectory, metaName } = api.useAppContext();
-        const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-        if (!isV5(userConfig)) {
-          pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/runtime/router'`);
+        });
+      }
+      return {
+        entrypoint,
+        plugins
+      };
+    });
+    api.checkEntryPoint(({ path: path2, entry }) => {
+      return {
+        path: path2,
+        entry: entry || isRouteEntry(path2)
+      };
+    });
+    api.config(() => {
+      return {
+        source: {
+          include: [
+            // react-router v6 is no longer support ie 11
+            // so we need to compile these packages to ensure the compatibility
+            // https://github.com/remix-run/react-router/commit/f6df0697e1b2064a2b3a12e8b39577326fdd945b
+            /node_modules\/react-router/,
+            /node_modules\/react-router-dom/,
+            /node_modules\/@remix-run\/router/
+          ]
         }
-      },
-      async fileChange(e) {
-        await handleFileChange(api, e);
-      },
-      async modifyFileSystemRoutes({ entrypoint, routes }) {
-        nestedRoutes[entrypoint.entryName] = routes;
-        nestedRoutesForServer[entrypoint.entryName] = filterRoutesForServer(routes);
-        return {
-          entrypoint,
-          routes
-        };
-      },
-      async beforeGenerateRoutes({ entrypoint, code }) {
-        const { distDirectory } = api.useAppContext();
-        await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer);
-        return {
-          entrypoint,
-          code
-        };
+      };
+    });
+    api.modifyEntrypoints(async ({ entrypoints }) => {
+      const newEntryPoints = await handleModifyEntrypoints(api, entrypoints);
+      return {
+        entrypoints: newEntryPoints
+      };
+    });
+    api.generateEntryCode(async ({ entrypoints }) => {
+      await handleGeneratorEntryCode(api, entrypoints);
+    });
+    api.addRuntimeExports(() => {
+      const userConfig = api.useResolvedConfigContext();
+      const { internalDirectory, metaName } = api.useAppContext();
+      const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
+      if (!isV5(userConfig)) {
+        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/runtime/router'`);
       }
-    };
+    });
+    api.onFileChanged(async (e) => {
+      await handleFileChange(api, e);
+    });
+    api.modifyFileSystemRoutes(({ entrypoint, routes }) => {
+      nestedRoutes[entrypoint.entryName] = routes;
+      nestedRoutesForServer[entrypoint.entryName] = filterRoutesForServer(routes);
+      return {
+        entrypoint,
+        routes
+      };
+    });
+    api.onBeforeGenerateRoutes(async ({ entrypoint, code }) => {
+      const { distDirectory } = api.getAppContext();
+      await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer);
+      return {
+        entrypoint,
+        code
+      };
+    });
   }
 });
 var cli_default = routerPlugin;

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

@@ -1,6 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { merge } from "@modern-js/runtime-utils/merge";
-import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
 import { RouterProvider, createBrowserRouter, createHashRouter, createRoutesFromElements, useHref, useLocation, useMatches } from "@modern-js/runtime-utils/router";
 import { useContext, useMemo } from "react";
 import { RuntimeReactContext } from "../../core";
@@ -28,7 +27,6 @@ const routerPlugin = (userConfig = {}) => {
     },
     setup: (api) => {
       let routes = [];
-      window._SERVER_DATA = parsedJSONFromElement("__MODERN_SERVER_DATA__");
       return {
         beforeRender(context) {
           context.router = {
@@ -56,9 +54,8 @@ const routerPlugin = (userConfig = {}) => {
           }
           const getRouteApp = () => {
             const useCreateRouter = (props) => {
-              var _window__SERVER_DATA;
               const runtimeContext = useContext(RuntimeReactContext);
-              const baseUrl = (((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname)).replace(/^\/*/, "/");
+              const baseUrl = select(location.pathname).replace(/^\/*/, "/");
               const _basename = baseUrl === "/" ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
               const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;

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

@@ -6,31 +6,29 @@ const statePlugin = () => ({
     "@modern-js/runtime"
   ],
   setup: (api) => {
-    return {
-      _internalRuntimePlugins({ entrypoint, plugins }) {
-        var _getEntryOptions;
-        const { entryName, isMainEntry } = entrypoint;
-        const userConfig = api.useResolvedConfigContext();
-        const { packageName, metaName } = api.useAppContext();
-        const stateConfig = (_getEntryOptions = 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
-        };
-      },
-      addRuntimeExports() {
-        const { internalDirectory, metaName } = api.useAppContext();
-        const pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-        pluginsExportsUtils.addExport(`export { default as state } from '@${metaName}/runtime/model'`);
+    api._internalRuntimePlugins(({ entrypoint, plugins }) => {
+      var _getEntryOptions;
+      const { entryName, isMainEntry } = entrypoint;
+      const userConfig = api.useResolvedConfigContext();
+      const { packageName, metaName } = api.useAppContext();
+      const stateConfig = (_getEntryOptions = 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 = createRuntimeExportsUtils(internalDirectory, "plugins");
+      pluginsExportsUtils.addExport(`export { default as state } from '@${metaName}/runtime/model'`);
+    });
   }
 });
 var cli_default = statePlugin;

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

@@ -1,10 +1,3 @@
-import type { AppTools, IAppContext, NormalizedConfig, RuntimePlugin } from '@modern-js/app-tools';
-import type { MaybeAsync } from '@modern-js/plugin';
+import type { AppToolsContext, AppToolsFeatureHooks, AppToolsNormalizedConfig } from '@modern-js/app-tools';
 import type { Entrypoint } from '@modern-js/types';
-export declare const generateCode: (entrypoints: Entrypoint[], appContext: IAppContext, config: NormalizedConfig<AppTools>, onCollectRuntimePlugins: (params: {
-    entrypoint: Entrypoint;
-    plugins: RuntimePlugin[];
-}) => MaybeAsync<{
-    entrypoint: Entrypoint;
-    plugins: RuntimePlugin[];
-}>) => 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,4 +1,4 @@
-import type { AppTools, CliPlugin } from '@modern-js/app-tools';
+import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
 import { documentPlugin } from '../document/cli';
 import { routerPlugin } from '../router/cli';
 import { statePlugin } from '../state/cli';
@@ -6,6 +6,6 @@ import { ssrPlugin } from './ssr';
 export { isRuntimeEntry } from './entry';
 export { statePlugin, ssrPlugin, routerPlugin, documentPlugin };
 export declare const runtimePlugin: (params?: {
-    plugins?: CliPlugin<AppTools>[];
-}) => CliPlugin<AppTools>;
+    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, CliPlugin } from '@modern-js/app-tools';
-export declare const ssrPlugin: () => CliPlugin<AppTools>;
+import type { AppTools, CliPluginFuture } from '@modern-js/app-tools';
+export declare const ssrPlugin: () => CliPluginFuture<AppTools<'shared'>>;
 export default ssrPlugin;

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

@@ -1,5 +1,5 @@
-import type { AppTools, CliPlugin } from '@modern-js/app-tools';
+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: () => CliPlugin<AppTools>;
+export declare const documentPlugin: () => CliPluginFuture<AppTools<'shared'>>;
 export default documentPlugin;

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

@@ -1,5 +1,5 @@
-import type { AppNormalizedConfig, AppTools } from '@modern-js/app-tools';
-import type { IAppContext, PluginAPI } from '@modern-js/core';
+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: IAppContext, config: AppNormalizedConfig<'shared'>, entrypoints: Entrypoint[], api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
+export declare const generateCode: (appContext: AppToolsContext<'shared'>, config: AppNormalizedConfig<'shared'>, entrypoints: Entrypoint[], api: CLIPluginAPI<AppTools<'shared'>>) => Promise<void>;
 export declare function generatorRegisterCode(internalDirectory: string, entryName: string, code: string): void;

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

@@ -1,4 +1,4 @@
-import type { AppNormalizedConfig, IAppContext } from '@modern-js/app-tools';
+import type { AppNormalizedConfig, AppToolsContext } from '@modern-js/app-tools';
 import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
 export declare const routesForServer: ({ routesForServerLoaderMatches, }: {
     routesForServerLoaderMatches: (NestedRouteForCli | PageRoute)[];
@@ -12,7 +12,7 @@ export declare const fileSystemRoutes: ({ metaName, routes, ssrMode, nestedRoute
     internalDirectory: string;
     splitRouteChunks?: boolean | undefined;
 }) => Promise<string>;
-export declare function ssrLoaderCombinedModule(entrypoints: Entrypoint[], entrypoint: Entrypoint, config: AppNormalizedConfig<'shared'>, appContext: IAppContext): string | null;
+export declare function ssrLoaderCombinedModule(entrypoints: Entrypoint[], entrypoint: Entrypoint, config: AppNormalizedConfig<'shared'>, appContext: AppToolsContext<'shared'>): string | null;
 export declare const runtimeGlobalContext: ({ metaName, srcDirectory, nestedRoutesEntry, internalSrcAlias, globalApp, }: {
     metaName: string;
     srcDirectory: string;

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

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

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

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

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

@@ -2,16 +2,6 @@
 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';
-declare global {
-    interface Window {
-        _SERVER_DATA?: {
-            router: {
-                baseUrl: string;
-                params: Record<string, string>;
-            };
-        };
-    }
-}
 export type SingleRouteConfig = RouteProps & {
     redirect?: string;
     routes?: SingleRouteConfig[];

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.3",
+  "version": "2.63.4",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -200,11 +200,12 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.63.3",
-    "@modern-js/plugin-data-loader": "2.63.3",
-    "@modern-js/types": "2.63.3",
-    "@modern-js/runtime-utils": "2.63.3",
-    "@modern-js/utils": "2.63.3"
+    "@modern-js/plugin": "2.63.4",
+    "@modern-js/plugin-v2": "2.63.4",
+    "@modern-js/plugin-data-loader": "2.63.4",
+    "@modern-js/runtime-utils": "2.63.4",
+    "@modern-js/types": "2.63.4",
+    "@modern-js/utils": "2.63.4"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -212,7 +213,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.1.10",
+    "@rsbuild/core": "1.1.12",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -228,10 +229,9 @@
     "ts-node": "^10.9.1",
     "typescript": "^5",
     "webpack": "^5.97.1",
-    "@modern-js/app-tools": "2.63.3",
-    "@modern-js/core": "2.63.3",
-    "@scripts/build": "2.63.3",
-    "@scripts/jest-config": "2.63.3"
+    "@modern-js/app-tools": "2.63.4",
+    "@scripts/build": "2.63.4",
+    "@scripts/jest-config": "2.63.4"
   },
   "sideEffects": false,
   "publishConfig": {