@modern-js/app-tools 2.25.0 → 2.25.2

package/CHANGELOG.md

@@ -1,5 +1,76 @@
 # @modern-js/app-tools
 
+## 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
+
+- 322ac9e: fix: the router-plugin should update source-map
+  fix: router-plugin 应该更新 sourcemap
+- 85366bc: chore(deps): bump esbuild from v15/v16 to v17
+
+  chore(deps): 将 esbuild 从 v15/v16 升级到 v17
+
+- Updated dependencies [b10045f]
+- Updated dependencies [9f78d0c]
+- Updated dependencies [85366bc]
+  - @modern-js/builder@2.25.1
+  - @modern-js/builder-shared@2.25.1
+  - @modern-js/utils@2.25.1
+  - @modern-js/node-bundle-require@2.25.1
+  - @modern-js/builder-plugin-esbuild@2.25.1
+  - @modern-js/builder-plugin-node-polyfill@2.25.1
+  - @modern-js/builder-rspack-provider@2.25.1
+  - @modern-js/builder-webpack-provider@2.25.1
+  - @modern-js/core@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/new-action@2.25.1
+  - @modern-js/prod-server@2.25.1
+  - @modern-js/server@2.25.1
+  - @modern-js/plugin@2.25.1
+  - @modern-js/upgrade@2.25.1
+  - @modern-js/types@2.25.1
+
 ## 2.25.0
 
 ### 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/commands/dev.js

