@modern-js/app-tools 2.22.0 → 2.23.0

package/CHANGELOG.md

@@ -1,5 +1,111 @@
 # @modern-js/app-tools
 
+## 2.23.0
+
+### Minor Changes
+
+- b185fdf: refactor: merge the swc plugin
+  refactor: 合并 swc 插件
+
+### Patch Changes
+
+- 162fb9d: fix: should only restart when changed file is watched
+  fix: 只有在变化的文件被监听是才重启
+- 7e6fb5f: chore: publishConfig add provenance config
+
+  chore: publishConfig 增加 provenance 配置
+
+- b593040: fix(app-tools): incorrect tools.tailwindcss schema
+
+  fix(app-tools): 修复 tools.tailwindcss schema 错误
+
+- 6dec7c2: test(utils): reuse the snapshot serializer of vitest config
+
+  test(utils): 复用 vitest 的 snapshot serializer
+
+- c3216b5: chore: split the scheme into the plugin
+
+  chore: 拆分 scheme 到插件内部
+
+- e5259fb: fix: absoluteEntryDir should support directory entry
+  fix: absoluteEntryDir 应该支持配置目录 entry，这里 document 会使用
+- Updated dependencies [15eac36]
+- Updated dependencies [a912b66]
+- Updated dependencies [9b270b6]
+- Updated dependencies [d4e85c1]
+- Updated dependencies [7e6fb5f]
+- Updated dependencies [a7a7ad7]
+- Updated dependencies [f212633]
+- Updated dependencies [b593040]
+- Updated dependencies [e2245c3]
+- Updated dependencies [5684381]
+- Updated dependencies [6dec7c2]
+- Updated dependencies [c3216b5]
+- Updated dependencies [f14f920]
+- Updated dependencies [692cc0e]
+- Updated dependencies [38eccef]
+- Updated dependencies [e5259fb]
+- Updated dependencies [f91c557]
+- Updated dependencies [65721f2]
+- Updated dependencies [a82d6f7]
+  - @modern-js/builder-webpack-provider@2.23.0
+  - @modern-js/builder-rspack-provider@2.23.0
+  - @modern-js/builder-shared@2.23.0
+  - @modern-js/builder@2.23.0
+  - @modern-js/builder-plugin-node-polyfill@2.23.0
+  - @modern-js/node-bundle-require@2.23.0
+  - @modern-js/builder-plugin-esbuild@2.23.0
+  - @modern-js/plugin-data-loader@2.23.0
+  - @modern-js/new-action@2.23.0
+  - @modern-js/prod-server@2.23.0
+  - @modern-js/plugin-i18n@2.23.0
+  - @modern-js/plugin-lint@2.23.0
+  - @modern-js/upgrade@2.23.0
+  - @modern-js/plugin@2.23.0
+  - @modern-js/server@2.23.0
+  - @modern-js/types@2.23.0
+  - @modern-js/utils@2.23.0
+  - @modern-js/core@2.23.0
+
+## 2.22.1
+
+### Patch Changes
+
+- 664f414: fix(app-tools): should not delete internalDir because we need guarantee the dev, build command correct.
+  fix(app-tools): 不应该在非构建模式下删除 internalDir，因为我们需要保证这些构建模式的入口是正确的
+- Updated dependencies [25b490a]
+- Updated dependencies [e2848a2]
+- Updated dependencies [a470c04]
+- Updated dependencies [95ffa6b]
+- Updated dependencies [12d54ae]
+- Updated dependencies [bd4b150]
+- Updated dependencies [c739207]
+- Updated dependencies [c465db6]
+- Updated dependencies [dd36311]
+- Updated dependencies [d4045ed]
+- Updated dependencies [8bd9981]
+- Updated dependencies [1f02cd2]
+- Updated dependencies [cfcf003]
+- Updated dependencies [15181be]
+  - @modern-js/types@2.22.1
+  - @modern-js/utils@2.22.1
+  - @modern-js/builder-webpack-provider@2.22.1
+  - @modern-js/builder-rspack-provider@2.22.1
+  - @modern-js/builder-shared@2.22.1
+  - @modern-js/builder@2.22.1
+  - @modern-js/server@2.22.1
+  - @modern-js/prod-server@2.22.1
+  - @modern-js/core@2.22.1
+  - @modern-js/plugin-data-loader@2.22.1
+  - @modern-js/builder-plugin-esbuild@2.22.1
+  - @modern-js/builder-plugin-node-polyfill@2.22.1
+  - @modern-js/plugin-i18n@2.22.1
+  - @modern-js/plugin-lint@2.22.1
+  - @modern-js/new-action@2.22.1
+  - @modern-js/node-bundle-require@2.22.1
+  - @modern-js/plugin@2.22.1
+  - @modern-js/upgrade@2.22.1
+
 ## 2.22.0
 
 ### Minor Changes

