From f699f1bbbf699b907ed4a43d299c1b6d5523e800 Mon Sep 17 00:00:00 2001
From: Brian Ng <bng412@gmail.com>
Date: Fri, 25 May 2018 16:53:23 -0500
Subject: [PATCH] flow@0.73.0 (#8032)

---
 package.json                                          | 2 +-
 packages/babel-core/src/config/files/configuration.js | 5 +++--
 packages/babel-parser/src/plugins/flow.js             | 1 -
 packages/babel-parser/src/tokenizer/state.js          | 7 ++++++-
 packages/babel-preset-env/src/normalize-options.js    | 2 +-
 packages/babel-types/src/definitions/index.js         | 2 +-
 yarn.lock                                             | 6 +++---
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index f424c69bd0..6285b641d9 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "eslint-config-babel": "^7.0.2",
     "eslint-plugin-flowtype": "^2.20.0",
     "eslint-plugin-prettier": "^2.5.0",
-    "flow-bin": "^0.66.0",
+    "flow-bin": "^0.73.0",
     "graceful-fs": "^4.1.11",
     "gulp": "^4.0.0",
     "gulp-babel": "^8.0.0-beta.2",
diff --git a/packages/babel-core/src/config/files/configuration.js b/packages/babel-core/src/config/files/configuration.js
index e7022ce2bc..4547f5e4ec 100644
--- a/packages/babel-core/src/config/files/configuration.js
+++ b/packages/babel-core/src/config/files/configuration.js
@@ -198,8 +198,9 @@ const readConfigJS = makeStrongCache(
 
 const packageToBabelConfig = makeWeakCache(
   (file: ConfigFile): ConfigFile | null => {
-    if (typeof file.options.babel === "undefined") return null;
-    const babel = file.options.babel;
+    const babel = file.options[("babel": string)];
+
+    if (typeof babel === "undefined") return null;
 
     if (typeof babel !== "object" || Array.isArray(babel) || babel === null) {
       throw new Error(`${file.filepath}: .babel property must be an object`);
diff --git a/packages/babel-parser/src/plugins/flow.js b/packages/babel-parser/src/plugins/flow.js
index dde77d49eb..bf71a92763 100644
--- a/packages/babel-parser/src/plugins/flow.js
+++ b/packages/babel-parser/src/plugins/flow.js
@@ -2043,7 +2043,6 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       // add typeParameters if we found them
       if (typeParameters) {
-        // $FlowFixMe (trying to set '.typeParameters' on an expression)
         (prop.value || prop).typeParameters = typeParameters;
       }
     }
diff --git a/packages/babel-parser/src/tokenizer/state.js b/packages/babel-parser/src/tokenizer/state.js
index 1e6ebf470b..364ceec96d 100644
--- a/packages/babel-parser/src/tokenizer/state.js
+++ b/packages/babel-parser/src/tokenizer/state.js
@@ -115,7 +115,11 @@ export default class State {
   classLevel: number;
 
   // Labels in scope.
-  labels: Array<{ kind: ?("loop" | "switch"), statementStart?: number }>;
+  labels: Array<{
+    kind: ?("loop" | "switch"),
+    name?: ?string,
+    statementStart?: number,
+  }>;
 
   // Leading decorators. Last element of the stack represents the decorators in current context.
   // Supports nesting of decorators, e.g. @foo(@bar class inner {}) class outer {}
@@ -140,6 +144,7 @@ export default class State {
     start: number,
     leadingComments: ?Array<N.Comment>,
     trailingComments: ?Array<N.Comment>,
+    type: string,
   }>;
   commentPreviousNode: N.Node;
 
diff --git a/packages/babel-preset-env/src/normalize-options.js b/packages/babel-preset-env/src/normalize-options.js
index 5339eed625..b8f0e697fa 100644
--- a/packages/babel-preset-env/src/normalize-options.js
+++ b/packages/babel-preset-env/src/normalize-options.js
@@ -126,7 +126,7 @@ export const validateModulesOption = (
   return modulesOpt;
 };
 
-export const objectToBrowserslist = (object: Targets) => {
+export const objectToBrowserslist = (object: Targets): Array<string> => {
   return Object.keys(object).reduce((list, targetName) => {
     if (validBrowserslistTargets.indexOf(targetName) >= 0) {
       const targetVersion = object[targetName];
diff --git a/packages/babel-types/src/definitions/index.js b/packages/babel-types/src/definitions/index.js
index 6ffd136e23..6bab249930 100644
--- a/packages/babel-types/src/definitions/index.js
+++ b/packages/babel-types/src/definitions/index.js
@@ -24,7 +24,7 @@ toFastProperties(NODE_FIELDS);
 toFastProperties(BUILDER_KEYS);
 toFastProperties(DEPRECATED_KEYS);
 
-const TYPES = Object.keys(VISITOR_KEYS)
+const TYPES: Array<string> = Object.keys(VISITOR_KEYS)
   .concat(Object.keys(FLIPPED_ALIAS_KEYS))
   .concat(Object.keys(DEPRECATED_KEYS));
 
diff --git a/yarn.lock b/yarn.lock
index 90a17cf3b7..f4cdd16e55 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3492,9 +3492,9 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
-flow-bin@^0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.66.0.tgz#a96dde7015dc3343fd552a7b4963c02be705ca26"
+flow-bin@^0.73.0:
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.73.0.tgz#da1b90a02b0ef9c439f068c2fc14968db83be425"
 
 flush-write-stream@^1.0.2:
   version "1.0.3"