@modern-js/babel-compiler 2.4.1-beta.0 → 2.6.0

package/CHANGELOG.md

@@ -1,11 +1,28 @@
 # @modern-js/babel-compiler
 
-## 2.4.1-beta.0
+## 2.6.0
 
 ### Patch Changes
 
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [0fe658a]
+  - @modern-js/utils@2.6.0
+
+## 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 [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/utils@2.4.1-beta.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/build.js

@@ -15,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 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 build_exports = {};
 __export(build_exports, {
   build: () => build
@@ -43,7 +23,7 @@ module.exports = __toCommonJS(build_exports);
 var import_utils = require("@modern-js/utils");
 var import_constants = require("./constants");
 var import_compiler = require("./compiler");
-const build = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, babelConfig = {}) {
+const build = async (option, babelConfig = {}) => {
   const {
     rootDir,
     enableVirtualDist,
@@ -56,7 +36,7 @@ const build = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, bab
   } = option;
   const virtualDists = [];
   if (clean) {
-    yield import_utils.fs.remove(distDir);
+    await import_utils.fs.remove(distDir);
   }
   import_utils.fs.ensureDir(distDir);
   const messageDetails = [];
@@ -106,7 +86,7 @@ const build = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, bab
     message: `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? "files" : "file"} with Babel.`,
     virtualDists
   };
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   build

package/dist/{js/node → cjs}/buildWatch.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 });
@@ -34,30 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __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 buildWatch_exports = {};
 __export(buildWatch_exports, {
   BuildWatchEmitter: () => BuildWatchEmitter,
@@ -80,21 +47,19 @@ class BuildWatchEmitter extends Event.EventEmitter {
   setInitFn(fn) {
     this._initFn = fn;
   }
-  watch() {
-    return __async(this, null, function* () {
-      if (typeof this._initFn === "function") {
-        return this._initFn(this);
-      }
-      return null;
-    });
+  async watch() {
+    if (typeof this._initFn === "function") {
+      return this._initFn(this);
+    }
+    return null;
   }
 }
-const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, babelConfig = {}, emitter) {
+const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   emitter.emit(BuildWatchEvent.compiling);
   const errorResult = new import_compilerErrorResult.CompilerErrorResult();
   const watchDir = option.watchDir;
   const { distDir, quiet } = option;
-  const firstBuildResult = yield (0, import_build.build)(option, babelConfig);
+  const firstBuildResult = await (0, import_build.build)(option, babelConfig);
   const { code } = firstBuildResult;
   if (code === 1) {
     errorResult.init(firstBuildResult);
@@ -104,7 +69,7 @@ const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (opt
   }
   return (0, import_utils.watch)(
     `${watchDir}/**/*.{js,jsx,ts,tsx}`,
-    (_02) => __async(void 0, [_02], function* ({ changeType, changedFilePath }) {
+    async ({ changeType, changedFilePath }) => {
       emitter.emit(BuildWatchEvent.compiling);
       if (changeType === import_utils.WatchChangeType.UNLINK) {
         const removeFiles = [
@@ -123,8 +88,8 @@ const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (opt
         emitter.emit(BuildWatchEvent.watchingCompiler, result2);
         return;
       }
-      const result = yield (0, import_build.build)(
-        __spreadProps(__spreadValues({}, option), { filenames: [changedFilePath] }),
+      const result = await (0, import_build.build)(
+        { ...option, filenames: [changedFilePath] },
         babelConfig
       );
       if (result.code === 1) {
@@ -134,19 +99,20 @@ const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (opt
       } else {
         errorResult.removeByFileName(changedFilePath);
         if (errorResult.checkExistError()) {
-          emitter.emit(BuildWatchEvent.watchingCompiler, __spreadProps(__spreadValues({}, errorResult.value), {
+          emitter.emit(BuildWatchEvent.watchingCompiler, {
+            ...errorResult.value,
             virtualDists: result.virtualDists
-          }));
+          });
           !quiet && import_utils.logger.info(errorResult.value.message);
         } else {
           emitter.emit(BuildWatchEvent.watchingCompiler, result);
           !quiet && import_utils.logger.info(result.message);
         }
       }
-    }),
+    },
     [`${watchDir}/**/*.d.ts`]
   );
-});
+};
 const buildWatch = (option, babelConfig = {}) => {
   const buildWatchEmitter = new BuildWatchEmitter();
   buildWatchEmitter.setInitFn(runBuildWatch.bind(null, option, babelConfig));

package/dist/{js/node → cjs}/compiler.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 });
@@ -34,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -119,12 +106,15 @@ const compiler = (option) => {
   }
   if ((babelRes == null ? void 0 : babelRes.map) && babelConfig.sourceMaps && babelConfig.sourceMaps !== "inline") {
     if (virtualDist) {
-      virtualDist = __spreadValues(__spreadValues({}, virtualDist), resolveSourceMap({
-        babelRes,
-        sourceFilePath: filepath,
-        distFilePath,
-        enableVirtualDist
-      }));
+      virtualDist = {
+        ...virtualDist,
+        ...resolveSourceMap({
+          babelRes,
+          sourceFilePath: filepath,
+          distFilePath,
+          enableVirtualDist
+        })
+      };
     } else {
       resolveSourceMap({
         babelRes,
@@ -135,10 +125,11 @@ const compiler = (option) => {
     }
   }
   if (virtualDist) {
-    virtualDist = __spreadProps(__spreadValues({}, virtualDist), {
+    virtualDist = {
+      ...virtualDist,
       distPath: distFilePath,
       code: babelRes.code
-    });
+    };
   } else {
     import_utils.fs.ensureDirSync(path.dirname(distFilePath));
     import_utils.fs.writeFileSync(distFilePath, babelRes.code);

package/dist/{js/node → cjs}/defaults.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -46,7 +32,10 @@ const defaultOptions = {
   verbose: false,
   clean: false
 };
-const mergeDefaultOption = (compilerOptions) => __spreadValues(__spreadValues({}, defaultOptions), compilerOptions);
+const mergeDefaultOption = (compilerOptions) => ({
+  ...defaultOptions,
+  ...compilerOptions
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   mergeDefaultOption

package/dist/{js/node → cjs}/getFinalOption.js

@@ -1,24 +1,7 @@
 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 __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 });
@@ -98,9 +81,10 @@ const getFinalCompilerOption = (option) => {
       finalExt
     });
   }
-  return __spreadProps(__spreadValues({}, optionWithDefault), {
+  return {
+    ...optionWithDefault,
     filenames: [...optionWithDefault.filenames, ...globFindFilenames]
-  });
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -16,26 +16,6 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 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 src_exports = {};
 __export(src_exports, {
   compiler: () => compiler
@@ -47,19 +27,17 @@ var import_buildWatch = require("./buildWatch");
 var import_validate = require("./validate");
 __reExport(src_exports, require("./buildWatch"), module.exports);
 __reExport(src_exports, require("./type"), module.exports);
-function compiler(_0) {
-  return __async(this, arguments, function* (compilerOptions, babelOptions = {}) {
-    const validRet = (0, import_validate.validate)(compilerOptions);
-    if (validRet) {
-      return validRet;
-    }
-    const finalCompilerOption = (0, import_getFinalOption.getFinalCompilerOption)(compilerOptions);
-    if (compilerOptions.enableWatch) {
-      return (0, import_buildWatch.buildWatch)(finalCompilerOption, babelOptions);
-    } else {
-      return (0, import_build.build)(finalCompilerOption, babelOptions);
-    }
-  });
+async function compiler(compilerOptions, babelOptions = {}) {
+  const validRet = (0, import_validate.validate)(compilerOptions);
+  if (validRet) {
+    return validRet;
+  }
+  const finalCompilerOption = (0, import_getFinalOption.getFinalCompilerOption)(compilerOptions);
+  if (compilerOptions.enableWatch) {
+    return (0, import_buildWatch.buildWatch)(finalCompilerOption, babelOptions);
+  } else {
+    return (0, import_build.build)(finalCompilerOption, babelOptions);
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/utils.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

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

@@ -1,27 +1,7 @@
-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 { fs, logger } from "@modern-js/utils";
 import { defaultDistFileExtMap } from "./constants";
 import { compiler } from "./compiler";
-const build = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, babelConfig = {}) {
+const build = async (option, babelConfig = {}) => {
   const {
     rootDir,
     enableVirtualDist,
@@ -34,7 +14,7 @@ const build = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, bab
   } = option;
   const virtualDists = [];
   if (clean) {
-    yield fs.remove(distDir);
+    await fs.remove(distDir);
   }
   fs.ensureDir(distDir);
   const messageDetails = [];
@@ -84,7 +64,7 @@ const build = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, bab
     message: `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? "files" : "file"} with Babel.`,
     virtualDists
   };
-});
+};
 export {
   build
 };

package/dist/{js/modern → esm-node}/buildWatch.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 * as Event from "events";
 import { logger, watch, WatchChangeType } from "@modern-js/utils";
@@ -51,21 +12,19 @@ class BuildWatchEmitter extends Event.EventEmitter {
   setInitFn(fn) {
     this._initFn = fn;
   }
-  watch() {
-    return __async(this, null, function* () {
-      if (typeof this._initFn === "function") {
-        return this._initFn(this);
-      }
-      return null;
-    });
+  async watch() {
+    if (typeof this._initFn === "function") {
+      return this._initFn(this);
+    }
+    return null;
   }
 }
-const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, babelConfig = {}, emitter) {
+const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   emitter.emit(BuildWatchEvent.compiling);
   const errorResult = new CompilerErrorResult();
   const watchDir = option.watchDir;
   const { distDir, quiet } = option;
-  const firstBuildResult = yield build(option, babelConfig);
+  const firstBuildResult = await build(option, babelConfig);
   const { code } = firstBuildResult;
   if (code === 1) {
     errorResult.init(firstBuildResult);
@@ -75,7 +34,7 @@ const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (opt
   }
   return watch(
     `${watchDir}/**/*.{js,jsx,ts,tsx}`,
-    (_02) => __async(void 0, [_02], function* ({ changeType, changedFilePath }) {
+    async ({ changeType, changedFilePath }) => {
       emitter.emit(BuildWatchEvent.compiling);
       if (changeType === WatchChangeType.UNLINK) {
         const removeFiles = [
@@ -94,8 +53,8 @@ const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (opt
         emitter.emit(BuildWatchEvent.watchingCompiler, result2);
         return;
       }
-      const result = yield build(
-        __spreadProps(__spreadValues({}, option), { filenames: [changedFilePath] }),
+      const result = await build(
+        { ...option, filenames: [changedFilePath] },
         babelConfig
       );
       if (result.code === 1) {
@@ -105,19 +64,20 @@ const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (opt
       } else {
         errorResult.removeByFileName(changedFilePath);
         if (errorResult.checkExistError()) {
-          emitter.emit(BuildWatchEvent.watchingCompiler, __spreadProps(__spreadValues({}, errorResult.value), {
+          emitter.emit(BuildWatchEvent.watchingCompiler, {
+            ...errorResult.value,
             virtualDists: result.virtualDists
-          }));
+          });
           !quiet && logger.info(errorResult.value.message);
         } else {
           emitter.emit(BuildWatchEvent.watchingCompiler, result);
           !quiet && logger.info(result.message);
         }
       }
-    }),
+    },
     [`${watchDir}/**/*.d.ts`]
   );
-});
+};
 const buildWatch = (option, babelConfig = {}) => {
   const buildWatchEmitter = new BuildWatchEmitter();
   buildWatchEmitter.setInitFn(runBuildWatch.bind(null, option, babelConfig));

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

@@ -1,22 +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));
 import * as path from "path";
 import * as babel from "@babel/core";
 import { logger, fs } from "@modern-js/utils";
@@ -90,12 +71,15 @@ const compiler = (option) => {
   }
   if ((babelRes == null ? void 0 : babelRes.map) && babelConfig.sourceMaps && babelConfig.sourceMaps !== "inline") {
     if (virtualDist) {
-      virtualDist = __spreadValues(__spreadValues({}, virtualDist), resolveSourceMap({
-        babelRes,
-        sourceFilePath: filepath,
-        distFilePath,
-        enableVirtualDist
-      }));
+      virtualDist = {
+        ...virtualDist,
+        ...resolveSourceMap({
+          babelRes,
+          sourceFilePath: filepath,
+          distFilePath,
+          enableVirtualDist
+        })
+      };
     } else {
       resolveSourceMap({
         babelRes,
@@ -106,10 +90,11 @@ const compiler = (option) => {
     }
   }
   if (virtualDist) {
-    virtualDist = __spreadProps(__spreadValues({}, virtualDist), {
+    virtualDist = {
+      ...virtualDist,
       distPath: distFilePath,
       code: babelRes.code
-    });
+    };
   } else {
     fs.ensureDirSync(path.dirname(distFilePath));
     fs.writeFileSync(distFilePath, babelRes.code);

package/dist/esm-node/defaults.js

@@ -0,0 +1,19 @@
+import { defaultDistFileExtMap } from "./constants";
+const defaultOptions = {
+  enableWatch: false,
+  enableVirtualDist: false,
+  extensions: [],
+  filenames: [],
+  distFileExtMap: defaultDistFileExtMap,
+  ignore: [],
+  quiet: false,
+  verbose: false,
+  clean: false
+};
+const mergeDefaultOption = (compilerOptions) => ({
+  ...defaultOptions,
+  ...compilerOptions
+});
+export {
+  mergeDefaultOption
+};

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

@@ -1,22 +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));
 import { glob } from "@modern-js/utils";
 import { DEFAULT_EXTENSIONS } from "@babel/core";
 import { mergeDefaultOption } from "./defaults";
@@ -75,9 +56,10 @@ const getFinalCompilerOption = (option) => {
       finalExt
     });
   }
-  return __spreadProps(__spreadValues({}, optionWithDefault), {
+  return {
+    ...optionWithDefault,
     filenames: [...optionWithDefault.filenames, ...globFindFilenames]
-  });
+  };
 };
 export {
   getFilesFromDir,

package/dist/esm-node/index.js

@@ -0,0 +1,21 @@
+import { getFinalCompilerOption } from "./getFinalOption";
+import { build } from "./build";
+import { buildWatch } from "./buildWatch";
+import { validate } from "./validate";
+async function compiler(compilerOptions, babelOptions = {}) {
+  const validRet = validate(compilerOptions);
+  if (validRet) {
+    return validRet;
+  }
+  const finalCompilerOption = getFinalCompilerOption(compilerOptions);
+  if (compilerOptions.enableWatch) {
+    return buildWatch(finalCompilerOption, babelOptions);
+  } else {
+    return build(finalCompilerOption, babelOptions);
+  }
+}
+export * from "./buildWatch";
+export * from "./type";
+export {
+  compiler
+};

package/package.json

@@ -11,26 +11,25 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.6.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": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/utils": "2.6.0"
   },
   "devDependencies": {
     "@babel/plugin-transform-classes": "^7.18.0",
@@ -41,8 +40,8 @@
     "@types/node": "^14",
     "typescript": "^4",
     "jest": "^27",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "@scripts/build": "2.6.0",
+    "@scripts/jest-config": "2.6.0"
   },
   "sideEffects": false,
   "modernConfig": {

package/dist/js/modern/defaults.js

@@ -1,32 +0,0 @@
-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;
-};
-import { defaultDistFileExtMap } from "./constants";
-const defaultOptions = {
-  enableWatch: false,
-  enableVirtualDist: false,
-  extensions: [],
-  filenames: [],
-  distFileExtMap: defaultDistFileExtMap,
-  ignore: [],
-  quiet: false,
-  verbose: false,
-  clean: false
-};
-const mergeDefaultOption = (compilerOptions) => __spreadValues(__spreadValues({}, defaultOptions), compilerOptions);
-export {
-  mergeDefaultOption
-};

package/dist/js/modern/index.js

@@ -1,43 +0,0 @@
-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 { getFinalCompilerOption } from "./getFinalOption";
-import { build } from "./build";
-import { buildWatch } from "./buildWatch";
-import { validate } from "./validate";
-function compiler(_0) {
-  return __async(this, arguments, function* (compilerOptions, babelOptions = {}) {
-    const validRet = validate(compilerOptions);
-    if (validRet) {
-      return validRet;
-    }
-    const finalCompilerOption = getFinalCompilerOption(compilerOptions);
-    if (compilerOptions.enableWatch) {
-      return buildWatch(finalCompilerOption, babelOptions);
-    } else {
-      return build(finalCompilerOption, babelOptions);
-    }
-  });
-}
-export * from "./buildWatch";
-export * from "./type";
-export {
-  compiler
-};