From 9cb3d132afc59875b9b6fbb100cd103383d81ed4 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 01:39:32 -0600
Subject: [PATCH 01/11] Changes to allow creating TS project

---
 meta.js                             | 59 ++++++++++++++++++++---------
 template/build/vue-loader.conf.js   | 13 +++++--
 template/build/webpack.base.conf.js | 21 ++++++++++
 template/package.json               |  5 +++
 template/tsconfig.json              | 34 +++++++++++++++++
 template/tslint.json                | 23 +++++++++++
 6 files changed, 133 insertions(+), 22 deletions(-)
 create mode 100644 template/tsconfig.json
 create mode 100644 template/tslint.json

diff --git a/meta.js b/meta.js
index 0dc63e651b..364bd4559d 100644
--- a/meta.js
+++ b/meta.js
@@ -1,29 +1,29 @@
-const path = require('path')
-const fs = require('fs')
+const path = require('path');
+const fs = require('fs');
 const {
   sortDependencies,
   installDependencies,
   runLintFix,
   printMessage,
-} = require('./utils')
-const pkg = require('./package.json')
+} = require('./utils');
+const pkg = require('./package.json');
 
-const templateVersion = pkg.version
+const templateVersion = pkg.version;
 
 module.exports = {
   helpers: {
     if_or(v1, v2, options) {
       if (v1 || v2) {
-        return options.fn(this)
+        return options.fn(this);
       }
 
-      return options.inverse(this)
+      return options.inverse(this);
     },
     template_version() {
-      return templateVersion
+      return templateVersion;
     },
   },
-  
+
   prompts: {
     name: {
       type: 'string',
@@ -57,6 +57,11 @@ module.exports = {
         },
       ],
     },
+    typescript: {
+      type: 'confirm',
+      message: 'Use TypeScript as default language?',
+      default: false,
+    },
     router: {
       type: 'confirm',
       message: 'Install vue-router?',
@@ -153,27 +158,45 @@ module.exports = {
     'test/unit/setup.js': "unit && runner === 'jest'",
     'test/e2e/**/*': 'e2e',
     'src/router/**/*': 'router',
+    'tsconfig.json': 'typescript',
+    'vue-shims.d.ts': 'typescript',
   },
   complete: function(data, { chalk }) {
-    const green = chalk.green
+    const green = chalk.green;
 
-    sortDependencies(data, green)
+    sortDependencies(data, green);
 
-    const cwd = path.join(process.cwd(), data.inPlace ? '' : data.destDirName)
+    const cwd = path.join(process.cwd(), data.inPlace ? '' : data.destDirName);
 
     if (data.autoInstall) {
       installDependencies(cwd, data.autoInstall, green)
         .then(() => {
-          return runLintFix(cwd, data, green)
+          return runLintFix(cwd, data, green);
         })
         .then(() => {
-          printMessage(data, green)
+          printMessage(data, green);
         })
         .catch(e => {
-          console.log(chalk.red('Error:'), e)
-        })
+          console.log(chalk.red('Error:'), e);
+        });
     } else {
-      printMessage(data, chalk)
+      printMessage(data, chalk);
+    }
+  },
+  metalsmith: function(metalsmith, opts, helpers) {
+    function renameJsSourcesToTs(files, metalsmith, done) {
+      // If typescript is enabled rename any .js files in src/ folder to .ts extension
+      if (metalsmith.metadata().typescript) {
+        Object.keys(files).forEach(filename => {
+          if (/^(src|test\\unit\\specs).*\.js$/.test(filename)) {
+            const renamed = filename.replace(/\.js$/, '.ts');
+            files[renamed] = files[filename];
+            delete files[filename];
+          }
+        });
+      }
+      done(null, files);
     }
+    metalsmith.use(renameJsSourcesToTs);
   },
