mikojs · HsuTing · Dec 11, 2019 · Dec 11, 2019 · Dec 11, 2019 · Dec 11, 2019
diff --git a/.catrc.js b/.catrc.js
@@ -52,8 +52,6 @@ const lint = {
       ...ignore.ignore,
       // ignore for @mikojs/eslint-config-base testing
       'packages/eslint-config-base/src/__tests__/__ignore__',
-      'packages/nested-flow/**/flow-typed/npm',
-      'packages/create-project/**/flow-typed/npm',
     ],
   }),
 };
@@ -75,8 +73,6 @@ const jest = {
         ),
         {
           exclude: [
-            /node_modules/,
-            /flow-typed\/npm/,
             /__generated__/,
             /__tests__\/__ignore__\/.*\/__tests__/,
             /__tests__\/__ignore__\/[a-zA-Z]*.js$/,

diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage

diff --git a/Makefile b/Makefile
@@ -8,7 +8,6 @@ install:
 	@yarn lerna exec "configs flow-typed:lerna install --verbose" \
 		--stream \
 		--concurrency 1
-	@yarn nested-flow flow-typed install
 
 babel-all:
 	@$(call babel-build)
@@ -56,7 +55,6 @@ define babel-build
 		$(2)
 	ln -snf $(ROOT)/packages/configs/lib/bin/index.js ./node_modules/.bin/configs
 	ln -snf $(ROOT)/packages/badges/lib/bin/index.js ./node_modules/.bin/badges
-	ln -snf $(ROOT)/packages/nested-flow/lib/bin/index.js ./node_modules/.bin/nested-flow
 	ln -snf $(ROOT)/server/server/lib/bin/index.js ./node_modules/.bin/server
 	yarn lerna exec \
 		"configs babel:lerna $(1)" \

diff --git a/__mocks__/envinfo.js b/__mocks__/envinfo.js
@@ -1,7 +1,7 @@
 // @flow
 
-export default ({
-  run: jest.fn().mockResolvedValue(
+export default {
+  run: () =>
     JSON.stringify({
       Binaries: {
         Node: {
@@ -15,7 +15,4 @@ export default ({
         },
       },
     }),
-  ),
-}: {|
-  run: JestMockFn<$ReadOnlyArray<void>, Promise<string>>,
-|});
+};
diff --git a/__mocks__/execa.js b/__mocks__/execa.js
@@ -1,19 +1,6 @@
 // @flow
 
-const mockResult: Promise<{ stdout: string }> & {
-  stdout?: {},
-  stderr?: {},
-} = Promise.resolve({ stdout: '' });
-
-mockResult.stdout = {
-  pipe: jest.fn(),
-};
-
-mockResult.stderr = {
-  pipe: jest.fn(),
-};
-
-export default (jest.fn().mockImplementation(() => mockResult): JestMockFn<
+export default (jest.fn().mockResolvedValue({ stdout: '' }): JestMockFn<
   $ReadOnlyArray<void>,
-  typeof mockResult,
+  Promise<{ stdout: string }>,
 >);
diff --git a/__mocks__/fs.js b/__mocks__/fs.js
@@ -5,5 +5,4 @@ export default {
   existsSync: jest.fn().mockReturnValue(true),
   mkdirSync: jest.fn(),
   createWriteStream: jest.fn(),
-  symlinkSync: jest.fn(),
 };
diff --git a/packages/create-project/src/__tests__/__ignore__/basic-server/.gitignore b/packages/create-project/src/__tests__/__ignore__/basic-server/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/basic-server/package.json b/packages/create-project/src/__tests__/__ignore__/basic-server/package.json
@@ -28,6 +28,7 @@
     "@mikojs/jest": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/basic-usage/.gitignore b/packages/create-project/src/__tests__/__ignore__/basic-usage/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/basic-usage/package.json b/packages/create-project/src/__tests__/__ignore__/basic-usage/package.json
@@ -22,6 +22,7 @@
     "@mikojs/jest": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "husky": "latest",
     "jest": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/getPkgInstalled.js b/packages/create-project/src/__tests__/__ignore__/getPkgInstalled.js
@@ -35,8 +35,7 @@ export default () =>
           ...result,
           [key]: argu.reduce(
             (newResult: $Values<resultType>, arguKey: string) =>
-              /** flow-bin can not be uesed in testing, flow-typed can not use flow-bin@latest */
-              ['add', '--dev', 'flow-bin'].includes(arguKey)
+              ['add', '--dev'].includes(arguKey)
                 ? newResult
                 : {
                     ...newResult,

diff --git a/packages/create-project/src/__tests__/__ignore__/graphql-server/.gitignore b/packages/create-project/src/__tests__/__ignore__/graphql-server/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/graphql-server/package.json b/packages/create-project/src/__tests__/__ignore__/graphql-server/package.json
@@ -30,6 +30,7 @@
     "@mikojs/jest": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/npm-pkg/.gitignore b/packages/create-project/src/__tests__/__ignore__/npm-pkg/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/npm-pkg/package.json b/packages/create-project/src/__tests__/__ignore__/npm-pkg/package.json
@@ -22,6 +22,7 @@
     "@mikojs/jest": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "husky": "latest",
     "jest": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/private-pkg/.gitignore b/packages/create-project/src/__tests__/__ignore__/private-pkg/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/private-pkg/package.json b/packages/create-project/src/__tests__/__ignore__/private-pkg/package.json
@@ -23,6 +23,7 @@
     "@mikojs/jest": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "husky": "latest",
     "jest": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/react-server-with-css/.gitignore b/packages/create-project/src/__tests__/__ignore__/react-server-with-css/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/react-server-with-css/package.json b/packages/create-project/src/__tests__/__ignore__/react-server-with-css/package.json
@@ -38,6 +38,7 @@
     "enzyme-adapter-react-16": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/react-server-with-less/.gitignore b/packages/create-project/src/__tests__/__ignore__/react-server-with-less/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/react-server-with-less/package.json b/packages/create-project/src/__tests__/__ignore__/react-server-with-less/package.json
@@ -39,6 +39,7 @@
     "enzyme-adapter-react-16": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/react-server/.gitignore b/packages/create-project/src/__tests__/__ignore__/react-server/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage
diff --git a/packages/create-project/src/__tests__/__ignore__/react-server/package.json b/packages/create-project/src/__tests__/__ignore__/react-server/package.json
@@ -35,6 +35,7 @@
     "enzyme-adapter-react-16": "latest",
     "eslint": "latest",
     "eslint-watch": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/relay-server-with-css/.gitignore b/packages/create-project/src/__tests__/__ignore__/relay-server-with-css/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage

diff --git a/packages/create-project/src/__tests__/__ignore__/relay-server-with-css/package.json b/packages/create-project/src/__tests__/__ignore__/relay-server-with-css/package.json
@@ -48,6 +48,7 @@
     "eslint": "latest",
     "eslint-watch": "latest",
     "fetch-mock": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/relay-server-with-less/.gitignore b/packages/create-project/src/__tests__/__ignore__/relay-server-with-less/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage

diff --git a/packages/create-project/src/__tests__/__ignore__/relay-server-with-less/package.json b/packages/create-project/src/__tests__/__ignore__/relay-server-with-less/package.json
@@ -49,6 +49,7 @@
     "eslint": "latest",
     "eslint-watch": "latest",
     "fetch-mock": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/__tests__/__ignore__/relay-server/.gitignore b/packages/create-project/src/__tests__/__ignore__/relay-server/.gitignore
@@ -13,7 +13,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage

diff --git a/packages/create-project/src/__tests__/__ignore__/relay-server/package.json b/packages/create-project/src/__tests__/__ignore__/relay-server/package.json
@@ -45,6 +45,7 @@
     "eslint": "latest",
     "eslint-watch": "latest",
     "fetch-mock": "latest",
+    "flow-bin": "latest",
     "flow-typed": "latest",
     "get-port": "latest",
     "husky": "latest",

diff --git a/packages/create-project/src/stores/gitignore.js b/packages/create-project/src/stores/gitignore.js
@@ -25,7 +25,7 @@ lib
 .eslintcache
 
 # flow
-**/flow-typed/npm
+flow-typed/npm
 
 # jest
 coverage${

diff --git a/packages/nested-flow/.npmignore b/packages/nested-flow/.npmignore
diff --git a/packages/nested-flow/README.md b/packages/nested-flow/README.md
diff --git a/packages/nested-flow/package.json b/packages/nested-flow/package.json
diff --git a/packages/nested-flow/src/__tests__/index.js b/packages/nested-flow/src/__tests__/index.js