@modern-js/babel-compiler 1.2.0 → 1.2.3

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @modern-js/babel-compiler
 
+## 1.2.3
+
+### Patch Changes
+
+- 6cffe99d: chore:
+  remove react eslint rules for `modern-js` rule set.
+  add .eslintrc for each package to speed up linting
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+
+## 1.2.2
+
+### Patch Changes
+
+- 55e18278: chore: remove unused dependencies and devDependencies
+- Updated dependencies [4c792f68]
+- Updated dependencies [a7f42f48]
+  - @modern-js/utils@1.3.3
+
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+  - @modern-js/utils@1.2.2
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/js/modern/getFinalOption.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import * as glob from 'glob';
+import { glob } from '@modern-js/utils';
 import { DEFAULT_EXTENSIONS } from '@babel/core';
 import { mergeDefaultOption } from "./defaults";
 export const getGlobPattern = (dir, extensions) => {

package/dist/js/modern/type.js

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

package/dist/js/node/getFinalOption.js

@@ -5,16 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getGlobPattern = exports.getFinalExtensions = exports.getFinalCompilerOption = exports.getFilesFromDir = void 0;
 
-var glob = _interopRequireWildcard(require("glob"));
+var _utils = require("@modern-js/utils");
 
 var _core = require("@babel/core");
 
 var _defaults = require("./defaults");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -56,7 +52,7 @@ const getFilesFromDir = ({
 }) => {
   let globFindFilenames = [];
   const globPattern = getGlobPattern(dir, _finalExt);
-  globFindFilenames = glob.sync(globPattern, {
+  globFindFilenames = _utils.glob.sync(globPattern, {
     ignore: _ignore
   });
   return globFindFilenames;

package/dist/js/node/type.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});

package/dist/types/buildWatch.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as Event from 'events';
-import { FSWatcher } from 'chokidar';
+import { FSWatcher } from '@modern-js/utils';
 import type { IFinaleCompilerOptions, BabelOptions } from './type';
 export declare const BuildWatchEvent: {
   firstCompiler: string;

package/dist/types/getFinalOption.d.ts

@@ -1,4 +1,4 @@
-import type { IOptions } from 'glob';
+import { GlobOptions } from '@modern-js/utils';
 import { Extensions, ExtensionsFunc, ICompilerOptions, IFinaleCompilerOptions } from './type';
 export declare const getGlobPattern: (dir: string, extensions: Extensions) => string;
 export declare const getFinalExtensions: (extensions: Extensions | ExtensionsFunc | undefined) => string[];
@@ -9,6 +9,6 @@ export declare const getFilesFromDir: ({
 }: {
   dir: string;
   finalExt?: string[] | undefined;
-  ignore?: IOptions['ignore'];
+  ignore?: GlobOptions['ignore'];
 }) => string[];
 export declare const getFinalCompilerOption: (option: ICompilerOptions) => IFinaleCompilerOptions;

package/dist/types/type.d.ts

@@ -1,5 +1,5 @@
-import { TransformOptions } from '@babel/core';
-import type { IOptions } from 'glob';
+import type { TransformOptions } from '@babel/core';
+import type { GlobOptions } from '@modern-js/utils';
 export declare type BabelOptions = TransformOptions;
 export declare type Extensions = string[];
 export declare type ExtensionsFunc = (defaultExtensions: Extensions) => Extensions;
@@ -13,7 +13,7 @@ export interface ICompilerOptions {
   extensions?: Extensions | ExtensionsFunc;
   filenames?: string[];
   distFileExtMap?: Record<string, string>;
-  ignore?: IOptions['ignore'];
+  ignore?: GlobOptions['ignore'];
   quiet?: boolean;
   verbose?: boolean;
   clean?: boolean;
@@ -28,7 +28,7 @@ export interface ICompilerOptionsWithDefault {
   extensions: Extensions | ExtensionsFunc;
   filenames: string[];
   distFileExtMap?: Record<string, string>;
-  ignore: IOptions['ignore'];
+  ignore: GlobOptions['ignore'];
   quiet?: boolean;
   verbose?: boolean;
   clean?: boolean;
@@ -36,7 +36,7 @@ export interface ICompilerOptionsWithDefault {
 export interface IFinaleCompilerOptions {
   rootDir: string;
   filenames: string[];
-  ignore?: IOptions['ignore'];
+  ignore?: GlobOptions['ignore'];
   enableVirtualDist?: boolean;
   distDir: string;
   watchDir?: string;

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/modern.config.js

@@ -1,7 +1,6 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
 module.exports = {
   output: {
-    // enableTsChecker: true,
     disableSourceMap: true,
   },
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.0",
+  "version": "1.2.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,9 +30,7 @@
   "dependencies": {
     "@babel/core": "7.16.7",
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.2.0",
-    "chokidar": "^3.5.2",
-    "glob": "^7.1.6"
+    "@modern-js/utils": "^1.5.0"
   },
   "devDependencies": {
     "@babel/plugin-transform-classes": "^7.14.9",
@@ -41,7 +39,6 @@
     "@types/glob": "^7.1.4",
     "@types/jest": "^26",
     "@types/node": "^14",
-    "jest-jasmine2": "^27.2.2",
     "typescript": "^4",
     "@scripts/build": "0.0.0",
     "jest": "^27",
@@ -55,8 +52,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/src/build.ts

@@ -1,95 +0,0 @@
-import { fs, logger } from '@modern-js/utils';
-import { defaultDistFileExtMap } from './constants';
-import { compiler } from './compiler';
-import type {
-  IFinaleCompilerOptions,
-  BabelOptions,
-  ICompilerResult,
-  IVirtualDist,
-  ICompilerMessageDetail,
-} from './type';
-
-export const build = async (
-  option: IFinaleCompilerOptions,
-  babelConfig: BabelOptions = {},
-): Promise<ICompilerResult> => {
-  const {
-    rootDir,
-    enableVirtualDist,
-    filenames,
-    clean,
-    distDir,
-    distFileExtMap = defaultDistFileExtMap,
-    verbose = false,
-    quiet = false,
-  } = option;
-
-  const virtualDists: IVirtualDist[] = [];
-
-  if (clean) {
-    await fs.remove(distDir);
-  }
-
-  fs.ensureDir(distDir);
-  const messageDetails: ICompilerMessageDetail[] = [];
-
-  for (const filename of filenames) {
-    try {
-      const dist = compiler({
-        rootDir,
-        enableVirtualDist,
-        filepath: filename,
-        distDir,
-        verbose,
-        quiet,
-        babelConfig,
-        distFileExtMap,
-      });
-      if (enableVirtualDist && dist) {
-        virtualDists.push(dist);
-      }
-    } catch (e: any) {
-      messageDetails.push({
-        filename,
-        content: e.toString(),
-      });
-    }
-  }
-
-  const happenError = messageDetails.length > 0;
-
-  if (!quiet) {
-    if (happenError) {
-      logger.error(
-        `Compilation failure ${messageDetails.length} ${
-          messageDetails.length !== 1 ? 'files' : 'file'
-        } with Babel.`,
-      );
-      // TODO: 具体的报错信息打印
-    } else {
-      logger.info(
-        `Successfully compiled ${filenames.length} ${
-          filenames.length !== 1 ? 'files' : 'file'
-        } with Babel.`,
-      );
-    }
-  }
-
-  if (happenError) {
-    return {
-      code: 1,
-      message: `Compilation failure ${messageDetails.length} ${
-        messageDetails.length !== 1 ? 'files' : 'file'
-      } with Babel.`,
-      messageDetails,
-    };
-  }
-
-  return {
-    code: 0,
-    message: `Successfully compiled ${filenames.length} ${
-      filenames.length !== 1 ? 'files' : 'file'
-    } with Babel.`,
-    virtualDists,
-  };
-};

package/src/buildWatch.ts

@@ -1,113 +0,0 @@
-import * as path from 'path';
-import * as Event from 'events';
-import { logger, watch, WatchChangeType } from '@modern-js/utils';
-import { FSWatcher } from 'chokidar';
-import { build } from './build';
-import { CompilerErrorResult } from './compilerErrorResult';
-import type {
-  IFinaleCompilerOptions,
-  BabelOptions,
-  ICompilerResult,
-} from './type';
-
-export const BuildWatchEvent = {
-  firstCompiler: 'first-compiler',
-  compiling: 'compiling',
-  watchingCompiler: 'watching-compiler',
-};
-
-export class BuildWatchEmitter extends Event.EventEmitter {
-  private _initFn!: (
-    emitter: BuildWatchEmitter,
-  ) => Promise<FSWatcher> | FSWatcher;
-
-  setInitFn(fn: (emitter: BuildWatchEmitter) => Promise<any> | any) {
-    this._initFn = fn;
-  }
-
-  async watch() {
-    if (typeof this._initFn === 'function') {
-      return this._initFn(this);
-    }
-
-    return null;
-  }
-}
-
-export const runBuildWatch = async (
-  option: IFinaleCompilerOptions,
-  babelConfig: BabelOptions = {},
-  emitter: BuildWatchEmitter,
-) => {
-  emitter.emit(BuildWatchEvent.compiling);
-  const errorResult = new CompilerErrorResult();
-  const watchDir = option.watchDir as string;
-  const { distDir, quiet } = option;
-  // 第一次正常构建
-  const fisrtBuildResult = await build(option, babelConfig);
-
-  const { code } = fisrtBuildResult;
-  if (code === 1) {
-    errorResult.init(fisrtBuildResult);
-    emitter.emit(BuildWatchEvent.firstCompiler, errorResult.value);
-  } else {
-    emitter.emit(BuildWatchEvent.firstCompiler, fisrtBuildResult);
-  }
-
-  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: ICompilerResult = {
-          code: 0,
-          message: `remove file: ${removeFiles.join(',')}`,
-          removeFiles,
-        };
-        emitter.emit(BuildWatchEvent.watchingCompiler, result);
-        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,
-          } as ICompilerResult);
-          !quiet && logger.info(errorResult.value.message);
-        } else {
-          emitter.emit(BuildWatchEvent.watchingCompiler, result);
-          !quiet && logger.info(result.message);
-        }
-      }
-    },
-    [`${watchDir}/**/*.d.ts`],
-  );
-};
-
-export const buildWatch = (
-  option: IFinaleCompilerOptions,
-  babelConfig: BabelOptions = {},
-) => {
-  const buildWatchEmitter = new BuildWatchEmitter();
-  buildWatchEmitter.setInitFn(runBuildWatch.bind(null, option, babelConfig));
-  return buildWatchEmitter;
-};

package/src/compiler.ts

@@ -1,151 +0,0 @@
-import * as path from 'path';
-import * as babel from '@babel/core';
-import { logger, fs } from '@modern-js/utils';
-import * as utils from './utils';
-import { BabelOptions, IVirtualDist } from './type';
-import { defaultDistFileExtMap } from './constants';
-
-export interface ISingleFileCompilerOption {
-  filepath: string;
-  rootDir: string;
-  enableVirtualDist?: boolean;
-  distDir?: string;
-  verbose?: boolean;
-  quiet?: boolean;
-  babelConfig?: BabelOptions;
-  distFileExtMap?: Record<string, string>;
-}
-
-const defaultDistDir = 'dist';
-
-export const isRes = (
-  r: babel.BabelFileResult | null,
-): r is babel.BabelFileResult => Boolean(r);
-
-export const getDistFilePath = (option: {
-  filepath: string;
-  rootDir: string;
-  distDir: string;
-  extMap: Record<string, string>;
-}) => {
-  const { filepath, rootDir, distDir, extMap } = option;
-  const ext = path.extname(filepath);
-  return path.join(
-    distDir,
-    path.relative(rootDir, filepath).replace(ext, extMap[ext]),
-  );
-};
-
-export const resolveSourceMap = (option: {
-  babelRes: babel.BabelFileResult;
-  sourceFilePath: string;
-  distFilePath: string;
-  enableVirtualDist?: boolean;
-}) => {
-  const {
-    babelRes,
-    sourceFilePath,
-    distFilePath,
-    enableVirtualDist = false,
-  } = option;
-  const mapLoc = `${distFilePath}.map`;
-  babelRes.code = utils.addSourceMappingUrl(babelRes.code as string, mapLoc);
-
-  if (babelRes.map) {
-    babelRes.map.file = path.basename(distFilePath);
-    babelRes.map.sources = [
-      path.relative(path.dirname(distFilePath), sourceFilePath),
-    ];
-  }
-
-  const sourceMapVirtualDist = {
-    sourcemap: JSON.stringify(babelRes.map),
-    sourceMapPath: mapLoc,
-  };
-
-  if (enableVirtualDist) {
-    return sourceMapVirtualDist;
-  }
-
-  fs.ensureDirSync(path.dirname(mapLoc));
-  fs.writeFileSync(mapLoc, JSON.stringify(babelRes.map));
-
-  return sourceMapVirtualDist;
-};
-
-export const compiler = (option: ISingleFileCompilerOption) => {
-  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: IVirtualDist | null = null;
-
-  if (!isRes(babelRes)) {
-    throw new Error(`${filepath} happen error`);
-  }
-
-  const distFilePath = getDistFilePath({
-    filepath,
-    rootDir,
-    distDir,
-    extMap: distFileExtMap,
-  });
-
-  if (enableVirtualDist) {
-    virtualDist = {
-      distPath: distFilePath,
-      sourceMapPath: '',
-      code: '',
-      sourcemap: '',
-    };
-  }
-
-  if (
-    babelRes?.map &&
-    babelConfig.sourceMaps &&
-    babelConfig.sourceMaps !== 'inline'
-  ) {
-    if (virtualDist) {
-      virtualDist = {
-        ...virtualDist,
-        ...resolveSourceMap({
-          babelRes,
-          sourceFilePath: filepath,
-          distFilePath,
-          enableVirtualDist,
-        }),
-      };
-    } else {
-      resolveSourceMap({
-        babelRes,
-        sourceFilePath: filepath,
-        distFilePath,
-        enableVirtualDist,
-      });
-    }
-  }
-
-  if (virtualDist) {
-    virtualDist = {
-      ...virtualDist,
-      distPath: distFilePath,
-      code: babelRes.code as string,
-    };
-  } else {
-    fs.ensureDirSync(path.dirname(distFilePath));
-    fs.writeFileSync(distFilePath, babelRes.code as string);
-  }
-
-  if (verbose && !quiet) {
-    logger.info(`${filepath} => ${distFilePath}`);
-  }
-
-  return virtualDist;
-};

package/src/compilerErrorResult.ts

@@ -1,49 +0,0 @@
-import { ICompilerResult, ICompilerMessageDetail } from './type';
-
-export class CompilerErrorResult {
-  _messageDetails!: ICompilerMessageDetail[];
-
-  constructor(initErrorResult?: ICompilerResult) {
-    this.init(initErrorResult);
-  }
-
-  init(initErrorResult?: ICompilerResult) {
-    this._messageDetails = initErrorResult?.messageDetails || [];
-  }
-
-  update(messageDetails: ICompilerMessageDetail[]) {
-    for (const messageDetail of messageDetails) {
-      // 遍历存不存在该文件报错信息，不存在则增加，否则更新内容
-      const addError = !this._messageDetails.some(detail => {
-        if (detail.filename === messageDetail.filename) {
-          // 如果错误栈里存在该文件报错信息，则更新内容
-          detail.content = messageDetail.content;
-          return true;
-        }
-        return false;
-      });
-
-      if (addError) {
-        this._messageDetails.push(messageDetail);
-      }
-    }
-  }
-
-  removeByFileName(filename: string) {
-    this._messageDetails = this._messageDetails.filter(
-      detail => detail.filename !== filename,
-    );
-  }
-
-  get value(): ICompilerResult {
-    return {
-      code: 1,
-      message: `Compilation failure ${this._messageDetails?.length} files with Babel.`,
-      messageDetails: this._messageDetails,
-    };
-  }
-
-  checkExistError() {
-    return this._messageDetails.length > 0;
-  }
-}

package/src/constants.ts

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

package/src/defaults.ts

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