@modern-js/app-tools 2.60.2 → 2.60.3

package/dist/cjs/builder/builder-rspack/index.js

@@ -22,12 +22,8 @@ __export(builder_rspack_exports, {
 });
 module.exports = __toCommonJS(builder_rspack_exports);
 var import_generator = require("../generator");
-var import_adapterCopy = require("./adapterCopy");
 async function createRspackBuilderForModern(options) {
   const builder = await (0, import_generator.generateBuilder)(options, "rspack");
-  builder.addPlugins([
-    (0, import_adapterCopy.builderPluginAdpaterCopy)(options)
-  ]);
   return builder;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/builder/builder-webpack/index.js

@@ -32,7 +32,6 @@ __export(builder_webpack_exports, {
 });
 module.exports = __toCommonJS(builder_webpack_exports);
 var import_generator = require("../generator");
-var import_adapterModern = require("./adapterModern");
 async function createWebpackBuilderForModern(options) {
   const builder = await (0, import_generator.generateBuilder)(options, "webpack");
   const { normalizedConfig } = options;
@@ -43,9 +42,6 @@ async function createWebpackBuilderForModern(options) {
       pluginEsbuild(esbuildOptions)
     ]);
   }
-  builder.addPlugins([
-    (0, import_adapterModern.builderPluginAdapterModern)(options)
-  ]);
   return builder;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/builder/{builder-webpack/adapterModern.js → generator/adapterCopy.js}

