@modern-js/babel-compiler 2.15.0 → 2.17.0

package/dist/esm-node/build.js

@@ -1,17 +1,8 @@
 import { fs, logger } from "@modern-js/utils";
 import { defaultDistFileExtMap } from "./constants";
 import { compiler } from "./compiler";
-const build = async (option, babelConfig = {}) => {
-  const {
-    rootDir,
-    enableVirtualDist,
-    filenames,
-    clean,
-    distDir,
-    distFileExtMap = defaultDistFileExtMap,
-    verbose = false,
-    quiet = false
-  } = option;
+export const build = async (option, babelConfig = {}) => {
+  const { rootDir, enableVirtualDist, filenames, clean, distDir, distFileExtMap = defaultDistFileExtMap, verbose = false, quiet = false } = option;
   const virtualDists = [];
   if (clean) {
     await fs.remove(distDir);
@@ -43,13 +34,9 @@ const build = async (option, babelConfig = {}) => {
   const happenError = messageDetails.length > 0;
   if (!quiet) {
     if (happenError) {
-      logger.error(
-        `Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? "files" : "file"} with Babel.`
-      );
+      logger.error(`Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? "files" : "file"} with Babel.`);
     } else {
-      logger.info(
-        `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? "files" : "file"} with Babel.`
-      );
+      logger.info(`Successfully compiled ${filenames.length} ${filenames.length !== 1 ? "files" : "file"} with Babel.`);
     }
   }
   if (happenError) {
@@ -65,6 +52,3 @@ const build = async (option, babelConfig = {}) => {
     virtualDists
   };
 };
-export {
-  build
-};

package/dist/esm-node/buildWatch.js

@@ -1,14 +1,27 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import * as path from "path";
 import * as Event from "events";
 import { logger, watch, WatchChangeType } from "@modern-js/utils";
 import { build } from "./build";
 import { CompilerErrorResult } from "./compilerErrorResult";
-const BuildWatchEvent = {
+export const BuildWatchEvent = {
   firstCompiler: "first-compiler",
   compiling: "compiling",
   watchingCompiler: "watching-compiler"
 };
-class BuildWatchEmitter extends Event.EventEmitter {
+export class BuildWatchEmitter extends Event.EventEmitter {
   setInitFn(fn) {
     this._initFn = fn;
   }
@@ -18,8 +31,12 @@ class BuildWatchEmitter extends Event.EventEmitter {
     }
     return null;
   }
+  constructor(...args) {
+    super(...args);
+    _define_property(this, "_initFn", void 0);
+  }
 }
-const runBuildWatch = async (option, babelConfig = {}, emitter) => {
+export const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   emitter.emit(BuildWatchEvent.compiling);
   const errorResult = new CompilerErrorResult();
   const watchDir = option.watchDir;
@@ -32,60 +49,52 @@ const runBuildWatch = async (option, babelConfig = {}, emitter) => {
   } else {
     emitter.emit(BuildWatchEvent.firstCompiler, firstBuildResult);
   }
-  return watch(
-    `${watchDir}/**/*.{js,jsx,ts,tsx}`,
-    async ({ changeType, changedFilePath }) => {
-      emitter.emit(BuildWatchEvent.compiling);
-      if (changeType === WatchChangeType.UNLINK) {
-        const removeFiles = [
-          path.normalize(
-            `./${distDir}/${path.relative(watchDir, changedFilePath)}`
-          )
-        ];
-        if (!quiet) {
-          logger.info(`remove file: ${removeFiles.join(",")}`);
-        }
-        const result2 = {
-          code: 0,
-          message: `remove file: ${removeFiles.join(",")}`,
-          removeFiles
-        };
-        emitter.emit(BuildWatchEvent.watchingCompiler, result2);
-        return;
+  return watch(`${watchDir}/**/*.{js,jsx,ts,tsx}`, async ({ changeType, changedFilePath }) => {
+    emitter.emit(BuildWatchEvent.compiling);
+    if (changeType === WatchChangeType.UNLINK) {
+      const removeFiles = [
+        path.normalize(`./${distDir}/${path.relative(watchDir, changedFilePath)}`)
+      ];
+      if (!quiet) {
+        logger.info(`remove file: ${removeFiles.join(",")}`);
       }
-      const result = await build(
-        { ...option, filenames: [changedFilePath] },
-        babelConfig
-      );
-      if (result.code === 1) {
-        errorResult.update(result.messageDetails || []);
-        emitter.emit(BuildWatchEvent.watchingCompiler, errorResult.value);
+      const result2 = {
+        code: 0,
+        message: `remove file: ${removeFiles.join(",")}`,
+        removeFiles
+      };
+      emitter.emit(BuildWatchEvent.watchingCompiler, result2);
+      return;
+    }
+    const result = await build({
+      ...option,
+      filenames: [
+        changedFilePath
+      ]
+    }, babelConfig);
+    if (result.code === 1) {
+      errorResult.update(result.messageDetails || []);
+      emitter.emit(BuildWatchEvent.watchingCompiler, errorResult.value);
+      !quiet && logger.info(errorResult.value.message);
+    } else {
+      errorResult.removeByFileName(changedFilePath);
+      if (errorResult.checkExistError()) {
+        emitter.emit(BuildWatchEvent.watchingCompiler, {
+          ...errorResult.value,
+          virtualDists: result.virtualDists
+        });
         !quiet && logger.info(errorResult.value.message);
       } else {
-        errorResult.removeByFileName(changedFilePath);
-        if (errorResult.checkExistError()) {
-          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);
-        }
+        emitter.emit(BuildWatchEvent.watchingCompiler, result);
+        !quiet && logger.info(result.message);
       }
-    },
-    [`${watchDir}/**/*.d.ts`]
-  );
+    }
+  }, [
+    `${watchDir}/**/*.d.ts`
+  ]);
 };
-const buildWatch = (option, babelConfig = {}) => {
+export const buildWatch = (option, babelConfig = {}) => {
   const buildWatchEmitter = new BuildWatchEmitter();
   buildWatchEmitter.setInitFn(runBuildWatch.bind(null, option, babelConfig));
   return buildWatchEmitter;
 };
-export {
-  BuildWatchEmitter,
-  BuildWatchEvent,
-  buildWatch,
-  runBuildWatch
-};

package/dist/esm-node/compiler.js

@@ -4,22 +4,14 @@ import { logger, fs } from "@modern-js/utils";
 import * as utils from "./utils";
 import { defaultDistFileExtMap } from "./constants";
 const defaultDistDir = "dist";
-const isRes = (r) => Boolean(r);
-const getDistFilePath = (option) => {
+export const isRes = (r) => Boolean(r);
+export const getDistFilePath = (option) => {
   const { filepath, rootDir, distDir, extMap } = option;
   const ext = path.extname(filepath);
-  return path.join(
-    distDir,
-    path.relative(rootDir, filepath).replace(ext, extMap[ext])
-  );
+  return path.join(distDir, path.relative(rootDir, filepath).replace(ext, extMap[ext]));
 };
-const resolveSourceMap = (option) => {
-  const {
-    babelRes,
-    sourceFilePath,
-    distFilePath,
-    enableVirtualDist = false
-  } = option;
+export const resolveSourceMap = (option) => {
+  const { babelRes, sourceFilePath, distFilePath, enableVirtualDist = false } = option;
   const mapLoc = `${distFilePath}.map`;
   babelRes.code = utils.addSourceMappingUrl(babelRes.code, mapLoc);
   if (babelRes.map) {
@@ -39,17 +31,8 @@ const resolveSourceMap = (option) => {
   fs.writeFileSync(mapLoc, JSON.stringify(babelRes.map));
   return sourceMapVirtualDist;
 };
-const compiler = (option) => {
-  const {
-    filepath,
-    rootDir,
-    enableVirtualDist = false,
-    distDir = path.join(path.dirname(rootDir), defaultDistDir),
-    verbose = false,
-    babelConfig = {},
-    distFileExtMap = defaultDistFileExtMap,
-    quiet = false
-  } = option;
+export const compiler = (option) => {
+  const { filepath, rootDir, enableVirtualDist = false, distDir = path.join(path.dirname(rootDir), defaultDistDir), verbose = false, babelConfig = {}, distFileExtMap = defaultDistFileExtMap, quiet = false } = option;
   const babelRes = babel.transformFileSync(filepath, babelConfig);
   let virtualDist = null;
   if (!isRes(babelRes)) {
@@ -69,7 +52,7 @@ const compiler = (option) => {
       sourcemap: ""
     };
   }
-  if ((babelRes == null ? void 0 : babelRes.map) && babelConfig.sourceMaps && babelConfig.sourceMaps !== "inline") {
+  if ((babelRes === null || babelRes === void 0 ? void 0 : babelRes.map) && babelConfig.sourceMaps && babelConfig.sourceMaps !== "inline") {
     if (virtualDist) {
       virtualDist = {
         ...virtualDist,
@@ -104,9 +87,3 @@ const compiler = (option) => {
   }
   return virtualDist;
 };
-export {
-  compiler,
-  getDistFilePath,
-  isRes,
-  resolveSourceMap
-};

package/dist/esm-node/compilerErrorResult.js

@@ -1,9 +1,19 @@
-class CompilerErrorResult {
-  constructor(initErrorResult) {
-    this.init(initErrorResult);
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+export class CompilerErrorResult {
   init(initErrorResult) {
-    this._messageDetails = (initErrorResult == null ? void 0 : initErrorResult.messageDetails) || [];
+    this._messageDetails = (initErrorResult === null || initErrorResult === void 0 ? void 0 : initErrorResult.messageDetails) || [];
   }
   update(messageDetails) {
     for (const messageDetail of messageDetails) {
@@ -20,22 +30,21 @@ class CompilerErrorResult {
     }
   }
   removeByFileName(filename) {
-    this._messageDetails = this._messageDetails.filter(
-      (detail) => detail.filename !== filename
-    );
+    this._messageDetails = this._messageDetails.filter((detail) => detail.filename !== filename);
   }
   get value() {
-    var _a;
+    var _this__messageDetails;
     return {
       code: 1,
-      message: `Compilation failure ${(_a = this._messageDetails) == null ? void 0 : _a.length} files with Babel.`,
+      message: `Compilation failure ${(_this__messageDetails = this._messageDetails) === null || _this__messageDetails === void 0 ? void 0 : _this__messageDetails.length} files with Babel.`,
       messageDetails: this._messageDetails
     };
   }
   checkExistError() {
     return this._messageDetails.length > 0;
   }
+  constructor(initErrorResult) {
+    _define_property(this, "_messageDetails", void 0);
+    this.init(initErrorResult);
+  }
 }
-export {
-  CompilerErrorResult
-};

package/dist/esm-node/constants.js

@@ -1,9 +1,6 @@
-const defaultDistFileExtMap = {
+export const defaultDistFileExtMap = {
   ".js": ".js",
   ".jsx": ".js",
   ".ts": ".js",
   ".tsx": ".js"
 };
-export {
-  defaultDistFileExtMap
-};

package/dist/esm-node/defaults.js

@@ -10,10 +10,7 @@ const defaultOptions = {
   verbose: false,
   clean: false
 };
-const mergeDefaultOption = (compilerOptions) => ({
+export const mergeDefaultOption = (compilerOptions) => ({
   ...defaultOptions,
   ...compilerOptions
 });
-export {
-  mergeDefaultOption
-};

package/dist/esm-node/getFinalOption.js

@@ -1,7 +1,7 @@
 import { glob } from "@modern-js/utils";
 import { DEFAULT_EXTENSIONS } from "@babel/core";
 import { mergeDefaultOption } from "./defaults";
-const getGlobPattern = (dir, extensions) => {
+export const getGlobPattern = (dir, extensions) => {
   if (extensions.length > 1) {
     return `${dir}/**/*{${extensions.join(",")}}`;
   } else if (extensions.length === 1) {
@@ -10,36 +10,31 @@ const getGlobPattern = (dir, extensions) => {
     return `${dir}/**/*`;
   }
 };
-const getFinalExtensions = (extensions) => {
+export const getFinalExtensions = (extensions) => {
   const isExtensions = (ext) => Array.isArray(ext);
   const isExtensionsFunc = (ext) => typeof ext === "function";
   if (isExtensions(extensions)) {
-    return [...extensions, ...DEFAULT_EXTENSIONS];
+    return [
+      ...extensions,
+      ...DEFAULT_EXTENSIONS
+    ];
   } else if (isExtensionsFunc(extensions)) {
     return extensions(DEFAULT_EXTENSIONS);
   } else {
     return DEFAULT_EXTENSIONS;
   }
 };
-const getFilesFromDir = ({
-  dir,
-  finalExt = [],
-  ignore = []
-}) => {
+export const getFilesFromDir = ({ dir, finalExt = [], ignore = [] }) => {
   let globFindFilenames = [];
   const globPattern = getGlobPattern(dir, finalExt);
-  globFindFilenames = glob.sync(globPattern, { ignore });
+  globFindFilenames = glob.sync(globPattern, {
+    ignore
+  });
   return globFindFilenames;
 };
-const getFinalCompilerOption = (option) => {
+export const getFinalCompilerOption = (option) => {
   const optionWithDefault = mergeDefaultOption(option);
-  const {
-    sourceDir,
-    ignore,
-    enableWatch = false,
-    watchDir,
-    extensions = DEFAULT_EXTENSIONS
-  } = option;
+  const { sourceDir, ignore, enableWatch = false, watchDir, extensions = DEFAULT_EXTENSIONS } = option;
   let globFindFilenames = [];
   const finalExt = getFinalExtensions(extensions);
   if (sourceDir) {
@@ -58,12 +53,9 @@ const getFinalCompilerOption = (option) => {
   }
   return {
     ...optionWithDefault,
-    filenames: [...optionWithDefault.filenames, ...globFindFilenames]
+    filenames: [
+      ...optionWithDefault.filenames,
+      ...globFindFilenames
+    ]
   };
 };
-export {
-  getFilesFromDir,
-  getFinalCompilerOption,
-  getFinalExtensions,
-  getGlobPattern
-};

package/dist/esm-node/index.js

@@ -2,7 +2,7 @@ import { getFinalCompilerOption } from "./getFinalOption";
 import { build } from "./build";
 import { buildWatch } from "./buildWatch";
 import { validate } from "./validate";
-async function compiler(compilerOptions, babelOptions = {}) {
+export async function compiler(compilerOptions, babelOptions = {}) {
   const validRet = validate(compilerOptions);
   if (validRet) {
     return validRet;
@@ -16,6 +16,3 @@ async function compiler(compilerOptions, babelOptions = {}) {
 }
 export * from "./buildWatch";
 export * from "./type";
-export {
-  compiler
-};

package/dist/esm-node/type.js

@@ -0,0 +1 @@
+export {};

package/dist/esm-node/utils.js

@@ -1,8 +1,5 @@
 import * as path from "path";
-function addSourceMappingUrl(code, loc) {
+export function addSourceMappingUrl(code, loc) {
   return `${code}
 //# sourceMappingURL=${path.normalize(path.basename(loc))}`;
 }
-export {
-  addSourceMappingUrl
-};

package/dist/esm-node/validate.js

@@ -1,7 +1,7 @@
 import { logger } from "@modern-js/utils";
-const sourceDirAndFileNamesValidMessage = "At least one of the sourceDir and filenames configurations must be configured";
-const watchDirValidMessage = "should set watchDir when enableWatch is true";
-const validateSourceDirAndFileNames = (compilerOptions) => {
+export const sourceDirAndFileNamesValidMessage = "At least one of the sourceDir and filenames configurations must be configured";
+export const watchDirValidMessage = "should set watchDir when enableWatch is true";
+export const validateSourceDirAndFileNames = (compilerOptions) => {
   const { sourceDir, filenames, quiet } = compilerOptions;
   if (!sourceDir && !filenames) {
     if (!quiet) {
@@ -15,26 +15,23 @@ const validateSourceDirAndFileNames = (compilerOptions) => {
   }
   return null;
 };
-const validateWatchDir = (compilerOptions) => {
+export const validateWatchDir = (compilerOptions) => {
   const { watchDir, enableWatch, quiet } = compilerOptions;
   if (enableWatch && !watchDir) {
     if (!quiet) {
       logger.error(watchDirValidMessage);
     }
-    return { code: 1, message: watchDirValidMessage, virtualDists: [] };
+    return {
+      code: 1,
+      message: watchDirValidMessage,
+      virtualDists: []
+    };
   }
   return null;
 };
-const validate = (compilerOptions) => {
+export const validate = (compilerOptions) => {
   if (compilerOptions.enableWatch) {
     return validateWatchDir(compilerOptions);
   }
   return validateSourceDirAndFileNames(compilerOptions);
 };
-export {
-  sourceDirAndFileNamesValidMessage,
-  validate,
-  validateSourceDirAndFileNames,
-  validateWatchDir,
-  watchDirValidMessage
-};

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/toolkit/compiler/babel"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -29,7 +33,7 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.15.0"
+    "@modern-js/utils": "2.17.0"
   },
   "devDependencies": {
     "@babel/plugin-transform-classes": "^7.18.0",
@@ -40,8 +44,8 @@
     "@types/node": "^14",
     "typescript": "^4",
     "jest": "^29",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@scripts/build": "2.17.0",
+    "@scripts/jest-config": "2.17.0"
   },
   "sideEffects": false,
   "modernConfig": {