package/dist/cjs/analyze/getBundleEntry.js

@@ -19,6 +19,7 @@ const ensureExtensions = (file) => {
   }
   return file;
 };
+const isDirectory = (file) => !_path.default.extname(file);
 const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
   if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
     checked.entryName = entrypoint.entryName;
@@ -34,7 +35,7 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
 });
 const getBundleEntry = (appContext, config) => {
   const { appDirectory, packageName } = appContext;
-  const { source: { disableDefaultEntries, entries, entriesDir } } = config;
+  const { disableDefaultEntries, entries, entriesDir } = config.source;
   const defaults = disableDefaultEntries ? [] : (0, _getFileSystemEntry.getFileSystemEntry)(appContext, config);
   if (entries) {
     Object.keys(entries).forEach((name) => {
@@ -42,13 +43,13 @@ const getBundleEntry = (appContext, config) => {
       const entrypoint = typeof value === "string" ? {
         entryName: name,
         entry: (0, _utils.ensureAbsolutePath)(appDirectory, value),
-        absoluteEntryDir: _path.default.dirname((0, _utils.ensureAbsolutePath)(appDirectory, value)),
+        absoluteEntryDir: isDirectory((0, _utils.ensureAbsolutePath)(appDirectory, value)) ? (0, _utils.ensureAbsolutePath)(appDirectory, value) : _path.default.dirname((0, _utils.ensureAbsolutePath)(appDirectory, value)),
         isAutoMount: true,
         fileSystemRoutes: _utils.fs.statSync((0, _utils.ensureAbsolutePath)(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
         entry: (0, _utils.ensureAbsolutePath)(appDirectory, value.entry),
-        absoluteEntryDir: _path.default.dirname((0, _utils.ensureAbsolutePath)(appDirectory, value.entry)),
+        absoluteEntryDir: isDirectory((0, _utils.ensureAbsolutePath)(appDirectory, value.entry)) ? (0, _utils.ensureAbsolutePath)(appDirectory, value.entry) : _path.default.dirname((0, _utils.ensureAbsolutePath)(appDirectory, value.entry)),
         isAutoMount: !value.disableMount,
         customBootstrap: value.customBootstrap && (0, _utils.ensureAbsolutePath)(appDirectory, value.customBootstrap),
         fileSystemRoutes: _utils.fs.statSync((0, _utils.ensureAbsolutePath)(appDirectory, value.entry)).isDirectory() ? {} : void 0

package/dist/cjs/analyze/index.js

@@ -36,10 +36,12 @@ const _default = ({ bundler }) => {
           const resolvedConfig = api.useResolvedConfigContext();
           const hookRunners = api.useHookRunners();
           try {
-            _utils.fs.emptydirSync(appContext.internalDirectory);
+            if ((0, _utils1.checkIsBuildCommands)()) {
+              _utils.fs.emptydirSync(appContext.internalDirectory);
+            }
           } catch {
           }
-          const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir);
+          const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir, appContext.apiDirectory);
           await hookRunners.addRuntimeExports();
           if (apiOnly) {
             const { routes: routes2 } = await hookRunners.modifyServerRoutes({
@@ -101,15 +103,7 @@ const _default = ({ bundler }) => {
             htmlTemplates
           };
           api.setAppContext(appContext);
-          const command = (0, _utils.getCommand)();
-          const buildCommands = [
-            "dev",
-            "start",
-            "build",
-            "inspect",
-            "deploy"
-          ];
-          if (buildCommands.includes(command)) {
+          if ((0, _utils1.checkIsBuildCommands)()) {
             const normalizedConfig = api.useResolvedConfigContext();
             const createBuilderForModern = await (0, _builder.createBuilderGenerator)(bundler);
             const builder = await createBuilderForModern({

package/dist/cjs/analyze/utils.js

@@ -33,6 +33,9 @@ _export(exports, {
   },
   getServerCombinedModueFile: function() {
     return getServerCombinedModueFile;
+  },
+  checkIsBuildCommands: function() {
+    return checkIsBuildCommands;
   }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
@@ -175,3 +178,14 @@ const getServerLoadersFile = (internalDirectory, entryName) => {
 const getServerCombinedModueFile = (internalDirectory, entryName) => {
   return _path.default.join(internalDirectory, entryName, "server-loader-combined.js");
 };
+const checkIsBuildCommands = () => {
+  const buildCommands = [
+    "dev",
+    "start",
+    "build",
+    "inspect",
+    "deploy"
+  ];
+  const command = (0, _utils.getCommand)();
+  return buildCommands.includes(command);
+};

package/dist/cjs/commands/serve.js

@@ -21,7 +21,7 @@ const start = async (api) => {
   const hookRunners = api.useHookRunners();
   const { appDirectory, port, serverConfigFile } = appContext;
   _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
-  const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir);
+  const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
   const serverInternalPlugins = await (0, _getServerInternalPlugins.getServerInternalPlugins)(api);
   const app = await (0, _prodserver.default)({
     pwd: appDirectory,

package/dist/cjs/index.js

@@ -112,6 +112,12 @@ const _default = (options = {
     ],
     setup: (api) => {
       const appContext = api.useAppContext();
+      let watchedFiles = [];
+      const isWatched = (fn) => {
+        return watchedFiles.some((ff) => {
+          return fn.includes(ff);
+        });
+      };
       api.setAppContext({
         ...appContext,
         toolsType: "app-tools"
@@ -172,15 +178,17 @@ const _default = (options = {
         async watchFiles() {
           const appContext2 = api.useAppContext();
           const config = api.useResolvedConfigContext();
-          return (0, _generateWatchFiles.generateWatchFiles)(appContext2, config.source.configDir);
+          const files = await (0, _generateWatchFiles.generateWatchFiles)(appContext2, config.source.configDir);
+          watchedFiles = files;
+          return files;
         },
         // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
         async fileChange(e) {
           const { filename, eventType } = e;
           const appContext2 = api.useAppContext();
-          const { appDirectory, srcDirectory } = appContext2;
+          const { appDirectory } = appContext2;
           const absolutePath = _path.default.resolve(appDirectory, filename);
-          if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
+          if (isWatched(absolutePath) && (eventType === "change" || eventType === "unlink")) {
             const { closeServer } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./utils/createServer")));
             await closeServer();
             await (0, _restart.restart)(api.useHookRunners(), filename);

package/dist/cjs/schema/index.js

@@ -166,29 +166,13 @@ const server = {
   }
 };
 const tools = {
-  tailwindcss: {
-    type: "object"
-  },
-  jest: {
-    typeof: [
-      "object",
-      "function"
-    ]
-  },
   esbuild: {
     typeof: [
       "object"
     ]
   }
 };
-const deploy = {
-  microFrontend: {
-    type: [
-      "boolean",
-      "object"
-    ]
-  }
-};
+const deploy = {};
 const builderPlugins = {
   type: "array"
 };

package/dist/esm/analyze/getBundleEntry.js

@@ -10,6 +10,9 @@ var ensureExtensions = function(file) {
   }
   return file;
 };
+var isDirectory = function(file) {
+  return !path.extname(file);
+};
 var ifAlreadyExists = function(entrypoints, checked) {
   return entrypoints.some(function(entrypoint) {
     if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
@@ -32,13 +35,13 @@ export var getBundleEntry = function(appContext, config) {
       var entrypoint = typeof value === "string" ? {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value),
-        absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value)),
+        absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, value)) ? ensureAbsolutePath(appDirectory, value) : path.dirname(ensureAbsolutePath(appDirectory, value)),
         isAutoMount: true,
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value.entry),
-        absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
+        absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, value.entry)) ? ensureAbsolutePath(appDirectory, value.entry) : path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
         isAutoMount: !value.disableMount,
         customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0

package/dist/esm/analyze/index.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly, minimist, getCommand, isDevCommand, getArgv } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly, minimist, isDevCommand, getArgv } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
@@ -12,7 +12,7 @@ import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
 import { createBuilderGenerator } from "../builder";
-import { isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
+import { checkIsBuildCommands, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 import { generateIndexCode } from "./generateCode";
 var debug = createDebugger("plugin-analyze");
@@ -27,7 +27,7 @@ export default function(param) {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, routes, _ref, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes1, importsStatemets, htmlTemplates, checkedEntries, entry, command, buildCommands, normalizedConfig, createBuilderForModern, builder;
+            var _resolvedConfig_source, appContext, resolvedConfig, hookRunners, apiOnly, routes, _ref, getBundleEntry, getServerRoutes, generateCode, getHtmlTemplate, entrypoints, initialRoutes, routes1, importsStatemets, htmlTemplates, checkedEntries, entry, normalizedConfig, createBuilderForModern, builder;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -35,12 +35,14 @@ export default function(param) {
                   resolvedConfig = api.useResolvedConfigContext();
                   hookRunners = api.useHookRunners();
                   try {
-                    fs.emptydirSync(appContext.internalDirectory);
+                    if (checkIsBuildCommands()) {
+                      fs.emptydirSync(appContext.internalDirectory);
+                    }
                   } catch (e) {
                   }
                   return [
                     4,
-                    isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir)
+                    isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir, appContext.apiDirectory)
                   ];
                 case 1:
                   apiOnly = _state.sent();
@@ -164,15 +166,7 @@ export default function(param) {
                     htmlTemplates: htmlTemplates
                   });
                   api.setAppContext(appContext);
-                  command = getCommand();
-                  buildCommands = [
-                    "dev",
-                    "start",
-                    "build",
-                    "inspect",
-                    "deploy"
-                  ];
-                  if (!buildCommands.includes(command))
+                  if (!checkIsBuildCommands())
                     return [
                       3,
                       14

package/dist/esm/analyze/utils.js

@@ -4,7 +4,7 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import fs from "fs";
 import path from "path";
-import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
+import { isReact18, normalizeToPosixPath, fs as fse, getCommand } from "@modern-js/utils";
 import { transform } from "esbuild";
 import { parse } from "es-module-lexer";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME } from "./constants";
@@ -201,3 +201,14 @@ export var getServerLoadersFile = function(internalDirectory, entryName) {
 export var getServerCombinedModueFile = function(internalDirectory, entryName) {
   return path.join(internalDirectory, entryName, "server-loader-combined.js");
 };
+export var checkIsBuildCommands = function() {
+  var buildCommands = [
+    "dev",
+    "start",
+    "build",
+    "inspect",
+    "deploy"
+  ];
+  var command = getCommand();
+  return buildCommands.includes(command);
+};

package/dist/esm/commands/serve.js

@@ -20,7 +20,7 @@ export var start = function() {
           logger.log(chalk.cyan("Starting the modern server..."));
           return [
             4,
-            isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir)
+            isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory)
           ];
         case 1:
           apiOnly = _state.sent();

package/dist/esm/index.js

@@ -297,6 +297,12 @@ export default function() {
     ],
     setup: function(api) {
       var appContext = api.useAppContext();
+      var watchedFiles = [];
+      var isWatched = function(fn) {
+        return watchedFiles.some(function(ff) {
+          return fn.includes(ff);
+        });
+      };
       api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
         toolsType: "app-tools"
       }));
@@ -501,14 +507,24 @@ export default function() {
         },
         watchFiles: function watchFiles() {
           return _async_to_generator(function() {
-            var appContext2, config;
+            var appContext2, config, files;
             return _ts_generator(this, function(_state) {
-              appContext2 = api.useAppContext();
-              config = api.useResolvedConfigContext();
-              return [
-                2,
-                generateWatchFiles(appContext2, config.source.configDir)
-              ];
+              switch (_state.label) {
+                case 0:
+                  appContext2 = api.useAppContext();
+                  config = api.useResolvedConfigContext();
+                  return [
+                    4,
+                    generateWatchFiles(appContext2, config.source.configDir)
+                  ];
+                case 1:
+                  files = _state.sent();
+                  watchedFiles = files;
+                  return [
+                    2,
+                    files
+                  ];
+              }
             });
           })();
         },
@@ -516,15 +532,15 @@ export default function() {
           // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
           function fileChange(e) {
             return _async_to_generator(function() {
-              var filename, eventType, appContext2, appDirectory, srcDirectory, absolutePath, closeServer;
+              var filename, eventType, appContext2, appDirectory, absolutePath, closeServer;
               return _ts_generator(this, function(_state) {
                 switch (_state.label) {
                   case 0:
                     filename = e.filename, eventType = e.eventType;
                     appContext2 = api.useAppContext();
-                    appDirectory = appContext2.appDirectory, srcDirectory = appContext2.srcDirectory;
+                    appDirectory = appContext2.appDirectory;
                     absolutePath = path.resolve(appDirectory, filename);
-                    if (!(!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")))
+                    if (!(isWatched(absolutePath) && (eventType === "change" || eventType === "unlink")))
                       return [
                         3,
                         4

package/dist/esm/schema/index.js

@@ -144,29 +144,13 @@ var server = {
   }
 };
 var tools = {
-  tailwindcss: {
-    type: "object"
-  },
-  jest: {
-    typeof: [
-      "object",
-      "function"
-    ]
-  },
   esbuild: {
     typeof: [
       "object"
     ]
   }
 };
-var deploy = {
-  microFrontend: {
-    type: [
-      "boolean",
-      "object"
-    ]
-  }
-};
+var deploy = {};
 var builderPlugins = {
   type: "array"
 };

package/dist/esm-node/analyze/getBundleEntry.js

@@ -8,6 +8,7 @@ const ensureExtensions = (file) => {
   }
   return file;
 };
+const isDirectory = (file) => !path.extname(file);
 const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
   if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
     checked.entryName = entrypoint.entryName;
@@ -23,7 +24,7 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
 });
 export const getBundleEntry = (appContext, config) => {
   const { appDirectory, packageName } = appContext;
-  const { source: { disableDefaultEntries, entries, entriesDir } } = config;
+  const { disableDefaultEntries, entries, entriesDir } = config.source;
   const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
   if (entries) {
     Object.keys(entries).forEach((name) => {
@@ -31,13 +32,13 @@ export const getBundleEntry = (appContext, config) => {
       const entrypoint = typeof value === "string" ? {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value),
-        absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value)),
+        absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, value)) ? ensureAbsolutePath(appDirectory, value) : path.dirname(ensureAbsolutePath(appDirectory, value)),
         isAutoMount: true,
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value.entry),
-        absoluteEntryDir: path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
+        absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, value.entry)) ? ensureAbsolutePath(appDirectory, value.entry) : path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
         isAutoMount: !value.disableMount,
         customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0

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

@@ -1,5 +1,5 @@
 import * as path from "path";
-import { createDebugger, findExists, fs, isApiOnly, minimist, getCommand, isDevCommand, getArgv } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly, minimist, isDevCommand, getArgv } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
@@ -7,7 +7,7 @@ import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
 import { createBuilderGenerator } from "../builder";
-import { isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
+import { checkIsBuildCommands, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 import { generateIndexCode } from "./generateCode";
 const debug = createDebugger("plugin-analyze");
@@ -25,10 +25,12 @@ export default ({ bundler }) => {
           const resolvedConfig = api.useResolvedConfigContext();
           const hookRunners = api.useHookRunners();
           try {
-            fs.emptydirSync(appContext.internalDirectory);
+            if (checkIsBuildCommands()) {
+              fs.emptydirSync(appContext.internalDirectory);
+            }
           } catch {
           }
-          const apiOnly = await isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir);
+          const apiOnly = await isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir, appContext.apiDirectory);
           await hookRunners.addRuntimeExports();
           if (apiOnly) {
             const { routes: routes2 } = await hookRunners.modifyServerRoutes({
@@ -90,15 +92,7 @@ export default ({ bundler }) => {
             htmlTemplates
           };
           api.setAppContext(appContext);
-          const command = getCommand();
-          const buildCommands = [
-            "dev",
-            "start",
-            "build",
-            "inspect",
-            "deploy"
-          ];
-          if (buildCommands.includes(command)) {
+          if (checkIsBuildCommands()) {
             const normalizedConfig = api.useResolvedConfigContext();
             const createBuilderForModern = await createBuilderGenerator(bundler);
             const builder = await createBuilderForModern({

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

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { isReact18, normalizeToPosixPath, fs as fse } from "@modern-js/utils";
+import { isReact18, normalizeToPosixPath, fs as fse, getCommand } from "@modern-js/utils";
 import { transform } from "esbuild";
 import { parse } from "es-module-lexer";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, JS_EXTENSIONS, LOADER_EXPORT_NAME } from "./constants";
@@ -137,3 +137,14 @@ export const getServerLoadersFile = (internalDirectory, entryName) => {
 export const getServerCombinedModueFile = (internalDirectory, entryName) => {
   return path.join(internalDirectory, entryName, "server-loader-combined.js");
 };
+export const checkIsBuildCommands = () => {
+  const buildCommands = [
+    "dev",
+    "start",
+    "build",
+    "inspect",
+    "deploy"
+  ];
+  const command = getCommand();
+  return buildCommands.includes(command);
+};

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

@@ -10,7 +10,7 @@ export const start = async (api) => {
   const hookRunners = api.useHookRunners();
   const { appDirectory, port, serverConfigFile } = appContext;
   logger.log(chalk.cyan(`Starting the modern server...`));
-  const apiOnly = await isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir);
+  const apiOnly = await isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
   const serverInternalPlugins = await getServerInternalPlugins(api);
   const app = await server({
     pwd: appDirectory,

package/dist/esm-node/index.js

@@ -84,6 +84,12 @@ export default (options = {
     ],
     setup: (api) => {
       const appContext = api.useAppContext();
+      let watchedFiles = [];
+      const isWatched = (fn) => {
+        return watchedFiles.some((ff) => {
+          return fn.includes(ff);
+        });
+      };
       api.setAppContext({
         ...appContext,
         toolsType: "app-tools"
@@ -144,15 +150,17 @@ export default (options = {
         async watchFiles() {
           const appContext2 = api.useAppContext();
           const config = api.useResolvedConfigContext();
-          return generateWatchFiles(appContext2, config.source.configDir);
+          const files = await generateWatchFiles(appContext2, config.source.configDir);
+          watchedFiles = files;
+          return files;
         },
         // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
         async fileChange(e) {
           const { filename, eventType } = e;
           const appContext2 = api.useAppContext();
-          const { appDirectory, srcDirectory } = appContext2;
+          const { appDirectory } = appContext2;
           const absolutePath = path.resolve(appDirectory, filename);
-          if (!absolutePath.includes(srcDirectory) && (eventType === "change" || eventType === "unlink")) {
+          if (isWatched(absolutePath) && (eventType === "change" || eventType === "unlink")) {
             const { closeServer } = await import("./utils/createServer");
             await closeServer();
             await restart(api.useHookRunners(), filename);

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

@@ -145,29 +145,13 @@ const server = {
   }
 };
 const tools = {
-  tailwindcss: {
-    type: "object"
-  },
-  jest: {
-    typeof: [
-      "object",
-      "function"
-    ]
-  },
   esbuild: {
     typeof: [
       "object"
     ]
   }
 };
-const deploy = {
-  microFrontend: {
-    type: [
-      "boolean",
-      "object"
-    ]
-  }
-};
+const deploy = {};
 const builderPlugins = {
   type: "array"
 };

package/dist/types/analyze/utils.d.ts

@@ -25,4 +25,5 @@ export declare const parseModule: ({
 }) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean]>;
 export declare const hasLoader: (filename: string) => Promise<boolean>;
 export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;
-export declare const getServerCombinedModueFile: (internalDirectory: string, entryName: string) => string;
+export declare const getServerCombinedModueFile: (internalDirectory: string, entryName: string) => string;
+export declare const checkIsBuildCommands: () => boolean;

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

@@ -9,20 +9,25 @@ export type BuilderToolsConfig = UnwrapBuilderConfig<BuilderConfig, 'tools'> & {
   esbuild?: PluginEsbuildOptions;
 };
 export type RsBuilderToolsConfig = UnwrapBuilderConfig<RsBuilderConfig, 'tools'>;
-/**
- * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
- * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
- * @requires `tailwindcss` plugin
- */
 export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
 export interface SharedToolsConfig extends BuilderSharedToolsConfig {
+  /**
+   * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
+   * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+   * @requires `tailwindcss` plugin
+   */
   tailwindcss?: Tailwindcss;
+  /**
+   * The configuration of `tools.jest` is provided by `test` plugin.
+   * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+   * @requires `test` plugin
+   */
   jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
   /**
    * The configuration of `swc` is provided by `swc` plugin.
    * @requires `swc` plugin
    */
-  swc?: PluginSwcOptions;
+  swc?: PluginSwcOptions<'outer'>;
 }
 export interface ToolsUserConfig extends BuilderToolsConfig, SharedToolsConfig {}
 export interface RsToolsUserConfig extends SharedToolsConfig, RsBuilderToolsConfig {}

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.22.0",
+  "version": "2.23.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -73,23 +73,23 @@
     "esbuild": "0.15.7",
     "rspack-plugin-virtual-module": "0.1.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.22.0",
-    "@modern-js/builder-plugin-esbuild": "2.22.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.22.0",
-    "@modern-js/builder-shared": "2.22.0",
-    "@modern-js/builder-webpack-provider": "2.22.0",
-    "@modern-js/core": "2.22.0",
-    "@modern-js/new-action": "2.22.0",
-    "@modern-js/node-bundle-require": "2.22.0",
-    "@modern-js/plugin": "2.22.0",
-    "@modern-js/plugin-data-loader": "2.22.0",
-    "@modern-js/plugin-i18n": "2.22.0",
-    "@modern-js/plugin-lint": "2.22.0",
-    "@modern-js/prod-server": "2.22.0",
-    "@modern-js/server": "2.22.0",
-    "@modern-js/types": "2.22.0",
-    "@modern-js/upgrade": "2.22.0",
-    "@modern-js/utils": "2.22.0"
+    "@modern-js/builder": "2.23.0",
+    "@modern-js/builder-plugin-esbuild": "2.23.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.23.0",
+    "@modern-js/builder-shared": "2.23.0",
+    "@modern-js/builder-webpack-provider": "2.23.0",
+    "@modern-js/core": "2.23.0",
+    "@modern-js/new-action": "2.23.0",
+    "@modern-js/node-bundle-require": "2.23.0",
+    "@modern-js/plugin": "2.23.0",
+    "@modern-js/plugin-data-loader": "2.23.0",
+    "@modern-js/plugin-i18n": "2.23.0",
+    "@modern-js/plugin-lint": "2.23.0",
+    "@modern-js/prod-server": "2.23.0",
+    "@modern-js/server": "2.23.0",
+    "@modern-js/types": "2.23.0",
+    "@modern-js/upgrade": "2.23.0",
+    "@modern-js/utils": "2.23.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -98,14 +98,14 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.82.1",
-    "@modern-js/builder-rspack-provider": "2.22.0",
-    "@scripts/jest-config": "2.22.0",
-    "@modern-js/server-core": "2.22.0",
-    "@scripts/build": "2.22.0",
-    "@modern-js/builder-plugin-swc": "2.22.0"
+    "@modern-js/builder-plugin-swc": "2.23.0",
+    "@modern-js/builder-rspack-provider": "2.23.0",
+    "@modern-js/server-core": "2.23.0",
+    "@scripts/build": "2.23.0",
+    "@scripts/jest-config": "2.23.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.22.0"
+    "@modern-js/builder-rspack-provider": "^2.23.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {
@@ -115,7 +115,8 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "new": "modern-lib new",