@modern-js/server-utils 2.0.0-beta.0 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,81 @@
 # @modern-js/server-utils
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 9b915e0c10: fix: tsconfig-paths plugin's new node use old node flag
+  fix: tsconfig-paths 插件转换的新节点使用旧节点的 flag
+- a8642da58f: fix(server-utils): incorrect babel-compiler version
+
+  fix(server-utils): 修复引用错误的 babel-compiler 版本的问题
+
+- c2bb0f1: chore(server-utils): using pre-bundled tsconfig-paths
+
+  chore(server-utils): 使用预打包的 tsconfig-paths 依赖
+
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/plugin@2.0.0-beta.2
+  - @modern-js/babel-preset-lib@2.0.0-beta.2
+  - @modern-js/babel-compiler@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 9b915e0c10: fix: tsconfig-paths plugin's new node use old node flag
+  fix: tsconfig-paths 插件转换的新节点使用旧节点的 flag
+- a8642da: fix(server-utils): incorrect babel-compiler version
+
+  fix(server-utils): 修复引用错误的 babel-compiler 版本的问题
+
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/plugin@2.0.0-beta.1
+  - @modern-js/babel-preset-lib@2.0.0-beta.1
+  - @modern-js/babel-compiler@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/common/index.js

@@ -3,20 +3,16 @@ import { fs } from '@modern-js/utils';
 import { compileByTs } from "../compilers/typescript";
 import { compileByBabel } from "../compilers/babel";
 export const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
 const validateAbsolutePath = (filename, message) => {
   if (!path.isAbsolute(filename)) {
     throw new Error(message);
   }
 };
-
 const validateAbsolutePaths = (filenames, messageFunc) => {
   filenames.forEach(filename => validateAbsolutePath(filename, messageFunc(filename)));
 };
-
 export const compile = async (appDirectory, modernConfig, compileOptions) => {
   var _modernConfig$server;
-
   const {
     sourceDirs,
     distDir,
@@ -26,7 +22,6 @@ export const compile = async (appDirectory, modernConfig, compileOptions) => {
   validateAbsolutePath(distDir, `dist dir ${distDir} is not an absolute path.`);
   const compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$server = modernConfig.server) === null || _modernConfig$server === void 0 ? void 0 : _modernConfig$server.compiler;
   const isTsProject = tsconfigPath && (await fs.pathExists(tsconfigPath));
-
   if (!isTsProject || compiler === 'babel') {
     await compileByBabel(appDirectory, modernConfig, compileOptions);
   } else {

package/dist/js/modern/compilers/babel/index.js

@@ -1,9 +1,6 @@
 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; }
-
 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 path from 'path';
 import { getBabelChain, applyUserBabelConfig } from '@modern-js/babel-preset-lib';
 import { fs, json5, getAliasConfig } from '@modern-js/utils';
@@ -15,7 +12,6 @@ export const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   if (!fs.existsSync(tsconfigPath)) {
     return noExistReturn;
   }
-
   const content = fs.readFileSync(tsconfigPath, 'utf-8');
   return json5.parse(content);
 };
@@ -29,26 +25,30 @@ export const getBabelConfig = (libPresetOption, syntaxOption) => {
     sourceType: 'unambiguous'
   }, chain.toJSON());
 };
-export const resolveBabelConfig = (appDirectory, config, option // FIXME: babel type can't pass type checking
+export const resolveBabelConfig = (appDirectory, config, option
+// FIXME: babel type can't pass type checking
 ) => {
   const {
-    envVars,
+    define,
     globalVars,
     alias,
     babelConfig
-  } = config; // alias config
+  } = config;
 
+  // alias config
   const aliasConfig = getAliasConfig(alias, _objectSpread({
     appDirectory
-  }, option)); // babel config
+  }, option));
 
