@modern-js/app-tools 2.25.1 → 2.26.0

package/CHANGELOG.md

@@ -1,5 +1,86 @@
 # @modern-js/app-tools
 
+## 2.26.0
+
+### Patch Changes
+
+- 05480f1: fix: @modern-js/server-core should be a dependencies of @modern-js/app-tools
+  fix: @modern-js/server-core 应该是 @modern-js/app-tools 的 dependencies
+- fbcac63: perf(cli): improve upgrade command load performance
+
+  perf(cli): 优化 upgrade 命令加载性能
+
+- Updated dependencies [150ddb1]
+- Updated dependencies [786c195]
+- Updated dependencies [e26b05e]
+- Updated dependencies [b36ece4]
+- Updated dependencies [e26b05e]
+- Updated dependencies [15ad760]
+- Updated dependencies [fac4ee0]
+- Updated dependencies [786c195]
+- Updated dependencies [ad7139b]
+- Updated dependencies [cdf5b6b]
+- Updated dependencies [786c195]
+- Updated dependencies [fbcac63]
+  - @modern-js/builder-webpack-provider@2.26.0
+  - @modern-js/builder-rspack-provider@2.26.0
+  - @modern-js/builder-shared@2.26.0
+  - @modern-js/builder@2.26.0
+  - @modern-js/upgrade@2.26.0
+  - @modern-js/builder-plugin-esbuild@2.26.0
+  - @modern-js/builder-plugin-node-polyfill@2.26.0
+  - @modern-js/core@2.26.0
+  - @modern-js/server@2.26.0
+  - @modern-js/new-action@2.26.0
+  - @modern-js/plugin-data-loader@2.26.0
+  - @modern-js/plugin-i18n@2.26.0
+  - @modern-js/plugin-lint@2.26.0
+  - @modern-js/server-core@2.26.0
+  - @modern-js/prod-server@2.26.0
+  - @modern-js/node-bundle-require@2.26.0
+  - @modern-js/plugin@2.26.0
+  - @modern-js/types@2.26.0
+  - @modern-js/utils@2.26.0
+
+## 2.25.2
+
+### Patch Changes
+
+- 6651684: fix(app-tools): failed to print error stack
+
+  fix(app-tools): 修复 build 报错时未打印错误堆栈的问题
+
+- ae723ab: fix: should not clean dist path if run deploy command but skip build
+  fix: 如果运行 deploy 命令，但是跳过构建阶段，不应该清理产物目录
+- 272646c: feat(builder): bump webpack v5.88, support top level await
+
+  feat(builder): 升级 webpack v5.88, 支持 top level await
+
+- Updated dependencies [63d8247]
+- Updated dependencies [f54bb68]
+- Updated dependencies [6651684]
+- Updated dependencies [15a8276]
+- Updated dependencies [272646c]
+- Updated dependencies [358ed24]
+  - @modern-js/utils@2.25.2
+  - @modern-js/builder-rspack-provider@2.25.2
+  - @modern-js/builder-webpack-provider@2.25.2
+  - @modern-js/builder-shared@2.25.2
+  - @modern-js/plugin-data-loader@2.25.2
+  - @modern-js/server@2.25.2
+  - @modern-js/builder@2.25.2
+  - @modern-js/builder-plugin-esbuild@2.25.2
+  - @modern-js/builder-plugin-node-polyfill@2.25.2
+  - @modern-js/core@2.25.2
+  - @modern-js/plugin-i18n@2.25.2
+  - @modern-js/plugin-lint@2.25.2
+  - @modern-js/new-action@2.25.2
+  - @modern-js/prod-server@2.25.2
+  - @modern-js/node-bundle-require@2.25.2
+  - @modern-js/plugin@2.25.2
+  - @modern-js/upgrade@2.25.2
+  - @modern-js/types@2.25.2
+
 ## 2.25.1
 
 ### Patch Changes

package/dist/cjs/commands/build.js

@@ -49,14 +49,9 @@ const build = async (api, options) => {
     distDirectory,
     configFile: serverConfigFile
   });
