From d68f47e687b3b113ca29f9a61d3d7f1a5fa5d6df Mon Sep 17 00:00:00 2001
From: Manuel Ojeda <manuelojedasistemas@gmail.com>
Date: Wed, 6 Nov 2019 20:41:52 -0700
Subject: [PATCH 1/3] types(router): added router array type for Array
 RouteConfig

---
 packages/@vue/cli-plugin-router/generator/index.js |  3 ++-
 .../generator/template/src/router/index.js         | 14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/@vue/cli-plugin-router/generator/index.js b/packages/@vue/cli-plugin-router/generator/index.js
index 3c2298f0c6..8998c8bf2e 100644
--- a/packages/@vue/cli-plugin-router/generator/index.js
+++ b/packages/@vue/cli-plugin-router/generator/index.js
@@ -10,7 +10,8 @@ module.exports = (api, options = {}) => {
 
   api.render('./template', {
     historyMode: options.historyMode,
-    doesCompile: api.hasPlugin('babel') || api.hasPlugin('typescript')
+    doesCompile: api.hasPlugin('babel') || api.hasPlugin('typescript'),
+    hasTypeScript: api.hasPlugin('typescript')
   })
 
   if (api.invoking) {
diff --git a/packages/@vue/cli-plugin-router/generator/template/src/router/index.js b/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
index 8a74fbc1fe..9a6a33205c 100644
--- a/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
+++ b/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
@@ -1,10 +1,16 @@
 import Vue from 'vue'
+<%_ if (hasTypeScript) { _%>
+import VueRouter, { RouteConfig } from 'vue-router'
+<%_ } else { _%>
 import VueRouter from 'vue-router'
+<%_ } _%>
 import Home from '../views/Home.vue'
 
-Vue.use(VueRouter)
-
-const routes = [
+<%_ if (hasTypeScript) { _%>
+  const routes = <Array<RouteConfig>>[
+<%_ } else { _%>
+  const routes = [
+<%_ } _%>
   {
     path: '/',
     name: 'home',
@@ -26,6 +32,8 @@ const routes = [
   }
 ]
 
+Vue.use(VueRouter)
+
 const router = new VueRouter({
   <%_ if (historyMode) { _%>
   mode: 'history',

From a0934af236969018139cdd8d1f9995dd51adba9e Mon Sep 17 00:00:00 2001
From: Manuel Ojeda <manuelojedasistemas@gmail.com>
Date: Thu, 27 Feb 2020 18:29:41 -0700
Subject: [PATCH 2/3] Update index.js

---
 .../cli-plugin-router/generator/template/src/router/index.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vue/cli-plugin-router/generator/template/src/router/index.js b/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
index 9a6a33205c..bdd21602e1 100644
--- a/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
+++ b/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
@@ -7,7 +7,7 @@ import VueRouter from 'vue-router'
 import Home from '../views/Home.vue'
 
 <%_ if (hasTypeScript) { _%>
-  const routes = <Array<RouteConfig>>[
+  const routes: Array<RouteConfig> = [
 <%_ } else { _%>
   const routes = [
 <%_ } _%>

From dda01278e5fa7df4e3a6f738af2f776718b33a0a Mon Sep 17 00:00:00 2001
From: Manuel Ojeda <manuelojedasistemas@gmail.com>
Date: Thu, 27 Feb 2020 20:51:45 -0700
Subject: [PATCH 3/3] Update index.js

---
 .../cli-plugin-router/generator/template/src/router/index.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@vue/cli-plugin-router/generator/template/src/router/index.js b/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
index bdd21602e1..297df92047 100644
--- a/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
+++ b/packages/@vue/cli-plugin-router/generator/template/src/router/index.js
@@ -6,6 +6,8 @@ import VueRouter from 'vue-router'
 <%_ } _%>
 import Home from '../views/Home.vue'
 
+Vue.use(VueRouter)
+
 <%_ if (hasTypeScript) { _%>
   const routes: Array<RouteConfig> = [
 <%_ } else { _%>
@@ -32,8 +34,6 @@ import Home from '../views/Home.vue'
   }
 ]
 
-Vue.use(VueRouter)
-
 const router = new VueRouter({
   <%_ if (historyMode) { _%>
   mode: 'history',