@modern-js/app-tools 2.67.11 → 2.68.1

package/dist/cjs/builder/generator/createBuilderProviderConfig.js

@@ -48,6 +48,9 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
   const config = {
     ...resolveConfig,
     plugins: [],
+    resolve: {
+      ...resolveConfig.resolve
+    },
     dev: {
       ...resolveConfig.dev,
       port: appContext.port

package/dist/cjs/builder/generator/index.js

@@ -45,6 +45,7 @@ async function generateBuilder(options, bundlerType) {
     cwd: appContext.appDirectory,
     rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,
     rscServerRuntimePath: `@${appContext.metaName}/runtime/rsc/server`,
+    internalDirectory: appContext.internalDirectory,
     frameworkConfigPath: appContext.configFile || void 0,
     bundlerType,
     config: builderConfig

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -49,7 +49,7 @@ const builderPluginAdapterSSR = (options) => ({
         server: {
           // the http-compression can't handler stream http.
           // so we disable compress when user use stream ssr temporarily.
-          compress: isStreamingSSR(normalizedConfig) ? false : void 0
+          compress: isStreamingSSR(normalizedConfig) || (0, import_utils.isUseRsc)(normalizedConfig) ? false : void 0
         }
       });
     });
@@ -65,7 +65,7 @@ const builderPluginAdapterSSR = (options) => ({
           appNormalizedConfig: normalizedConfig2
         });
       }