-  try {
-    _utils.logger.info("Create a production build...\n");
-    if (!appContext.builder) {
-      throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
-    }
-    await appContext.builder.build();
-  } catch (error) {
-    (0, _utils.printBuildError)(error);
-    process.exit(1);
+  _utils.logger.info("Create a production build...\n");
+  if (!appContext.builder) {
+    throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
+  await appContext.builder.build();
 };

package/dist/cjs/index.js

@@ -43,7 +43,6 @@ const _generateWatchFiles = require("./utils/generateWatchFiles");
 const _core = require("@modern-js/core");
 _export_star._(require("./defineConfig"), exports);
 _export_star._(require("./types"), exports);
-const upgradeModel = _utils.Import.lazy("@modern-js/upgrade", require);
 const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
@@ -162,10 +161,22 @@ const appTools = (options = {
             const { inspect } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("./commands/inspect")));
             inspect(api, options2);
           });
-          upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)));
+          const { defineCommand } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/upgrade")));
+          defineCommand(program.command("upgrade").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)));
         },
         async prepare() {
           const command = (0, _utils.getCommand)();
+          if (command === "deploy") {
+            const isSkipBuild = [
+              "-s",
+              "--skip-build"
+            ].some((tag) => {
+              return (0, _utils.getArgv)().includes(tag);
+            });
+            if (isSkipBuild) {
+              return;
+            }
+          }
           if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
             const resolvedConfig = api.useResolvedConfigContext();
             if (resolvedConfig.output.cleanDistPath) {

package/dist/esm/commands/build.js

@@ -3,12 +3,12 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { logger, printBuildError } from "@modern-js/utils";
+import { logger } from "@modern-js/utils";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 export var build = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1, error;
+    var resolvedConfig, appContext, hookRunners, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -78,14 +78,6 @@ export var build = function() {
           ];
         case 6:
           _state.sent();
-          _state.label = 7;
-        case 7:
-          _state.trys.push([
-            7,
-            9,
-            ,
-            10
-          ]);
           logger.info("Create a production build...\n");
           if (!appContext.builder) {
             throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
@@ -94,21 +86,8 @@ export var build = function() {
             4,
             appContext.builder.build()
           ];
-        case 8:
+        case 7:
           _state.sent();
-          return [
-            3,
-            10
-          ];
-        case 9:
-          error = _state.sent();
-          printBuildError(error);
-          process.exit(1);
-          return [
-            3,
-            10
-          ];
-        case 10:
           return [
             2
           ];

package/dist/esm/index.js

@@ -4,7 +4,7 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, Import, getCommand } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
@@ -16,7 +16,6 @@ import { generateWatchFiles } from "./utils/generateWatchFiles";
 export { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
-var upgradeModel = Import.lazy("@modern-js/upgrade", require);
 export var devCommand = function() {
   var _ref = _async_to_generator(function(program, api) {
     var runner, devToolMetas, devProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, meta, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, subCmd;
@@ -325,6 +324,7 @@ export var appTools = function() {
         commands: function commands(param) {
           var program = param.program;
           return _async_to_generator(function() {
+            var defineCommand;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -464,7 +464,13 @@ export var appTools = function() {
                       return _ref.apply(this, arguments);
                     };
                   }());
-                  upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
+                  return [
+                    4,
+                    import("@modern-js/upgrade")
+                  ];
+                case 3:
+                  defineCommand = _state.sent().defineCommand;
+                  defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
                   return [
                     2
                   ];
@@ -474,11 +480,24 @@ export var appTools = function() {
         },
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var command, resolvedConfig, appContext2;
+            var command, isSkipBuild, resolvedConfig, appContext2;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   command = getCommand();
+                  if (command === "deploy") {
+                    isSkipBuild = [
+                      "-s",
+                      "--skip-build"
+                    ].some(function(tag) {
+                      return getArgv().includes(tag);
+                    });
+                    if (isSkipBuild) {
+                      return [
+                        2
+                      ];
+                    }
+                  }
                   if (!(command === "dev" || command === "start" || command === "build" || command === "deploy"))
                     return [
                       3,

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

@@ -1,5 +1,5 @@
 import { ResolvedConfigContext } from "@modern-js/core";
-import { logger, printBuildError } from "@modern-js/utils";
+import { logger } from "@modern-js/utils";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 export const build = async (api, options) => {
@@ -39,14 +39,9 @@ export const build = async (api, options) => {
     distDirectory,
     configFile: serverConfigFile
   });
-  try {
-    logger.info("Create a production build...\n");
-    if (!appContext.builder) {
-      throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
-    }
-    await appContext.builder.build();
-  } catch (error) {
-    printBuildError(error);
-    process.exit(1);
+  logger.info("Create a production build...\n");
+  if (!appContext.builder) {
+    throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
+  await appContext.builder.build();
 };

package/dist/esm-node/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, Import, getCommand } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
@@ -12,7 +12,6 @@ import { generateWatchFiles } from "./utils/generateWatchFiles";
 export { mergeConfig } from "@modern-js/core";
 export * from "./defineConfig";
 export * from "./types";
-const upgradeModel = Import.lazy("@modern-js/upgrade", require);
 export const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
@@ -131,10 +130,22 @@ export const appTools = (options = {
             const { inspect } = await import("./commands/inspect");
             inspect(api, options2);
           });
-          upgradeModel.defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
+          const { defineCommand } = await import("@modern-js/upgrade");
+          defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)));
         },
         async prepare() {
           const command = getCommand();
+          if (command === "deploy") {
+            const isSkipBuild = [
+              "-s",
+              "--skip-build"
+            ].some((tag) => {
+              return getArgv().includes(tag);
+            });
+            if (isSkipBuild) {
+              return;
+            }
+          }
           if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
             const resolvedConfig = api.useResolvedConfigContext();
             if (resolvedConfig.output.cleanDistPath) {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.25.1",
+  "version": "2.26.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -73,23 +73,24 @@
     "esbuild": "0.17.19",
     "rspack-plugin-virtual-module": "0.1.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.25.1",
-    "@modern-js/builder-plugin-esbuild": "2.25.1",
-    "@modern-js/builder-plugin-node-polyfill": "2.25.1",
-    "@modern-js/builder-shared": "2.25.1",
-    "@modern-js/builder-webpack-provider": "2.25.1",
-    "@modern-js/core": "2.25.1",
-    "@modern-js/new-action": "2.25.1",
-    "@modern-js/node-bundle-require": "2.25.1",
-    "@modern-js/plugin": "2.25.1",
-    "@modern-js/plugin-data-loader": "2.25.1",
-    "@modern-js/plugin-i18n": "2.25.1",
-    "@modern-js/plugin-lint": "2.25.1",
-    "@modern-js/prod-server": "2.25.1",
-    "@modern-js/server": "2.25.1",
-    "@modern-js/types": "2.25.1",
-    "@modern-js/upgrade": "2.25.1",
-    "@modern-js/utils": "2.25.1"
+    "@modern-js/builder": "2.26.0",
+    "@modern-js/builder-plugin-esbuild": "2.26.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.26.0",
+    "@modern-js/builder-shared": "2.26.0",
+    "@modern-js/builder-webpack-provider": "2.26.0",
+    "@modern-js/core": "2.26.0",
+    "@modern-js/new-action": "2.26.0",
+    "@modern-js/node-bundle-require": "2.26.0",
+    "@modern-js/plugin": "2.26.0",
+    "@modern-js/plugin-data-loader": "2.26.0",
+    "@modern-js/plugin-i18n": "2.26.0",
+    "@modern-js/plugin-lint": "2.26.0",
+    "@modern-js/prod-server": "2.26.0",
+    "@modern-js/server": "2.26.0",
+    "@modern-js/types": "2.26.0",
+    "@modern-js/upgrade": "2.26.0",
+    "@modern-js/utils": "2.26.0",
+    "@modern-js/server-core": "2.26.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -97,15 +98,14 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.82.1",
-    "@modern-js/builder-plugin-swc": "2.25.1",
-    "@modern-js/builder-rspack-provider": "2.25.1",
-    "@modern-js/server-core": "2.25.1",
-    "@scripts/build": "2.25.1",
-    "@scripts/jest-config": "2.25.1"
+    "webpack": "^5.88.1",
+    "@modern-js/builder-plugin-swc": "2.26.0",
+    "@modern-js/builder-rspack-provider": "2.26.0",
+    "@scripts/jest-config": "2.26.0",
+    "@scripts/build": "2.26.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.25.1"
+    "@modern-js/builder-rspack-provider": "^2.26.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {