fix: typescript caching problems

xdlover · Jan 29, 2018 · a80cf18 · a80cf18
1 parent fbc25a0
commit a80cf18
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 23 deletions.
diff --git a/packages/@vue/cli-plugin-typescript/generator/template/tsconfig.json b/packages/@vue/cli-plugin-typescript/generator/template/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "<%- options.useTsWithBabel ? 'es2015' : 'es5' %>",
     "module": "es2015",
     "strict": true,
+    "jsx": "preserve",
     "moduleResolution": "node",
     <%_ if (options.classComponent) { _%>
     "experimentalDecorators": true,
@@ -13,6 +14,7 @@
     "baseUrl": ".",
     <%_if (isTest) { _%>
     "types": [
+      "node",
       <%_ if (hasMocha) { _%>
       "mocha",
       "chai"

diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js
@@ -17,43 +17,75 @@ module.exports = (api, options) => {
           .add(api.resolve('src'))
           .add(api.resolve('test'))
           .end()
-
-    if (options.experimentalCompileTsWithBabel) {
-      // Experimental: compile TS with babel so that it can leverage
-      // preset-env for auto-detected polyfills based on browserslists config.
-      // this is pending on the readiness of @babel/preset-typescript.
-      tsRule
         .use('cache-loader')
           .loader('cache-loader')
           .options({ cacheDirectory })
           .end()
-        .use('babel-loader')
-          .loader('babel-loader')
 
-      config.module
-        .rule('vue')
-          .use('vue-loader')
-            .tap(options => {
-              options.loaders.ts = 'babel-loader'
-              return options
-            })
-    } else {
+    const vueLoader = config.module
+      .rule('vue')
+        .use('vue-loader')
+        .tap(options => {
+          options.loaders.ts = [
+            {
+              loader: 'cache-loader',
+              options: { cacheDirectory }
+            }
+          ]
+          return options
+        })
+
+    if (!options.experimentalCompileTsWithBabel) {
+      const tsLoaderOptions = {
+        transpileOnly: true,
+        appendTsSuffixTo: [/\.vue$/]
+      }
+
+      // if has babel plugin, inject babel-loader before ts-loader
       if (api.hasPlugin('babel')) {
         tsRule
-          .use('cache-loader')
-            .loader('cache-loader')
-            .options({ cacheDirectory })
-            .end()
           .use('babel-loader')
             .loader('babel-loader')
+        vueLoader
+          .tap(options => {
+            if (api.hasPlugin('babel')) {
+              options.loaders.ts.push({
+                loader: 'babel-loader'
+              })
+            }
+            return options
+          })
       }
+
+      // apply ts-loader
       tsRule
         .use('ts-loader')
           .loader('ts-loader')
-          .options({
-            transpileOnly: true,
-            appendTsSuffixTo: [/\.vue$/]
+          .options(tsLoaderOptions)
+      vueLoader
+        .tap(options => {
+          options.loaders.ts.push({
+            loader: 'ts-loader',
+            options: tsLoaderOptions
           })
+          return options
+        })
+    } else {
+      // Experimental: compile TS with babel so that it can leverage
+      // preset-env for auto-detected polyfills based on browserslists config.
+      // this is pending on the readiness of @babel/preset-typescript.
+      tsRule
+        .use('babel-loader')
+          .loader('babel-loader')
+      vueLoader
+        .tap(options => {
+          options.loaders.ts.push(
+            {
+              loader: 'babel-loader'
+            }
+          )
+          return options
+        })
     }
 
     config