tweak ts setup

vuejs · Jan 11, 2018 · 957e08d · 957e08d
1 parent 18036a3
commit 957e08d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/packages/@vue/cli-plugin-typescript/generator/template/tslint.json b/packages/@vue/cli-plugin-typescript/generator/template/tslint.json
@@ -4,18 +4,10 @@
     "tslint:recommended"
   ],
   "rules": {
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "indent": [
-      true
-    ],
-    "interface-name": [
-      false
-    ],
-    "arrow-parens": false,
-    // Pending fix for shorthand property names.
+    "quotemark": [true, "single"],
+    "indent": [true, "spaces", 2],
+    "interface-name": false,
+    "ordered-imports": false,
     "object-literal-sort-keys": false
   }
 }
diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js
@@ -13,6 +13,7 @@ module.exports = api => {
         .test(/\.tsx?$/)
         .include
           .add(api.resolve('src'))
+          .add(api.resolve('test'))
           .end()
         .use('ts-loader')
           .loader('ts-loader')

diff --git a/packages/@vue/cli-plugin-unit-mocha/index.js b/packages/@vue/cli-plugin-unit-mocha/index.js
@@ -1,14 +1,10 @@
 module.exports = api => {
-  api.configureWebpack(webpackConfig => {
+  api.chainWebpack(webpackConfig => {
     if (process.env.NODE_ENV === 'test') {
-      if (!webpackConfig.externals) {
-        webpackConfig.externals = []
-      }
-      webpackConfig.externals = [].concat(
-        webpackConfig.externals,
-        require('webpack-node-externals')()
-      )
-      webpackConfig.devtool = 'inline-cheap-module-source-map'
+      webpackConfig.merge({
+        devtool: 'inline-cheap-module-source-map',
+        externals: [require('webpack-node-externals')()]
+      })
     }
   })