From a051e6fd717dedf6c9a7520a5f6831422fb38fb4 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fschott@google.com>
Date: Wed, 15 Nov 2017 19:06:46 -0800
Subject: [PATCH] fix and update flow to get typechecker running again

---
 .babelrc     |  3 +--
 .flowconfig  |  9 ---------
 package.json | 12 ++++++------
 yarn.lock    | 16 +++++++++++++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.babelrc b/.babelrc
index 03b323ea..922ec4b5 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,3 @@
 {
-  "presets": ["es2015", "stage-1"],
-  "plugins": ["syntax-flow", "transform-flow-strip-types"]
+  "presets": ["es2015", "stage-1", "flow"]
 }
diff --git a/.flowconfig b/.flowconfig
index 238b91e4..e86ae846 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -1,17 +1,8 @@
 [ignore]
-.*/ripple-lib/src/.*
 .*/ripple-lib/dist/.*
 .*/ripple-lib/test/fixtures/.*
-.*/node_modules/flow-bin/.*
-.*/node_modules/webpack/.*
-.*/node_modules/babel-core/.*
-.*/node_modules/babel-eslint/.*
-.*/node_modules/babel-preset-es2015/.*
-.*/node_modules/babel-preset-stage-1/.*
-.*/node_modules/babel-register/.*
 
 [include]
-./node_modules/
 
 [libs]
 
diff --git a/package.json b/package.json
index d4d89859..4343f025 100644
--- a/package.json
+++ b/package.json
@@ -28,20 +28,20 @@
   },
   "devDependencies": {
     "assert-diff": "^1.0.1",
-    "babel-cli": "^6.4.0",
+    "babel-cli": "^6.26.0",
     "babel-core": "^6.4.0",
     "babel-eslint": "^6.0.4",
     "babel-loader": "^6.2.1",
-    "babel-plugin-syntax-flow": "^6.3.13",
-    "babel-plugin-transform-flow-strip-types": "^6.4.0",
     "babel-preset-es2015": "^6.3.13",
+    "babel-preset-flow": "^6.23.0",
     "babel-preset-stage-1": "^6.3.13",
-    "babel-register": "^6.3.13",
+    "babel-babel-register": "^6.3.13",
     "coveralls": "^2.13.1",
     "doctoc": "^0.15.0",
     "ejs": "^2.3.4",
     "eslint": "^2.9.0",
     "eventemitter2": "^0.4.14",
+    "flow-bin": "^0.59.0",
     "gulp": "^3.8.10",
     "gulp-bump": "^0.1.13",
     "gulp-rename": "^1.2.0",
@@ -62,8 +62,8 @@
     "build": "gulp",
     "doctoc": "doctoc docs/index.md --title '# RippleAPI Reference' --github --maxlevel 2",
     "docgen": "node --harmony scripts/build_docs.js",
-    "clean": "rm -rf dist/npm && rm -rf build/flow",
-    "typecheck": "babel --optional runtime --blacklist flow -d build/flow/ src/ && flow check",
+    "clean": "rm -rf dist/npm",
+    "typecheck": "flow check",
     "compile": "babel -D --optional runtime -d dist/npm/ src/",
     "watch": "babel -w -D --optional runtime -d dist/npm/ src/",
     "compile-with-source-maps": "babel -D --optional runtime -s -t -d dist/npm/ src/",
diff --git a/yarn.lock b/yarn.lock
index 527cbe72..4b259c24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -274,7 +274,7 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
-babel-cli@^6.4.0:
+babel-cli@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
   dependencies:
@@ -521,7 +521,7 @@ babel-plugin-syntax-export-extensions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
 
-babel-plugin-syntax-flow@^6.18.0, babel-plugin-syntax-flow@^6.3.13:
+babel-plugin-syntax-flow@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
 
@@ -759,7 +759,7 @@ babel-plugin-transform-export-extensions@^6.22.0:
     babel-plugin-syntax-export-extensions "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-flow-strip-types@^6.4.0:
+babel-plugin-transform-flow-strip-types@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
   dependencies:
@@ -823,6 +823,12 @@ babel-preset-es2015@^6.3.13:
     babel-plugin-transform-es2015-unicode-regex "^6.24.1"
     babel-plugin-transform-regenerator "^6.24.1"
 
+babel-preset-flow@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
+  dependencies:
+    babel-plugin-transform-flow-strip-types "^6.22.0"
+
 babel-preset-stage-1@^6.3.13:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0"
@@ -1882,6 +1888,10 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
+flow-bin@^0.59.0:
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.59.0.tgz#8c151ee7f09f1deed9bf0b9d1f2e8ab9d470f1bb"
+
 for-in@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"