-      if ((0, import_utils.isUseSSRBundle)(normalizedConfig2)) {
+      if ((0, import_utils.isUseSSRBundle)(normalizedConfig2) || (0, import_utils.isUseRsc)(normalizedConfig2)) {
         await applySSRLoaderEntry(chain, options, isServer);
         applySSRDataLoader(chain, options);
       }
@@ -95,7 +95,7 @@ const isStreamingSSR = (userConfig) => {
   return false;
 };
 function applyAsyncChunkHtmlPlugin({ chain, modernConfig, HtmlBundlerPlugin }) {
-  if (isStreamingSSR(modernConfig)) {
+  if (isStreamingSSR(modernConfig) || (0, import_utils.isUseRsc)(modernConfig)) {
     chain.plugin("html-async-chunk").use(import_bundlerPlugins.HtmlAsyncChunkPlugin, [
       HtmlBundlerPlugin
     ]);

package/dist/cjs/commands/build.js

@@ -37,7 +37,7 @@ var import_loadPlugins = require("../utils/loadPlugins");
 var import_register = require("../utils/register");
 var import_routes = require("../utils/routes");
 const build = async (api, options) => {
-  var _resolvedConfig_source;
+  var _resolvedConfig_resolve, _resolvedConfig_source;
   if (options === null || options === void 0 ? void 0 : options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -46,15 +46,21 @@ const build = async (api, options) => {
   const hooks = api.getHooks();
   await (0, import_loadPlugins.loadServerPlugins)(api, appContext.appDirectory, appContext.metaName);
   if (appContext.moduleType && appContext.moduleType === "module") {
-    var _resolvedConfig_source1;
+    var _resolvedConfig_resolve1, _resolvedConfig_source1;
     const { registerEsm } = await import("../esm/register-esm.mjs");
     await registerEsm({
       appDir: appContext.appDirectory,
       distDir: appContext.distDirectory,
-      alias: (_resolvedConfig_source1 = resolvedConfig.source) === null || _resolvedConfig_source1 === void 0 ? void 0 : _resolvedConfig_source1.alias
+      alias: {
+        ...(_resolvedConfig_resolve1 = resolvedConfig.resolve) === null || _resolvedConfig_resolve1 === void 0 ? void 0 : _resolvedConfig_resolve1.alias,
+        ...(_resolvedConfig_source1 = resolvedConfig.source) === null || _resolvedConfig_source1 === void 0 ? void 0 : _resolvedConfig_source1.alias
+      }
     });
   }
-  await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
+  await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, {
+    ...resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_resolve = resolvedConfig.resolve) === null || _resolvedConfig_resolve === void 0 ? void 0 : _resolvedConfig_resolve.alias,
+    ...resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias
+  });
   const { apiOnly } = appContext;
   if (apiOnly) {
     const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;

package/dist/cjs/commands/dev.js

@@ -42,7 +42,7 @@ var import_printInstructions = require("../utils/printInstructions");
 var import_register = require("../utils/register");
 var import_routes = require("../utils/routes");
 const dev = async (api, options, devServerOptions) => {
-  var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev;
+  var _normalizedConfig_source, _normalizedConfig_resolve, _normalizedConfig_tools, _normalizedConfig_dev;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -50,15 +50,21 @@ const dev = async (api, options, devServerOptions) => {
   const appContext = api.getAppContext();
   const hooks = api.getHooks();
   if (appContext.moduleType && appContext.moduleType === "module") {
-    var _normalizedConfig_source1;
+    var _normalizedConfig_resolve1, _normalizedConfig_source1;
     const { registerEsm } = await import("../esm/register-esm.mjs");
     await registerEsm({
       appDir: appContext.appDirectory,
       distDir: appContext.distDirectory,
-      alias: (_normalizedConfig_source1 = normalizedConfig.source) === null || _normalizedConfig_source1 === void 0 ? void 0 : _normalizedConfig_source1.alias
+      alias: {
+        ...(_normalizedConfig_resolve1 = normalizedConfig.resolve) === null || _normalizedConfig_resolve1 === void 0 ? void 0 : _normalizedConfig_resolve1.alias,
+        ...(_normalizedConfig_source1 = normalizedConfig.source) === null || _normalizedConfig_source1 === void 0 ? void 0 : _normalizedConfig_source1.alias
+      }
     });
   }
-  await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias);
+  await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, {
+    ...normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias,
+    ...normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_resolve = normalizedConfig.resolve) === null || _normalizedConfig_resolve === void 0 ? void 0 : _normalizedConfig_resolve.alias
+  });
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await (0, import_config.buildServerConfig)({
     appDirectory,

package/dist/cjs/commands/inspect.js

@@ -26,11 +26,15 @@ const inspect = async (api, options) => {
   if (!appContext.builder) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
+  const metaName = appContext.metaName === "modern-js" ? "modern.js" : appContext.metaName;
   return appContext.builder.inspectConfig({
     mode: options.env,
     verbose: options.verbose,
     outputPath: options.output,
-    writeToDisk: true
+    writeToDisk: true,
+    extraConfigs: {
+      [metaName]: api.getNormalizedConfig()
+    }
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/config/default.js

@@ -58,6 +58,9 @@ function createDefaultConfig(appContext) {
     entriesDir: "./src",
     configDir: "./config",
     globalVars: (0, import_env.getAutoInjectEnv)(appContext),
+    alias: {}
+  };
+  const resolve = {
     alias: {
       [appContext.internalDirAlias]: appContext.internalDirectory,
       [appContext.internalSrcAlias]: appContext.srcDirectory,
@@ -94,6 +97,7 @@ function createDefaultConfig(appContext) {
   };
   return {
     source,
+    resolve,
     output,
     server,
     dev,

package/dist/cjs/config/legacy/index.js

@@ -33,6 +33,7 @@ function transformNormalizedConfig(config) {
   const tools = (0, import_createToolsConfig.createToolsConfig)(config);
   const { bff, dev, deploy, runtime, runtimeByEntries, server, cliOptions, plugins, testing, autoLoadPlugins } = config;
   return {
+    resolve: {},
     source,
     html,
     output,

package/dist/cjs/run/index.js

@@ -49,7 +49,7 @@ async function run({ cwd, initialLog, metaName = "modern-js", version, internalP
   ${import_utils.chalk.bgRed.white.bold(" ⚠️ CRITICAL NODE.JS VERSION ALERT ⚠️ ")}
 
   ${import_utils.chalk.red.bold("Node.js 16 End-of-Life Notice:")}
-  ${import_utils.chalk.red.bold.underline("June 30, 2025")} ${import_utils.chalk.red("- Security updates and support will cease")}
+  ${import_utils.chalk.red("- Security updates and support have ended for Node.js 16")}
 
   ${import_utils.chalk.yellow("▸ Detected Runtime:")}  ${import_utils.chalk.yellow.bold(`Node.js v${nodeVersion}`)}
   ${import_utils.chalk.green("▸ Required Minimum:")} ${import_utils.chalk.green.bold("Node.js LTS (v18.x or higher)")}
@@ -63,7 +63,7 @@ async function run({ cwd, initialLog, metaName = "modern-js", version, internalP
      ${import_utils.chalk.gray("└──")} ${import_utils.chalk.yellow("Environment Verification")}
        ${import_utils.chalk.bold("node -v && npm -v")}
 
-  ${import_utils.chalk.hex("#AAAAAA").italic("[Security Advisory] Production environments must update before 2025-06-30")}
+  ${import_utils.chalk.hex("#AAAAAA").italic("[Security Advisory] Node.js 16 is no longer supported. Upgrade immediately for security and compatibility.")}
       `);
   }
   const command = process.argv[2];

package/dist/cjs/types/config/resolve.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var resolve_exports = {};
+module.exports = __toCommonJS(resolve_exports);

package/dist/esm/builder/generator/createBuilderProviderConfig.js

@@ -20,6 +20,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
   }
   var config = _object_spread_props(_object_spread({}, resolveConfig), {
     plugins: [],
+    resolve: _object_spread({}, resolveConfig.resolve),
     dev: _object_spread_props(_object_spread({}, resolveConfig.dev), {
       port: appContext.port
     }),

package/dist/esm/builder/generator/index.js

@@ -24,6 +24,7 @@ function _generateBuilder() {
               cwd: appContext.appDirectory,
               rscClientRuntimePath: "@".concat(appContext.metaName, "/runtime/rsc/client"),
               rscServerRuntimePath: "@".concat(appContext.metaName, "/runtime/rsc/server"),
+              internalDirectory: appContext.internalDirectory,
               frameworkConfigPath: appContext.configFile || void 0,
               bundlerType,
               config: builderConfig

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -3,7 +3,7 @@ import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import { SERVICE_WORKER_ENVIRONMENT_NAME, isHtmlDisabled } from "@modern-js/uni-builder";
-import { fs, isUseSSRBundle } from "@modern-js/utils";
+import { fs, isUseRsc, isUseSSRBundle } from "@modern-js/utils";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { getServerCombinedModueFile } from "../../../plugins/analyze/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
@@ -20,7 +20,7 @@ var builderPluginAdapterSSR = function(options) {
           server: {
             // the http-compression can't handler stream http.
             // so we disable compress when user use stream ssr temporarily.
-            compress: isStreamingSSR(normalizedConfig) ? false : void 0
+            compress: isStreamingSSR(normalizedConfig) || isUseRsc(normalizedConfig) ? false : void 0
           }
         });
       });
@@ -42,7 +42,7 @@ var builderPluginAdapterSSR = function(options) {
                     appNormalizedConfig: normalizedConfig2
                   });
                 }
-                if (!isUseSSRBundle(normalizedConfig2))
+                if (!(isUseSSRBundle(normalizedConfig2) || isUseRsc(normalizedConfig2)))
                   return [
                     3,
                     2
@@ -112,7 +112,7 @@ var isStreamingSSR = function(userConfig) {
 };
 function applyAsyncChunkHtmlPlugin(param) {
   var chain = param.chain, modernConfig = param.modernConfig, HtmlBundlerPlugin = param.HtmlBundlerPlugin;
-  if (isStreamingSSR(modernConfig)) {
+  if (isStreamingSSR(modernConfig) || isUseRsc(modernConfig)) {
     chain.plugin("html-async-chunk").use(HtmlAsyncChunkPlugin, [
       HtmlBundlerPlugin
     ]);

package/dist/esm/commands/build.js

@@ -1,4 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { logger } from "@modern-js/utils";
 import { buildServerConfig } from "../utils/config";
@@ -7,7 +8,7 @@ import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 var build = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var _resolvedConfig_source, resolvedConfig, appContext, hooks, _resolvedConfig_source1, registerEsm, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
+    var _resolvedConfig_resolve, _resolvedConfig_source, resolvedConfig, appContext, hooks, _resolvedConfig_resolve1, _resolvedConfig_source1, registerEsm, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -39,7 +40,7 @@ var build = function() {
             registerEsm({
               appDir: appContext.appDirectory,
               distDir: appContext.distDirectory,
-              alias: (_resolvedConfig_source1 = resolvedConfig.source) === null || _resolvedConfig_source1 === void 0 ? void 0 : _resolvedConfig_source1.alias
+              alias: _object_spread({}, (_resolvedConfig_resolve1 = resolvedConfig.resolve) === null || _resolvedConfig_resolve1 === void 0 ? void 0 : _resolvedConfig_resolve1.alias, (_resolvedConfig_source1 = resolvedConfig.source) === null || _resolvedConfig_source1 === void 0 ? void 0 : _resolvedConfig_source1.alias)
             })
           ];
         case 3:
@@ -48,7 +49,7 @@ var build = function() {
         case 4:
           return [
             4,
-            registerCompiler(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias)
+            registerCompiler(appContext.appDirectory, appContext.distDirectory, _object_spread({}, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_resolve = resolvedConfig.resolve) === null || _resolvedConfig_resolve === void 0 ? void 0 : _resolvedConfig_resolve.alias, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias))
           ];
         case 5:
           _state.sent();

package/dist/esm/commands/dev.js

@@ -14,7 +14,7 @@ import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 var dev = function() {
   var _ref = _async_to_generator(function(api, options, devServerOptions) {
-    var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hooks, _normalizedConfig_source1, registerEsm, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, toolsDevServerConfig, _normalizedConfig_dev_host, _normalizedConfig_dev_https, _normalizedConfig_dev_hmr, _normalizedConfig_dev_setupMiddlewares, serverOptions, host, server, _ref2, server1, afterListen;
+    var _normalizedConfig_source, _normalizedConfig_resolve, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hooks, _normalizedConfig_resolve1, _normalizedConfig_source1, registerEsm, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, toolsDevServerConfig, _normalizedConfig_dev_host, _normalizedConfig_dev_https, _normalizedConfig_dev_hmr, _normalizedConfig_dev_setupMiddlewares, serverOptions, host, server, _ref2, server1, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -40,7 +40,7 @@ var dev = function() {
             registerEsm({
               appDir: appContext.appDirectory,
               distDir: appContext.distDirectory,
-              alias: (_normalizedConfig_source1 = normalizedConfig.source) === null || _normalizedConfig_source1 === void 0 ? void 0 : _normalizedConfig_source1.alias
+              alias: _object_spread({}, (_normalizedConfig_resolve1 = normalizedConfig.resolve) === null || _normalizedConfig_resolve1 === void 0 ? void 0 : _normalizedConfig_resolve1.alias, (_normalizedConfig_source1 = normalizedConfig.source) === null || _normalizedConfig_source1 === void 0 ? void 0 : _normalizedConfig_source1.alias)
             })
           ];
         case 2:
@@ -49,7 +49,7 @@ var dev = function() {
         case 3:
           return [
             4,
-            registerCompiler(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias)
+            registerCompiler(appContext.appDirectory, appContext.distDirectory, _object_spread({}, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_resolve = normalizedConfig.resolve) === null || _normalizedConfig_resolve === void 0 ? void 0 : _normalizedConfig_resolve.alias))
           ];
         case 4:
           _state.sent();

package/dist/esm/commands/inspect.js

@@ -1,20 +1,23 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 var inspect = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var appContext;
+    var appContext, metaName;
     return _ts_generator(this, function(_state) {
       appContext = api.getAppContext();
       if (!appContext.builder) {
         throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
       }
+      metaName = appContext.metaName === "modern-js" ? "modern.js" : appContext.metaName;
       return [
         2,
         appContext.builder.inspectConfig({
           mode: options.env,
           verbose: options.verbose,
           outputPath: options.output,
-          writeToDisk: true
+          writeToDisk: true,
+          extraConfigs: _define_property({}, metaName, api.getNormalizedConfig())
         })
       ];
     });

package/dist/esm/config/default.js

@@ -32,7 +32,6 @@ function createDefaultConfig(appContext) {
     enableInlineRouteManifests: true,
     disableInlineRouteManifests: false
   };
-  var _obj;
   var source = {
     entries: void 0,
     mainEntryName: MAIN_ENTRY_NAME,
@@ -42,6 +41,10 @@ function createDefaultConfig(appContext) {
     entriesDir: "./src",
     configDir: "./config",
     globalVars: getAutoInjectEnv(appContext),
+    alias: {}
+  };
+  var _obj;
+  var resolve = {
     alias: (_obj = {}, _define_property(_obj, appContext.internalDirAlias, appContext.internalDirectory), _define_property(_obj, appContext.internalSrcAlias, appContext.srcDirectory), _define_property(_obj, "@", appContext.srcDirectory), _define_property(_obj, "@shared", appContext.sharedDirectory), _obj)
   };
   var html = {
@@ -73,6 +76,7 @@ function createDefaultConfig(appContext) {
   };
   return {
     source,
+    resolve,
     output,
     server,
     dev,

package/dist/esm/config/legacy/index.js

@@ -9,6 +9,7 @@ function transformNormalizedConfig(config) {
   var tools = createToolsConfig(config);
   var bff = config.bff, dev = config.dev, deploy = config.deploy, runtime = config.runtime, runtimeByEntries = config.runtimeByEntries, server = config.server, cliOptions = config.cliOptions, plugins = config.plugins, testing = config.testing, autoLoadPlugins = config.autoLoadPlugins;
   return {
+    resolve: {},
     source,
     html,
     output,

package/dist/esm/run/index.js

@@ -23,7 +23,7 @@ function _run() {
           nodeVersion = process.versions.node;
           versionArr = nodeVersion.split(".").map(Number);
           if (versionArr[0] <= 16) {
-            console.warn("\n  ".concat(chalk.bgRed.white.bold(" ⚠️ CRITICAL NODE.JS VERSION ALERT ⚠️ "), "\n\n  ").concat(chalk.red.bold("Node.js 16 End-of-Life Notice:"), "\n  ").concat(chalk.red.bold.underline("June 30, 2025"), " ").concat(chalk.red("- Security updates and support will cease"), "\n\n  ").concat(chalk.yellow("▸ Detected Runtime:"), "  ").concat(chalk.yellow.bold("Node.js v".concat(nodeVersion)), "\n  ").concat(chalk.green("▸ Required Minimum:"), " ").concat(chalk.green.bold("Node.js LTS (v18.x or higher)"), "\n  ").concat(chalk.green("▸ Recommended:"), " ").concat(chalk.green.bold("Node.js LTS (v22.x or higher)"), "\n\n  ").concat(chalk.cyan("Immediate Action Required:"), "\n    ").concat(chalk.gray("├──"), " ").concat(chalk.yellow("Recommended Upgrade"), "\n       ").concat(chalk.bold("nvm install 22 --lts && nvm use 22"), "\n    ").concat(chalk.gray("├──"), " ").concat(chalk.yellow("Manual Installation"), "\n       ").concat(chalk.underline("https://nodejs.org/download/release/lts-hydrogen/"), "\n     ").concat(chalk.gray("└──"), " ").concat(chalk.yellow("Environment Verification"), "\n       ").concat(chalk.bold("node -v && npm -v"), "\n\n  ").concat(chalk.hex("#AAAAAA").italic("[Security Advisory] Production environments must update before 2025-06-30"), "\n      "));
+            console.warn("\n  ".concat(chalk.bgRed.white.bold(" ⚠️ CRITICAL NODE.JS VERSION ALERT ⚠️ "), "\n\n  ").concat(chalk.red.bold("Node.js 16 End-of-Life Notice:"), "\n  ").concat(chalk.red("- Security updates and support have ended for Node.js 16"), "\n\n  ").concat(chalk.yellow("▸ Detected Runtime:"), "  ").concat(chalk.yellow.bold("Node.js v".concat(nodeVersion)), "\n  ").concat(chalk.green("▸ Required Minimum:"), " ").concat(chalk.green.bold("Node.js LTS (v18.x or higher)"), "\n  ").concat(chalk.green("▸ Recommended:"), " ").concat(chalk.green.bold("Node.js LTS (v22.x or higher)"), "\n\n  ").concat(chalk.cyan("Immediate Action Required:"), "\n    ").concat(chalk.gray("├──"), " ").concat(chalk.yellow("Recommended Upgrade"), "\n       ").concat(chalk.bold("nvm install 22 --lts && nvm use 22"), "\n    ").concat(chalk.gray("├──"), " ").concat(chalk.yellow("Manual Installation"), "\n       ").concat(chalk.underline("https://nodejs.org/download/release/lts-hydrogen/"), "\n     ").concat(chalk.gray("└──"), " ").concat(chalk.yellow("Environment Verification"), "\n       ").concat(chalk.bold("node -v && npm -v"), "\n\n  ").concat(chalk.hex("#AAAAAA").italic("[Security Advisory] Node.js 16 is no longer supported. Upgrade immediately for security and compatibility."), "\n      "));
           }
           command = process.argv[2];
           cliParams = minimist(process.argv.slice(2));

package/dist/esm-node/builder/generator/createBuilderProviderConfig.js

@@ -25,6 +25,9 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
   const config = {
     ...resolveConfig,
     plugins: [],
+    resolve: {
+      ...resolveConfig.resolve
+    },
     dev: {
       ...resolveConfig.dev,
       port: appContext.port

package/dist/esm-node/builder/generator/index.js

@@ -12,6 +12,7 @@ async function generateBuilder(options, bundlerType) {
     cwd: appContext.appDirectory,
     rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,
     rscServerRuntimePath: `@${appContext.metaName}/runtime/rsc/server`,
+    internalDirectory: appContext.internalDirectory,
     frameworkConfigPath: appContext.configFile || void 0,
     bundlerType,
     config: builderConfig

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -1,6 +1,6 @@
 import * as path from "path";
 import { SERVICE_WORKER_ENVIRONMENT_NAME, isHtmlDisabled } from "@modern-js/uni-builder";
-import { fs, isUseSSRBundle } from "@modern-js/utils";
+import { fs, isUseRsc, isUseSSRBundle } from "@modern-js/utils";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { getServerCombinedModueFile } from "../../../plugins/analyze/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
@@ -16,7 +16,7 @@ const builderPluginAdapterSSR = (options) => ({
         server: {
           // the http-compression can't handler stream http.
           // so we disable compress when user use stream ssr temporarily.
-          compress: isStreamingSSR(normalizedConfig) ? false : void 0
+          compress: isStreamingSSR(normalizedConfig) || isUseRsc(normalizedConfig) ? false : void 0
         }
       });
     });
@@ -32,7 +32,7 @@ const builderPluginAdapterSSR = (options) => ({
           appNormalizedConfig: normalizedConfig2
         });
       }
-      if (isUseSSRBundle(normalizedConfig2)) {
+      if (isUseSSRBundle(normalizedConfig2) || isUseRsc(normalizedConfig2)) {
         await applySSRLoaderEntry(chain, options, isServer);
         applySSRDataLoader(chain, options);
       }
@@ -62,7 +62,7 @@ const isStreamingSSR = (userConfig) => {
   return false;
 };
 function applyAsyncChunkHtmlPlugin({ chain, modernConfig, HtmlBundlerPlugin }) {
-  if (isStreamingSSR(modernConfig)) {
+  if (isStreamingSSR(modernConfig) || isUseRsc(modernConfig)) {
     chain.plugin("html-async-chunk").use(HtmlAsyncChunkPlugin, [
       HtmlBundlerPlugin
     ]);

package/dist/esm-node/commands/build.js

@@ -4,7 +4,7 @@ import { loadServerPlugins } from "../utils/loadPlugins";
 import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 const build = async (api, options) => {
-  var _resolvedConfig_source;
+  var _resolvedConfig_resolve, _resolvedConfig_source;
   if (options === null || options === void 0 ? void 0 : options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -13,15 +13,21 @@ const build = async (api, options) => {
   const hooks = api.getHooks();
   await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
   if (appContext.moduleType && appContext.moduleType === "module") {
-    var _resolvedConfig_source1;
+    var _resolvedConfig_resolve1, _resolvedConfig_source1;
     const { registerEsm } = await import("../esm/register-esm.mjs");
     await registerEsm({
       appDir: appContext.appDirectory,
       distDir: appContext.distDirectory,
-      alias: (_resolvedConfig_source1 = resolvedConfig.source) === null || _resolvedConfig_source1 === void 0 ? void 0 : _resolvedConfig_source1.alias
+      alias: {
+        ...(_resolvedConfig_resolve1 = resolvedConfig.resolve) === null || _resolvedConfig_resolve1 === void 0 ? void 0 : _resolvedConfig_resolve1.alias,
+        ...(_resolvedConfig_source1 = resolvedConfig.source) === null || _resolvedConfig_source1 === void 0 ? void 0 : _resolvedConfig_source1.alias
+      }
     });
   }
-  await registerCompiler(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
+  await registerCompiler(appContext.appDirectory, appContext.distDirectory, {
+    ...resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_resolve = resolvedConfig.resolve) === null || _resolvedConfig_resolve === void 0 ? void 0 : _resolvedConfig_resolve.alias,
+    ...resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias
+  });
   const { apiOnly } = appContext;
   if (apiOnly) {
     const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;

package/dist/esm-node/commands/dev.js

@@ -9,7 +9,7 @@ import { printInstructions } from "../utils/printInstructions";
 import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 const dev = async (api, options, devServerOptions) => {
-  var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev;
+  var _normalizedConfig_source, _normalizedConfig_resolve, _normalizedConfig_tools, _normalizedConfig_dev;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
@@ -17,15 +17,21 @@ const dev = async (api, options, devServerOptions) => {
   const appContext = api.getAppContext();
   const hooks = api.getHooks();
   if (appContext.moduleType && appContext.moduleType === "module") {
-    var _normalizedConfig_source1;
+    var _normalizedConfig_resolve1, _normalizedConfig_source1;
     const { registerEsm } = await import("../esm/register-esm.mjs");
     await registerEsm({
       appDir: appContext.appDirectory,
       distDir: appContext.distDirectory,
-      alias: (_normalizedConfig_source1 = normalizedConfig.source) === null || _normalizedConfig_source1 === void 0 ? void 0 : _normalizedConfig_source1.alias
+      alias: {
+        ...(_normalizedConfig_resolve1 = normalizedConfig.resolve) === null || _normalizedConfig_resolve1 === void 0 ? void 0 : _normalizedConfig_resolve1.alias,
+        ...(_normalizedConfig_source1 = normalizedConfig.source) === null || _normalizedConfig_source1 === void 0 ? void 0 : _normalizedConfig_source1.alias
+      }
     });
   }
-  await registerCompiler(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias);
+  await registerCompiler(appContext.appDirectory, appContext.distDirectory, {
+    ...normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias,
+    ...normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_resolve = normalizedConfig.resolve) === null || _normalizedConfig_resolve === void 0 ? void 0 : _normalizedConfig_resolve.alias
+  });
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await buildServerConfig({
     appDirectory,

package/dist/esm-node/commands/inspect.js

@@ -3,11 +3,15 @@ const inspect = async (api, options) => {
   if (!appContext.builder) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
+  const metaName = appContext.metaName === "modern-js" ? "modern.js" : appContext.metaName;
   return appContext.builder.inspectConfig({
     mode: options.env,
     verbose: options.verbose,
     outputPath: options.output,
-    writeToDisk: true
+    writeToDisk: true,
+    extraConfigs: {
+      [metaName]: api.getNormalizedConfig()
+    }
   });
 };
 export {

package/dist/esm-node/config/default.js

@@ -34,6 +34,9 @@ function createDefaultConfig(appContext) {
     entriesDir: "./src",
     configDir: "./config",
     globalVars: getAutoInjectEnv(appContext),
+    alias: {}
+  };
+  const resolve = {
     alias: {
       [appContext.internalDirAlias]: appContext.internalDirectory,
       [appContext.internalSrcAlias]: appContext.srcDirectory,
@@ -70,6 +73,7 @@ function createDefaultConfig(appContext) {
   };
   return {
     source,
+    resolve,
     output,
     server,
     dev,

package/dist/esm-node/config/legacy/index.js

@@ -9,6 +9,7 @@ function transformNormalizedConfig(config) {
   const tools = createToolsConfig(config);
   const { bff, dev, deploy, runtime, runtimeByEntries, server, cliOptions, plugins, testing, autoLoadPlugins } = config;
   return {
+    resolve: {},
     source,
     html,
     output,

package/dist/esm-node/run/index.js

@@ -16,7 +16,7 @@ async function run({ cwd, initialLog, metaName = "modern-js", version, internalP
   ${chalk.bgRed.white.bold(" ⚠️ CRITICAL NODE.JS VERSION ALERT ⚠️ ")}
 
   ${chalk.red.bold("Node.js 16 End-of-Life Notice:")}
-  ${chalk.red.bold.underline("June 30, 2025")} ${chalk.red("- Security updates and support will cease")}
+  ${chalk.red("- Security updates and support have ended for Node.js 16")}
 
   ${chalk.yellow("▸ Detected Runtime:")}  ${chalk.yellow.bold(`Node.js v${nodeVersion}`)}
   ${chalk.green("▸ Required Minimum:")} ${chalk.green.bold("Node.js LTS (v18.x or higher)")}
@@ -30,7 +30,7 @@ async function run({ cwd, initialLog, metaName = "modern-js", version, internalP
      ${chalk.gray("└──")} ${chalk.yellow("Environment Verification")}
        ${chalk.bold("node -v && npm -v")}
 
-  ${chalk.hex("#AAAAAA").italic("[Security Advisory] Production environments must update before 2025-06-30")}
+  ${chalk.hex("#AAAAAA").italic("[Security Advisory] Node.js 16 is no longer supported. Upgrade immediately for security and compatibility.")}
       `);
   }
   const command = process.argv[2];

package/dist/types/types/config/index.d.ts

@@ -8,6 +8,7 @@ import type { ExperimentsUserConfig } from './experiments';
 import type { HtmlUserConfig } from './html';
 import type { OutputUserConfig } from './output';
 import type { PerformanceUserConfig } from './performance';
+import type { ResolveUserConfig } from './resolve';
 import type { SecurityUserConfig } from './security';
 import type { SourceUserConfig } from './source';
 import type { TestingUserConfig } from './testing';
@@ -20,6 +21,7 @@ export interface RuntimeByEntriesUserConfig {
     [name: string]: RuntimeUserConfig;
 }
 export interface AppToolsUserConfig<B extends Bundler> {
+    resolve?: ResolveUserConfig;
     server?: ServerUserConfig;
     source?: SourceUserConfig;
     output?: OutputUserConfig;

package/dist/types/types/config/resolve.d.ts

@@ -0,0 +1,2 @@
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
+export type ResolveUserConfig = UniBuilderConfig['resolve'];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.11",
+  "version": "2.68.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -85,31 +85,31 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "1.3.22",
+    "@rsbuild/core": "1.4.4",
     "@rsbuild/plugin-node-polyfill": "1.3.0",
     "@swc/helpers": "^0.5.17",
     "es-module-lexer": "^1.1.0",
-    "esbuild": "0.17.19",
+    "esbuild": "0.25.5",
     "esbuild-register": "^3.6.0",
     "flatted": "^3.3.3",
-    "mlly": "^1.6.1",
-    "ndepe": "^0.1.11",
-    "pkg-types": "^1.1.0",
+    "mlly": "^1.7.4",
+    "ndepe": "^0.1.12",
+    "pkg-types": "^1.3.1",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.67.11",
-    "@modern-js/node-bundle-require": "2.67.11",
-    "@modern-js/plugin": "2.67.11",
-    "@modern-js/plugin-data-loader": "2.67.11",
-    "@modern-js/plugin-i18n": "2.67.11",
-    "@modern-js/plugin-v2": "2.67.11",
-    "@modern-js/prod-server": "2.67.11",
-    "@modern-js/rsbuild-plugin-esbuild": "2.67.11",
-    "@modern-js/server": "2.67.11",
-    "@modern-js/server-core": "2.67.11",
-    "@modern-js/server-utils": "2.67.11",
-    "@modern-js/types": "2.67.11",
-    "@modern-js/uni-builder": "2.67.11",
-    "@modern-js/utils": "2.67.11"
+    "@modern-js/core": "2.68.1",
+    "@modern-js/node-bundle-require": "2.68.1",
+    "@modern-js/plugin": "2.68.1",
+    "@modern-js/plugin-data-loader": "2.68.1",
+    "@modern-js/plugin-i18n": "2.68.1",
+    "@modern-js/plugin-v2": "2.68.1",
+    "@modern-js/prod-server": "2.68.1",
+    "@modern-js/rsbuild-plugin-esbuild": "2.68.1",
+    "@modern-js/server-core": "2.68.1",
+    "@modern-js/server": "2.68.1",
+    "@modern-js/server-utils": "2.68.1",
+    "@modern-js/uni-builder": "2.68.1",
+    "@modern-js/types": "2.68.1",
+    "@modern-js/utils": "2.68.1"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.1.1",