@@ -16,17 +16,17 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var adapterModern_exports = {};
-__export(adapterModern_exports, {
-  builderPluginAdapterModern: () => builderPluginAdapterModern
+var adapterCopy_exports = {};
+__export(adapterCopy_exports, {
+  builderPluginAdapterCopy: () => builderPluginAdapterCopy
 });
-module.exports = __toCommonJS(adapterModern_exports);
+module.exports = __toCommonJS(adapterCopy_exports);
 var import_createCopyPattern = require("./createCopyPattern");
-const builderPluginAdapterModern = (options) => ({
-  name: "builder-plugin-adapter-modern",
+const builderPluginAdapterCopy = (options) => ({
+  name: "builder-plugin-adapter-copy",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
-    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
         const defaultCopyPattern = (0, import_createCopyPattern.createPublicPattern)(appContext, modernConfig, chain);
         chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
@@ -46,5 +46,5 @@ const builderPluginAdapterModern = (options) => ({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  builderPluginAdapterModern
+  builderPluginAdapterCopy
 });

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

@@ -21,7 +21,7 @@ __export(createBuilderProviderConfig_exports, {
   createBuilderProviderConfig: () => createBuilderProviderConfig
 });
 module.exports = __toCommonJS(createBuilderProviderConfig_exports);
-var import_createCopyPattern = require("../builder-webpack/createCopyPattern");
+var import_createCopyPattern = require("./createCopyPattern");
 function modifyOutputConfig(config, appContext) {
   const defaultCopyPattern = (0, import_createCopyPattern.createUploadPattern)(appContext, config);
   const { copy } = config.output;

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

@@ -23,7 +23,8 @@ __export(getBuilderEnvironments_exports, {
 module.exports = __toCommonJS(getBuilderEnvironments_exports);
 var import_uni_builder = require("@modern-js/uni-builder");
 var import_utils = require("@modern-js/utils");
-function getBuilderEnvironments(normalizedConfig, appContext) {
+function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig) {
+  var _tempBuilderConfig_output;
   const entries = {};
   const { entrypoints = [], checkedEntries } = appContext;
   for (const { entryName, internalEntry, entry } of entrypoints) {
@@ -54,6 +55,10 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
       }
     }
   };
+  if ((_tempBuilderConfig_output = tempBuilderConfig.output) === null || _tempBuilderConfig_output === void 0 ? void 0 : _tempBuilderConfig_output.copy) {
+    environments.web.output.copy = tempBuilderConfig.output.copy;
+    delete tempBuilderConfig.output.copy;
+  }
   const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
   if (useNodeTarget) {
     environments.node = {
@@ -76,7 +81,10 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
       }
     };
   }
-  return environments;
+  return {
+    environments,
+    builderConfig: tempBuilderConfig
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -33,12 +33,13 @@ __export(generator_exports, {
 module.exports = __toCommonJS(generator_exports);
 var import_uni_builder = require("@modern-js/uni-builder");
 var import_core = require("@rsbuild/core");
+var import_adapterCopy = require("./adapterCopy");
 var import_createBuilderProviderConfig = require("./createBuilderProviderConfig");
 var import_getBuilderEnvironments = require("./getBuilderEnvironments");
 async function generateBuilder(options, bundlerType) {
   const { normalizedConfig, appContext } = options;
-  const builderConfig = (0, import_createBuilderProviderConfig.createBuilderProviderConfig)(normalizedConfig, appContext);
-  const environments = (0, import_getBuilderEnvironments.getBuilderEnvironments)(normalizedConfig, appContext);
+  const tempBuilderConfig = (0, import_createBuilderProviderConfig.createBuilderProviderConfig)(normalizedConfig, appContext);
+  const { environments, builderConfig } = (0, import_getBuilderEnvironments.getBuilderEnvironments)(normalizedConfig, appContext, tempBuilderConfig);
   builderConfig.environments = builderConfig.environments ? (0, import_core.mergeRsbuildConfig)(environments, builderConfig.environments) : environments;
   const builder = await (0, import_uni_builder.createUniBuilder)({
     cwd: appContext.appDirectory,
@@ -56,6 +57,11 @@ async function applyBuilderPlugins(builder, options) {
     builderPluginAdapterSSR(options),
     builderPluginAdapterHtml(options)
   ]);
+  builder.addPlugins([
+    (0, import_adapterCopy.builderPluginAdapterCopy)(options)
+  ], {
+    environment: "web"
+  });
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
     const { pluginNodePolyfill } = await import("@rsbuild/plugin-node-polyfill");

package/dist/cjs/index.js

@@ -37,6 +37,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_path = __toESM(require("path"));
 var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
+var import_uni_builder = require("@modern-js/uni-builder");
 var import_utils = require("@modern-js/utils");
 var import_hooks = require("./hooks");
 var import_locale = require("./locale");
@@ -139,7 +140,16 @@ const appTools = (options = {
       async watchFiles() {
         const appContext2 = api.useAppContext();
         const config = api.useResolvedConfigContext();
-        return await (0, import_generateWatchFiles.generateWatchFiles)(appContext2, config.source.configDir);
+        const files = await (0, import_generateWatchFiles.generateWatchFiles)(appContext2, config.source.configDir);
+        const watchFiles = (0, import_uni_builder.castArray)(config.dev.watchFiles);
+        watchFiles.forEach(({ type, paths }) => {
+          if (type === "reload-server") {
+            files.push(...Array.isArray(paths) ? paths : [
+              paths
+            ]);
+          }
+        });
+        return files;
       },
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
       async fileChange(e) {

package/dist/cjs/utils/register.js

@@ -83,7 +83,7 @@ const registerCompiler = async (appDir, distDir, alias) => {
   const { MODERN_NODE_LOADER } = process.env;
   if (MODERN_NODE_LOADER !== "esbuild") {
     try {
-      const tsNode = await import("ts-node");
+      const tsNode = await (0, import_utils.loadFromProject)("ts-node", appDir);
       const tsNodeOptions = tsConfig["ts-node"];
       if (isTsProject) {
         tsNode.register({
@@ -100,6 +100,7 @@ const registerCompiler = async (appDir, distDir, alias) => {
         });
       }
     } catch (error) {
+      import_utils.logger.error(error);
       await registerEsbuild({
         isTsProject,
         tsConfig,

package/dist/esm/builder/builder-rspack/index.js

@@ -1,7 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { generateBuilder } from "../generator";
-import { builderPluginAdpaterCopy } from "./adapterCopy";
 function createRspackBuilderForModern(options) {
   return _createRspackBuilderForModern.apply(this, arguments);
 }
@@ -17,9 +16,6 @@ function _createRspackBuilderForModern() {
           ];
         case 1:
           builder = _state.sent();
-          builder.addPlugins([
-            builderPluginAdpaterCopy(options)
-          ]);
           return [
             2,
             builder

package/dist/esm/builder/builder-webpack/index.js

@@ -1,7 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { generateBuilder } from "../generator";
-import { builderPluginAdapterModern } from "./adapterModern";
 function createWebpackBuilderForModern(options) {
   return _createWebpackBuilderForModern.apply(this, arguments);
 }
@@ -35,9 +34,6 @@ function _createWebpackBuilderForModern() {
           ]);
           _state.label = 3;
         case 3:
-          builder.addPlugins([
-            builderPluginAdapterModern(options)
-          ]);
           return [
             2,
             builder

package/dist/esm/builder/{builder-webpack/adapterModern.js → generator/adapterCopy.js}

@@ -1,11 +1,11 @@
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { createPublicPattern } from "./createCopyPattern";
-var builderPluginAdapterModern = function(options) {
+var builderPluginAdapterCopy = function(options) {
   return {
-    name: "builder-plugin-adapter-modern",
+    name: "builder-plugin-adapter-copy",
     setup: function setup(api) {
       var modernConfig = options.normalizedConfig, appContext = options.appContext;
-      api.modifyWebpackChain(function(chain, param) {
+      api.modifyBundlerChain(function(chain, param) {
         var CHAIN_ID = param.CHAIN_ID;
         if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
           var defaultCopyPattern = createPublicPattern(appContext, modernConfig, chain);
@@ -25,5 +25,5 @@ var builderPluginAdapterModern = function(options) {
   };
 };
 export {
-  builderPluginAdapterModern
+  builderPluginAdapterCopy
 };

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

@@ -1,7 +1,7 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { createUploadPattern } from "../builder-webpack/createCopyPattern";
+import { createUploadPattern } from "./createCopyPattern";
 function modifyOutputConfig(config, appContext) {
   var defaultCopyPattern = createUploadPattern(appContext, config);
   var copy = config.output.copy;

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

@@ -1,6 +1,7 @@
 import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
 import { isProd, isSSR, isServiceWorker, isUseSSRBundle } from "@modern-js/utils";
-function getBuilderEnvironments(normalizedConfig, appContext) {
+function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig) {
+  var _tempBuilderConfig_output;
   var entries = {};
   var _appContext_entrypoints = appContext.entrypoints, entrypoints = _appContext_entrypoints === void 0 ? [] : _appContext_entrypoints, checkedEntries = appContext.checkedEntries;
   var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
@@ -52,6 +53,10 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
       }
     }
   };
+  if ((_tempBuilderConfig_output = tempBuilderConfig.output) === null || _tempBuilderConfig_output === void 0 ? void 0 : _tempBuilderConfig_output.copy) {
+    environments.web.output.copy = tempBuilderConfig.output.copy;
+    delete tempBuilderConfig.output.copy;
+  }
   var useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
   if (useNodeTarget) {
     environments.node = {
@@ -74,7 +79,10 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
       }
     };
   }
-  return environments;
+  return {
+    environments,
+    builderConfig: tempBuilderConfig
+  };
 }
 export {
   getBuilderEnvironments

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

@@ -2,6 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createUniBuilder } from "@modern-js/uni-builder";
 import { mergeRsbuildConfig } from "@rsbuild/core";
+import { builderPluginAdapterCopy } from "./adapterCopy";
 import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
 import { getBuilderEnvironments } from "./getBuilderEnvironments";
 function generateBuilder(options, bundlerType) {
@@ -9,13 +10,13 @@ function generateBuilder(options, bundlerType) {
 }
 function _generateBuilder() {
   _generateBuilder = _async_to_generator(function(options, bundlerType) {
-    var normalizedConfig, appContext, builderConfig, environments, builder;
+    var normalizedConfig, appContext, tempBuilderConfig, _getBuilderEnvironments, environments, builderConfig, builder;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           normalizedConfig = options.normalizedConfig, appContext = options.appContext;
-          builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-          environments = getBuilderEnvironments(normalizedConfig, appContext);
+          tempBuilderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
+          _getBuilderEnvironments = getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig), environments = _getBuilderEnvironments.environments, builderConfig = _getBuilderEnvironments.builderConfig;
           builderConfig.environments = builderConfig.environments ? mergeRsbuildConfig(environments, builderConfig.environments) : environments;
           return [
             4,
@@ -63,6 +64,11 @@ function _applyBuilderPlugins() {
             builderPluginAdapterSSR(options),
             builderPluginAdapterHtml(options)
           ]);
+          builder.addPlugins([
+            builderPluginAdapterCopy(options)
+          ], {
+            environment: "web"
+          });
           normalizedConfig = options.normalizedConfig;
           if (!!normalizedConfig.output.disableNodePolyfill)
             return [

package/dist/esm/index.js

@@ -1,9 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
+import { castArray } from "@modern-js/uni-builder";
 import { cleanRequireCache, deprecatedCommands, emptyDir, getArgv, getCommand } from "@modern-js/utils";
 import { hooks } from "./hooks";
 import { i18n } from "./locale";
@@ -159,7 +161,7 @@ var appTools = function() {
         },
         watchFiles: function watchFiles() {
           return _async_to_generator(function() {
-            var appContext2, config;
+            var appContext2, config, files, watchFiles2;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -170,9 +172,20 @@ var appTools = function() {
                     generateWatchFiles(appContext2, config.source.configDir)
                   ];
                 case 1:
+                  files = _state.sent();
+                  watchFiles2 = castArray(config.dev.watchFiles);
+                  watchFiles2.forEach(function(param) {
+                    var type = param.type, paths = param.paths;
+                    if (type === "reload-server") {
+                      var _files;
+                      (_files = files).push.apply(_files, _to_consumable_array(Array.isArray(paths) ? paths : [
+                        paths
+                      ]));
+                    }
+                  });
                   return [
                     2,
-                    _state.sent()
+                    files
                   ];
               }
             });

package/dist/esm/utils/register.js

@@ -5,7 +5,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
-import { fs, getAliasConfig, readTsConfigByFile } from "@modern-js/utils";
+import { fs, getAliasConfig, loadFromProject, logger, readTsConfigByFile } from "@modern-js/utils";
 var registerEsbuild = function() {
   var _ref = _async_to_generator(function(param) {
     var isTsProject, tsConfig, distDir, esbuildRegister;
@@ -97,7 +97,7 @@ var registerCompiler = function() {
           ]);
           return [
             4,
-            import("ts-node")
+            loadFromProject("ts-node", appDir)
           ];
         case 3:
           tsNode = _state.sent();
@@ -121,6 +121,7 @@ var registerCompiler = function() {
           ];
         case 4:
           error = _state.sent();
+          logger.error(error);
           return [
             4,
             registerEsbuild({

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

@@ -1,10 +1,6 @@
 import { generateBuilder } from "../generator";
-import { builderPluginAdpaterCopy } from "./adapterCopy";
 async function createRspackBuilderForModern(options) {
   const builder = await generateBuilder(options, "rspack");
-  builder.addPlugins([
-    builderPluginAdpaterCopy(options)
-  ]);
   return builder;
 }
 export {

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

@@ -1,5 +1,4 @@
 import { generateBuilder } from "../generator";
-import { builderPluginAdapterModern } from "./adapterModern";
 async function createWebpackBuilderForModern(options) {
   const builder = await generateBuilder(options, "webpack");
   const { normalizedConfig } = options;
@@ -10,9 +9,6 @@ async function createWebpackBuilderForModern(options) {
       pluginEsbuild(esbuildOptions)
     ]);
   }
-  builder.addPlugins([
-    builderPluginAdapterModern(options)
-  ]);
   return builder;
 }
 export {

package/dist/esm-node/builder/{builder-webpack/adapterModern.js → generator/adapterCopy.js}

@@ -1,9 +1,9 @@
 import { createPublicPattern } from "./createCopyPattern";
-const builderPluginAdapterModern = (options) => ({
-  name: "builder-plugin-adapter-modern",
+const builderPluginAdapterCopy = (options) => ({
+  name: "builder-plugin-adapter-copy",
   setup(api) {
     const { normalizedConfig: modernConfig, appContext } = options;
-    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
       if (chain.plugins.has(CHAIN_ID.PLUGIN.COPY)) {
         const defaultCopyPattern = createPublicPattern(appContext, modernConfig, chain);
         chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
@@ -22,5 +22,5 @@ const builderPluginAdapterModern = (options) => ({
   }
 });
 export {
-  builderPluginAdapterModern
+  builderPluginAdapterCopy
 };

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

@@ -1,4 +1,4 @@
-import { createUploadPattern } from "../builder-webpack/createCopyPattern";
+import { createUploadPattern } from "./createCopyPattern";
 function modifyOutputConfig(config, appContext) {
   const defaultCopyPattern = createUploadPattern(appContext, config);
   const { copy } = config.output;

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

@@ -1,6 +1,7 @@
 import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
 import { isProd, isSSR, isServiceWorker, isUseSSRBundle } from "@modern-js/utils";
-function getBuilderEnvironments(normalizedConfig, appContext) {
+function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig) {
+  var _tempBuilderConfig_output;
   const entries = {};
   const { entrypoints = [], checkedEntries } = appContext;
   for (const { entryName, internalEntry, entry } of entrypoints) {
@@ -31,6 +32,10 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
       }
     }
   };
+  if ((_tempBuilderConfig_output = tempBuilderConfig.output) === null || _tempBuilderConfig_output === void 0 ? void 0 : _tempBuilderConfig_output.copy) {
+    environments.web.output.copy = tempBuilderConfig.output.copy;
+    delete tempBuilderConfig.output.copy;
+  }
   const useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
   if (useNodeTarget) {
     environments.node = {
@@ -53,7 +58,10 @@ function getBuilderEnvironments(normalizedConfig, appContext) {
       }
     };
   }
-  return environments;
+  return {
+    environments,
+    builderConfig: tempBuilderConfig
+  };
 }
 export {
   getBuilderEnvironments

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

@@ -1,11 +1,12 @@
 import { createUniBuilder } from "@modern-js/uni-builder";
 import { mergeRsbuildConfig } from "@rsbuild/core";
+import { builderPluginAdapterCopy } from "./adapterCopy";
 import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
 import { getBuilderEnvironments } from "./getBuilderEnvironments";
 async function generateBuilder(options, bundlerType) {
   const { normalizedConfig, appContext } = options;
-  const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-  const environments = getBuilderEnvironments(normalizedConfig, appContext);
+  const tempBuilderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
+  const { environments, builderConfig } = getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig);
   builderConfig.environments = builderConfig.environments ? mergeRsbuildConfig(environments, builderConfig.environments) : environments;
   const builder = await createUniBuilder({
     cwd: appContext.appDirectory,
@@ -23,6 +24,11 @@ async function applyBuilderPlugins(builder, options) {
     builderPluginAdapterSSR(options),
     builderPluginAdapterHtml(options)
   ]);
+  builder.addPlugins([
+    builderPluginAdapterCopy(options)
+  ], {
+    environment: "web"
+  });
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
     const { pluginNodePolyfill } = await import("@rsbuild/plugin-node-polyfill");

package/dist/esm-node/index.js

@@ -1,5 +1,6 @@
 import path from "path";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
+import { castArray } from "@modern-js/uni-builder";
 import { cleanRequireCache, deprecatedCommands, emptyDir, getArgv, getCommand } from "@modern-js/utils";
 import { hooks } from "./hooks";
 import { i18n } from "./locale";
@@ -102,7 +103,16 @@ const appTools = (options = {
       async watchFiles() {
         const appContext2 = api.useAppContext();
         const config = api.useResolvedConfigContext();
-        return await generateWatchFiles(appContext2, config.source.configDir);
+        const files = await generateWatchFiles(appContext2, config.source.configDir);
+        const watchFiles = castArray(config.dev.watchFiles);
+        watchFiles.forEach(({ type, paths }) => {
+          if (type === "reload-server") {
+            files.push(...Array.isArray(paths) ? paths : [
+              paths
+            ]);
+          }
+        });
+        return files;
       },
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
       async fileChange(e) {

package/dist/esm-node/utils/register.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { fs, getAliasConfig, readTsConfigByFile } from "@modern-js/utils";
+import { fs, getAliasConfig, loadFromProject, logger, readTsConfigByFile } from "@modern-js/utils";
 const registerEsbuild = async ({ isTsProject, tsConfig, distDir }) => {
   const esbuildRegister = await import("esbuild-register/dist/node");
   esbuildRegister.register({
@@ -50,7 +50,7 @@ const registerCompiler = async (appDir, distDir, alias) => {
   const { MODERN_NODE_LOADER } = process.env;
   if (MODERN_NODE_LOADER !== "esbuild") {
     try {
-      const tsNode = await import("ts-node");
+      const tsNode = await loadFromProject("ts-node", appDir);
       const tsNodeOptions = tsConfig["ts-node"];
       if (isTsProject) {
         tsNode.register({
@@ -67,6 +67,7 @@ const registerCompiler = async (appDir, distDir, alias) => {
         });
       }
     } catch (error) {
+      logger.error(error);
       await registerEsbuild({
         isTsProject,
         tsConfig,

package/dist/types/builder/generator/adapterCopy.d.ts

@@ -0,0 +1,3 @@
+import type { RsbuildPlugin } from '@modern-js/uni-builder';
+import type { BuilderOptions } from '../shared';
+export declare const builderPluginAdapterCopy: (options: BuilderOptions<'shared'>) => RsbuildPlugin;

package/dist/types/builder/generator/getBuilderEnvironments.d.ts

@@ -1,5 +1,8 @@
 import type { IAppContext } from '@modern-js/core';
-import type { AppNormalizedConfig } from '../../types';
-export declare function getBuilderEnvironments(normalizedConfig: AppNormalizedConfig<'shared'>, appContext: IAppContext): {
-    [name: string]: import("@rsbuild/core").EnvironmentConfig;
+import type { AppNormalizedConfig, Bundler } from '../../types';
+export declare function getBuilderEnvironments<B extends Bundler>(normalizedConfig: AppNormalizedConfig<'shared'>, appContext: IAppContext, tempBuilderConfig: Omit<AppNormalizedConfig<B>, 'plugins'>): {
+    environments: {
+        [name: string]: import("@rsbuild/core").EnvironmentConfig;
+    };
+    builderConfig: Omit<AppNormalizedConfig<B_1>, "plugins">;
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.2",
+  "version": "2.60.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -77,8 +77,8 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.24.7",
-    "@rsbuild/core": "1.0.7",
-    "@rsbuild/plugin-node-polyfill": "1.0.4",
+    "@rsbuild/core": "~1.0.11",
+    "@rsbuild/plugin-node-polyfill": "~1.0.4",
     "@swc/helpers": "0.5.13",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -88,22 +88,22 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.60.2",
-    "@modern-js/node-bundle-require": "2.60.2",
-    "@modern-js/plugin": "2.60.2",
-    "@modern-js/plugin-i18n": "2.60.2",
-    "@modern-js/plugin-data-loader": "2.60.2",
-    "@modern-js/rsbuild-plugin-esbuild": "2.60.2",
-    "@modern-js/prod-server": "2.60.2",
-    "@modern-js/server-core": "2.60.2",
-    "@modern-js/server": "2.60.2",
-    "@modern-js/uni-builder": "2.60.2",
-    "@modern-js/types": "2.60.2",
-    "@modern-js/utils": "2.60.2",
-    "@modern-js/server-utils": "2.60.2"
+    "@modern-js/node-bundle-require": "2.60.3",
+    "@modern-js/plugin": "2.60.3",
+    "@modern-js/plugin-i18n": "2.60.3",
+    "@modern-js/plugin-data-loader": "2.60.3",
+    "@modern-js/rsbuild-plugin-esbuild": "2.60.3",
+    "@modern-js/prod-server": "2.60.3",
+    "@modern-js/server": "2.60.3",
+    "@modern-js/core": "2.60.3",
+    "@modern-js/server-core": "2.60.3",
+    "@modern-js/server-utils": "2.60.3",
+    "@modern-js/types": "2.60.3",
+    "@modern-js/uni-builder": "2.60.3",
+    "@modern-js/utils": "2.60.3"
   },
   "devDependencies": {
-    "@rsbuild/plugin-webpack-swc": "1.0.3",
+    "@rsbuild/plugin-webpack-swc": "~1.0.3",
     "@types/babel__traverse": "7.20.6",
     "@types/jest": "^29",
     "@types/node": "^16",
@@ -111,9 +111,9 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "webpack": "^5.94.0",
-    "@scripts/build": "2.60.2",
-    "@scripts/jest-config": "2.60.2"
+    "webpack": "^5.95.0",
+    "@scripts/jest-config": "2.60.3",
+    "@scripts/build": "2.60.3"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",

package/dist/cjs/builder/builder-rspack/adapterCopy.js

@@ -1,101 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var adapterCopy_exports = {};
-__export(adapterCopy_exports, {
-  builderPluginAdpaterCopy: () => builderPluginAdpaterCopy
-});
-module.exports = __toCommonJS(adapterCopy_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_fs_extra = __toESM(require("@modern-js/utils/fs-extra"));
-var import_shared = require("../shared");
-const builderPluginAdpaterCopy = (options) => ({
-  name: "builder-plugin-adapter-rspack-copy",
-  setup(api) {
-    let publicPath;
-    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
-      chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
-        var _args_;
-        return [
-          {
-            patterns: [
-              ...((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || [],
-              ...createConfigBuiltinCopy(options)
-            ]
-          }
-        ];
-      });
-    });
-    api.modifyRspackConfig((config) => {
-      var _config_output;
-      publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
-    });
-    api.onDevCompileDone(async () => {
-      await transformHtmlFiles();
-    });
-    api.onAfterBuild(async () => {
-      await transformHtmlFiles();
-    });
-    async function transformHtmlFiles() {
-      var _normalizedConfig_output_distPath;
-      const { normalizedConfig } = options;
-      const publicDir = import_path.default.resolve(((_normalizedConfig_output_distPath = normalizedConfig.output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.root) || "./dist", "./public");
-      if (!import_fs_extra.default.existsSync(publicDir) || !import_fs_extra.default.statSync(publicDir).isDirectory()) {
-        return;
-      }
-      const HTML_REGEXP = /\.html?$/;
-      const filepaths = (await import_fs_extra.default.readdir(publicDir)).map((file) => import_path.default.resolve(publicDir, file));
-      await Promise.all(filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
-        const content = await import_fs_extra.default.readFile(file, "utf-8");
-        if (publicPath && typeof publicPath === "string") {
-          await import_fs_extra.default.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, (0, import_utils.removeTailSlash)(publicPath)));
-        } else {
-          import_utils.logger.warn(`Expect get a string from \`publicPath\`, but receive \`${typeof publicPath}\`.`);
-          await import_fs_extra.default.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, (0, import_utils.removeTailSlash)("/")));
-        }
-      }));
-    }
-  }
-});
-function createConfigBuiltinCopy(options) {
-  const { normalizedConfig, appContext } = options;
-  const { publicDir } = (0, import_shared.createCopyInfo)(appContext, normalizedConfig);
-  return [
-    {
-      from: "**/*",
-      to: "public",
-      context: publicDir,
-      noErrorOnMissing: true
-    }
-  ];
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  builderPluginAdpaterCopy
-});

package/dist/esm/builder/builder-rspack/adapterCopy.js

@@ -1,166 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { _ as _type_of } from "@swc/helpers/_/_type_of";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import path from "path";
-import { logger, removeTailSlash } from "@modern-js/utils";
-import fs from "@modern-js/utils/fs-extra";
-import { createCopyInfo } from "../shared";
-var builderPluginAdpaterCopy = function(options) {
-  return {
-    name: "builder-plugin-adapter-rspack-copy",
-    setup: function setup(api) {
-      var publicPath;
-      api.modifyBundlerChain(function(chain, param) {
-        var CHAIN_ID = param.CHAIN_ID;
-        chain.plugin(CHAIN_ID.PLUGIN.COPY).tap(function(args) {
-          var _args_;
-          return [
-            {
-              patterns: _to_consumable_array(((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || []).concat(_to_consumable_array(createConfigBuiltinCopy(options)))
-            }
-          ];
-        });
-      });
-      api.modifyRspackConfig(function(config) {
-        var _config_output;
-        publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
-      });
-      api.onDevCompileDone(/* @__PURE__ */ _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              return [
-                4,
-                transformHtmlFiles()
-              ];
-            case 1:
-              _state.sent();
-              return [
-                2
-              ];
-          }
-        });
-      }));
-      api.onAfterBuild(/* @__PURE__ */ _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              return [
-                4,
-                transformHtmlFiles()
-              ];
-            case 1:
-              _state.sent();
-              return [
-                2
-              ];
-          }
-        });
-      }));
-      function transformHtmlFiles() {
-        return _transformHtmlFiles.apply(this, arguments);
-      }
-      function _transformHtmlFiles() {
-        _transformHtmlFiles = /** transform public/*.html manaully */
-        _async_to_generator(function() {
-          var _normalizedConfig_output_distPath, normalizedConfig, publicDir, HTML_REGEXP, filepaths;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                normalizedConfig = options.normalizedConfig;
-                publicDir = path.resolve(((_normalizedConfig_output_distPath = normalizedConfig.output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.root) || "./dist", "./public");
-                if (!fs.existsSync(publicDir) || !fs.statSync(publicDir).isDirectory()) {
-                  return [
-                    2
-                  ];
-                }
-                HTML_REGEXP = /\.html?$/;
-                return [
-                  4,
-                  fs.readdir(publicDir)
-                ];
-              case 1:
-                filepaths = _state.sent().map(function(file) {
-                  return path.resolve(publicDir, file);
-                });
-                return [
-                  4,
-                  Promise.all(filepaths.filter(function(file) {
-                    return HTML_REGEXP.test(file);
-                  }).map(function() {
-                    var _ref = _async_to_generator(function(file) {
-                      var content;
-                      return _ts_generator(this, function(_state2) {
-                        switch (_state2.label) {
-                          case 0:
-                            return [
-                              4,
-                              fs.readFile(file, "utf-8")
-                            ];
-                          case 1:
-                            content = _state2.sent();
-                            if (!(publicPath && typeof publicPath === "string"))
-                              return [
-                                3,
-                                3
-                              ];
-                            return [
-                              4,
-                              fs.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(publicPath)))
-                            ];
-                          case 2:
-                            _state2.sent();
-                            return [
-                              3,
-                              5
-                            ];
-                          case 3:
-                            logger.warn("Expect get a string from `publicPath`, but receive `".concat(typeof publicPath === "undefined" ? "undefined" : _type_of(publicPath), "`."));
-                            return [
-                              4,
-                              fs.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash("/")))
-                            ];
-                          case 4:
-                            _state2.sent();
-                            _state2.label = 5;
-                          case 5:
-                            return [
-                              2
-                            ];
-                        }
-                      });
-                    });
-                    return function(file) {
-                      return _ref.apply(this, arguments);
-                    };
-                  }()))
-                ];
-              case 2:
-                _state.sent();
-                return [
-                  2
-                ];
-            }
-          });
-        });
-        return _transformHtmlFiles.apply(this, arguments);
-      }
-    }
-  };
-};
-function createConfigBuiltinCopy(options) {
-  var normalizedConfig = options.normalizedConfig, appContext = options.appContext;
-  var publicDir = createCopyInfo(appContext, normalizedConfig).publicDir;
-  return [
-    {
-      from: "**/*",
-      to: "public",
-      context: publicDir,
-      noErrorOnMissing: true
-    }
-  ];
-}
-export {
-  builderPluginAdpaterCopy
-};

package/dist/esm-node/builder/builder-rspack/adapterCopy.js

@@ -1,67 +0,0 @@
-import path from "path";
-import { logger, removeTailSlash } from "@modern-js/utils";
-import fs from "@modern-js/utils/fs-extra";
-import { createCopyInfo } from "../shared";
-const builderPluginAdpaterCopy = (options) => ({
-  name: "builder-plugin-adapter-rspack-copy",
-  setup(api) {
-    let publicPath;
-    api.modifyBundlerChain((chain, { CHAIN_ID }) => {
-      chain.plugin(CHAIN_ID.PLUGIN.COPY).tap((args) => {
-        var _args_;
-        return [
-          {
-            patterns: [
-              ...((_args_ = args[0]) === null || _args_ === void 0 ? void 0 : _args_.patterns) || [],
-              ...createConfigBuiltinCopy(options)
-            ]
-          }
-        ];
-      });
-    });
-    api.modifyRspackConfig((config) => {
-      var _config_output;
-      publicPath = (_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.publicPath;
-    });
-    api.onDevCompileDone(async () => {
-      await transformHtmlFiles();
-    });
-    api.onAfterBuild(async () => {
-      await transformHtmlFiles();
-    });
-    async function transformHtmlFiles() {
-      var _normalizedConfig_output_distPath;
-      const { normalizedConfig } = options;
-      const publicDir = path.resolve(((_normalizedConfig_output_distPath = normalizedConfig.output.distPath) === null || _normalizedConfig_output_distPath === void 0 ? void 0 : _normalizedConfig_output_distPath.root) || "./dist", "./public");
-      if (!fs.existsSync(publicDir) || !fs.statSync(publicDir).isDirectory()) {
-        return;
-      }
-      const HTML_REGEXP = /\.html?$/;
-      const filepaths = (await fs.readdir(publicDir)).map((file) => path.resolve(publicDir, file));
-      await Promise.all(filepaths.filter((file) => HTML_REGEXP.test(file)).map(async (file) => {
-        const content = await fs.readFile(file, "utf-8");
-        if (publicPath && typeof publicPath === "string") {
-          await fs.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(publicPath)));
-        } else {
-          logger.warn(`Expect get a string from \`publicPath\`, but receive \`${typeof publicPath}\`.`);
-          await fs.writeFile(file, content.replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash("/")));
-        }
-      }));
-    }
-  }
-});
-function createConfigBuiltinCopy(options) {
-  const { normalizedConfig, appContext } = options;
-  const { publicDir } = createCopyInfo(appContext, normalizedConfig);
-  return [
-    {
-      from: "**/*",
-      to: "public",
-      context: publicDir,
-      noErrorOnMissing: true
-    }
-  ];
-}
-export {
-  builderPluginAdpaterCopy
-};

package/dist/types/builder/builder-rspack/adapterCopy.d.ts

@@ -1,3 +0,0 @@
-import type { RsbuildPlugin } from '@modern-js/uni-builder';
-import { type BuilderOptions } from '../shared';
-export declare const builderPluginAdpaterCopy: (options: BuilderOptions<'rspack'>) => RsbuildPlugin;

package/dist/types/builder/builder-webpack/adapterModern.d.ts

@@ -1,6 +0,0 @@
-import type { RsbuildPlugin } from '@modern-js/uni-builder';
-import type { BuilderOptions } from '../shared';
-/**
- * Provides default configuration consistent with modern.js v1
- */
-export declare const builderPluginAdapterModern: (options: BuilderOptions<'webpack'>) => RsbuildPlugin;