+  // babel config
   const babelChain = getBabelChain({
     appDirectory,
     enableReactPreset: true,
     enableTypescriptPreset: true,
     alias: aliasConfig,
-    envVars,
-    globalVars
+    // FIXME: handle the define envVars
+    envVars: define,
+    globalVars: globalVars
   }, {
     type: option.type,
     syntax: option.syntax
@@ -60,14 +60,13 @@ export const resolveBabelConfig = (appDirectory, config, option // FIXME: babel
   babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
   babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
     legacy: true
-  }]); // resolve "Definitely assigned fields cannot be initialized here, but only in the constructor."
+  }]);
 
+  // resolve "Definitely assigned fields cannot be initialized here, but only in the constructor."
   babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
     loose: true
   }]);
-
   const internalBabelConfig = _objectSpread({}, babelChain.toJSON());
-
   return applyUserBabelConfig(internalBabelConfig, babelConfig);
 };
 export const compileByBabel = async (appDirectory, config, compileOptions) => {
@@ -82,7 +81,6 @@ export const compileByBabel = async (appDirectory, config, compileOptions) => {
       syntax: 'es6+',
       type: 'commonjs'
     });
-
     if (await fs.pathExists(sourceDir)) {
       const basename = path.basename(sourceDir);
       const targetDir = path.join(distDir, basename);
@@ -90,7 +88,6 @@ export const compileByBabel = async (appDirectory, config, compileOptions) => {
         filter: src => !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath
       });
     }
-
     return compiler({
       rootDir: appDirectory,
       distDir,

package/dist/js/modern/compilers/typescript/index.js

@@ -1,15 +1,11 @@
 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; }
-
 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 path from 'path';
 import { logger, getAliasConfig, fs } from '@modern-js/utils';
 import ts from 'typescript';
 import { TypescriptLoader } from "./typescript-loader";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfig-paths-plugin";
-
 const readTsConfigByFile = tsConfigFile => {
   const parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, undefined, ts.sys);
   const {
@@ -23,7 +19,6 @@ const readTsConfigByFile = tsConfigFile => {
     projectReferences
   };
 };
-
 const copyFiles = async (from, to, tsconfigPath) => {
   if (await fs.pathExists(from)) {
     const basename = path.basename(from);
@@ -33,7 +28,6 @@ const copyFiles = async (from, to, tsconfigPath) => {
     });
   }
 };
-
 export const compileByTs = async (appDirectory, config, compileOptions) => {
   logger.info(`Running ts compile...`);
   const {
@@ -41,11 +35,9 @@ export const compileByTs = async (appDirectory, config, compileOptions) => {
     distDir,
     tsconfigPath
   } = compileOptions;
-
   if (!tsconfigPath) {
     return;
   }
-
   const ts = new TypescriptLoader({
     appDirectory
   }).load();
@@ -86,20 +78,16 @@ export const compileByTs = async (appDirectory, config, compileOptions) => {
     before: [tsconfigPathsPlugin]
   });
   const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-
   if (allDiagnostics.length > 0) {
-    logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost)); // eslint-disable-next-line no-process-exit
-
+    logger.error(ts.formatDiagnosticsWithColorAndContext(allDiagnostics, formatHost));
+    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
-
   for (const source of sourceDirs) {
     await copyFiles(source, distDir, tsconfigPath);
   }
-
   logger.info(`Ts compile succeed`);
 };
