@modern-js/server-utils 2.4.0 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @modern-js/server-utils
 
+## 2.5.0
+
+### Patch Changes
+
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- Updated dependencies [89ca6cc]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
+- Updated dependencies [11c053b]
+  - @modern-js/babel-preset-lib@2.5.0
+  - @modern-js/babel-compiler@2.5.0
+  - @modern-js/utils@2.5.0
+
 ## 2.4.0
 
 ### Patch Changes

package/dist/{js/node → cjs}/common/index.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var common_exports = {};
 __export(common_exports, {
   FILE_EXTENSIONS: () => FILE_EXTENSIONS,
@@ -62,7 +42,7 @@ const validateAbsolutePaths = (filenames, messageFunc) => {
     (filename) => validateAbsolutePath(filename, messageFunc(filename))
   );
 };
-const compile = (appDirectory, modernConfig, compileOptions) => __async(void 0, null, function* () {
+const compile = async (appDirectory, modernConfig, compileOptions) => {
   var _a;
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   validateAbsolutePaths(
@@ -71,13 +51,13 @@ const compile = (appDirectory, modernConfig, compileOptions) => __async(void 0,
   );
   validateAbsolutePath(distDir, `dist dir ${distDir} is not an absolute path.`);
   const compiler = (_a = modernConfig == null ? void 0 : modernConfig.server) == null ? void 0 : _a.compiler;
-  const isTsProject = tsconfigPath && (yield import_utils.fs.pathExists(tsconfigPath));
+  const isTsProject = tsconfigPath && await import_utils.fs.pathExists(tsconfigPath);
   if (!isTsProject || compiler === "babel") {
-    yield (0, import_babel.compileByBabel)(appDirectory, modernConfig, compileOptions);
+    await (0, import_babel.compileByBabel)(appDirectory, modernConfig, compileOptions);
   } else {
-    yield (0, import_typescript.compileByTs)(appDirectory, modernConfig, compileOptions);
+    await (0, import_typescript.compileByTs)(appDirectory, modernConfig, compileOptions);
   }
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FILE_EXTENSIONS,

package/dist/{js/node → cjs}/compilers/babel/index.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -39,26 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var babel_exports = {};
 __export(babel_exports, {
   compileByBabel: () => compileByBabel,
@@ -87,9 +50,10 @@ const existTsConfigFile = (tsconfigAbsolutePath) => {
 };
 const getBabelConfig = (libPresetOption, syntaxOption) => {
   const chain = (0, import_babel_preset_lib.getBabelChain)(libPresetOption, syntaxOption);
-  return __spreadValues({
-    sourceType: "unambiguous"
-  }, chain.toJSON());
+  return {
+    sourceType: "unambiguous",
+    ...chain.toJSON()
+  };
 };
 const resolveBabelConfig = (appDirectory, config, option) => {
   const { globalVars, alias, babelConfig, define } = config;
@@ -97,9 +61,10 @@ const resolveBabelConfig = (appDirectory, config, option) => {
     object[key] = JSON.stringify(value);
     return object;
   }, {});
-  const aliasConfig = (0, import_utils.getAliasConfig)(alias, __spreadValues({
-    appDirectory
-  }, option));
+  const aliasConfig = (0, import_utils.getAliasConfig)(alias, {
+    appDirectory,
+    ...option
+  });
   const babelChain = (0, import_babel_preset_lib.getBabelChain)(
     {
       appDirectory,
@@ -107,7 +72,10 @@ const resolveBabelConfig = (appDirectory, config, option) => {
       enableTypescriptPreset: true,
       alias: aliasConfig,
       envVars: [],
-      globalVars: __spreadValues(__spreadValues({}, globalVars), globalDefineVars)
+      globalVars: {
+        ...globalVars,
+        ...globalDefineVars
+      }
     },
     {
       type: option.type,
@@ -116,9 +84,10 @@ const resolveBabelConfig = (appDirectory, config, option) => {
   );
   const envOptions = babelChain.preset("@babel/preset-env").options();
   babelChain.preset("@babel/preset-env").use(require.resolve("@babel/preset-env"), [
-    __spreadProps(__spreadValues({}, envOptions[0]), {
+    {
+      ...envOptions[0],
       loose: true
-    })
+    }
   ]);
   babelChain.plugin("babel-plugin-transform-typescript-metadata").use(
     require.resolve("babel-plugin-transform-typescript-metadata"),
@@ -132,22 +101,22 @@ const resolveBabelConfig = (appDirectory, config, option) => {
       loose: true
     }
   ]);
-  const internalBabelConfig = __spreadValues({}, babelChain.toJSON());
+  const internalBabelConfig = { ...babelChain.toJSON() };
   return (0, import_babel_preset_lib.applyUserBabelConfig)(internalBabelConfig, babelConfig);
 };
-const compileByBabel = (appDirectory, config, compileOptions) => __async(void 0, null, function* () {
+const compileByBabel = async (appDirectory, config, compileOptions) => {
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
-  const results = yield Promise.all(
-    sourceDirs.map((sourceDir) => __async(void 0, null, function* () {
+  const results = await Promise.all(
+    sourceDirs.map(async (sourceDir) => {
       const babelConfig = resolveBabelConfig(appDirectory, config, {
         tsconfigPath: tsconfigPath ? tsconfigPath : "",
         syntax: "es6+",
         type: "commonjs"
       });
-      if (yield import_utils.fs.pathExists(sourceDir)) {
+      if (await import_utils.fs.pathExists(sourceDir)) {
         const basename = path.basename(sourceDir);
         const targetDir = path.join(distDir, basename);
-        yield import_utils.fs.copy(sourceDir, targetDir, {
+        await import_utils.fs.copy(sourceDir, targetDir, {
           filter: (src) => ![".ts", ".js"].includes(path.extname(src)) && src !== tsconfigPath
         });
       }
@@ -160,14 +129,14 @@ const compileByBabel = (appDirectory, config, compileOptions) => __async(void 0,
         },
         babelConfig
       );
-    }))
+    })
   );
   results.forEach((result) => {
     if (result.code === 1) {
       throw new Error(result.message);
     }
   });
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   compileByBabel,

package/dist/{js/node → cjs}/compilers/typescript/index.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -35,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var typescript_exports = {};
 __export(typescript_exports, {
   compileByTs: () => compileByTs
@@ -74,16 +40,16 @@ const readTsConfigByFile = (tsConfigFile) => {
   const { options, fileNames, projectReferences } = parsedCmd;
   return { options, fileNames, projectReferences };
 };
-const copyFiles = (from, to, tsconfigPath) => __async(void 0, null, function* () {
-  if (yield import_utils.fs.pathExists(from)) {
+const copyFiles = async (from, to, tsconfigPath) => {
+  if (await import_utils.fs.pathExists(from)) {
     const basename = import_path.default.basename(from);
     const targetDir = import_path.default.join(to, basename);
-    yield import_utils.fs.copy(from, targetDir, {
+    await import_utils.fs.copy(from, targetDir, {
       filter: (src) => ![".ts"].includes(import_path.default.extname(src)) && src !== tsconfigPath
     });
   }
-});
-const compileByTs = (appDirectory, config, compileOptions) => __async(void 0, null, function* () {
+};
+const compileByTs = async (appDirectory, config, compileOptions) => {
   import_utils.logger.info(`Running ts compile...`);
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   if (!tsconfigPath) {
@@ -112,10 +78,11 @@ const compileByTs = (appDirectory, config, compileOptions) => __async(void 0, nu
   const program = createProgram.call(ts2, {
     rootNames,
     projectReferences,
-    options: __spreadValues({
+    options: {
       rootDir: appDirectory,
-      outDir: distDir
-    }, options)
+      outDir: distDir,
+      ...options
+    }
   });
   const tsconfigPathsPlugin = (0, import_tsconfig_paths_plugin.tsconfigPathsBeforeHookFactory)(
     ts2,
@@ -133,10 +100,10 @@ const compileByTs = (appDirectory, config, compileOptions) => __async(void 0, nu
     process.exit(1);
   }
   for (const source of sourceDirs) {
-    yield copyFiles(source, distDir, tsconfigPath);
+    await copyFiles(source, distDir, tsconfigPath);
   }
   import_utils.logger.info(`Ts compile succeed`);
-});
+};
 const getFormatHost = (ts2) => {
   return {
     getCanonicalFileName: (path2) => path2,

package/dist/{js/node → cjs}/compilers/typescript/tsconfig-paths-plugin.js

@@ -162,7 +162,7 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
             }
             newNode.flags = node.flags;
             return newNode;
-          } catch (e) {
+          } catch {
             return node;
           }
         }
@@ -194,7 +194,7 @@ function getNotAliasedPath(sf, matcher, text) {
         if (packagePath) {
           return result;
         }
-      } catch (e) {
+      } catch {
       }
     }
     try {
@@ -204,7 +204,7 @@ function getNotAliasedPath(sf, matcher, text) {
       if (packagePath) {
         return text;
       }
-    } catch (e) {
+    } catch {
     }
   }
   const resolvedPath = import_path.posix.relative((0, import_path.dirname)(sf.fileName), result) || "./";

package/dist/{js/treeshaking → esm}/common/index.js

@@ -144,7 +144,7 @@ var validateAbsolutePaths = function(filenames, messageFunc) {
 };
 var compile = function() {
     var _ref = _asyncToGenerator(function(appDirectory, modernConfig, compileOptions) {
-        var ref, sourceDirs, distDir, tsconfigPath, compiler, isTsProject, _tmp;
+        var _modernConfig_server, sourceDirs, distDir, tsconfigPath, compiler, isTsProject, _tmp;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -153,7 +153,7 @@ var compile = function() {
                         return "source dir ".concat(dir, " is not an absolute path.");
                     });
                     validateAbsolutePath(distDir, "dist dir ".concat(distDir, " is not an absolute path."));
-                    compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (ref = modernConfig.server) === null || ref === void 0 ? void 0 : ref.compiler;
+                    compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_server = modernConfig.server) === null || _modernConfig_server === void 0 ? void 0 : _modernConfig_server.compiler;
                     _tmp = tsconfigPath;
                     if (!_tmp) return [
                         3,

package/dist/{js/treeshaking → esm}/compilers/typescript/index.js

@@ -207,7 +207,7 @@ var copyFiles = function() {
 }();
 var compileByTs = function() {
     var _ref = _asyncToGenerator(function(appDirectory, config, compileOptions) {
-        var sourceDirs, distDir, tsconfigPath, ts2, createProgram, formatHost, alias, aliasOption, _paths, paths, _absoluteBaseUrl, absoluteBaseUrl, ref, options, fileNames, projectReferences, sourcePosixPaths, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, source, err;
+        var sourceDirs, distDir, tsconfigPath, ts2, createProgram, formatHost, alias, aliasOption, _aliasOption_paths, paths, _aliasOption_absoluteBaseUrl, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, sourcePosixPaths, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, source, err;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -228,8 +228,8 @@ var compileByTs = function() {
                         appDirectory: appDirectory,
                         tsconfigPath: tsconfigPath
                     });
-                    _paths = aliasOption.paths, paths = _paths === void 0 ? {} : _paths, _absoluteBaseUrl = aliasOption.absoluteBaseUrl, absoluteBaseUrl = _absoluteBaseUrl === void 0 ? "./" : _absoluteBaseUrl;
-                    ref = readTsConfigByFile(tsconfigPath), options = ref.options, fileNames = ref.fileNames, projectReferences = ref.projectReferences;
+                    _aliasOption_paths = aliasOption.paths, paths = _aliasOption_paths === void 0 ? {} : _aliasOption_paths, _aliasOption_absoluteBaseUrl = aliasOption.absoluteBaseUrl, absoluteBaseUrl = _aliasOption_absoluteBaseUrl === void 0 ? "./" : _aliasOption_absoluteBaseUrl;
+                    _readTsConfigByFile = readTsConfigByFile(tsconfigPath), options = _readTsConfigByFile.options, fileNames = _readTsConfigByFile.fileNames, projectReferences = _readTsConfigByFile.projectReferences;
                     sourcePosixPaths = sourceDirs.map(function(sourceDir) {
                         return sourceDir.split(path.sep).join(path.posix.sep);
                     });

package/dist/{js/treeshaking → esm}/compilers/typescript/tsconfig-paths-plugin.js

@@ -102,7 +102,7 @@ var createAliasMatcher = function(baseUrl, alias) {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
             for(var _iterator = aliasPairs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
+                var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
                 if (_instanceof(key, RegExp)) {
                     if (key.test(requestedModule)) {
                         cacheMap.set(requestedModule, value);
@@ -173,8 +173,8 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
                 }
                 if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
                     try {
-                        var ref;
-                        var importPathWithQuotes1 = node === null || node === void 0 ? void 0 : (ref = node.moduleSpecifier) === null || ref === void 0 ? void 0 : ref.getText();
+                        var _node_moduleSpecifier;
+                        var importPathWithQuotes1 = node === null || node === void 0 ? void 0 : (_node_moduleSpecifier = node.moduleSpecifier) === null || _node_moduleSpecifier === void 0 ? void 0 : _node_moduleSpecifier.getText();
                         if (!importPathWithQuotes1) {
                             return node;
                         }

package/dist/{js/modern → esm-node}/common/index.js

@@ -1,23 +1,3 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import * as path from "path";
 import { fs } from "@modern-js/utils";
 import { compileByTs } from "../compilers/typescript";
@@ -33,7 +13,7 @@ const validateAbsolutePaths = (filenames, messageFunc) => {
     (filename) => validateAbsolutePath(filename, messageFunc(filename))
   );
 };
-const compile = (appDirectory, modernConfig, compileOptions) => __async(void 0, null, function* () {
+const compile = async (appDirectory, modernConfig, compileOptions) => {
   var _a;
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   validateAbsolutePaths(
@@ -42,13 +22,13 @@ const compile = (appDirectory, modernConfig, compileOptions) => __async(void 0,
   );
   validateAbsolutePath(distDir, `dist dir ${distDir} is not an absolute path.`);
   const compiler = (_a = modernConfig == null ? void 0 : modernConfig.server) == null ? void 0 : _a.compiler;
-  const isTsProject = tsconfigPath && (yield fs.pathExists(tsconfigPath));
+  const isTsProject = tsconfigPath && await fs.pathExists(tsconfigPath);
   if (!isTsProject || compiler === "babel") {
-    yield compileByBabel(appDirectory, modernConfig, compileOptions);
+    await compileByBabel(appDirectory, modernConfig, compileOptions);
   } else {
-    yield compileByTs(appDirectory, modernConfig, compileOptions);
+    await compileByTs(appDirectory, modernConfig, compileOptions);
   }
-});
+};
 export {
   FILE_EXTENSIONS,
   compile

package/dist/{js/modern → esm-node}/compilers/babel/index.js

@@ -1,42 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import * as path from "path";
 import {
   getBabelChain,
@@ -59,9 +20,10 @@ const existTsConfigFile = (tsconfigAbsolutePath) => {
 };
 const getBabelConfig = (libPresetOption, syntaxOption) => {
   const chain = getBabelChain(libPresetOption, syntaxOption);
-  return __spreadValues({
-    sourceType: "unambiguous"
-  }, chain.toJSON());
+  return {
+    sourceType: "unambiguous",
+    ...chain.toJSON()
+  };
 };
 const resolveBabelConfig = (appDirectory, config, option) => {
   const { globalVars, alias, babelConfig, define } = config;
@@ -69,9 +31,10 @@ const resolveBabelConfig = (appDirectory, config, option) => {
     object[key] = JSON.stringify(value);
     return object;
   }, {});
-  const aliasConfig = getAliasConfig(alias, __spreadValues({
-    appDirectory
-  }, option));
+  const aliasConfig = getAliasConfig(alias, {
+    appDirectory,
+    ...option
+  });
   const babelChain = getBabelChain(
     {
       appDirectory,
@@ -79,7 +42,10 @@ const resolveBabelConfig = (appDirectory, config, option) => {
       enableTypescriptPreset: true,
       alias: aliasConfig,
       envVars: [],
-      globalVars: __spreadValues(__spreadValues({}, globalVars), globalDefineVars)
+      globalVars: {
+        ...globalVars,
+        ...globalDefineVars
+      }
     },
     {
       type: option.type,
@@ -88,9 +54,10 @@ const resolveBabelConfig = (appDirectory, config, option) => {
   );
   const envOptions = babelChain.preset("@babel/preset-env").options();
   babelChain.preset("@babel/preset-env").use(require.resolve("@babel/preset-env"), [
-    __spreadProps(__spreadValues({}, envOptions[0]), {
+    {
+      ...envOptions[0],
       loose: true
-    })
+    }
   ]);
   babelChain.plugin("babel-plugin-transform-typescript-metadata").use(
     require.resolve("babel-plugin-transform-typescript-metadata"),
@@ -104,22 +71,22 @@ const resolveBabelConfig = (appDirectory, config, option) => {
       loose: true
     }
   ]);
-  const internalBabelConfig = __spreadValues({}, babelChain.toJSON());
+  const internalBabelConfig = { ...babelChain.toJSON() };
   return applyUserBabelConfig(internalBabelConfig, babelConfig);
 };
-const compileByBabel = (appDirectory, config, compileOptions) => __async(void 0, null, function* () {
+const compileByBabel = async (appDirectory, config, compileOptions) => {
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
-  const results = yield Promise.all(
-    sourceDirs.map((sourceDir) => __async(void 0, null, function* () {
+  const results = await Promise.all(
+    sourceDirs.map(async (sourceDir) => {
       const babelConfig = resolveBabelConfig(appDirectory, config, {
         tsconfigPath: tsconfigPath ? tsconfigPath : "",
         syntax: "es6+",
         type: "commonjs"
       });
-      if (yield fs.pathExists(sourceDir)) {
+      if (await fs.pathExists(sourceDir)) {
         const basename = path.basename(sourceDir);
         const targetDir = path.join(distDir, basename);
-        yield fs.copy(sourceDir, targetDir, {
+        await fs.copy(sourceDir, targetDir, {
           filter: (src) => ![".ts", ".js"].includes(path.extname(src)) && src !== tsconfigPath
         });
       }
@@ -132,14 +99,14 @@ const compileByBabel = (appDirectory, config, compileOptions) => __async(void 0,
         },
         babelConfig
       );
-    }))
+    })
   );
   results.forEach((result) => {
     if (result.code === 1) {
       throw new Error(result.message);
     }
   });
-});
+};
 export {
   compileByBabel,
   existTsConfigFile,

package/dist/{js/modern → esm-node}/compilers/typescript/index.js

@@ -1,39 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import path from "path";
 import { logger, getAliasConfig, fs } from "@modern-js/utils";
 import ts from "typescript";
@@ -48,16 +12,16 @@ const readTsConfigByFile = (tsConfigFile) => {
   const { options, fileNames, projectReferences } = parsedCmd;
   return { options, fileNames, projectReferences };
 };
-const copyFiles = (from, to, tsconfigPath) => __async(void 0, null, function* () {
-  if (yield fs.pathExists(from)) {
+const copyFiles = async (from, to, tsconfigPath) => {
+  if (await fs.pathExists(from)) {
     const basename = path.basename(from);
     const targetDir = path.join(to, basename);
-    yield fs.copy(from, targetDir, {
+    await fs.copy(from, targetDir, {
       filter: (src) => ![".ts"].includes(path.extname(src)) && src !== tsconfigPath
     });
   }
-});
-const compileByTs = (appDirectory, config, compileOptions) => __async(void 0, null, function* () {
+};
+const compileByTs = async (appDirectory, config, compileOptions) => {
   logger.info(`Running ts compile...`);
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   if (!tsconfigPath) {
@@ -86,10 +50,11 @@ const compileByTs = (appDirectory, config, compileOptions) => __async(void 0, nu
   const program = createProgram.call(ts2, {
     rootNames,
     projectReferences,
-    options: __spreadValues({
+    options: {
       rootDir: appDirectory,
-      outDir: distDir
-    }, options)
+      outDir: distDir,
+      ...options
+    }
   });
   const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(
     ts2,
@@ -107,10 +72,10 @@ const compileByTs = (appDirectory, config, compileOptions) => __async(void 0, nu
     process.exit(1);
   }
   for (const source of sourceDirs) {
-    yield copyFiles(source, distDir, tsconfigPath);
+    await copyFiles(source, distDir, tsconfigPath);
   }
   logger.info(`Ts compile succeed`);
-});
+};
 const getFormatHost = (ts2) => {
   return {
     getCanonicalFileName: (path2) => path2,

package/dist/{js/modern → esm-node}/compilers/typescript/tsconfig-paths-plugin.js

@@ -134,7 +134,7 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
             }
             newNode.flags = node.flags;
             return newNode;
-          } catch (e) {
+          } catch {
             return node;
           }
         }
@@ -166,7 +166,7 @@ function getNotAliasedPath(sf, matcher, text) {
         if (packagePath) {
           return result;
         }
-      } catch (e) {
+      } catch {
       }
     }
     try {
@@ -176,7 +176,7 @@ function getNotAliasedPath(sf, matcher, text) {
       if (packagePath) {
         return text;
       }
-    } catch (e) {
+    } catch {
     }
   }
   const resolvedPath = posix.relative(dirname(sf.fileName), result) || "./";

package/package.json

@@ -11,20 +11,19 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm-node/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/treeshaking/index.js"
+      "default": "./dist/esm/index.js"
     }
   },
   "dependencies": {
@@ -36,9 +35,9 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "@modern-js/babel-compiler": "2.4.0",
-    "@modern-js/babel-preset-lib": "2.4.0",
-    "@modern-js/utils": "2.4.0"
+    "@modern-js/babel-compiler": "2.5.0",
+    "@modern-js/babel-preset-lib": "2.5.0",
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -47,9 +46,9 @@
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/server-core": "2.4.0",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "@modern-js/server-core": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "sideEffects": false,
   "publishConfig": {