fix(typescript): avoid including router file when router is not selected

bxb0911 · May 30, 2018 · 4d00161 · 4d00161
1 parent 970eee7
commit 4d00161
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue b/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue
@@ -1,5 +1,6 @@
 ---
 extend: '@vue/cli-service/generator/router/template/src/views/Home.vue'
+when: 'rootOptions.router'
 replace:
   - !!js/regexp /Welcome to Your Vue\.js App/
   - !!js/regexp /<script>[^]*?<\/script>/

diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js
@@ -297,6 +297,13 @@ function renderFile (name, data, ejsOptions) {
         finalTemplate = finalTemplate.replace(parsed.replace, content.trim())
       }
     }
+    if (parsed.when) {
+      finalTemplate = (
+        `<%_ if (${parsed.when}) { _%>` +
+          finalTemplate +
+        `<%_ } _%>`
+      )
+    }
   }
 
   return ejs.render(finalTemplate, data, ejsOptions)