From 9050c554a3b0f1c7588fba716cf650b7e354b4b7 Mon Sep 17 00:00:00 2001
From: rainer oviir <raineroviir@rainers-MacBook-Pro.local>
Date: Sun, 14 Feb 2016 23:15:05 -0800
Subject: [PATCH] Make tests pass using Node 5 / NPM 3 #832

Make tests pass using Node 5 / NPM 3 #832

Make tests pass using Node 5 / NPM 3 #832

Make tests pass using Node 5 / NPM 3 #832
---
 .travis.yml                                |  2 +-
 package.json                               | 16 +++++-----------
 scripts/babel-relay-plugin/src/.flowconfig |  1 +
 src/.flowconfig                            |  2 ++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cffb962d14099..11c8f2fa5395b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-- '4'
+- '5'
 env:
 - TEST_DIR=.
 - TEST_DIR=scripts/babel-relay-plugin
diff --git a/package.json b/package.json
index 039201b8e6cd9..85d5c64792893 100644
--- a/package.json
+++ b/package.json
@@ -30,10 +30,10 @@
   "dependencies": {
     "babel-runtime": "5.8.24",
     "fbjs": "^0.7.0",
-    "react-static-container": "^1.0.0-alpha.1"
+    "react-static-container": "^1.0.0-alpha.1",
+    "babel-relay-plugin": "0.7.0"
   },
   "peerDependencies": {
-    "babel-relay-plugin": "0.7.0",
     "react": "^0.14.0"
   },
   "devDependencies": {
@@ -61,8 +61,8 @@
     "webpack-stream": "^2.1.0"
   },
   "devEngines": {
-    "node": ">=4.x",
-    "npm": ">=2.x"
+    "node": ">=5.x",
+    "npm": ">=3.x"
   },
   "jest": {
     "rootDir": "",
@@ -85,13 +85,7 @@
       "<rootDir>/src/"
     ],
     "unmockedModulePathPatterns": [
-      "<rootDir>/node_modules/fbjs/node_modules/core-js/",
-      "<rootDir>/node_modules/fbjs-scripts/",
-      "<rootDir>/node_modules/fbjs/node_modules/promise/",
-      "<rootDir>/node_modules/fbjs/lib/(?!(ErrorUtils.js$|fetch.js$|fetchWithRetries.js$))",
-      "<rootDir>/node_modules/react/",
-      "<rootDir>/node_modules/react-dom/",
-      "<rootDir>/node_modules/react-static-container/"
+      "<rootDir>/node_modules/(?!(fbjs/lib/ErrorUtils.js$|fbjs/lib/fetch.js$|fbjs/lib/fetchWithRetries.js$))"
     ]
   }
 }
diff --git a/scripts/babel-relay-plugin/src/.flowconfig b/scripts/babel-relay-plugin/src/.flowconfig
index eaa71ef37534c..11580306f2dfd 100644
--- a/scripts/babel-relay-plugin/src/.flowconfig
+++ b/scripts/babel-relay-plugin/src/.flowconfig
@@ -4,6 +4,7 @@
 
 [include]
 ../node_modules/
+../../../node_modules/util/
 
 [libs]
 ../interfaces
diff --git a/src/.flowconfig b/src/.flowconfig
index 02a2a72d98cbf..2f3fe754706d9 100644
--- a/src/.flowconfig
+++ b/src/.flowconfig
@@ -3,11 +3,13 @@
 .*/node_modules/graphql/.*
 .*/react/node_modules/.*
 .*/react-static-container/node_modules/.*
+.*/babel-relay-plugin/node_modules/.*
 
 [include]
 ../node_modules/fbjs/lib
 ../node_modules/react
 ../node_modules/react-static-container/lib
+../node_modules/base62
 
 [libs]
 ../node_modules/fbjs/flow/lib