chore: ease work with monorepo with jest packages and global Flow

obot24 · Jan 11, 2019 · abc00a3 · abc00a3
1 parent a88c78f
commit abc00a3
Show file tree

Hide file tree

Showing 9 changed files with 493 additions and 520 deletions.
diff --git a/packages/local-cli/.flowconfig → .flowconfig b/packages/local-cli/.flowconfig → .flowconfig
@@ -18,7 +18,7 @@
 .*/node_modules/metro.*/.*
 
 [include]
-../../node_modules
+flow-typed
 
 [options]
 emoji=true

diff --git a/babel.config.js b/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  babelrcRoots: ['packages/*'],
+};
diff --git a/.../local-cli/flow-typed/npm/jest_v23.x.x.js → flow-typed/npm/jest_v23.x.x.js b/.../local-cli/flow-typed/npm/jest_v23.x.x.js → flow-typed/npm/jest_v23.x.x.js
diff --git a/package.json b/package.json
@@ -4,16 +4,18 @@
     "packages/*"
   ],
   "scripts": {
-    "test": "cd packages/local-cli && yarn jest",
+    "test": "jest",
     "lint": "eslint packages",
-    "flow-check": "cd packages/local-cli && yarn flow check"
+    "flow-check": "flow check"
   },
   "devDependencies": {
+    "@babel/core": "^7.2.2",
     "@callstack/eslint-config": "^3.0.2",
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^7.1.2",
     "eslint": "^5.10.0",
-    "husky": "^1.3.1"
+    "husky": "^1.3.1",
+    "jest": "^24.0.0-alpha.12"
   },
   "eslintConfig": {
     "extends": "@callstack",
@@ -26,5 +28,10 @@
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
+  },
+  "jest": {
+    "projects": [
+      "packages/*"
+    ]
   }
 }
diff --git a/packages/global-cli/package.json b/packages/global-cli/package.json
@@ -22,5 +22,8 @@
     "minimist": "^1.2.0",
     "prompt": "^0.2.14",
     "semver": "^5.0.3"
+  },
+  "jest": {
+    "displayName": "global"
   }
 }
diff --git a/packages/local-cli/babel.config.js → packages/local-cli/.babelrc.js b/packages/local-cli/babel.config.js → packages/local-cli/.babelrc.js
diff --git a/packages/local-cli/cli.js b/packages/local-cli/cli.js
@@ -11,7 +11,7 @@
 require('graceful-fs').gracefulify(require('fs'));
 
 // Transpile the source code
-const babelConfig = require('./babel.config');
+const babelConfig = require('./.babelrc');
 
 require('@babel/register')(babelConfig);
 

diff --git a/packages/local-cli/package.json b/packages/local-cli/package.json
@@ -16,6 +16,7 @@
     "url": "https://github.com/react-native-community/react-native-cli.git"
   },
   "jest": {
+    "displayName": "local",
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/templates/"
@@ -66,10 +67,7 @@
     "xmldoc": "^0.4.0"
   },
   "devDependencies": {
-    "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "24.0.0-alpha.6",
     "flow-bin": "0.87.0",
-    "jest": "24.0.0-alpha.6",
     "react-native": "^0.57.0"
   },
   "peerDependencies": {