Revert "💥 feat: support umi@3 app (#106)" (#108)

This reverts commit cfb00c7.
umijs · Apr 30, 2020 · 368bc65 · 368bc65
1 parent 0e0596e
commit 368bc65
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 59 deletions.
diff --git a/cli.js b/cli.js
@@ -26,12 +26,8 @@ if (!semver.satisfies(process.version, '>= 8.0.0')) {
 const name = args._[0] || '';
 const { type } = args;
 delete args.type;
-
-(async () => {
-  await run({
-    name,
-    type,
-    args,
-  });
-  process.exit(0);
-})();
+run({
+  name,
+  type,
+  args,
+});
diff --git a/lib/generators/ant-design-pro/index.js b/lib/generators/ant-design-pro/index.js
@@ -40,28 +40,17 @@ class AntDesignProGenerator extends BasicGenerator {
       };
     } else {
       const prompts = [
-        {
-          name: 'nextPro',
-          type: 'confirm',
-          message: '🧙 Be the first to experience the new umi@3 ?',
-          default: false,
-          when: () => {
-            // 为了测试，没有任何用处
-            process.send && process.send({ type: 'prompt' });
-            process.emit('message', { type: 'prompt' });
-            return true;
-          },
-        },
         {
           name: 'language',
           type: 'list',
           message: '🤓 Which language do you want to use?',
           choices: ['TypeScript', 'JavaScript'],
           default: 'TypeScript',
-          when: ({ nextPro }) => {
+          filter: value => {
+            // 为了测试，没有任何用处
             process.send && process.send({ type: 'prompt' });
             process.emit('message', { type: 'prompt' });
-            return !nextPro;
+            return value;
           },
         },
         {
@@ -70,20 +59,18 @@ class AntDesignProGenerator extends BasicGenerator {
           message: '🚀 Do you need all the blocks or a simple scaffold?',
           choices: ['simple', 'complete'],
           default: 'simple',
-          when: ({ nextPro }) => {
+          filter: value => {
+            // 为了测试，没有任何用处
             process.send && process.send({ type: 'prompt' });
             process.emit('message', { type: 'prompt' });
-            return !nextPro;
+            return value;
           },
         },
         {
           name: 'nextAntd',
           type: 'confirm',
-          when: ({ allBlocks, nextPro }) => {
-            process.send && process.send({ type: 'prompt' });
-            process.emit('message', { type: 'prompt' });
-            console.log(nextPro);
-            return allBlocks === 'simple' && !nextPro;
+          when: ({ allBlocks }) => {
+            return allBlocks === 'simple';
           },
           message: '🦄 Time to use better, faster and latest antd@4!',
           default: true,
@@ -96,7 +83,7 @@ class AntDesignProGenerator extends BasicGenerator {
   }
 
   async writing() {
-    const { language = 'TypeScript', allBlocks, nextPro, nextAntd } = this.prompts;
+    const { language, allBlocks, nextAntd } = this.prompts;
 
     const isTypeScript = language === 'TypeScript';
     const projectName = this.opts.name || this.opts.env.cwd;
@@ -114,18 +101,14 @@ class AntDesignProGenerator extends BasicGenerator {
       gitArgs.push('--branch', 'antd@3');
     }
 
-    if (nextPro) {
-      gitArgs.push('--branch', 'v5');
-    }
-
     // all-blocks 分支上包含了所有的区块
     if (allBlocks === 'complete') {
       log(`🙈 complete mode can only use the version of antd@4`);
       gitArgs.push('--branch', 'all-blocks');
     }
 
     // Set branch if provided
-    if (this.opts.args.branch && !nextPro) {
+    if (this.opts.args.branch) {
       gitArgs.push('--branch', this.opts.args.branch);
     }
 

diff --git a/lib/run.js b/lib/run.js
@@ -67,7 +67,7 @@ const run = async config => {
 
   try {
     return runGenerator(`./generators/${type}`, config);
-  } catch (e) {
+  } catch(e) {
     console.error(chalk.red(`> Generate failed`), e);
     process.exit(1);
   }

diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
@@ -9,15 +9,12 @@ 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
-
 ? 🤓 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
 ❯ 🚚 clone success
 ❯ Clean up...
@@ -34,8 +31,6 @@ 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
-
 ? 🤓 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,7 +39,6 @@ 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
 ❯ 🚚 clone success
 ❯ [Sylvanas] Prepare js environment...

diff --git a/test/index.test.js b/test/index.test.js
@@ -23,8 +23,6 @@ describe('test umi-create', () => {
       .beforeScript(path.join(fixtures, 'mock_github.js'))
       .waitForPrompt()
       .write('\n')
-      .write('\n')
-      .write('\n')
       .writeKey('DOWN', 'ENTER')
       .write('\n')
       .write('\n')
@@ -53,8 +51,6 @@ describe('test umi-create', () => {
       .write('\n')
       .write('\n')
       .write('\n')
-      .write('\n')
-      .write('\n')
       .end();
 
     expect(winEOL(response.stdout).replace(/>/g, '❯')).toMatchSnapshot();
@@ -82,9 +78,6 @@ describe('typescript', () => {
       .write('\n')
       .write('\n')
       .write('\n')
-      .write('\n')
-      .write('\n')
-      .write('\n')
       .end();
 
     expect(response.code).toBe(0);
@@ -109,14 +102,13 @@ describe('typescript', () => {
         .beforeScript(path.join(fixtures, 'mock_github.js'))
         .waitForPrompt()
         .write('\n')
-        .write('\n')
-        .write('\n')
         // ts
         .write('\n')
         // all-blocks
         .writeKey('DOWN', 'ENTER')
         .write('\n')
         .end();
+
       expect(response.code).toBe(0);
       expect(fs.existsSync(path.join(temp, '/src/pages/exception/403/index.tsx'))).toBeTruthy();
     });
@@ -135,18 +127,14 @@ describe('typescript', () => {
       })
         .beforeScript(path.join(fixtures, 'mock_github.js'))
         .waitForPrompt()
-        .writeKey('ENTER')
-        .writeKey('ENTER')
-        .writeKey('ENTER')
+        .write('\n')
         // js
         .writeKey('DOWN', 'ENTER')
         // all blocks
         .writeKey('DOWN', 'ENTER')
-        .writeKey('ENTER')
-        .writeKey('ENTER')
+        .write('\n')
         .end();
-      console.log(response);
-      console.log(temp);
+
       expect(response.code).toBe(0);
       expect(fs.existsSync(path.join(temp, 'tsconfig.json'))).toBeFalsy();
       expect(fs.existsSync(path.join(temp, '/src/pages/exception/403/index.jsx'))).toBeTruthy();