From 14bcb29707c0f415f8384028c1098fa1dd25b3ed Mon Sep 17 00:00:00 2001 From: Daniel Tschinder Date: Fri, 2 Nov 2018 16:43:46 -0700 Subject: [PATCH] Update flow tests and fix underscore being a reserved type --- Makefile | 4 ++-- packages/babel-parser/src/plugins/flow.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 325866dea3cf..e4168eb2c3ee 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ MAKEFLAGS = -j1 -FLOW_COMMIT = bea8b83f50f597454941d2a7ecef6e93a881e576 +FLOW_COMMIT = e192e1a4793dd8e43415fbfe8046d832cb513c8b TEST262_COMMIT = 06c2f019019cf7850923de4d56828e6dfd9212b8 # Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967 @@ -82,7 +82,7 @@ test-ci-coverage: bootstrap-flow: rm -rf ./build/flow mkdir -p ./build - git clone --branch=master --single-branch --shallow-since=2017-01-01 https://github.com/facebook/flow.git ./build/flow + git clone --branch=master --single-branch --shallow-since=2018-11-01 https://github.com/facebook/flow.git ./build/flow cd build/flow && git checkout $(FLOW_COMMIT) test-flow: diff --git a/packages/babel-parser/src/plugins/flow.js b/packages/babel-parser/src/plugins/flow.js index cd250e9ad085..79edbc0f9751 100644 --- a/packages/babel-parser/src/plugins/flow.js +++ b/packages/babel-parser/src/plugins/flow.js @@ -23,6 +23,9 @@ const primitiveTypes = [ "true", "typeof", "void", + "interface", + "extends", + "_", ]; function isEsModuleType(bodyElement: N.Node): boolean {