-
 const getFormatHost = ts => {
   return {
     getCanonicalFileName: path => path,

package/dist/js/modern/compilers/typescript/tsconfig-paths-plugin.js

@@ -1,21 +1,17 @@
 import * as os from 'os';
 import path, { dirname, posix } from 'path';
 import * as ts from 'typescript';
-import { createMatchPath } from 'tsconfig-paths';
-
+import { createMatchPath } from '@modern-js/utils/tsconfig-paths';
 const isRegExpKey = str => {
   return str.startsWith('^') || str.endsWith('$');
 };
-
 const resolveAliasPath = (baseUrl, filePath) => {
   // exclude absolute path and alias
   if (filePath.startsWith('.') || filePath.startsWith('..')) {
     return path.resolve(baseUrl, filePath);
   }
-
   return filePath;
 };
-
 const createAliasMatcher = (baseUrl, alias) => {
   const aliasPairs = Object.keys(alias).reduce((o, key) => {
     if (isRegExpKey(key)) {
@@ -26,16 +22,15 @@ const createAliasMatcher = (baseUrl, alias) => {
       const aliasPath = resolveAliasPath(baseUrl, alias[key]);
       o.push([key, aliasPath]);
     }
-
     return o;
   }, []);
-  const cacheMap = new Map(); // eslint-disable-next-line consistent-return
+  const cacheMap = new Map();
 
+  // eslint-disable-next-line consistent-return
   return requestedModule => {
     if (cacheMap.has(requestedModule)) {
       return cacheMap.get(requestedModule);
     }
-
     for (const [key, value] of aliasPairs) {
       if (key instanceof RegExp) {
         if (key.test(requestedModule)) {
@@ -43,7 +38,6 @@ const createAliasMatcher = (baseUrl, alias) => {
           return value;
         }
       }
-
       if (requestedModule === key) {
         cacheMap.set(requestedModule, value);
         return value;
@@ -51,11 +45,9 @@ const createAliasMatcher = (baseUrl, alias) => {
     }
   };
 };
-
 const isDynamicImport = (tsBinary, node) => {
   return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
 };
-
 export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   const tsPaths = {};
   const alias = {};
@@ -68,21 +60,16 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   });
   const matchAliasPath = createAliasMatcher(baseUrl, alias);
   const matchTsPath = createMatchPath(baseUrl, tsPaths, ['main']);
-
   const matchPath = (requestedModule, readJSONSync, fileExists, extensions) => {
     const result = matchTsPath(requestedModule, readJSONSync, fileExists, extensions);
-
     if (result) {
       return result;
     }
-
     return matchAliasPath(requestedModule);
   };
-
   if (Object.keys(paths).length === 0) {
     return undefined;
   }
-
   return ctx => {
     return sf => {
       const visitNode = node => {
@@ -90,67 +77,53 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
           const importPathWithQuotes = node.arguments[0].getText(sf);
           const text = importPathWithQuotes.slice(1, importPathWithQuotes.length - 1);
           const result = getNotAliasedPath(sf, matchPath, text);
-
           if (!result) {
             return node;
           }
-
           return tsBinary.factory.updateCallExpression(node, node.expression, node.typeArguments, tsBinary.factory.createNodeArray([tsBinary.factory.createStringLiteral(result)]));
         }
-
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
             var _node$moduleSpecifier;
-
             const importPathWithQuotes = node === null || node === void 0 ? void 0 : (_node$moduleSpecifier = node.moduleSpecifier) === null || _node$moduleSpecifier === void 0 ? void 0 : _node$moduleSpecifier.getText();
-
             if (!importPathWithQuotes) {
               return node;
             }
-
             const text = importPathWithQuotes.substring(1, importPathWithQuotes.length - 1);
             const result = getNotAliasedPath(sf, matchPath, text);
-
             if (!result) {
               return node;
             }
-
             const moduleSpecifier = tsBinary.factory.createStringLiteral(result);
             moduleSpecifier.parent = node.moduleSpecifier.parent;
             let newNode;
-
             if (tsBinary.isImportDeclaration(node)) {
               newNode = tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
             } else {
               newNode = tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
             }
-
             newNode.flags = node.flags;
             return newNode;
           } catch (_unused) {
             return node;
           }
         }
-
         return tsBinary.visitEachChild(node, visitNode, ctx);
       };
-
       return tsBinary.visitNode(sf, visitNode);
     };
   };
-} // fork from https://github.com/nestjs/nest-cli/blob/HEAD/lib/compiler/hooks/tsconfig-paths.hook.ts
+}
 
