feat: all use select (#111)

umijs · May 18, 2020 · 2f9b56b · 2f9b56b
1 parent e45bb0a
commit 2f9b56b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/lib/generators/ant-design-pro/index.js b/lib/generators/ant-design-pro/index.js
@@ -42,9 +42,10 @@ class AntDesignProGenerator extends BasicGenerator {
       const prompts = [
         {
           name: 'nextPro',
-          type: 'confirm',
+          type: 'list',
+          choices: ['Pro V5', 'Pro V4'],
           message: '🧙 Be the first to experience the new umi@3 ?',
-          default: false,
+          default: 'Pro V4',
           when: () => {
             // 为了测试，没有任何用处
             process.send && process.send({ type: 'prompt' });
@@ -61,7 +62,7 @@ class AntDesignProGenerator extends BasicGenerator {
           when: ({ nextPro }) => {
             process.send && process.send({ type: 'prompt' });
             process.emit('message', { type: 'prompt' });
-            return !nextPro;
+            return nextPro === 'Pro V4';
           },
         },
         {
@@ -73,20 +74,20 @@ class AntDesignProGenerator extends BasicGenerator {
           when: ({ nextPro }) => {
             process.send && process.send({ type: 'prompt' });
             process.emit('message', { type: 'prompt' });
-            return !nextPro;
+            return nextPro === 'Pro V4';
           },
         },
         {
           name: 'nextAntd',
-          type: 'confirm',
+          type: 'list',
+          choices: ['antd@4', 'antd@3'],
           when: ({ allBlocks, nextPro }) => {
             process.send && process.send({ type: 'prompt' });
             process.emit('message', { type: 'prompt' });
-            console.log(nextPro);
-            return allBlocks === 'simple' && !nextPro;
+            return allBlocks === 'simple' && nextPro === 'Pro V4';
           },
           message: '🦄 Time to use better, faster and latest antd@4!',
-          default: true,
+          default: 'antd@4',
         },
       ];
       return this.prompt(prompts).then(props => {
@@ -110,11 +111,11 @@ class AntDesignProGenerator extends BasicGenerator {
     const gitArgs = [`clone`, githubUrl, `--depth=1`];
 
     // 如果想要使用旧的 antd,使用 antd@3 分支
-    if (!nextAntd && allBlocks === 'simple') {
+    if (nextAntd === 'antd@3' && allBlocks === 'simple') {
       gitArgs.push('--branch', 'antd@3');
     }
 
-    if (nextPro) {
+    if (nextPro === 'Pro V5') {
       gitArgs.push('--branch', 'v5');
     }
 

diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
@@ -9,16 +9,18 @@ exports[`test umi-create test generate antd pro project from gitee.org 1`] = `
   block           - Create a umi block. 
   library         - Create a library with umi. 
   plugin          - Create a umi plugin. [41D[41C[2K[1A[2K[1A[2K[1A[2K[1A[2K[1A[2K[1A[2K[1A[2K[G? Select the boilerplate type ant-design-pro[44D[44C
-? 🧙 Be the first to experience the new umi@3 ? (y/N) [54D[54C[2K[G? 🧙 Be the first to experience the new umi@3 ? No[50D[50C
-
+? 🧙 Be the first to experience the new umi@3 ? (Use arrow keys)
+  Pro V5 
+❯ Pro V4 [9D[9C[2K[1A[2K[1A[2K[G? 🧙 Be the first to experience the new umi@3 ? Pro V4[54D[54C
 ? 🤓 Which language do you want to use? (Use arrow keys)
 ❯ TypeScript 
   JavaScript [13D[13C[2K[1A[2K[1A[2K[G? 🤓 Which language do you want to use? TypeScript[50D[50C
 ? 🚀 Do you need all the blocks or a simple scaffold? (Use arrow keys)
 ❯ simple 
   complete [11D[11C[2K[1A[2K[1A[2K[G? 🚀 Do you need all the blocks or a simple scaffold? simple[60D[60C
-false
-? 🦄 Time to use better, faster and latest antd@4! (Y/n) [57D[57C[2K[G? 🦄 Time to use better, faster and latest antd@4! Yes[54D[54C
+? 🦄 Time to use better, faster and latest antd@4! (Use arrow keys)
+❯ antd@4 
+  antd@3 [9D[9C[2K[1A[2K[1A[2K[G? 🦄 Time to use better, faster and latest antd@4! antd@4[57D[57C
 ❯ 🚚 clone success
 ❯ Clean up...
 ✨ File Generate Done
@@ -34,8 +36,9 @@ exports[`test umi-create test generate antd pro project from github 1`] = `
   block           - Create a umi block. 
   library         - Create a library with umi. 
   plugin          - Create a umi plugin. [41D[41C[2K[1A[2K[1A[2K[1A[2K[1A[2K[1A[2K[1A[2K[1A[2K[G? Select the boilerplate type ant-design-pro[44D[44C
-? 🧙 Be the first to experience the new umi@3 ? (y/N) [54D[54C[2K[G? 🧙 Be the first to experience the new umi@3 ? No[50D[50C
-
+? 🧙 Be the first to experience the new umi@3 ? (Use arrow keys)
+  Pro V5 
+❯ Pro V4 [9D[9C[2K[1A[2K[1A[2K[G? 🧙 Be the first to experience the new umi@3 ? Pro V4[54D[54C
 ? 🤓 Which language do you want to use? (Use arrow keys)
 ❯ TypeScript 
   JavaScript [13D[13C[2K[1A[2K[1A[2K[G? 🤓 Which language do you want to use? 
@@ -44,8 +47,9 @@ exports[`test umi-create test generate antd pro project from github 1`] = `
 ? 🚀 Do you need all the blocks or a simple scaffold? (Use arrow keys)
 ❯ simple 
   complete [11D[11C[2K[1A[2K[1A[2K[G? 🚀 Do you need all the blocks or a simple scaffold? simple[60D[60C
-false
-? 🦄 Time to use better, faster and latest antd@4! (Y/n) [57D[57C[2K[G? 🦄 Time to use better, faster and latest antd@4! Yes[54D[54C
+? 🦄 Time to use better, faster and latest antd@4! (Use arrow keys)
+❯ antd@4 
+  antd@3 [9D[9C[2K[1A[2K[1A[2K[G? 🦄 Time to use better, faster and latest antd@4! antd@4[57D[57C
 ❯ 🚚 clone success
 ❯ [Sylvanas] Prepare js environment...
 ❯ [JS] Clean up...