-}
+};
diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index 33ed58bc0a..66e92f5bac 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -7,10 +7,15 @@ const sourceMapEnabled = isProduction
   : config.dev.cssSourceMap
 
 module.exports = {
-  loaders: utils.cssLoaders({
-    sourceMap: sourceMapEnabled,
-    extract: isProduction
-  }),
+  loaders: {
+    ...utils.cssLoaders({
+      sourceMap: sourceMapEnabled,
+      extract: isProduction
+    }),
+    {{#typescript}}
+    ts: 'ts-loader!tslint-loader',
+    {{/typescript}}
+  },
   cssSourceMap: sourceMapEnabled,
   cacheBusting: config.dev.cacheBusting,
   transformToRequire: {
diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 391160c571..47a95271c8 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -45,6 +45,27 @@ module.exports = {
       {{#lint}}
       ...(config.dev.useEslint ? [createLintingRule()] : []),
       {{/lint}}
+      {{#typescript}}
+      {
+        test: /\.ts$/,
+        loader: 'ts-loader',
+        exclude: /node_modules/,
+        options: {
+          appendTsSuffixTo: [/\.vue$/],
+        },
+      },
+      {
+        test: /\.ts$/,
+        loader: 'tslint-loader',
+        enforce: 'pre',
+        include: [resolve('src'), resolve('test')],
+        options: {
+          configFile: 'tslint.json',
+          tsConfigFile: 'tsconfig.json',
+          typeCheck: true,
+        },
+      },
+      {{/typescript}}
       {
         test: /\.vue$/,
         loader: 'vue-loader',
diff --git a/template/package.json b/template/package.json
index db5f9564d2..bcaa2b9e62 100644
--- a/template/package.json
+++ b/template/package.json
@@ -82,6 +82,11 @@
     "nightwatch": "^0.9.12",
     "selenium-server": "^3.0.1",
     {{/e2e}}
+    {{#typescript}}
+    "tslint": "^5.8.0",
+    "tslint-loader": "^3.5.3",
+    "typescript": "^2.6.2",
+    {{/typescript}}
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
diff --git a/template/tsconfig.json b/template/tsconfig.json
new file mode 100644
index 0000000000..7222982858
--- /dev/null
+++ b/template/tsconfig.json
@@ -0,0 +1,34 @@
+{
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.vue"
+  ],
+  "exclude": [
+    "node_modules"
+  ],
+  "compilerOptions": {
+    // this aligns with Vue's browser support
+    "target": "es5",
+    // this enables stricter inference for data properties on `this`
+    "strict": true,
+    // if using webpack 2+ or rollup, to leverage tree shaking:
+    "module": "es2015",
+    "moduleResolution": "node",
+    "lib": [
+      "es2016",
+      "dom"
+    ],
+    "sourceMap": true,
+    "noImplicitReturns": true,
+    "noImplicitAny": false,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "noUnusedLocals": false,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    }
+  }
+}
diff --git a/template/tslint.json b/template/tslint.json
new file mode 100644
index 0000000000..9b8d974262
--- /dev/null
+++ b/template/tslint.json
@@ -0,0 +1,23 @@
+{
+  "defaultSeverity": "error",
+  "extends": ["tslint:recommended"],
+  "jsRules": {},
+  "rules": {
+    "indent": [true, "spaces", 2],
+    "interface-name": false,
+    "newline-before-return": true,
+    "no-consecutive-blank-lines": false,
+    "no-console": { "severity": "warning" },
+    "no-debugger": { "severity": "warning" },
+    "no-empty": { "severity": "warning", "options": "allow-empty-catch" },
+    "no-irregular-whitespace": true,
+    "no-unused-variable": { "severity": "warning" },
+    "object-literal-sort-keys": [true],
+    "ordered-imports": false,
+    "prefer-switch": true,
+    "space-within-parens": true,
+    "quotemark": [true, "single"],
+    "variable-name": true
+  },
+  "rulesDirectory": []
+}

From f2aa1fb49ccf13b0eae31779812f3b34a71cc195 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 01:44:47 -0600
Subject: [PATCH 02/11] Added shim

---
 meta.js               | 3 ++-
 template/src/sfc.d.ts | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 template/src/sfc.d.ts

diff --git a/meta.js b/meta.js
index 364bd4559d..062b5be111 100644
--- a/meta.js
+++ b/meta.js
@@ -159,7 +159,8 @@ module.exports = {
     'test/e2e/**/*': 'e2e',
     'src/router/**/*': 'router',
     'tsconfig.json': 'typescript',
-    'vue-shims.d.ts': 'typescript',
+    'tslint.json': 'typescript',
+    'src/sfc.d.ts': 'typescript',
   },
   complete: function(data, { chalk }) {
     const green = chalk.green;
diff --git a/template/src/sfc.d.ts b/template/src/sfc.d.ts
new file mode 100644
index 0000000000..8f6f410263
--- /dev/null
+++ b/template/src/sfc.d.ts
@@ -0,0 +1,4 @@
+declare module '*.vue' {
+  import Vue from 'vue';
+  export default Vue;
+}

From 99318b34d68c9b3050a4d45a2717681303fc3304 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:03:47 -0600
Subject: [PATCH 03/11] Final touches

---
 template/src/App.vue                        | 9 +++++----
 template/src/components/HelloWorld.vue      | 8 +++++---
 template/src/main.js                        | 2 +-
 template/src/router/index.js                | 6 +++---
 template/test/unit/jest.conf.js             | 9 ++++++---
 template/test/unit/specs/HelloWorld.spec.js | 4 +++-
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/template/src/App.vue b/template/src/App.vue
index 03d5e7247d..7999c93cb3 100644
--- a/template/src/App.vue
+++ b/template/src/App.vue
@@ -9,17 +9,18 @@
   </div>
 </template>
 
-<script>
+<script{{#typescript}} lang="ts"{{/typescript}}>
+{{#typescript}}import Vue from 'vue'{{/typescript}}
 {{#unless router}}
-import HelloWorld from './components/HelloWorld'
+import HelloWorld from './components/HelloWorld{{#typescript}}.vue{{/typescript}}'
 
 {{/unless}}
-export default {
+export default {{#typescript}}Vue.extend({{/typescript}}{
   name: 'app'{{#router}}{{else}},
   components: {
     HelloWorld
   }{{/router}}
-}
+}{{#typescript}}){{/typescript}}
 </script>
 
 <style>
diff --git a/template/src/components/HelloWorld.vue b/template/src/components/HelloWorld.vue
index 6f18621654..093523d67c 100644
--- a/template/src/components/HelloWorld.vue
+++ b/template/src/components/HelloWorld.vue
@@ -20,15 +20,17 @@
   </div>
 </template>
 
-<script>
-export default {
+<script{{#typescript}} lang="ts"{{/typescript}}>
+{{#typescript}}import Vue from 'vue'
+
+{{/typescript}}export default {{#typescript}}Vue.extend({{/typescript}}{
   name: 'HelloWorld',
   data () {
     return {
       msg: 'Welcome to Your Vue.js App'
     }
   }
-}
+}{{#typescript}}){{/typescript}}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/template/src/main.js b/template/src/main.js
index 48833b5ab7..5ece503a43 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -3,7 +3,7 @@
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 {{/if_eq}}
 import Vue from 'vue'
-import App from './App'
+import App from './App{{#typescript}}.vue{{/typescript}}'
 {{#router}}
 import router from './router'
 {{/router}}
diff --git a/template/src/router/index.js b/template/src/router/index.js
index 5fa7f9d319..878bd421f7 100644
--- a/template/src/router/index.js
+++ b/template/src/router/index.js
@@ -1,15 +1,15 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import HelloWorld from '@/components/HelloWorld'
+import HelloWorld from '@/components/HelloWorld{{#typescript}}.vue{{/typescript}}'
 
 Vue.use(Router)
 
 export default new Router({
   routes: [
     {
-      path: '/',
+      component: HelloWorld,
       name: 'HelloWorld',
-      component: HelloWorld
+      path: '/',
     }
   ]
 })
diff --git a/template/test/unit/jest.conf.js b/template/test/unit/jest.conf.js
index c524e9d7bd..ade6694a3c 100644
--- a/template/test/unit/jest.conf.js
+++ b/template/test/unit/jest.conf.js
@@ -3,15 +3,18 @@ const path = require('path')
 module.exports = {
   rootDir: path.resolve(__dirname, '../../'),
   moduleFileExtensions: [
-    'js',
+    'js',{{#typescript}}
+    'ts',{{/typescript}}
     'json',
     'vue'
-  ],
+  ],{{#typescript}}
+  testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",{{/typescript}}
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1'
   },
   transform: {
-    '^.+\\.js$': '<rootDir>/node_modules/babel-jest',
+    '^.+\\.js$': '<rootDir>/node_modules/babel-jest',{{#typescript}}
+    '^.+\\.ts$': 'ts-jest',{{/typescript}}
     '.*\\.(vue)$': '<rootDir>/node_modules/vue-jest'
   },{{#e2e}}
   testPathIgnorePatterns: [
diff --git a/template/test/unit/specs/HelloWorld.spec.js b/template/test/unit/specs/HelloWorld.spec.js
index 8951ac95b5..f69d32b7e5 100644
--- a/template/test/unit/specs/HelloWorld.spec.js
+++ b/template/test/unit/specs/HelloWorld.spec.js
@@ -1,7 +1,9 @@
 import Vue from 'vue'
 import HelloWorld from '@/components/HelloWorld'
 
-describe('HelloWorld.vue', () => {
+{{#typescript}}{{#if_eq runner "karma"}}import { expect } from 'chai'
+
+{{/if_eq}}{{/typescript}}describe('HelloWorld.vue', () => {
   it('should render correct contents', () => {
     const Constructor = Vue.extend(HelloWorld)
     const vm = new Constructor().$mount()

From 058087bef1ee9871988643d22ac15fa5419ad387 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:09:40 -0600
Subject: [PATCH 04/11] tslint rule changes

---
 template/tslint.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/tslint.json b/template/tslint.json
index 9b8d974262..887220f50e 100644
--- a/template/tslint.json
+++ b/template/tslint.json
@@ -15,8 +15,10 @@
     "object-literal-sort-keys": [true],
     "ordered-imports": false,
     "prefer-switch": true,
+    "semicolon": false,
     "space-within-parens": true,
     "quotemark": [true, "single"],
+    "trailing-comma": false,
     "variable-name": true
   },
   "rulesDirectory": []

From cf49fb589bc31408fef83cf3a40eca9f541cbdc5 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:16:07 -0600
Subject: [PATCH 05/11] Making tslint optional

---
 meta.js                           | 8 +++++++-
 template/build/vue-loader.conf.js | 2 +-
 template/package.json             | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta.js b/meta.js
index 062b5be111..fa882ba6a6 100644
--- a/meta.js
+++ b/meta.js
@@ -67,9 +67,15 @@ module.exports = {
       message: 'Install vue-router?',
     },
     lint: {
+      when: '!typescript',
       type: 'confirm',
       message: 'Use ESLint to lint your code?',
     },
+    tslint: {
+      when: 'typescript',
+      type: 'confirm',
+      message: 'Use TSLint to lint your code?',
+    },
     lintConfig: {
       when: 'lint',
       type: 'list',
@@ -159,7 +165,7 @@ module.exports = {
     'test/e2e/**/*': 'e2e',
     'src/router/**/*': 'router',
     'tsconfig.json': 'typescript',
-    'tslint.json': 'typescript',
+    'tslint.json': 'typescript && lint',
     'src/sfc.d.ts': 'typescript',
   },
   complete: function(data, { chalk }) {
diff --git a/template/build/vue-loader.conf.js b/template/build/vue-loader.conf.js
index 66e92f5bac..0952ac9665 100644
--- a/template/build/vue-loader.conf.js
+++ b/template/build/vue-loader.conf.js
@@ -13,7 +13,7 @@ module.exports = {
       extract: isProduction
     }),
     {{#typescript}}
-    ts: 'ts-loader!tslint-loader',
+    ts: 'ts-loader{{#tslint}}!tslint-loader{{/tslint}}',
     {{/typescript}}
   },
   cssSourceMap: sourceMapEnabled,
diff --git a/template/package.json b/template/package.json
index bcaa2b9e62..b5f3dc7a6f 100644
--- a/template/package.json
+++ b/template/package.json
@@ -83,8 +83,10 @@
     "selenium-server": "^3.0.1",
     {{/e2e}}
     {{#typescript}}
+    {{#tslint}}
     "tslint": "^5.8.0",
     "tslint-loader": "^3.5.3",
+    {{/tslint}}
     "typescript": "^2.6.2",
     {{/typescript}}
     "autoprefixer": "^7.1.2",

From a79fc01a0e6750b1ffdaefca8a347542c676eba7 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:17:56 -0600
Subject: [PATCH 06/11] Fixing dumb mistake

---
 meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta.js b/meta.js
index fa882ba6a6..d31619ce81 100644
--- a/meta.js
+++ b/meta.js
@@ -77,7 +77,7 @@ module.exports = {
       message: 'Use TSLint to lint your code?',
     },
     lintConfig: {
-      when: 'lint',
+      when: '!typescript && lint',
       type: 'list',
       message: 'Pick an ESLint preset',
       choices: [

From a5e78681cfabd9070d767a922513b473ba3b39d4 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:19:39 -0600
Subject: [PATCH 07/11] Fixing more mistakes

---
 meta.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta.js b/meta.js
index d31619ce81..5cc2ef84e0 100644
--- a/meta.js
+++ b/meta.js
@@ -152,8 +152,8 @@ module.exports = {
     },
   },
   filters: {
-    '.eslintrc.js': 'lint',
-    '.eslintignore': 'lint',
+    '.eslintrc.js': '!typescript && lint',
+    '.eslintignore': '!typescript && lint',
     'config/test.env.js': 'unit || e2e',
     'build/webpack.test.conf.js': "unit && runner === 'karma'",
     'test/unit/**/*': 'unit',
@@ -165,7 +165,7 @@ module.exports = {
     'test/e2e/**/*': 'e2e',
     'src/router/**/*': 'router',
     'tsconfig.json': 'typescript',
-    'tslint.json': 'typescript && lint',
+    'tslint.json': 'typescript && tslint',
     'src/sfc.d.ts': 'typescript',
   },
   complete: function(data, { chalk }) {

From 08b7bc398a8a2b31dd84a48743a6177b502b2fdd Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:24:33 -0600
Subject: [PATCH 08/11] Moar fixes!

---
 template/build/webpack.base.conf.js    | 2 +-
 template/src/components/HelloWorld.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 47a95271c8..b1eb6977de 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -22,7 +22,7 @@ function resolve (dir) {
 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
-    app: './src/main.js'
+    app: './src/main.{{#typescript}}ts{{else}}js{{/typescript}}'
   },
   output: {
     path: config.build.assetsRoot,
diff --git a/template/src/components/HelloWorld.vue b/template/src/components/HelloWorld.vue
index 093523d67c..9d625a7c1e 100644
--- a/template/src/components/HelloWorld.vue
+++ b/template/src/components/HelloWorld.vue
@@ -25,7 +25,7 @@
 
 {{/typescript}}export default {{#typescript}}Vue.extend({{/typescript}}{
   name: 'HelloWorld',
-  data () {
+  data() {
     return {
       msg: 'Welcome to Your Vue.js App'
     }

From d5f127c27d1b91a7e33ba9cac69f24223b3bba26 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:34:23 -0600
Subject: [PATCH 09/11] More fixes

---
 template/build/webpack.base.conf.js | 3 ++-
 template/package.json               | 1 +
 template/src/main.js                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index b1eb6977de..49e55fbbf1 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -54,6 +54,7 @@ module.exports = {
           appendTsSuffixTo: [/\.vue$/],
         },
       },
+      {{#tslint}}
       {
         test: /\.ts$/,
         loader: 'tslint-loader',
@@ -65,7 +66,7 @@ module.exports = {
           typeCheck: true,
         },
       },
-      {{/typescript}}
+      {{/tslint}}{{/typescript}}
       {
         test: /\.vue$/,
         loader: 'vue-loader',
diff --git a/template/package.json b/template/package.json
index b5f3dc7a6f..79162dc9df 100644
--- a/template/package.json
+++ b/template/package.json
@@ -87,6 +87,7 @@
     "tslint": "^5.8.0",
     "tslint-loader": "^3.5.3",
     {{/tslint}}
+    "ts-loader": "^3.5.3",
     "typescript": "^2.6.2",
     {{/typescript}}
     "autoprefixer": "^7.1.2",
diff --git a/template/src/main.js b/template/src/main.js
index 5ece503a43..4bd02f2554 100644
--- a/template/src/main.js
+++ b/template/src/main.js
@@ -10,7 +10,7 @@ import router from './router'
 
 Vue.config.productionTip = false
 
-/* eslint-disable no-new */
+/* {{#typescript}}tslint:disable-next-line{{else}}eslint-disable no-new{{/typescript}} */
 new Vue({
   el: '#app',
   {{#router}}

From 37d4a0a9545c2924cf2ab8ef45641cc98ab2e9d8 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:40:56 -0600
Subject: [PATCH 10/11] Wish I could test this locally

---
 template/build/webpack.base.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/build/webpack.base.conf.js b/template/build/webpack.base.conf.js
index 49e55fbbf1..cddd88bb7c 100644
--- a/template/build/webpack.base.conf.js
+++ b/template/build/webpack.base.conf.js
@@ -32,7 +32,7 @@ module.exports = {
       : config.dev.assetsPublicPath
   },
   resolve: {
-    extensions: ['.js', '.vue', '.json'],
+    extensions: ['.js', {{#typescript}}'.ts', {{/typescript}}'.vue', '.json'],
     alias: {
       {{#if_eq build "standalone"}}
       'vue$': 'vue/dist/vue.esm.js',

From 47461566d11e88cf200c12c1cc9230f9ef01b305 Mon Sep 17 00:00:00 2001
From: Sam Hulick <ffxsam@users.noreply.github.com>
Date: Wed, 10 Jan 2018 02:42:53 -0600
Subject: [PATCH 11/11] Fixed incorrect ts-loader version

---
 template/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/package.json b/template/package.json
index 79162dc9df..31f2e95f39 100644
--- a/template/package.json
+++ b/template/package.json
@@ -87,7 +87,7 @@
     "tslint": "^5.8.0",
     "tslint-loader": "^3.5.3",
     {{/tslint}}
-    "ts-loader": "^3.5.3",
+    "ts-loader": "^3.2.0",
     "typescript": "^2.6.2",
     {{/typescript}}
     "autoprefixer": "^7.1.2",