fix: ts cache and auto check egg

Author: hubcarl

config/loader.js

@@ -48,7 +48,7 @@ exports.typescript = {
 
 exports.tslint = {
   enable: false,
-  test: /\.ts$/,
+  test: /\.tsx?$/,
   exclude: /node_modules/,
   enforce: 'pre',
   use: ['tslint-loader'],

lib/base.js

@@ -592,28 +592,30 @@ class WebpackBaseBuilder extends Config {
     return { loader, options };
   }
 
-  createBabelLoader() {
-    const loaderName = 'babel-loader';
-    const babelOptions = {};
+  createBabelLoader(babel = {}) {
+    babel = this.merge({ loader: 'babel-loader', options: {}}, babel);
     const babelEnv = process.env.BABEL_ENV;
     if (babelEnv) {
       if (this.isBabel7) { // @babel/core use envName key
-        babelOptions.envName = babelEnv;
+        babel.options.envName = babelEnv;
       } else { // babel-core use forceEnv key
-        babelOptions.forceEnv = babelEnv;
+        babel.options.forceEnv = babelEnv;
       }
     }
     const compile = this.config.compile || {};
-    const configCacheOptions = this.utils.isObject(compile.cache) ? compile.cache : {};
-    const cacheOptions = this.merge(babelOptions, configCacheOptions);
-    const config = compile.cache ? this.createCacheLoader(cacheOptions, loaderName) : { loader: loaderName, babelOptions };
+    // use babel cache
+    if (compile.cache) {
+      const cacheOptions = this.utils.isBoolean(compile.cache) ?  {} : compile.cache;
+      const cacheDirectory = this.utils.getCacheLoaderInfoPath(babel.loader, this.env, this.type);
+      babel.options = this.merge(babel.options, { cacheDirectory }, cacheOptions);
+    }
     // use project .babelrc
     if (fs.existsSync(this.projectBabelrc)) {
-      return config;
+      return babel;
     }
     // use default babelrc
-    const options = this.merge(babelOptions, this.babelConfig);
-    return this.merge(config, { options });
+    babel.options = this.merge(babel.options, this.babelConfig);
+    return babel;
   }
 
   createCacheLoader(loaderOptions, name) {

lib/config.js

@@ -73,6 +73,20 @@ class Config {
     return this._isEgg;
   }
 
+  get typescript() {
+    const configLoaders = this.config.loaders;
+    if (this.utils.isObject(configLoaders)) {
+      if (configLoaders.typescript) {
+        return true;
+      }
+    } else if (Array.isArray(configLoaders)) {
+      return configLoaders.some(loader => {
+        return !!loader.typescript;
+      });
+    }
+    return false;
+  }
+
   get buildPath() {
     return utils.normalizeBuildPath(this.config.buildPath, this.baseDir);
   }

utils/adapter.js

@@ -23,7 +23,7 @@ module.exports = class WebpackAdapter {
         }
         // egg project, auto set client typescript tsconfig.json config
         const tsConfigFile = g(config, 'typescript.options.configFile');
-        if (config.egg && !tsConfigFile) {
+        if (this.builder.egg && !tsConfigFile) {
           const configFile = path.join(this.baseDir, './app/web/tsconfig.json');
           if (fs.existsSync(configFile)) {
             this.builder.mergeConfig({