summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.eslintrc3
-rw-r--r--.flowconfig2
-rw-r--r--package.json2
-rw-r--r--yarn.lock18
4 files changed, 17 insertions, 8 deletions
diff --git a/.eslintrc b/.eslintrc
index 70248418cd..eb889110f2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -26,7 +26,8 @@
"no-unused-expressions" : [ 0 ], // until fixed https://github.com/babel/babel-eslint/issues/158
"no-unused-vars": ["error", {"args": all, "argsIgnorePattern": "_.*"}],
"block-scoped-var": [ 0 ], // until fixed https://github.com/eslint/eslint/issues/2253
- "react/prop-types": [ 0 ]
+ "react/prop-types": [ 0 ],
+ "flowtype/define-flow-type": 1
},
"env": {
"es6": true,
diff --git a/.flowconfig b/.flowconfig
index 6d8e2c3c6e..e08fa5ecae 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -10,5 +10,7 @@
flow-libs/
[options]
+emoji=true
+suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
munge_underscores=true
unsafe.enable_getters_and_setters=true
diff --git a/package.json b/package.json
index 615dfde17c..9b16195226 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"eslint": "^3.14.1",
"eslint-plugin-flowtype": "^2.34.0",
"eslint-plugin-react": "^6.9.0",
- "flow-bin": "^0.46.0",
+ "flow-bin": "^0.48.0",
"flow-typed": "^2.1.2",
"isomorphic-fetch": "^2.2.1",
"jsdom": "^9.11.0",
diff --git a/yarn.lock b/yarn.lock
index 6924abe385..7a3a61d6c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2292,6 +2292,12 @@ esdoc@^0.5.2:
minimist "1.2.0"
taffydb "2.7.2"
+eslint-plugin-flowtype@^2.34.0:
+ version "2.34.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.34.0.tgz#b9875f314652e5081623c9d2b18a346bbb759c09"
+ dependencies:
+ lodash "^4.15.0"
+
eslint-plugin-react@^6.9.0:
version "6.10.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"
@@ -2583,9 +2589,9 @@ flat-cache@^1.2.1:
graceful-fs "^4.1.2"
write "^0.2.1"
-flow-bin@^0.46.0:
- version "0.46.0"
- resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.46.0.tgz#06ad7fe19dddb1042264438064a2a32fee12b872"
+flow-bin@^0.48.0:
+ version "0.48.0"
+ resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.48.0.tgz#72d075143524358db8901525e3c784dc13a7c7ee"
flow-remove-types@^1.1.2:
version "1.2.1"
@@ -3667,7 +3673,7 @@ lodash@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -4016,8 +4022,8 @@ npmlog@^4.0.2:
set-blocking "~2.0.0"
"nseventmonitor@git+https://github.com/pronebird/NSEventMonitor.git":
- version "0.0.2"
- resolved "git+https://github.com/pronebird/NSEventMonitor.git#f6af316e7a92c1d50872ef3552271fdd4d8d4459"
+ version "0.0.3"
+ resolved "git+https://github.com/pronebird/NSEventMonitor.git#2707370d46748c2e4de99f0f762daf6d3b28b431"
dependencies:
bindings "^1.2.1"