@modern-js/runtime 2.63.2 → 2.63.4

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

@@ -24,7 +24,7 @@ const ssrBuilderPlugin = (modernAPI) => ({
   setup(api) {
     api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig }) => {
       const isServerEnvironment = config.output.target === "node" || name === "workerSSR";
-      const userConfig = modernAPI.useResolvedConfigContext();
+      const userConfig = modernAPI.getNormalizedConfig();
       const useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
       return mergeEnvironmentConfig(config, {
         source: {
@@ -52,61 +52,58 @@ const ssrPlugin = () => ({
     "@modern-js/runtime"
   ],
   setup: (api) => {
-    const appContext = api.useAppContext();
-    return {
-      // for bundle
-      config() {
-        const { bundlerType = "webpack" } = api.useAppContext();
-        const babelHandler = (() => {
-          if (bundlerType === "webpack") {
-            return (config) => {
-              var _config_plugins;
-              const userConfig = api.useResolvedConfigContext();
+    const appContext = api.getAppContext();
+    api.config(() => {
+      const { bundlerType = "webpack" } = api.getAppContext();
+      const babelHandler = (() => {
+        if (bundlerType === "webpack") {
+          return (config) => {
+            var _config_plugins;
+            const userConfig = api.getNormalizedConfig();
+            (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+            if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
+              var _config_plugins1;
+              (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+            }
+          };
+        } else if (bundlerType === "rspack") {
+          return (config) => {
+            const userConfig = api.useResolvedConfigContext();
+            if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
+              var _config_plugins, _config_plugins1;
               (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-              if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
-                var _config_plugins1;
-                (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
-              }
-            };
-          } else if (bundlerType === "rspack") {
-            return (config) => {
-              const userConfig = api.useResolvedConfigContext();
-              if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
-                var _config_plugins, _config_plugins1;
-                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
-              }
-            };
-          }
-        })();
-        return {
-          builderPlugins: [
-            ssrBuilderPlugin(api)
-          ],
-          source: {
-            alias: {
-              // ensure that all packages use the same storage in @modern-js/runtime-utils/node
-              "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node")
+              (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
             }
-          },
-          tools: {
-            babel: babelHandler,
-            bundlerChain: (chain, { isServer }) => {
-              if (isServer && appContext.moduleType === "module") {
-                chain.output.libraryTarget("module").set("chunkFormat", "module");
-                chain.output.library({
-                  type: "module"
-                });
-                chain.experiments({
-                  ...chain.get("experiments"),
-                  outputModule: true
-                });
-              }
+          };
+        }
+      })();
+      return {
+        builderPlugins: [
+          ssrBuilderPlugin(api)
+        ],
+        source: {
+          alias: {
+            // ensure that all packages use the same storage in @modern-js/runtime-utils/node
+            "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node")
+          }
+        },
+        tools: {
+          babel: babelHandler,
+          bundlerChain: (chain, { isServer }) => {
+            if (isServer && appContext.moduleType === "module") {
+              chain.output.libraryTarget("module").set("chunkFormat", "module");
+              chain.output.library({
+                type: "module"
+              });
+              chain.experiments({
+                ...chain.get("experiments"),
+                outputModule: true
+              });
             }
           }
-        };
-      }
-    };
+        }
+      };
+    });
   }
 });
 var ssr_default = ssrPlugin;

package/dist/esm-node/core/server/string/loadable.js

@@ -47,8 +47,18 @@ class LoadableCollector {
     if (!this.extractor) {
       return;
     }
-    const { extractor } = this;
-    const chunks = extractor.getChunkAssets(extractor.chunks);
+    const { extractor, options } = this;
+    const { entryName, config } = options;
+    const asyncChunks = [];
+    if (config.enableAsyncEntry) {
+      try {
+        asyncChunks.push(...extractor.getChunkAssets([
+          `async-${entryName}`
+        ]));
+      } catch (e) {
+      }
+    }
+    const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks));
     const scriptChunks = generateChunks(chunks, "js");
     const styleChunks = generateChunks(chunks, "css");
     this.emitLoadableScripts(extractor);
@@ -99,7 +109,7 @@ class LoadableCollector {
     chunkSet.jsChunk += scripts.filter((script) => Boolean(script)).join("");
   }
   async emitStyleAssets(chunks) {
-    const { template, chunkSet, config } = this.options;
+    const { template, chunkSet, config, entryName } = this.options;
     const { enableInlineStyles } = config;
     const atrributes = attributesToString(this.generateAttributes());
     const linkRegExp = /<link .*?href="([^"]+)".*?>/g;

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

@@ -39,13 +39,13 @@ const documentPlugin = () => ({
       };
     }
     const documentEntry = (entryName, templateParameters) => {
-      const { entrypoints, internalDirectory, appDirectory } = api.useAppContext();
+      const { entrypoints, internalDirectory, appDirectory } = api.getAppContext();
       const documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
       if (!documentFilePath) {
         return null;
       }
       return async ({ htmlWebpackPlugin }) => {
-        const config = api.useResolvedConfigContext();
+        const config = api.getNormalizedConfig();
         const documentParams = getDocParams({
           config,
           entryName,
@@ -109,7 +109,7 @@ const documentPlugin = () => ({
         }, React.createElement(Document, null));
         let html = ReactDomServer.renderToStaticMarkup(HTMLElement);
         debug("entry %s's document jsx rendered html: %o", entryName, html);
-        const { partialsByEntrypoint } = api.useAppContext();
+        const { partialsByEntrypoint } = api.getAppContext();
         const scripts = [
           htmlWebpackPlugin.tags.headTags.filter((item) => item.tagName === "script").join(""),
           htmlWebpackPlugin.tags.bodyTags.toString()
@@ -148,38 +148,36 @@ const documentPlugin = () => ({
         return finalHtml;
       };
     };
-    return {
-      config: () => {
-        var _userConfig_tools;
-        const userConfig = api.useConfigContext();
-        if (((_userConfig_tools = userConfig.tools) === null || _userConfig_tools === void 0 ? void 0 : _userConfig_tools.htmlPlugin) === false) {
-          return {};
-        }
-        return {
-          tools: {
-            htmlPlugin: (options, entry) => {
-              const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : {
-                ...options === null || options === void 0 ? void 0 : options.templateParameters
-              };
-              const templateContent = documentEntry(
-                entry.entryName,
-                // options,
-                hackParameters
-              );
-              const documentHtmlOptions = templateContent ? {
-                templateContent,
-                // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
-                inject: false
-              } : {};
-              return {
-                ...options,
-                ...documentHtmlOptions
-              };
-            }
-          }
-        };
+    api.config(() => {
+      var _userConfig_tools;
+      const userConfig = api.getConfig();
+      if (((_userConfig_tools = userConfig.tools) === null || _userConfig_tools === void 0 ? void 0 : _userConfig_tools.htmlPlugin) === false) {
+        return {};
       }
-    };
+      return {
+        tools: {
+          htmlPlugin: (options, entry) => {
+            const hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : {
+              ...options === null || options === void 0 ? void 0 : options.templateParameters
+            };
+            const templateContent = documentEntry(
+              entry.entryName,
+              // options,
+              hackParameters
+            );
+            const documentHtmlOptions = templateContent ? {
+              templateContent,
+              // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
+              inject: false
+            } : {};
+            return {
+              ...options,
+              ...documentHtmlOptions
+            };
+          }
+        }
+      };
+    });
   }
 });
 var cli_default = documentPlugin;

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

@@ -10,14 +10,14 @@ import * as templates from "./templates";
 import { getServerCombinedModueFile, getServerLoadersFile } from "./utils";
 const generateCode = async (appContext, config, entrypoints, api) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
-  const hookRunners = api.useHookRunners();
+  const hooks = api.getHooks();
   const isV5 = isRouterV5(config);
   const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
   const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
     const { entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry } = entrypoint;
-    const { metaName } = api.useAppContext();
+    const { metaName } = api.getAppContext();
     if (isAutoMount) {
       if (pageRoutesEntry || nestedRoutesEntry) {
         var _config_output;
@@ -48,11 +48,11 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             }
           }
         }
-        const config2 = api.useResolvedConfigContext();
+        const config2 = api.getNormalizedConfig();
         const ssrByRouteIds = config2.server.ssrByRouteIds || [];
         const clonedRoutes = cloneDeep(initialRoutes);
         const markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
-        const { routes } = await hookRunners.modifyFileSystemRoutes({
+        const { routes } = await hooks.modifyFileSystemRoutes.call({
           entrypoint,
           routes: markedRoutes
         });
@@ -69,7 +69,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             process.exit(1);
           }
         }
-        const { code } = await hookRunners.beforeGenerateRoutes({
+        const { code } = await hooks.onBeforeGenerateRoutes.call({
           entrypoint,
           code: await templates.fileSystemRoutes({
             metaName,

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

@@ -5,13 +5,13 @@ import { isPageComponentFile } from "./code/utils";
 import { modifyEntrypoints } from "./entry";
 let originEntrypoints = [];
 async function handleModifyEntrypoints(api, entrypoints) {
-  const config = api.useResolvedConfigContext();
+  const config = api.getNormalizedConfig();
   return modifyEntrypoints(entrypoints, config);
 }
 async function handleGeneratorEntryCode(api, entrypoints) {
-  const appContext = api.useAppContext();
-  const { internalDirectory } = api.useAppContext();
-  const resolvedConfig = api.useResolvedConfigContext();
+  const appContext = api.getAppContext();
+  const { internalDirectory } = appContext;
+  const resolvedConfig = api.getNormalizedConfig();
   const { generatorRegisterCode, generateCode } = await import("./code");
   originEntrypoints = cloneDeep(entrypoints);
   await generateCode(appContext, resolvedConfig, entrypoints, api);
@@ -30,7 +30,7 @@ async function handleGeneratorEntryCode(api, entrypoints) {
   return entrypoints;
 }
 async function handleFileChange(api, e) {
-  const appContext = api.useAppContext();
+  const appContext = api.getAppContext();
   const { appDirectory, entrypoints } = appContext;
   const { filename, eventType } = e;
   const nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
@@ -39,7 +39,7 @@ async function handleFileChange(api, e) {
   const absoluteFilePath = path.resolve(appDirectory, filename);
   const isRouteComponent = isPageFile(absoluteFilePath) && isPageComponentFile(absoluteFilePath);
   if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
-    const resolvedConfig = api.useResolvedConfigContext();
+    const resolvedConfig = api.getNormalizedConfig();
     const { generateCode } = await import("./code");
     const entrypoints2 = cloneDeep(originEntrypoints);
     await generateCode(appContext, resolvedConfig, entrypoints2, api);

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/core/server/string/loadable.d.ts

@@ -2,8 +2,8 @@ import type { ReactElement } from 'react';
 import type { ChunkSet, Collector } from './types';
 declare module '@loadable/server' {
     interface ChunkExtractor {
-        chunks: Chunk;
-        getChunkAssets: (chunks: Chunk) => Chunk[];
+        chunks: string[];
+        getChunkAssets: (chunks: string[]) => Chunk[];
     }
 }
 export interface LoadableCollectorOptions {
@@ -20,6 +20,7 @@ export interface LoadableCollectorConfig {
     enableInlineStyles?: boolean | RegExp;
     enableInlineScripts?: boolean | RegExp;
     crossorigin?: boolean | 'anonymous' | 'use-credentials';
+    enableAsyncEntry?: boolean;
 }
 export declare class LoadableCollector implements Collector {
     private options;

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;