@modern-js/runtime 2.63.3 → 2.63.5

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

@@ -50,87 +50,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 = (0, import_utils.getEntryOptions)(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
-        if (routerConfig && !(0, import_utils.isRouterV5)(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 || (0, import_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 = (0, import_utils.getEntryOptions)(entrypoint.entryName, entrypoint.isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.router;
+      if (routerConfig && !(0, import_utils.isRouterV5)(userConfig)) {
+        plugins.push({
+          name: "router",
+          path: `@${metaName}/runtime/router`,
+          config: typeof routerConfig === "boolean" ? {
+            serverBase
+          } : {
+            ...routerConfig,
+            serverBase
           }
-        };
-      },
-      async modifyEntrypoints({ entrypoints }) {
-        const newEntryPoints = await (0, import_handler.handleModifyEntrypoints)(api, entrypoints);
-        return {
-          entrypoints: newEntryPoints
-        };
-      },
-      async generateEntryCode({ entrypoints }) {
-        await (0, import_handler.handleGeneratorEntryCode)(api, entrypoints);
-      },
-      addRuntimeExports() {
-        const userConfig = api.useResolvedConfigContext();
-        const { internalDirectory, metaName } = api.useAppContext();
-        const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
-        if (!(0, import_utils.isRouterV5)(userConfig)) {
-          pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/runtime/router'`);
+        });
+      }
+      return {
+        entrypoint,
+        plugins
+      };
+    });
+    api.checkEntryPoint(({ path: path2, entry }) => {
+      return {
+        path: path2,
+        entry: entry || (0, import_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 (0, import_handler.handleFileChange)(api, e);
-      },
-      async modifyFileSystemRoutes({ entrypoint, routes }) {
-        nestedRoutes[entrypoint.entryName] = routes;
-        nestedRoutesForServer[entrypoint.entryName] = (0, import_utils2.filterRoutesForServer)(routes);
-        return {
-          entrypoint,
-          routes
-        };
-      },
-      async beforeGenerateRoutes({ entrypoint, code }) {
-        const { distDirectory } = api.useAppContext();
-        await import_utils.fs.outputJSON(import_node_path.default.resolve(distDirectory, import_utils.NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer);
-        return {
-          entrypoint,
-          code
-        };
+      };
+    });
+    api.modifyEntrypoints(async ({ entrypoints }) => {
+      const newEntryPoints = await (0, import_handler.handleModifyEntrypoints)(api, entrypoints);
+      return {
+        entrypoints: newEntryPoints
+      };
+    });
+    api.generateEntryCode(async ({ entrypoints }) => {
+      await (0, import_handler.handleGeneratorEntryCode)(api, entrypoints);
+    });
+    api.addRuntimeExports(() => {
+      const userConfig = api.useResolvedConfigContext();
+      const { internalDirectory, metaName } = api.useAppContext();
+      const pluginsExportsUtils = (0, import_utils.createRuntimeExportsUtils)(internalDirectory, "plugins");
+      if (!(0, import_utils.isRouterV5)(userConfig)) {
+        pluginsExportsUtils.addExport(`export { default as router } from '@${metaName}/runtime/router'`);
       }
-    };
+    });
+    api.onFileChanged(async (e) => {
+      await (0, import_handler.handleFileChange)(api, e);
+    });
+    api.modifyFileSystemRoutes(({ entrypoint, routes }) => {
+      nestedRoutes[entrypoint.entryName] = routes;
+      nestedRoutesForServer[entrypoint.entryName] = (0, import_utils2.filterRoutesForServer)(routes);
+      return {
+        entrypoint,
+        routes
+      };
+    });
+    api.onBeforeGenerateRoutes(async ({ entrypoint, code }) => {
+      const { distDirectory } = api.getAppContext();
+      await import_utils.fs.outputJSON(import_node_path.default.resolve(distDirectory, import_utils.NESTED_ROUTE_SPEC_FILE), nestedRoutesForServer);
+      return {
+        entrypoint,
+        code
+      };
+    });
   }
 });
 var cli_default = routerPlugin;

package/dist/cjs/router/runtime/plugin.js

@@ -26,7 +26,6 @@ __export(plugin_exports, {
 module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_merge = require("@modern-js/runtime-utils/merge");
-var import_parsed = require("@modern-js/runtime-utils/parsed");
 var import_router = require("@modern-js/runtime-utils/router");
 var import_react = require("react");
 var import_core = require("../../core");
@@ -54,7 +53,6 @@ const routerPlugin = (userConfig = {}) => {
     },
     setup: (api) => {
       let routes = [];
-      window._SERVER_DATA = (0, import_parsed.parsedJSONFromElement)("__MODERN_SERVER_DATA__");
       return {
         beforeRender(context) {
           context.router = {
@@ -82,9 +80,8 @@ const routerPlugin = (userConfig = {}) => {
           }
           const getRouteApp = () => {
             const useCreateRouter = (props) => {
-              var _window__SERVER_DATA;
               const runtimeContext = (0, import_react.useContext)(import_core.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 === "/" ? (0, import_utils.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
               const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;

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

@@ -30,31 +30,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 = (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
-        };
-      },
-      addRuntimeExports() {
-        const { internalDirectory, metaName } = api.useAppContext();
-        const pluginsExportsUtils = (0, import_utils.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 = (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;

package/dist/esm/cli/code.js

@@ -22,7 +22,7 @@ function getSSRMode(entry, config) {
   }
 }
 var generateCode = function() {
-  var _ref = _async_to_generator(function(entrypoints, appContext, config, onCollectRuntimePlugins) {
+  var _ref = _async_to_generator(function(entrypoints, appContext, config, hooks) {
     var mountId, enableAsyncEntry, runtimeConfigFile, internalDirectory, internalSrcAlias, metaName, srcDirectory;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -41,7 +41,7 @@ var generateCode = function() {
                       entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, entry = entrypoint.entry, customEntry = entrypoint.customEntry, customBootstrap = entrypoint.customBootstrap, customServerEntry = entrypoint.customServerEntry;
                       return [
                         4,
-                        onCollectRuntimePlugins({
+                        hooks._internalRuntimePlugins.call({
                           entrypoint,
                           plugins: []
                         })
@@ -125,7 +125,7 @@ var generateCode = function() {
       }
     });
   });
-  return function generateCode2(entrypoints, appContext, config, onCollectRuntimePlugins) {
+  return function generateCode2(entrypoints, appContext, config, hooks) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/cli/index.js

@@ -30,143 +30,133 @@ var runtimePlugin = function(params) {
       documentPlugin()
     ],
     setup: function(api) {
-      return {
-        checkEntryPoint: function checkEntryPoint(param) {
-          var path2 = param.path, entry = param.entry;
-          return {
-            path: path2,
-            entry: entry || isRuntimeEntry(path2)
-          };
-        },
-        modifyEntrypoints: function modifyEntrypoints(param) {
-          var entrypoints = param.entrypoints;
-          var internalDirectory = api.useAppContext().internalDirectory;
-          var _api_useResolvedConfigContext = api.useResolvedConfigContext(), enableAsyncEntry = _api_useResolvedConfigContext.source.enableAsyncEntry;
-          var newEntryPoints = entrypoints.map(function(entrypoint) {
-            if (entrypoint.isAutoMount) {
-              entrypoint.internalEntry = path.resolve(internalDirectory, "./".concat(entrypoint.entryName, "/").concat(enableAsyncEntry ? ENTRY_BOOTSTRAP_FILE_NAME : ENTRY_POINT_FILE_NAME));
+      api.checkEntryPoint(function(param) {
+        var path2 = param.path, entry = param.entry;
+        return {
+          path: path2,
+          entry: entry || isRuntimeEntry(path2)
+        };
+      });
+      api.modifyEntrypoints(function(param) {
+        var entrypoints = param.entrypoints;
+        var internalDirectory = api.getAppContext().internalDirectory;
+        var _api_getNormalizedConfig = api.getNormalizedConfig(), enableAsyncEntry = _api_getNormalizedConfig.source.enableAsyncEntry;
+        var newEntryPoints = entrypoints.map(function(entrypoint) {
+          if (entrypoint.isAutoMount) {
+            entrypoint.internalEntry = path.resolve(internalDirectory, "./".concat(entrypoint.entryName, "/").concat(enableAsyncEntry ? ENTRY_BOOTSTRAP_FILE_NAME : ENTRY_POINT_FILE_NAME));
+          }
+          return entrypoint;
+        });
+        return {
+          entrypoints: newEntryPoints
+        };
+      });
+      api.generateEntryCode(function() {
+        var _ref = _async_to_generator(function(param) {
+          var entrypoints, appContext, resolvedConfig, hooks;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                entrypoints = param.entrypoints;
+                appContext = api.getAppContext();
+                resolvedConfig = api.getNormalizedConfig();
+                hooks = api.getHooks();
+                return [
+                  4,
+                  generateCode(entrypoints, appContext, resolvedConfig, hooks)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
             }
-            return entrypoint;
           });
-          return {
-            entrypoints: newEntryPoints
-          };
-        },
-        generateEntryCode: function generateEntryCode(param) {
-          var entrypoints = param.entrypoints;
-          return _async_to_generator(function() {
-            var appContext, resolvedConfig, runners;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  appContext = api.useAppContext();
-                  resolvedConfig = api.useResolvedConfigContext();
-                  runners = api.useHookRunners();
-                  return [
-                    4,
-                    generateCode(entrypoints, appContext, resolvedConfig, runners._internalRuntimePlugins)
-                  ];
-                case 1:
-                  _state.sent();
-                  return [
-                    2
-                  ];
-              }
-            });
-          })();
-        },
-        /* 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: function prepare() {
-          var _api_useAppContext = api.useAppContext(), builder = _api_useAppContext.builder, entrypoints = _api_useAppContext.entrypoints, internalDirectory = _api_useAppContext.internalDirectory, metaName = _api_useAppContext.metaName;
-          builder === null || builder === void 0 ? void 0 : builder.addPlugins([
-            builderPluginAlias({
-              entrypoints,
-              internalDirectory,
-              metaName
-            })
-          ]);
-        },
-        config: function config() {
-          var _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, metaName = _api_useAppContext.metaName, internalDirectory = _api_useAppContext.internalDirectory;
-          var isReact18 = checkIsReact18(appDirectory);
-          process.env.IS_REACT18 = isReact18.toString();
-          var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
-          var _obj;
-          return {
-            runtime: {},
-            runtimeByEntries: {},
-            source: {
-              alias: (_obj = {
-                /**
-                * 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.
+        });
+        return function(_) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.onPrepare(function() {
+        var _api_getAppContext = api.getAppContext(), builder = _api_getAppContext.builder, entrypoints = _api_getAppContext.entrypoints, internalDirectory = _api_getAppContext.internalDirectory, metaName = _api_getAppContext.metaName;
+        builder === null || builder === void 0 ? void 0 : builder.addPlugins([
+          builderPluginAlias({
+            entrypoints,
+            internalDirectory,
+            metaName
+          })
+        ]);
+      });
+      api.config(function() {
+        var _api_getAppContext = api.getAppContext(), appDirectory = _api_getAppContext.appDirectory, metaName = _api_getAppContext.metaName, internalDirectory = _api_getAppContext.internalDirectory;
+        var isReact18 = checkIsReact18(appDirectory);
+        process.env.IS_REACT18 = isReact18.toString();
+        var pluginsExportsUtils = createRuntimeExportsUtils(internalDirectory, "plugins");
+        var _obj;
+        return {
+          runtime: {},
+          runtimeByEntries: {},
+          source: {
+            alias: (_obj = {
+              /**
+              * 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
               */
-              _define_property(_obj, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath()), _define_property(_obj, "@meta/runtime/browser$", require.resolve("@modern-js/runtime/browser")), _define_property(_obj, "@meta/runtime/react$", require.resolve("@modern-js/runtime/react")), _define_property(_obj, "@meta/runtime/context$", require.resolve("@modern-js/runtime/context")), _define_property(_obj, "@meta/runtime$", require.resolve("@modern-js/runtime")), _obj),
-              globalVars: {
-                "process.env.IS_REACT18": process.env.IS_REACT18
+              "styled-components": require.resolve("styled-components")
+            }, /**
+            * Compatible with the reference path of the old version of the plugin.
+            */
+            _define_property(_obj, "@".concat(metaName, "/runtime/plugins"), pluginsExportsUtils.getPath()), _define_property(_obj, "@meta/runtime/browser$", require.resolve("@modern-js/runtime/browser")), _define_property(_obj, "@meta/runtime/react$", require.resolve("@modern-js/runtime/react")), _define_property(_obj, "@meta/runtime/context$", require.resolve("@modern-js/runtime/context")), _define_property(_obj, "@meta/runtime$", require.resolve("@modern-js/runtime")), _obj),
+            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: function(chain) {
+              chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(path.resolve(appDirectory, "node_modules", ".".concat(metaName))).end().sideEffects(true);
+            },
+            /**
+            * Add IgnorePlugin to fix react-dom/client import error when use react17
+            */
+            webpackChain: function(chain, param) {
+              var webpack = param.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: function(chain) {
-                chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(path.resolve(appDirectory, "node_modules", ".".concat(metaName))).end().sideEffects(true);
-              },
-              /**
-              * Add IgnorePlugin to fix react-dom/client import error when use react17
-              */
-              webpackChain: function(chain, param) {
-                var webpack = param.webpack;
-                if (!isReact18) {
-                  chain.plugin("ignore-plugin").use(webpack.IgnorePlugin, [
-                    {
-                      resourceRegExp: /^react-dom\/client$/,
-                      contextRegExp: /./
-                    }
-                  ]);
-                }
-              },
-              rspack: function(_config, param) {
-                var appendPlugins = param.appendPlugins, rspack = param.rspack;
-                if (!isReact18) {
-                  appendPlugins([
-                    new rspack.IgnorePlugin({
-                      resourceRegExp: /^react-dom\/client$/,
-                      contextRegExp: /./
-                    })
-                  ]);
-                }
+            rspack: function(_config, param) {
+              var appendPlugins = param.appendPlugins, rspack = param.rspack;
+              if (!isReact18) {
+                appendPlugins([
+                  new rspack.IgnorePlugin({
+                    resourceRegExp: /^react-dom\/client$/,
+                    contextRegExp: /./
+                  })
+                ]);
               }
             }
-          };
-        },
-        beforeRestart: function beforeRestart() {
-          return _async_to_generator(function() {
-            return _ts_generator(this, function(_state) {
-              cleanRequireCache([
-                require.resolve("../state/cli"),
-                require.resolve("../router/cli"),
-                require.resolve("./ssr")
-              ]);
-              return [
-                2
-              ];
-            });
-          })();
-        }
-      };
+          }
+        };
+      });
+      api.onBeforeRestart(function() {
+        cleanRequireCache([
+          require.resolve("../state/cli"),
+          require.resolve("../router/cli"),
+          require.resolve("./ssr")
+        ]);
+      });
     }
   };
 };