@@ -33,11 +33,7 @@ const dev = async (api, options) => {
     appDirectory,
     distDirectory,
     configFile: serverConfigFile,
-    options: {
-      esbuildOptions: {
-        watch: true
-      }
-    }
+    watch: true
   });
   await hookRunners.beforeDev();
   if (!appContext.builder && !apiOnly) {

package/dist/cjs/index.js

@@ -166,6 +166,17 @@ const appTools = (options = {
         },
         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/cjs/utils/config.js

@@ -28,7 +28,7 @@ const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
 const _nodebundlerequire = require("@modern-js/node-bundle-require");
 const _utils = require("@modern-js/utils");
 const defineServerConfig = (config) => config;
-const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options }) => {
+const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options, watch }) => {
   const configFilePath = await (0, _utils.getServerConfig)(appDirectory, configFile);
   const getOutputFile = async (filepath) => _path.resolve(distDirectory, `${filepath.replace(new RegExp(_utils.CONFIG_FILE_EXTENSIONS.join("|")), "")}.js`);
   if (configFilePath) {
@@ -40,6 +40,7 @@ const buildServerConfig = async ({ appDirectory, distDirectory, configFile, opti
     await _utils.fs.writeFile(configHelperFilePath, helperCode);
     await (0, _nodebundlerequire.bundle)(configFilePath, {
       ...options,
+      watch,
       getOutputFile,
       esbuildPlugins: [
         {

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/commands/dev.js

@@ -32,11 +32,7 @@ export var dev = function() {
               appDirectory: appDirectory,
               distDirectory: distDirectory,
               configFile: serverConfigFile,
-              options: {
-                esbuildOptions: {
-                  watch: true
-                }
-              }
+              watch: true
             })
           ];
         case 1:

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, Import, 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";
@@ -474,11 +474,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/utils/config.js

@@ -10,11 +10,11 @@ export var defineServerConfig = function(config) {
 };
 export var buildServerConfig = function() {
   var _ref = _async_to_generator(function(param) {
-    var appDirectory, distDirectory, configFile, options, configFilePath, getOutputFile, configHelperFilePath, helperCode;
+    var appDirectory, distDirectory, configFile, options, watch, configFilePath, getOutputFile, configHelperFilePath, helperCode;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          appDirectory = param.appDirectory, distDirectory = param.distDirectory, configFile = param.configFile, options = param.options;
+          appDirectory = param.appDirectory, distDirectory = param.distDirectory, configFile = param.configFile, options = param.options, watch = param.watch;
           return [
             4,
             getServerConfig(appDirectory, configFile)
@@ -56,6 +56,7 @@ export var buildServerConfig = function() {
           return [
             4,
             bundle(configFilePath, _object_spread_props(_object_spread({}, options), {
+              watch: watch,
               getOutputFile: getOutputFile,
               esbuildPlugins: [
                 {

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/commands/dev.js

@@ -23,11 +23,7 @@ export const dev = async (api, options) => {
     appDirectory,
     distDirectory,
     configFile: serverConfigFile,
-    options: {
-      esbuildOptions: {
-        watch: true
-      }
-    }
+    watch: true
   });
   await hookRunners.beforeDev();
   if (!appContext.builder && !apiOnly) {

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, Import, 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";
@@ -135,6 +135,17 @@ export const appTools = (options = {
         },
         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/dist/esm-node/utils/config.js

@@ -2,7 +2,7 @@ import * as path from "path";
 import { bundle } from "@modern-js/node-bundle-require";
 import { CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from "@modern-js/utils";
 export const defineServerConfig = (config) => config;
-export const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options }) => {
+export const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options, watch }) => {
   const configFilePath = await getServerConfig(appDirectory, configFile);
   const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join("|")), "")}.js`);
   if (configFilePath) {
@@ -14,6 +14,7 @@ export const buildServerConfig = async ({ appDirectory, distDirectory, configFil
     await fs.writeFile(configHelperFilePath, helperCode);
     await bundle(configFilePath, {
       ...options,
+      watch,
       getOutputFile,
       esbuildPlugins: [
         {

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

@@ -6,12 +6,14 @@ export declare const buildServerConfig: ({
   appDirectory,
   distDirectory,
   configFile,
-  options
+  options,
+  watch
 }: {
   appDirectory: string;
   distDirectory: string;
   configFile: string;
   options?: Parameters<typeof bundle>[1];
+  watch?: boolean | undefined;
 }) => Promise<void>;
 /**
  *

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.25.0",
+  "version": "2.25.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -70,26 +70,26 @@
     "@babel/traverse": "^7.21.5",
     "@babel/types": "^7.21.5",
     "es-module-lexer": "^1.1.0",
-    "esbuild": "0.15.7",
+    "esbuild": "0.17.19",
     "rspack-plugin-virtual-module": "0.1.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.25.0",
-    "@modern-js/builder-plugin-esbuild": "2.25.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.25.0",
-    "@modern-js/builder-shared": "2.25.0",
-    "@modern-js/builder-webpack-provider": "2.25.0",
-    "@modern-js/core": "2.25.0",
-    "@modern-js/new-action": "2.25.0",
-    "@modern-js/node-bundle-require": "2.25.0",
-    "@modern-js/plugin": "2.25.0",
-    "@modern-js/plugin-data-loader": "2.25.0",
-    "@modern-js/plugin-i18n": "2.25.0",
-    "@modern-js/plugin-lint": "2.25.0",
-    "@modern-js/prod-server": "2.25.0",
-    "@modern-js/server": "2.25.0",
-    "@modern-js/types": "2.25.0",
-    "@modern-js/upgrade": "2.25.0",
-    "@modern-js/utils": "2.25.0"
+    "@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/builder-shared": "2.25.2",
+    "@modern-js/builder-webpack-provider": "2.25.2",
+    "@modern-js/core": "2.25.2",
+    "@modern-js/new-action": "2.25.2",
+    "@modern-js/node-bundle-require": "2.25.2",
+    "@modern-js/plugin": "2.25.2",
+    "@modern-js/plugin-data-loader": "2.25.2",
+    "@modern-js/plugin-i18n": "2.25.2",
+    "@modern-js/plugin-lint": "2.25.2",
+    "@modern-js/prod-server": "2.25.2",
+    "@modern-js/server": "2.25.2",
+    "@modern-js/types": "2.25.2",
+    "@modern-js/upgrade": "2.25.2",
+    "@modern-js/utils": "2.25.2"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -97,15 +97,15 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.82.1",
-    "@modern-js/builder-plugin-swc": "2.25.0",
-    "@modern-js/builder-rspack-provider": "2.25.0",
-    "@modern-js/server-core": "2.25.0",
-    "@scripts/build": "2.25.0",
-    "@scripts/jest-config": "2.25.0"
+    "webpack": "^5.88.1",
+    "@modern-js/builder-plugin-swc": "2.25.2",
+    "@modern-js/builder-rspack-provider": "2.25.2",
+    "@modern-js/server-core": "2.25.2",
+    "@scripts/jest-config": "2.25.2",
+    "@scripts/build": "2.25.2"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.25.0"
+    "@modern-js/builder-rspack-provider": "^2.25.2"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {