From 7c19dd61e24804cc77e9169487ffb18918d965ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Tue, 30 Jul 2019 10:42:00 +0200
Subject: [PATCH] fix: do not generate empty file when use ts without router
 (#4374)

(cherry picked from commit 52bae8e14a1e4af8ad00141f565624975e337e4c)
---
 .../__tests__/tsGenerator.spec.js              | 18 ++++++++++++++++++
 packages/@vue/cli/lib/GeneratorAPI.js          |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsGenerator.spec.js b/packages/@vue/cli-plugin-typescript/__tests__/tsGenerator.spec.js
index 8cc134cc8..d55ddaa0e 100644
--- a/packages/@vue/cli-plugin-typescript/__tests__/tsGenerator.spec.js
+++ b/packages/@vue/cli-plugin-typescript/__tests__/tsGenerator.spec.js
@@ -17,6 +17,8 @@ test('generate files', async () => {
   expect(files['src/main.ts']).toBeTruthy()
   expect(files['src/main.js']).toBeFalsy()
   expect(files['src/App.vue']).toMatch('<script lang="ts">')
+  // checks that the Home.vue file has not been created, even empty
+  expect(files.hasOwnProperty('src/views/Home.vue')).toBeFalsy()
 })
 
 test('classComponent', async () => {
@@ -62,6 +64,22 @@ test('use with Babel', async () => {
   expect(files['tsconfig.json']).toMatch(`"target": "esnext"`)
 })
 
+test('use with router', async () => {
+  const { files } = await generateWithPlugin([
+    {
+      id: '@vue/cli-plugin-router',
+      apply: require('@vue/cli-plugin-router/generator'),
+      options: {}
+    },
+    {
+      id: 'ts',
+      apply: require('../generator'),
+      options: {}
+    }
+  ])
+  expect(files['src/views/Home.vue']).toMatch('<div class=\"home\">')
+})
+
 test('lint', async () => {
   const { pkg, files } = await generateWithPlugin([
     {
diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js
index 497599dcc..bf5e21f87 100644
--- a/packages/@vue/cli/lib/GeneratorAPI.js
+++ b/packages/@vue/cli/lib/GeneratorAPI.js
@@ -412,7 +412,7 @@ function renderFile (name, data, ejsOptions) {
     // if evaluated to falsy value, return early to avoid extra cost for extend expression
     const result = ejs.render(finalTemplate, data, ejsOptions)
     if (!result) {
-      return
+      return ''
     }
   }