+// fork from https://github.com/nestjs/nest-cli/blob/HEAD/lib/compiler/hooks/tsconfig-paths.hook.ts
 function getNotAliasedPath(sf, matcher, text) {
   let result = matcher(text, undefined, undefined, ['.ts', '.tsx', '.js', '.jsx']);
-
   if (!result) {
     return;
   }
-
   if (os.platform() === 'win32') {
     result = result.replace(/\\/g, '/');
   }
-
   if (!path.isAbsolute(result)) {
     // handle alias to alias
     if (!result.startsWith('.') && !result.startsWith('..')) {
@@ -160,29 +133,25 @@ function getNotAliasedPath(sf, matcher, text) {
         const packagePath = require.resolve(result, {
           paths: [process.cwd(), ...module.paths]
         });
-
         if (packagePath) {
           // eslint-disable-next-line consistent-return
           return result;
         }
       } catch (_unused2) {}
     }
-
     try {
       // Installed packages (node modules) should take precedence over root files with the same name.
       // Ref: https://github.com/nestjs/nest-cli/issues/838
       const packagePath = require.resolve(text, {
         paths: [process.cwd(), ...module.paths]
       });
-
       if (packagePath) {
         // eslint-disable-next-line consistent-return
         return text;
       }
     } catch (_unused3) {}
   }
-
-  const resolvedPath = posix.relative(dirname(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return
-
+  const resolvedPath = posix.relative(dirname(sf.fileName), result) || './';
+  // eslint-disable-next-line consistent-return
   return resolvedPath[0] === '.' ? resolvedPath : `./${resolvedPath}`;
 }

package/dist/js/modern/compilers/typescript/typescript-loader.js

@@ -1,32 +1,24 @@
 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; }
-
 export class TypescriptLoader {
   constructor({
     appDirectory
   }) {
     _defineProperty(this, "tsBinary", void 0);
-
     _defineProperty(this, "appDirectory", void 0);
-
     this.appDirectory = appDirectory;
   }
-
   load() {
     if (this.tsBinary) {
       return this.tsBinary;
     }
-
     try {
       const tsPath = require.resolve('typescript', {
         paths: [this.appDirectory || process.cwd()]
       });
-
       const ts = require(tsPath);
-
       return ts;
     } catch (error) {
       throw new Error('TypeScript could not be found! Please, install "typescript" package.');
     }
   }
-
 }

package/dist/js/node/common/index.js

@@ -4,35 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compile = exports.FILE_EXTENSIONS = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _typescript = require("../compilers/typescript");
-
 var _babel = require("../compilers/babel");
-
 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; }
-
 const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
 exports.FILE_EXTENSIONS = FILE_EXTENSIONS;
-
 const validateAbsolutePath = (filename, message) => {
   if (!path.isAbsolute(filename)) {
     throw new Error(message);
   }
 };
-
 const validateAbsolutePaths = (filenames, messageFunc) => {
   filenames.forEach(filename => validateAbsolutePath(filename, messageFunc(filename)));
 };
-
 const compile = async (appDirectory, modernConfig, compileOptions) => {
   var _modernConfig$server;
-
   const {
     sourceDirs,
     distDir,
@@ -42,12 +31,10 @@ const compile = async (appDirectory, modernConfig, compileOptions) => {
   validateAbsolutePath(distDir, `dist dir ${distDir} is not an absolute path.`);
   const compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$server = modernConfig.server) === null || _modernConfig$server === void 0 ? void 0 : _modernConfig$server.compiler;
   const isTsProject = tsconfigPath && (await _utils.fs.pathExists(tsconfigPath));
-
   if (!isTsProject || compiler === 'babel') {
     await (0, _babel.compileByBabel)(appDirectory, modernConfig, compileOptions);
   } else {
     await (0, _typescript.compileByTs)(appDirectory, modernConfig, compileOptions);
   }
 };
-
 exports.compile = compile;

package/dist/js/node/compilers/babel/index.js

@@ -11,19 +11,12 @@ var _exportNames = {
   compileByBabel: true
 };
 exports.resolveBabelConfig = exports.readTsConfig = exports.getBabelConfig = exports.existTsConfigFile = exports.compileByBabel = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var _babelPresetLib = require("@modern-js/babel-preset-lib");
-
 var _utils = require("@modern-js/utils");
-
 var _babelCompiler = require("@modern-js/babel-compiler");
-
 var _common = require("../../common");
-
 var _core = require("@babel/core");
-
 Object.keys(_core).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -35,66 +28,56 @@ Object.keys(_core).forEach(function (key) {
     }
   });
 });
