@modern-js/runtime 2.63.2 → 2.63.4

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

@@ -48,7 +48,7 @@ var ssrBuilderPlugin = function(modernAPI) {
       api.modifyEnvironmentConfig(function(config, param) {
         var name = param.name, mergeEnvironmentConfig = param.mergeEnvironmentConfig;
         var isServerEnvironment = config.output.target === "node" || name === "workerSSR";
-        var userConfig = modernAPI.useResolvedConfigContext();
+        var userConfig = modernAPI.getNormalizedConfig();
         var useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
         return mergeEnvironmentConfig(config, {
           source: {
@@ -78,61 +78,58 @@ var ssrPlugin = function() {
       "@modern-js/runtime"
     ],
     setup: function(api) {
-      var appContext = api.useAppContext();
-      return {
-        // for bundle
-        config: function config() {
-          var _api_useAppContext = api.useAppContext(), _api_useAppContext_bundlerType = _api_useAppContext.bundlerType, bundlerType = _api_useAppContext_bundlerType === void 0 ? "webpack" : _api_useAppContext_bundlerType;
-          var babelHandler = function() {
-            if (bundlerType === "webpack") {
-              return function(config2) {
-                var _config_plugins;
-                var userConfig = api.useResolvedConfigContext();
-                (_config_plugins = config2.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 = config2.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
-                }
-              };
-            } else if (bundlerType === "rspack") {
-              return function(config2) {
-                var userConfig = api.useResolvedConfigContext();
-                if (isUseSSRBundle(userConfig) && checkUseStringSSR(userConfig)) {
-                  var _config_plugins, _config_plugins1;
-                  (_config_plugins = config2.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-                  (_config_plugins1 = config2.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")
+      var appContext = api.getAppContext();
+      api.config(function() {
+        var _api_getAppContext = api.getAppContext(), _api_getAppContext_bundlerType = _api_getAppContext.bundlerType, bundlerType = _api_getAppContext_bundlerType === void 0 ? "webpack" : _api_getAppContext_bundlerType;
+        var babelHandler = function() {
+          if (bundlerType === "webpack") {
+            return function(config) {
+              var _config_plugins;
+              var 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"));
               }
-            },
-            tools: {
-              babel: babelHandler,
-              bundlerChain: function(chain, param) {
-                var isServer = param.isServer;
-                if (isServer && appContext.moduleType === "module") {
-                  chain.output.libraryTarget("module").set("chunkFormat", "module");
-                  chain.output.library({
-                    type: "module"
-                  });
-                  chain.experiments(_object_spread_props(_object_spread({}, chain.get("experiments")), {
-                    outputModule: true
-                  }));
-                }
+            };
+          } else if (bundlerType === "rspack") {
+            return function(config) {
+              var 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")
             }
-          };
-        }
-      };
+          },
+          tools: {
+            babel: babelHandler,
+            bundlerChain: function(chain, param) {
+              var isServer = param.isServer;
+              if (isServer && appContext.moduleType === "module") {
+                chain.output.libraryTarget("module").set("chunkFormat", "module");
+                chain.output.library({
+                  type: "module"
+                });
+                chain.experiments(_object_spread_props(_object_spread({}, chain.get("experiments")), {
+                  outputModule: true
+                }));
+              }
+            }
+          }
+        };
+      });
     }
   };
 };

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

@@ -3,6 +3,7 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, checkIsNode } from "../utils";
@@ -83,7 +84,7 @@ var LoadableCollector = /* @__PURE__ */ function() {
   _proto.effect = function effect() {
     var _this = this;
     return _async_to_generator(function() {
-      var extractor, chunks, scriptChunks, styleChunks;
+      var extractor, options, entryName, config, asyncChunks, _asyncChunks, chunks, scriptChunks, styleChunks;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -92,8 +93,19 @@ var LoadableCollector = /* @__PURE__ */ function() {
                 2
               ];
             }
-            extractor = _this.extractor;
-            chunks = extractor.getChunkAssets(extractor.chunks);
+            extractor = _this.extractor, options = _this.options;
+            entryName = options.entryName, config = options.config;
+            asyncChunks = [];
+            if (config.enableAsyncEntry) {
+              try {
+                ;
+                (_asyncChunks = asyncChunks).push.apply(_asyncChunks, _to_consumable_array(extractor.getChunkAssets([
+                  "async-".concat(entryName)
+                ])));
+              } catch (e) {
+              }
+            }
+            chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks));
             scriptChunks = generateChunks(chunks, "js");
             styleChunks = generateChunks(chunks, "css");
             _this.emitLoadableScripts(extractor);
@@ -220,11 +232,11 @@ var LoadableCollector = /* @__PURE__ */ function() {
   _proto.emitStyleAssets = function emitStyleAssets(chunks) {
     var _this = this;
     return _async_to_generator(function() {
-      var _this_options, template, chunkSet, config, enableInlineStyles, atrributes, linkRegExp, matchs, existedLinks, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, match, css;
+      var _this_options, template, chunkSet, config, entryName, enableInlineStyles, atrributes, linkRegExp, matchs, existedLinks, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, match, css;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
-            _this_options = _this.options, template = _this_options.template, chunkSet = _this_options.chunkSet, config = _this_options.config;
+            _this_options = _this.options, template = _this_options.template, chunkSet = _this_options.chunkSet, config = _this_options.config, entryName = _this_options.entryName;
             enableInlineStyles = config.enableInlineStyles;
             atrributes = attributesToString(_this.generateAttributes());
             linkRegExp = /<link .*?href="([^"]+)".*?>/g;

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

@@ -50,7 +50,7 @@ var documentPlugin = function() {
         }
         return _ts_generator(this, function(_state) {
           documentEntry = function(entryName, templateParameters) {
-            var _api_useAppContext = api.useAppContext(), entrypoints = _api_useAppContext.entrypoints, internalDirectory = _api_useAppContext.internalDirectory, appDirectory = _api_useAppContext.appDirectory;
+            var _api_getAppContext = api.getAppContext(), entrypoints = _api_getAppContext.entrypoints, internalDirectory = _api_getAppContext.internalDirectory, appDirectory = _api_getAppContext.appDirectory;
             var documentFilePath = getDocumenByEntryName(entrypoints, entryName, appDirectory);
             if (!documentFilePath) {
               return null;
@@ -62,7 +62,7 @@ var documentPlugin = function() {
                   switch (_state2.label) {
                     case 0:
                       htmlWebpackPlugin = param.htmlWebpackPlugin;
-                      config = api.useResolvedConfigContext();
+                      config = api.getNormalizedConfig();
                       documentParams = getDocParams({
                         config,
                         entryName,
@@ -156,7 +156,7 @@ var documentPlugin = function() {
                       }, React.createElement(Document, null));
                       html = ReactDomServer.renderToStaticMarkup(HTMLElement);
                       debug("entry %s's document jsx rendered html: %o", entryName, html);
-                      partialsByEntrypoint = api.useAppContext().partialsByEntrypoint;
+                      partialsByEntrypoint = api.getAppContext().partialsByEntrypoint;
                       scripts = [
                         htmlWebpackPlugin.tags.headTags.filter(function(item) {
                           return item.tagName === "script";
@@ -218,35 +218,33 @@ var documentPlugin = function() {
               };
             }();
           };
-          return [
-            2,
-            {
-              config: function() {
-                var _userConfig_tools;
-                var userConfig = api.useConfigContext();
-                if (((_userConfig_tools = userConfig.tools) === null || _userConfig_tools === void 0 ? void 0 : _userConfig_tools.htmlPlugin) === false) {
-                  return {};
+          api.config(function() {
+            var _userConfig_tools;
+            var userConfig = api.getConfig();
+            if (((_userConfig_tools = userConfig.tools) === null || _userConfig_tools === void 0 ? void 0 : _userConfig_tools.htmlPlugin) === false) {
+              return {};
+            }
+            return {
+              tools: {
+                htmlPlugin: function(options, entry) {
+                  var hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _object_spread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
+                  var templateContent = documentEntry(
+                    entry.entryName,
+                    // options,
+                    hackParameters
+                  );
+                  var documentHtmlOptions = templateContent ? {
+                    templateContent,
+                    // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
+                    inject: false
+                  } : {};
+                  return _object_spread({}, options, documentHtmlOptions);
                 }
-                return {
-                  tools: {
-                    htmlPlugin: function(options, entry) {
-                      var hackParameters = typeof (options === null || options === void 0 ? void 0 : options.templateParameters) === "function" ? options === null || options === void 0 ? void 0 : options.templateParameters({}, {}, {}, {}) : _object_spread({}, options === null || options === void 0 ? void 0 : options.templateParameters);
-                      var templateContent = documentEntry(
-                        entry.entryName,
-                        // options,
-                        hackParameters
-                      );
-                      var documentHtmlOptions = templateContent ? {
-                        templateContent,
-                        // Note: the behavior of inject/modify tags in afterTemplateExecution hook will not take effect
-                        inject: false
-                      } : {};
-                      return _object_spread({}, options, documentHtmlOptions);
-                    }
-                  }
-                };
               }
-            }
+            };
+          });
+          return [
+            2
           ];
         });
       });

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

@@ -13,18 +13,18 @@ import * as templates from "./templates";
 import { getServerCombinedModueFile, getServerLoadersFile } from "./utils";
 var generateCode = function() {
   var _ref = _async_to_generator(function(appContext, config, entrypoints, api) {
-    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hookRunners, isV5, getRoutes, oldVersion;
+    var internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName, hooks, isV5, getRoutes, oldVersion;
     function generateEntryCode(entrypoint) {
       return _generateEntryCode.apply(this, arguments);
     }
     function _generateEntryCode() {
       _generateEntryCode = _async_to_generator(function(entrypoint) {
-        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, _$config, ssrByRouteIds, clonedRoutes, markedRoutes, routes, ssr, useSSG, mode, hasPageRoute, code, _, _tmp, _config_output1, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, serverLoaderCombined, serverLoaderFile;
+        var entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry, metaName, _config_output, initialRoutes, nestedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, _$config, ssrByRouteIds, clonedRoutes, markedRoutes, routes, ssr, useSSG, mode, hasPageRoute, code, _, _1, _tmp, _config_output1, routesServerFile, filtedRoutesForServer, routesForServerLoaderMatches, code1, serverRoutesCode, serverLoaderCombined, serverLoaderFile;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
               entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, isAutoMount = entrypoint.isAutoMount, pageRoutesEntry = entrypoint.pageRoutesEntry, nestedRoutesEntry = entrypoint.nestedRoutesEntry;
-              metaName = api.useAppContext().metaName;
+              metaName = api.getAppContext().metaName;
               if (!isAutoMount)
                 return [
                   3,
@@ -89,13 +89,13 @@ var generateCode = function() {
               }
               _state.label = 2;
             case 2:
-              _$config = api.useResolvedConfigContext();
+              _$config = api.getNormalizedConfig();
               ssrByRouteIds = _$config.server.ssrByRouteIds || [];
               clonedRoutes = cloneDeep(initialRoutes);
               markedRoutes = ssrByRouteIds.length > 0 ? markRoutes(clonedRoutes, ssrByRouteIds) : initialRoutes;
               return [
                 4,
-                hookRunners.modifyFileSystemRoutes({
+                hooks.modifyFileSystemRoutes.call({
                   entrypoint,
                   routes: markedRoutes
                 })
@@ -116,7 +116,7 @@ var generateCode = function() {
                   process.exit(1);
                 }
               }
-              _ = hookRunners.beforeGenerateRoutes;
+              _1 = (_ = hooks.onBeforeGenerateRoutes).call;
               _tmp = {
                 entrypoint
               };
@@ -135,7 +135,7 @@ var generateCode = function() {
             case 4:
               return [
                 4,
-                _.apply(hookRunners, [
+                _1.apply(_, [
                   (_tmp.code = _state.sent(), _tmp)
                 ])
               ];
@@ -221,7 +221,7 @@ var generateCode = function() {
       switch (_state.label) {
         case 0:
           internalDirectory = appContext.internalDirectory, srcDirectory = appContext.srcDirectory, internalDirAlias = appContext.internalDirAlias, internalSrcAlias = appContext.internalSrcAlias, packageName = appContext.packageName;
-          hookRunners = api.useHookRunners();
+          hooks = api.getHooks();
           isV5 = isRouterV5(config);
           getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
           oldVersion = _type_of(config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;

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

@@ -13,7 +13,7 @@ function _handleModifyEntrypoints() {
   _handleModifyEntrypoints = _async_to_generator(function(api, entrypoints) {
     var config;
     return _ts_generator(this, function(_state) {
-      config = api.useResolvedConfigContext();
+      config = api.getNormalizedConfig();
       return [
         2,
         modifyEntrypoints(entrypoints, config)
@@ -31,9 +31,9 @@ function _handleGeneratorEntryCode() {
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          appContext = api.useAppContext();
-          internalDirectory = api.useAppContext().internalDirectory;
-          resolvedConfig = api.useResolvedConfigContext();
+          appContext = api.getAppContext();
+          internalDirectory = appContext.internalDirectory;
+          resolvedConfig = api.getNormalizedConfig();
           return [
             4,
             import("./code")
@@ -111,7 +111,7 @@ function _handleFileChange() {
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          appContext = api.useAppContext();
+          appContext = api.getAppContext();
           appDirectory = appContext.appDirectory, entrypoints = appContext.entrypoints;
           filename = e.filename, eventType = e.eventType;
           nestedRouteEntries = entrypoints.map(function(point) {
@@ -134,7 +134,7 @@ function _handleFileChange() {
               3,
               3
             ];
-          resolvedConfig = api.useResolvedConfigContext();
+          resolvedConfig = api.getNormalizedConfig();
           return [
             4,
             import("./code")