@modern-js/runtime 2.63.3 → 2.63.5

package/dist/cjs/cli/code.js

@@ -52,13 +52,13 @@ function getSSRMode(entry, config) {
     return ssr2.mode === "stream" ? "stream" : "string";
   }
 }
-const generateCode = async (entrypoints, appContext, config, onCollectRuntimePlugins) => {
+const generateCode = async (entrypoints, appContext, config, hooks) => {
   const { mountId } = config.html;
   const { enableAsyncEntry } = config.source;
   const { runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory } = appContext;
   await Promise.all(entrypoints.map(async (entrypoint) => {
     const { entryName, isAutoMount, entry, customEntry, customBootstrap, customServerEntry } = entrypoint;
-    const { plugins: runtimePlugins } = await onCollectRuntimePlugins({
+    const { plugins: runtimePlugins } = await hooks._internalRuntimePlugins.call({
       entrypoint,
       plugins: []
     });

package/dist/cjs/cli/index.js

@@ -65,119 +65,113 @@ const runtimePlugin = (params) => ({
     (0, import_cli.documentPlugin)()
   ],
   setup: (api) => {
-    return {
-      checkEntryPoint({ path: path2, entry }) {
-        return {
-          path: path2,
-          entry: entry || (0, import_entry.isRuntimeEntry)(path2)
-        };
-      },
-      modifyEntrypoints({ entrypoints }) {
-        const { internalDirectory } = api.useAppContext();
-        const { source: { enableAsyncEntry } } = api.useResolvedConfigContext();
-        const newEntryPoints = entrypoints.map((entrypoint) => {
-          if (entrypoint.isAutoMount) {
-            entrypoint.internalEntry = import_path.default.resolve(internalDirectory, `./${entrypoint.entryName}/${enableAsyncEntry ? import_constants.ENTRY_BOOTSTRAP_FILE_NAME : import_constants.ENTRY_POINT_FILE_NAME}`);
+    api.checkEntryPoint(({ path: path2, entry }) => {
+      return {
+        path: path2,
+        entry: entry || (0, import_entry.isRuntimeEntry)(path2)
+      };
+    });
+    api.modifyEntrypoints(({ entrypoints }) => {
+      const { internalDirectory } = api.getAppContext();
+      const { source: { enableAsyncEntry } } = api.getNormalizedConfig();
+      const newEntryPoints = entrypoints.map((entrypoint) => {
+        if (entrypoint.isAutoMount) {
+          entrypoint.internalEntry = import_path.default.resolve(internalDirectory, `./${entrypoint.entryName}/${enableAsyncEntry ? import_constants.ENTRY_BOOTSTRAP_FILE_NAME : import_constants.ENTRY_POINT_FILE_NAME}`);
+        }
+        return entrypoint;
+      });
+      return {
+        entrypoints: newEntryPoints
+      };
+    });
+    api.generateEntryCode(async ({ entrypoints }) => {
+      const appContext = api.getAppContext();
+      const resolvedConfig = api.getNormalizedConfig();
+      const hooks = api.getHooks();
+      await (0, import_code.generateCode)(entrypoints, appContext, resolvedConfig, hooks);
+    });
+    api.onPrepare(() => {
+      const { builder, entrypoints, internalDirectory, metaName } = api.getAppContext();
+      builder === null || builder === void 0 ? void 0 : builder.addPlugins([
+        (0, import_alias.builderPluginAlias)({
+          entrypoints,
+          internalDirectory,
+          metaName
+        })
+      ]);
+    });
+    api.config(() => {
+      const { appDirectory, metaName, internalDirectory } = api.getAppContext();
+      const isReact18 = (0, import_utils.isReact18)(appDirectory);
+      process.env.IS_REACT18 = isReact18.toString();
+      const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
+      return {
+        runtime: {},
+        runtimeByEntries: {},
+        source: {
+          alias: {
+            /**
+            * twin.macro inserts styled-components into the code during the compilation process
+            * But it will not be installed under the user project.
+            * So need to add alias
+            */
+            "styled-components": require.resolve("styled-components"),
+            /**
+            * Compatible with the reference path of the old version of the plugin.
+            */
+            [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
+            "@meta/runtime/browser$": require.resolve("@modern-js/runtime/browser"),
+            "@meta/runtime/react$": require.resolve("@modern-js/runtime/react"),
+            "@meta/runtime/context$": require.resolve("@modern-js/runtime/context"),
+            "@meta/runtime$": require.resolve("@modern-js/runtime")
+          },
+          globalVars: {
+            "process.env.IS_REACT18": process.env.IS_REACT18
           }
-          return entrypoint;
-        });
-        return {
-          entrypoints: newEntryPoints
-        };
-      },
-      async generateEntryCode({ entrypoints }) {
-        const appContext = api.useAppContext();
-        const resolvedConfig = api.useResolvedConfigContext();
-        const runners = api.useHookRunners();
-        await (0, import_code.generateCode)(entrypoints, appContext, resolvedConfig, runners._internalRuntimePlugins);
-      },
-      /* Note that the execution time of the config hook is before prepare.
-      /* This means that the entry information cannot be obtained in the config hook.
-      /* Therefore, aliases cannot be set directly in the config.
-      */
-      prepare() {
-        const { builder, entrypoints, internalDirectory, metaName } = api.useAppContext();
-        builder === null || builder === void 0 ? void 0 : builder.addPlugins([
-          (0, import_alias.builderPluginAlias)({
-            entrypoints,
-            internalDirectory,
-            metaName
-          })
-        ]);
-      },
-      config() {
-        const { appDirectory, metaName, internalDirectory } = api.useAppContext();
-        const isReact18 = (0, import_utils.isReact18)(appDirectory);
-        process.env.IS_REACT18 = isReact18.toString();
-        const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
-        return {
-          runtime: {},
-          runtimeByEntries: {},
-          source: {
-            alias: {
-              /**
-              * twin.macro inserts styled-components into the code during the compilation process
-              * But it will not be installed under the user project.
-              * So need to add alias
-              */
-              "styled-components": require.resolve("styled-components"),
-              /**
-              * Compatible with the reference path of the old version of the plugin.
-              */
-              [`@${metaName}/runtime/plugins`]: pluginsExportsUtils.getPath(),
-              "@meta/runtime/browser$": require.resolve("@modern-js/runtime/browser"),
-              "@meta/runtime/react$": require.resolve("@modern-js/runtime/react"),
-              "@meta/runtime/context$": require.resolve("@modern-js/runtime/context"),
-              "@meta/runtime$": require.resolve("@modern-js/runtime")
-            },
-            globalVars: {
-              "process.env.IS_REACT18": process.env.IS_REACT18
+        },
+        tools: {
+          styledComponents: {
+            // https://github.com/styled-components/babel-plugin-styled-components/issues/287
+            topLevelImportPaths: [
+              "@modern-js/runtime/styled"
+            ]
+          },
+          bundlerChain: (chain) => {
+            chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(import_path.default.resolve(appDirectory, "node_modules", `.${metaName}`)).end().sideEffects(true);
+          },
+          /**
+          * Add IgnorePlugin to fix react-dom/client import error when use react17
+          */
+          webpackChain: (chain, { webpack }) => {
+            if (!isReact18) {
+              chain.plugin("ignore-plugin").use(webpack.IgnorePlugin, [
+                {
+                  resourceRegExp: /^react-dom\/client$/,
+                  contextRegExp: /./
+                }
+              ]);
             }
           },
-          tools: {
-            styledComponents: {
-              // https://github.com/styled-components/babel-plugin-styled-components/issues/287
-              topLevelImportPaths: [
-                "@modern-js/runtime/styled"
-              ]
-            },
-            bundlerChain: (chain) => {
-              chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(import_path.default.resolve(appDirectory, "node_modules", `.${metaName}`)).end().sideEffects(true);
-            },
-            /**
-            * Add IgnorePlugin to fix react-dom/client import error when use react17
-            */
-            webpackChain: (chain, { webpack }) => {
-              if (!isReact18) {
-                chain.plugin("ignore-plugin").use(webpack.IgnorePlugin, [
-                  {
-                    resourceRegExp: /^react-dom\/client$/,
-                    contextRegExp: /./
-                  }
-                ]);
-              }
-            },
-            rspack: (_config, { appendPlugins, rspack }) => {
-              if (!isReact18) {
-                appendPlugins([
-                  new rspack.IgnorePlugin({
-                    resourceRegExp: /^react-dom\/client$/,
-                    contextRegExp: /./
-                  })
-                ]);
-              }
+          rspack: (_config, { appendPlugins, rspack }) => {
+            if (!isReact18) {
+              appendPlugins([
+                new rspack.IgnorePlugin({
+                  resourceRegExp: /^react-dom\/client$/,
+                  contextRegExp: /./
+                })
+              ]);
             }
           }
-        };
-      },
-      async beforeRestart() {
-        (0, import_utils.cleanRequireCache)([
-          require.resolve("../state/cli"),
-          require.resolve("../router/cli"),
-          require.resolve("./ssr")
-        ]);
-      }
-    };
+        }
+      };
+    });
+    api.onBeforeRestart(() => {
+      (0, import_utils.cleanRequireCache)([
+        require.resolve("../state/cli"),
+        require.resolve("../router/cli"),
+        require.resolve("./ssr")
+      ]);
+    });
   }
 });
 var cli_default = runtimePlugin;

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

@@ -58,7 +58,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 = (0, import_utils.isUseSSRBundle)(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
       return mergeEnvironmentConfig(config, {
         source: {
@@ -86,61 +86,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(import_path.default.join(__dirname, "./babel-plugin-ssr-loader-id"));
+            if ((0, import_utils.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 ((0, import_utils.isUseSSRBundle)(userConfig) && checkUseStringSSR(userConfig)) {
+              var _config_plugins, _config_plugins1;
               (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(import_path.default.join(__dirname, "./babel-plugin-ssr-loader-id"));
-              if ((0, import_utils.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 ((0, import_utils.isUseSSRBundle)(userConfig) && checkUseStringSSR(userConfig)) {
-                var _config_plugins, _config_plugins1;
-                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(import_path.default.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/cjs/document/cli/index.js

@@ -74,13 +74,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,
@@ -144,7 +144,7 @@ const documentPlugin = () => ({
         }, import_react.default.createElement(Document, null));
         let html = import_server.default.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()
@@ -183,38 +183,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/cjs/router/cli/code/index.js

@@ -44,14 +44,14 @@ var templates = __toESM(require("./templates"));
 var import_utils3 = require("./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 = (0, import_utils.isRouterV5)(config);
   const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.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;
@@ -82,11 +82,11 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             }
           }
         }
-        const config2 = api.useResolvedConfigContext();
+        const config2 = api.getNormalizedConfig();
         const ssrByRouteIds = config2.server.ssrByRouteIds || [];
         const clonedRoutes = (0, import_lodash.cloneDeep)(initialRoutes);
         const markedRoutes = ssrByRouteIds.length > 0 ? (0, import_utils2.markRoutes)(clonedRoutes, ssrByRouteIds) : initialRoutes;
-        const { routes } = await hookRunners.modifyFileSystemRoutes({
+        const { routes } = await hooks.modifyFileSystemRoutes.call({
           entrypoint,
           routes: markedRoutes
         });
@@ -103,7 +103,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/cjs/router/cli/handler.js

@@ -40,13 +40,13 @@ var import_utils = require("./code/utils");
 var import_entry = require("./entry");
 let originEntrypoints = [];
 async function handleModifyEntrypoints(api, entrypoints) {
-  const config = api.useResolvedConfigContext();
+  const config = api.getNormalizedConfig();
   return (0, import_entry.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 Promise.resolve().then(() => __toESM(require("./code")));
   originEntrypoints = (0, import_lodash.cloneDeep)(entrypoints);
   await generateCode(appContext, resolvedConfig, entrypoints, api);
@@ -65,7 +65,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);
@@ -74,7 +74,7 @@ async function handleFileChange(api, e) {
   const absoluteFilePath = import_path.default.resolve(appDirectory, filename);
   const isRouteComponent = isPageFile(absoluteFilePath) && (0, import_utils.isPageComponentFile)(absoluteFilePath);
   if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
-    const resolvedConfig = api.useResolvedConfigContext();
+    const resolvedConfig = api.getNormalizedConfig();
     const { generateCode } = await Promise.resolve().then(() => __toESM(require("./code")));
     const entrypoints2 = (0, import_lodash.cloneDeep)(originEntrypoints);
     await generateCode(appContext, resolvedConfig, entrypoints2, api);