From a863bb6832bebbc89c3f544794b7c3f9be128cd1 Mon Sep 17 00:00:00 2001
From: "Howard.Zuo" <leftstick@qq.com>
Date: Sun, 29 Sep 2019 17:14:03 +0800
Subject: [PATCH 1/2] fix: remove unexpected tsconfig.json from JavaScript
 creation

---
 lib/generators/ant-design-pro/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/ant-design-pro/index.js b/lib/generators/ant-design-pro/index.js
index b1a004d..f11f51e 100644
--- a/lib/generators/ant-design-pro/index.js
+++ b/lib/generators/ant-design-pro/index.js
@@ -93,7 +93,7 @@ class AntDesignProGenerator extends BasicGenerator {
       });
 
       log('[JS] Clean up...');
-      const removeTsFiles = globList(['**/*.d.ts'], envOptions);
+      const removeTsFiles = globList(['tsconfig.json', '**/*.d.ts'], envOptions);
       removeTsFiles.forEach(filePath => {
         const targetPath = path.resolve(projectPath, filePath);
         fs.removeSync(targetPath);

From 20065b6cc980a7c8ea264389dc9d1827956c929d Mon Sep 17 00:00:00 2001
From: "Howard.Zuo" <leftstick@qq.com>
Date: Sun, 29 Sep 2019 17:29:10 +0800
Subject: [PATCH 2/2] test: add ut

---
 test/index.test.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/test/index.test.js b/test/index.test.js
index 4c2dfbb..817f246 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -91,4 +91,28 @@ describe('test umi-create', () => {
     assert.equal(response.stdout, expectStdout.join('\n'));
     assert.equal(response.code, 0);
   });
+
+  it('tsconfig.json should be removed if JavaScript is picked', async () => {
+    let temp = fs.mkdtempSync(path.join(os.tmpdir(), `umi-create`));
+    if (os.platform() === 'darwin') {
+      temp = path.join('/private', temp);
+    }
+    const Coffee = coffee.Coffee;
+    const fixtures = path.join(__dirname, 'fixtures');
+    const response = await new Coffee({
+      method: 'fork',
+      cmd: path.join(__dirname, '../cli.js'),
+      opt: { cwd: temp },
+    })
+      .beforeScript(path.join(fixtures, 'mock_cnpmjs.js'))
+      .waitForPrompt()
+      .write('\n')
+      .waitForPrompt()
+      .writeKey('DOWN', 'ENTER')
+      .end();
+
+    assert.equal(response.code, 0);
+    assert.ok(fs.existsSync(path.join(temp, 'jsconfig.json')));
+    assert.ok(!fs.existsSync(path.join(temp, 'tsconfig.json')));
+  });
 });