-
 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; }
-
 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; }
-
 const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   // 如果不存在，则返回 noExistReturn
   if (!_utils.fs.existsSync(tsconfigPath)) {
     return noExistReturn;
   }
-
   const content = _utils.fs.readFileSync(tsconfigPath, 'utf-8');
-
   return _utils.json5.parse(content);
 };
-
 exports.readTsConfig = readTsConfig;
-
 const existTsConfigFile = tsconfigAbsolutePath => {
   const tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-
 exports.existTsConfigFile = existTsConfigFile;
-
 const getBabelConfig = (libPresetOption, syntaxOption) => {
   const chain = (0, _babelPresetLib.getBabelChain)(libPresetOption, syntaxOption);
   return _objectSpread({
     sourceType: 'unambiguous'
   }, chain.toJSON());
 };
-
 exports.getBabelConfig = getBabelConfig;
-
-const resolveBabelConfig = (appDirectory, config, option // FIXME: babel type can't pass type checking
+const resolveBabelConfig = (appDirectory, config, option
+// FIXME: babel type can't pass type checking
 ) => {
   const {
-    envVars,
+    define,
     globalVars,
     alias,
     babelConfig
-  } = config; // alias config
+  } = config;
 
+  // alias config
   const aliasConfig = (0, _utils.getAliasConfig)(alias, _objectSpread({
     appDirectory
-  }, option)); // babel config
+  }, option));
 
+  // babel config
   const babelChain = (0, _babelPresetLib.getBabelChain)({
     appDirectory,
     enableReactPreset: true,
     enableTypescriptPreset: true,
     alias: aliasConfig,
-    envVars,
-    globalVars
+    // FIXME: handle the define envVars
+    envVars: define,
+    globalVars: globalVars
   }, {
     type: option.type,
     syntax: option.syntax
@@ -106,19 +89,16 @@ const resolveBabelConfig = (appDirectory, config, option // FIXME: babel type ca
   babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
   babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
     legacy: true
-  }]); // resolve "Definitely assigned fields cannot be initialized here, but only in the constructor."
+  }]);
 
+  // resolve "Definitely assigned fields cannot be initialized here, but only in the constructor."
   babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
     loose: true
   }]);
-
   const internalBabelConfig = _objectSpread({}, babelChain.toJSON());
-
   return (0, _babelPresetLib.applyUserBabelConfig)(internalBabelConfig, babelConfig);
 };
-
 exports.resolveBabelConfig = resolveBabelConfig;
-
 const compileByBabel = async (appDirectory, config, compileOptions) => {
   const {
     sourceDirs,
@@ -131,7 +111,6 @@ const compileByBabel = async (appDirectory, config, compileOptions) => {
       syntax: 'es6+',
       type: 'commonjs'
     });
-
     if (await _utils.fs.pathExists(sourceDir)) {
       const basename = path.basename(sourceDir);
       const targetDir = path.join(distDir, basename);
@@ -139,7 +118,6 @@ const compileByBabel = async (appDirectory, config, compileOptions) => {
         filter: src => !['.ts', '.js'].includes(path.extname(src)) && src !== tsconfigPath
       });
     }
-
     return (0, _babelCompiler.compiler)({
       rootDir: appDirectory,
       distDir,
@@ -153,5 +131,4 @@ const compileByBabel = async (appDirectory, config, compileOptions) => {
     }
   });
 };
-
 exports.compileByBabel = compileByBabel;