diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7fe155f9f564..cb085191b714 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
   build:
     working_directory: ~/babel
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:12
     steps:
       - checkout
       - restore-cache: *restore-yarn-cache
@@ -42,7 +42,7 @@ jobs:
       - run: yarn --version
       - run: make test-ci-coverage
       # Builds babel-standalone with the regular Babel config
-      - run: make build
+      - run: IS_PUBLISH=true make build
       # test-ci-coverage doesn't test babel-standalone, as trying to gather coverage
       # data for a JS file that's several megabytes large is bound to fail. Here,
       # we just run the babel-standalone test separately.
diff --git a/.editorconfig b/.editorconfig
index ba48528bbf4b..e86321667115 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,9 +6,12 @@ charset = utf-8
 trim_trailing_whitespace = true
 end_of_line = lf
 
-[*.{js,json}]
+[*.{js,json,ts,tsx}]
 indent_style = space
 indent_size = 2
 
+[Makefile]
+indent_style = tab
+
 [*.{md,markdown}]
 trim_trailing_whitespace = false
diff --git a/.eslintignore b/.eslintignore
index 18e74eafba27..092fbbb802cd 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -5,8 +5,8 @@ package.json
 lerna.json
 packages/babel-runtime
 !packages/babel-plugin-transform-runtime/scripts
-!packages/babel-runtime-corejs2/core-js.js
 packages/babel-runtime-corejs2
+packages/babel-runtime-corejs3
 packages/*/node_modules
 packages/*/lib
 packages/*/dist
diff --git a/.eslintrc.json b/.eslintrc.json
index d26b40aa6c5d..a59dc0d9e2dd 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "root": true,
+  "plugins": ["prettier", "@babel/development", "import"],
   "extends": "babel",
-  "plugins": ["local-rules", "prettier"],
   "rules": {
     "prettier/prettier": "error"
   },
@@ -12,8 +12,10 @@
     {
       "files": ["packages/*/src/**/*.js", "codemods/*/src/**/*.js"],
       "rules": {
-        "local-rules/no-undefined-identifier": "error",
-        "local-rules/no-deprecated-clone": "error"
+        "@babel/development/no-undefined-identifier": "error",
+        "@babel/development/no-deprecated-clone": "error",
+        "import/no-extraneous-dependencies": "error",
+        "guard-for-in": "error"
       }
     },
     {
@@ -26,6 +28,14 @@
       "env": {
         "jest": true
       }
+    },
+    {
+      "files": ["packages/babel-plugin-*/src/index.js"],
+      "excludedFiles": ["packages/babel-plugin-transform-regenerator/**/*.js"],
+      "rules": {
+        "@babel/development/plugin-name": "error",
+        "eqeqeq": ["error", "always", { "null": "ignore" }]
+      }
     }
   ]
 }
diff --git a/.flowconfig b/.flowconfig
index 9aacaf35ebdd..694811e55964 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -1,11 +1,10 @@
 [ignore]
-.*/build/.*
-.*/packages/.*/lib
-.*/packages/.*/test
-.*/codemods/.*/lib
-.*/codemods/.*/test
-.*/node_modules/conventional-changelog-core/
-.*/node_modules/module-deps/
+<PROJECT_ROOT>/build/.*
+<PROJECT_ROOT>/packages/.*/lib
+<PROJECT_ROOT>/packages/.*/test
+<PROJECT_ROOT>/codemods/.*/lib
+<PROJECT_ROOT>/codemods/.*/test
+<PROJECT_ROOT>/node_modules/module-deps/
 
 [include]
 packages/*/src
diff --git a/.github/CHANGELOG-6to5.md b/.github/CHANGELOG-6to5.md
index 6005a2db3ab0..45afe2368d8d 100644
--- a/.github/CHANGELOG-6to5.md
+++ b/.github/CHANGELOG-6to5.md
@@ -84,7 +84,7 @@
   * More performance improvements.
   * Parsing is now ~30% faster thanks to [marijnh/acorn@7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f](https://github.com/marijnh/acorn/commit/7264bc0178e7e6af7cfe02e9e0c6b26ee0e6007f).
  * **New Feature**
-  * Optional `es6.blockScopingTDZ` is now completely functional and handles all edgecases.
+  * Optional `es6.blockScopingTDZ` is now completely functional and handles all edge cases.
   * `super` in object literals.
   * Tail call optimisation. Thanks [@RReverser](https://github.com/RReverser)!
 
@@ -474,7 +474,7 @@
  * **Polish**
   * Rest parameters now allocate the array before populating.
  * **Internal**
-  * `for...in` loops have been changed to optimized `for` loops - better performance and no enumeration of protoype keys.
+  * `for...in` loops have been changed to optimized `for` loops - better performance and no enumeration of prototype keys.
   * Parts of the code generator have now been optimized thanks to [gaearon](https://github.com/gaearon).
 
 ## 2.12.3
@@ -643,7 +643,7 @@
 
  * **Bug Fix**
   * Better handling of number literal property keys.
-  * Handle `NewExpression` paren insertion edegcases better.
+  * Handle `NewExpression` paren insertion edge cases better.
  * **Internal**
   * Fix incorrect AST node `identifier("this")`.
   * Better `toIdentifier` method that handles reserved words.
@@ -850,7 +850,7 @@
 
 ## 1.14.10
 
- * Fix let scoping unneccesary override.
+ * Fix let scoping unnecessary override.
 
 ## 1.14.6
 
@@ -973,7 +973,7 @@
 
 ## 1.12.21
 
- * Fix unneccesary let scoping replacement.
+ * Fix unnecessary let scoping replacement.
  * Add `commonInterop` module formatter. Thanks [@Naddiseo](https://github.com/Naddiseo).
  * Fix `return` outside of function body bug. Thanks [@brentburg](https://github.com/brentburg).
  * Add more flexible option types.
@@ -1020,7 +1020,7 @@
 
 ## 1.12.12
 
- * Make scope tracker more reliable to handle all edgecases.
+ * Make scope tracker more reliable to handle all edge cases.
 
 ## 1.12.11
 
diff --git a/.github/CHANGELOG-v4.md b/.github/CHANGELOG-v4.md
index 70ba225ffaef..7a06b2c93eee 100644
--- a/.github/CHANGELOG-v4.md
+++ b/.github/CHANGELOG-v4.md
@@ -127,7 +127,7 @@
 ## 4.6.4
 
  * **Bug Fix**
-  * Fix `ForOfStatement` not proplery inheriting labels.
+  * Fix `ForOfStatement` not properly inheriting labels.
   * When in closure mode in block scoping transformer, properly check for variable shadowing.
  * **New Feature**
   * New `utility.inlineEnvironmentVariables` and `utility.inlineExpression` transformers.
@@ -153,7 +153,7 @@
  * **Spec Compliancy**
   * `for...of` now outputs in a lengthy `try...catch` this is to ensure spec compliancy in regards to iterator returns and abrupt completions. See [google/traceur-compiler#1773](https://github.com/google/traceur-compiler/issues/1773) and [babel/babel/#838](https://github.com/babel/babel/issues/838) for more information.
  * **Polish**
-  * Rest parameters that are only refered to via number properties on member expressions are desugared into a direct `arguments` reference. Thanks [@neVERberleRfellerER](https://github.com/neVERberleRfellerER)!
+  * Rest parameters that are only referred to via number properties on member expressions are desugared into a direct `arguments` reference. Thanks [@neVERberleRfellerER](https://github.com/neVERberleRfellerER)!
   * `$ babel` no longer exits on syntax errors.
  * **Internal**
   * Upgrade `browserify`.
diff --git a/.github/CHANGELOG-v5.md b/.github/CHANGELOG-v5.md
index 04dfb5218d18..64d4999d58df 100644
--- a/.github/CHANGELOG-v5.md
+++ b/.github/CHANGELOG-v5.md
@@ -262,8 +262,8 @@ Issues with publish process.
   * Register labels as bindings to fix undeclared variable checks.
  * **Polish**
   * Remove unnecessary string binary expressions when transforming template literals.
-  * Support module live bindings in arbitary positions not in Program statement position.
-  * Throw error when attemping to replace a `Program` root node with another node not of type `Program`.
+  * Support module live bindings in arbitrary positions not in Program statement position.
+  * Throw error when attempting to replace a `Program` root node with another node not of type `Program`.
   * Optimise rest parameters in spread element position and allocate rest array at the earliest common ancestor of all references.
   * Generate original number representation when value was not changed.
   * Check for invalid binding identifiers when generating inferred method names.
@@ -543,12 +543,12 @@ Issues with publish process.
  * **Internal**
   * Removed native inheritance support from classes.
   * Added `replaceWithSourceString` path API.
-  * Split up `es3.propertyLiterals` and `es3.memberExpressionLiterals` transformers to `minfication.propertyLiterals` and `es3.memberExpressionLiterals`.
+  * Split up `es3.propertyLiterals` and `es3.memberExpressionLiterals` transformers to `minification.propertyLiterals` and `es3.memberExpressionLiterals`.
 
 ## 5.2.6
 
  * **Internal**
-  * Fix transformer aliases being accidently set as deprecated ones.
+  * Fix transformer aliases being accidentally set as deprecated ones.
   * Expose `Pipeline` as `TransformerPipeline` instead.
 
 ## 5.2.5
@@ -824,10 +824,10 @@ Issues with publish process.
   * Save register cache on tick instead of `SIGINT`.
   * Enable strict mode on babel-node eval flag.
  * **Bug Fixes**
-  * Add support for live bindings. This change also increases the reliablity of export specifier renaming.
+  * Add support for live bindings. This change also increases the reliability of export specifier renaming.
   * Add support for super update and non equals assignment expressions.
   * Rename shadow constructor binding in classes.
-  * Seed next iteration bindings with previous fresh bindings when reassinging loop block scoped variables.
+  * Seed next iteration bindings with previous fresh bindings when reassigning loop block scoped variables.
   * Fix new expression spread referencing the wrong constructor.
   * Call `resolveModuleSource` on dynamic imports.
   * Added `param` to list of duplicate declaration kinds.
@@ -836,4 +836,3 @@ Issues with publish process.
   * ES7 Abstract References have been removed.
   * Experimental option has been removed in favor of a stage option.
   * Rename `returnUsedHelpers` to `metadataUsedHelpers`.
-  
\ No newline at end of file
diff --git a/.github/CHANGELOG-v6.md b/.github/CHANGELOG-v6.md
index bed990b56e9e..92d9173db5b8 100644
--- a/.github/CHANGELOG-v6.md
+++ b/.github/CHANGELOG-v6.md
@@ -19,7 +19,7 @@
 
 ## 6.26.0 (2017-08-16)
 
-> Backports for some folks (also other's when we accidently merged PRs from both 6.x/master)
+> Backports for some folks (also other's when we accidentally merged PRs from both 6.x/master)
 > Lesson learned: just use `master` and backport on another branch.
 
 #### :eyeglasses: Spec Compliancy
@@ -1767,7 +1767,7 @@ typeof Symbol.prototype === 'object'
   * [#3456](https://github.com/babel/babel/pull/3456) Use the real sourcemap API and handle input sourcemaps - Fixes [#7259](https://github.com/babel/babel/issues/7259). ([@loganfsmyth](https://github.com/loganfsmyth))
   * [#4507](https://github.com/babel/babel/pull/4507) Only set options in cli if different from default. ([@danez](https://github.com/danez))
 
-Fix an issue with defaults not being overidden. This was causing options like `comments: false` not to work correctly.
+Fix an issue with defaults not being overridden. This was causing options like `comments: false` not to work correctly.
 
   * [#4508](https://github.com/babel/babel/pull/4508) Support custom ports for V8 --inspect. ([@andykant](https://github.com/andykant))
   * [#4562](https://github.com/babel/babel/pull/4562) Fixes [#2299](https://github.com/babel/babel/issues/2299): Prevent REPL from printing implicit 'use strict'. ([@hzoo](https://github.com/hzoo))
@@ -2084,7 +2084,7 @@ Also added more tests and will update Babel to use the new preset options after
 
 ## v6.13.1 (2016-08-04)
 
-We had a regression in our new babel-preset-es2015@6.13.0 that made it unexpectedly backward-incompatible. This release introduces a new alternative plugin-options approach that is uglier but supports backward-compatiblity. Ideally new plugins would use the new `module.exports = function(babel, options){ }` approach and simple skip supporting `babel-core@<6.13.x`.
+We had a regression in our new babel-preset-es2015@6.13.0 that made it unexpectedly backward-incompatible. This release introduces a new alternative plugin-options approach that is uglier but supports backward-compatibility. Ideally new plugins would use the new `module.exports = function(babel, options){ }` approach and simple skip supporting `babel-core@<6.13.x`.
 
 #### Bug Fix
 * `babel-core`, `babel-preset-es2015`
@@ -2092,7 +2092,7 @@ We had a regression in our new babel-preset-es2015@6.13.0 that made it unexpecte
 
 ## v6.13.0 (2016-08-04)
 
-> Since the last release we've created https://github.com/babel/notes to track discussions on our slack and high level features/changes that could be added - definetely check it out if you're interested in Babel's development!
+> Since the last release we've created https://github.com/babel/notes to track discussions on our slack and high level features/changes that could be added - definitely check it out if you're interested in Babel's development!
 
 Some small but very important additions in this release:
 
@@ -3817,7 +3817,7 @@ Thanks to @samwgoldman for all the new flow support!
  * **New Feature**
   * Add support for `function.sent`.
  * **Internal**
-  * Bump `invariant` depenency version.
+  * Bump `invariant` dependency version.
  * **Polish**
   * Infer filename from the base directory when resolving plugins and presets.
   * Allow JSX pragma to be specified in line comments.
@@ -3887,7 +3887,7 @@ Thanks to @samwgoldman for all the new flow support!
 ## 6.1.2
 
  * **Bug Fix**
-  * Fix bug where the parser wouldn't allow typed annotated default parametesr in arrow functions.
+  * Fix bug where the parser wouldn't allow typed annotated default parameters in arrow functions.
   * Add existence check to `NodePath#has` to ensure safeness when making comparisons.
   * Protect against replacing a class expression with a name inferred version that would
     result in it never being transformed.
@@ -3976,7 +3976,7 @@ Thanks to @samwgoldman for all the new flow support!
   * Fix SystemJS module formatter exporting function parameters.
   * Ensure that invalid identifier JSX attribute keys are quoted when transforming to calls.
   * Fix ES3 property literal plugin.
-  * Fix parameters after defaults in arrow functions refering to the wrong `arguments`.
+  * Fix parameters after defaults in arrow functions referring to the wrong `arguments`.
 
 ## 6.0.13
 
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 13ef44cc2688..344922e4702c 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,6 +1,9 @@
 ---
-name: 🐛 Bug Report
-about: If something isn't working as expected 🤔.
+name: "\U0001F41B Bug Report"
+about: "If something isn't working as expected \U0001F914."
+title: ''
+labels: 'i: bug, i: needs triage'
+assignees: ''
 
 ---
 
@@ -31,7 +34,7 @@ A clear and concise description of what you expected to happen (or code).
 - Babel version(s): [e.g. v6.0.0, v7.0.0-beta.34]
 - Node/npm version: [e.g. Node 8/npm 5]
 - OS: [e.g. OSX 10.13.4, Windows 10]
-- Monorepo [e.g. yes/no/Lerna]
+- Monorepo: [e.g. yes/no/Lerna]
 - How you are using Babel: [e.g. `cli`, `register`, `loader`]
 
 **Possible Solution**
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index fdbe35c81ed3..b9c82542ff8c 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,6 +1,9 @@
 ---
-name: 🚀 Feature Request
-about: I have a suggestion (and may want to implement it 🙂)!
+name: "\U0001F680 Feature Request"
+about: "I have a suggestion (and may want to implement it \U0001F642)!"
+title: ''
+labels: 'i: enhancement, i: needs triage'
+assignees: ''
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/Regression-v7.md b/.github/ISSUE_TEMPLATE/Regression-v7.md
index cf839d261cbb..a700b90ba073 100644
--- a/.github/ISSUE_TEMPLATE/Regression-v7.md
+++ b/.github/ISSUE_TEMPLATE/Regression-v7.md
@@ -1,12 +1,16 @@
 ---
-name: 💥 v7 Regression
-about: Report an unexpected behavior in v7 from v6 (Check the upgrade guide first ✌️)
+name: "\U0001F4A5 v7 Regression"
+about: Report an unexpected behavior in v7 from v6 (Check the upgrade guide first
+  ✌️)
+title: ''
+labels: 'i: bug, 7.x: regression, i: needs triage'
+assignees: ''
 
 ---
 
 # v7 Regression
 
-> First check out: https://new.babeljs.io/docs/en/next/v7-migration.html
+> First check out: https://babeljs.io/docs/en/v7-migration
 > Also a partial upgrade tool: https://github.com/babel/babel-upgrade
 
 **Potential Commit/PR that introduced the regression**
diff --git a/.github/ISSUE_TEMPLATE/Support_question.md b/.github/ISSUE_TEMPLATE/Support_question.md
index 32ad69fa25a3..57c183f7323d 100644
--- a/.github/ISSUE_TEMPLATE/Support_question.md
+++ b/.github/ISSUE_TEMPLATE/Support_question.md
@@ -1,6 +1,9 @@
 ---
-name: 🤗 Support Question
-about: If you have a question 💬, please check out our Slack or StackOverflow!
+name: "\U0001F917 Support Question"
+about: "If you have a question \U0001F4AC, please check out our Slack or StackOverflow!"
+title: ''
+labels: 'i: question, i: needs triage'
+assignees: ''
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/Support_us.md b/.github/ISSUE_TEMPLATE/Support_us.md
index 56c9c08d57cc..cd7eb394bdd8 100644
--- a/.github/ISSUE_TEMPLATE/Support_us.md
+++ b/.github/ISSUE_TEMPLATE/Support_us.md
@@ -1,6 +1,10 @@
 ---
-name: 🤝 Support us on Babel
-about: If you would like to support our efforts in maintaining this community-driven project 🙌!
+name: "\U0001F91D Support us on Babel"
+about: "If you would like to support our efforts in maintaining this community-driven
+  project \U0001F64C!"
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
diff --git a/.github/main.workflow b/.github/main.workflow
new file mode 100644
index 000000000000..3267641c50ce
--- /dev/null
+++ b/.github/main.workflow
@@ -0,0 +1,76 @@
+workflow "Release" {
+  on = "push"
+  resolves = ["Trigger GitHub release"]
+}
+
+action "Is version tag" {
+  uses = "actions/bin/filter@0dbb077f64d0ec1068a644d25c71b1db66148a24"
+  args = "tag v*"
+}
+
+action "Is tag from master" {
+  uses = "babel/actions/commit-matches-branch@master"
+  needs = [
+    "Is version tag",
+  ]
+  args = "master"
+}
+
+action "Trigger GitHub release" {
+  uses = "babel/actions/trigger-github-release@master"
+  secrets = ["GITHUB_TOKEN"]
+  env = {
+    COMMIT_AUTHOR_NAME = "Babel Bot"
+    COMMIT_AUTHOR_EMAIL = "babel-bot@users.noreply.github.com"
+  }
+  needs = [
+    "Is version tag",
+    "Is tag from master",
+  ]
+}
+
+workflow "Welcome" {
+  resolves = [
+    "Create Welcome Comment"
+  ]
+  on = "issues"
+}
+
+action "Is action 'opened'" {
+  uses = "actions/bin/filter@master"
+  args = "action opened"
+}
+
+action "Create Welcome Comment" {
+  uses = "babel/actions/create-welcome-comment@master"
+  secrets = ["GITHUB_TOKEN", "BOT_TOKEN"]
+  needs = ["Is action 'opened'"]
+}
+
+workflow "Needs Info" {
+  resolves = [
+    "Create Needs Info Comment"
+  ]
+  on = "issues"
+}
+
+action "Is action 'labeled'" {
+  uses = "actions/bin/filter@master"
+  args = "action labeled"
+}
+
+action "Has label 'Needs Info'" {
+  uses = "actions/bin/filter@master"
+  needs = [
+    "Is action 'labeled'"
+  ]
+  args = "label 'Needs Info'"
+}
+
+action "Create Needs Info Comment" {
+  uses = "babel/actions/create-needs-info-comment@master"
+  needs = [
+    "Has label 'Needs Info'",
+  ]
+  secrets = ["BOT_TOKEN", "GITHUB_TOKEN"]
+}
diff --git a/.gitignore b/.gitignore
index 2b06f7e3e409..2f99b017304b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
+.npmrc
+
 .DS_Store
 /node_modules
+/.github/actions/*/node_modules
 /packages/*/node_modules
 /packages/*/LICENSE
 !/packages/babel-parser/LICENSE
@@ -15,6 +18,7 @@ coverage
 dist
 /.package.json
 package-lock.json
+!/.github/actions/*/package-lock.json
 
 /packages/babel-runtime/helpers/*.js
 !/packages/babel-runtime/helpers/toArray.js
@@ -36,6 +40,11 @@ package-lock.json
 /packages/babel-runtime-corejs2/core-js/**/*.js
 !/packages/babel-runtime-corejs2/core-js/map.js
 
+/packages/babel-runtime-corejs3/helpers/*.js
+/packages/babel-runtime-corejs3/helpers/esm/*.js
+/packages/babel-runtime-corejs3/core-js/**/*.js
+/packages/babel-runtime-corejs3/core-js-stable/**/*.js
+
 /packages/babel-register/test/.babel
 /packages/babel-cli/test/tmp
 /packages/babel-node/test/tmp
diff --git a/.prettierignore b/.prettierignore
index 0318d666e9dc..e86c7aa505d3 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,5 @@
 package.json
 packages/babel-preset-env/data
+packages/*/test/fixtures/**/input.*
+packages/*/test/fixtures/**/exec.*
+packages/*/test/fixtures/**/output.*
diff --git a/.travis.yml b/.travis.yml
index 67627f76c300..3957c277c102 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
 git:
-  depth: 10
-sudo: false
+  depth: 5
 language: node_js
 cache:
   yarn: true
-  directories:
-    - node_modules
 node_js:
   # We test the latest version on circleci
-  - '9'
+  - '11'
+  - '10'
   - '8'
   - '6'
 
@@ -20,17 +18,20 @@ env:
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
 
-install: yarn --ignore-engines
+install:
+  # the `make test-ci` script runs this command already
+  - if [ "$JOB" != "test" ] && [ "$JOB" != "lint" ]; then yarn install; fi
+  - if [ "$JOB" = "lint" ]; then make bootstrap; fi
 
 before_script:
-  - 'if [ "$JOB" = "babel-parser-flow-tests" ]; then make bootstrap-flow; fi'
-  - 'if [ "$JOB" = "babel-parser-test262-tests" ]; then make bootstrap-test262; fi'
+  - if [ "$JOB" = "babel-parser-flow-tests" ]; then make bootstrap-flow; fi
+  - if [ "$JOB" = "babel-parser-test262-tests" ]; then make bootstrap-test262; fi
 
 script:
-  - 'if [ "$JOB" = "test" ]; then make test-ci; fi'
-  - 'if [ "$JOB" = "lint" ]; then make lint && make flow; fi'
-  - 'if [ "$JOB" = "babel-parser-flow-tests" ]; then make test-flow-ci; fi'
-  - 'if [ "$JOB" = "babel-parser-test262-tests" ]; then make test-test262-ci; fi'
+  - if [ "$JOB" = "test" ]; then make test-ci; fi
+  - if [ "$JOB" = "lint" ]; then make lint && make flow; fi
+  - if [ "$JOB" = "babel-parser-flow-tests" ]; then make test-flow-ci; fi
+  - if [ "$JOB" = "babel-parser-test262-tests" ]; then make test-test262-ci; fi
 
 matrix:
   fast_finish: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e7eadb7c7d4..9ce2fc517e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,1018 @@ See [CHANGELOG - v4](/.github/CHANGELOG-v4.md), [CHANGELOG - v5](/.github/CHANGE
 See [CHANGELOG - 6to5](/.github/CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 See [Babylon's CHANGELOG](packages/babylon/CHANGELOG.md) for the Babylon pre-7.0.0-beta.29 version changelog.
 
+<!-- DO NOT CHANGE THESE COMMENTS - See .github/actions/trigger-github-release/update-changelog.js -->
+<!-- insert-new-changelog-here -->
+
+## v7.5.5 (2019-07-17)
+
+#### :bug: Bug Fix
+* `babel-code-frame`
+  * [#10211](https://github.com/babel/babel/pull/10211) fix code-frame marker with highlighting ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-plugin-proposal-object-rest-spread`
+  * [#10200](https://github.com/babel/babel/pull/10200) Workaround #10179 in proposal-object-rest-spread ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-types`
+  * [#10198](https://github.com/babel/babel/pull/10198) add assertShape to validate templateElement ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-helper-create-class-features-plugin`, `babel-helper-member-expression-to-functions`, `babel-helper-replace-supers`, `babel-helpers`, `babel-plugin-proposal-class-properties`, `babel-plugin-transform-classes`, `babel-plugin-transform-object-super`, `babel-types`
+  * [#10017](https://github.com/babel/babel/pull/10017) destructuring private fields with array pattern / object pattern ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-plugin-transform-flow-comments`
+  * [#9901](https://github.com/babel/babel/pull/9901) fix transform-flow-comments for import types ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-core`, `babel-helpers`
+  * [#10208](https://github.com/babel/babel/pull/10208) always throw when add missing helpers ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-plugin-transform-runtime`
+  * [#10207](https://github.com/babel/babel/pull/10207) Closes [#10205](https://github.com/babel/babel/issues/10205) ([@sag1v](https://github.com/sag1v))
+* `babel-helpers`, `babel-plugin-transform-instanceof`
+  * [#10197](https://github.com/babel/babel/pull/10197) fix: custom instOfHandler result should be cast to boolean ([@JLHwung](https://github.com/JLHwung))
+
+#### :house: Internal
+* `babel-parser`, `babel-plugin-transform-typescript`
+  * [#10014](https://github.com/babel/babel/pull/10014) Use correct extension for typescript fixtures ([@danez](https://github.com/danez))
+
+#### :running_woman: Performance
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`, `babel-preset-env`
+  * [#10189](https://github.com/babel/babel/pull/10189) perf: match ownKeys perf to the one of objectSpread ([@JLHwung](https://github.com/JLHwung))
+
+## v7.5.4 (2019-07-09)
+
+#### :bug: Bug Fix
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`, `babel-preset-env`
+  * [#10188](https://github.com/babel/babel/pull/10188) Fix _objectSpread2 for real ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.5.3 (2019-07-09)
+
+#### :bug: Bug Fix
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`, `babel-preset-env`
+  * [#10180](https://github.com/babel/babel/pull/10180) [_objectSpread2] Do not use hoisted var from prev iteration ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.5.2 (2019-07-08)
+
+#### :bug: Bug Fix
+* `babel-plugin-transform-typescript`
+  * [#10174](https://github.com/babel/babel/pull/10174) Do not trust Scope when removing TypeScript types ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`, `babel-preset-env`
+  * [#10171](https://github.com/babel/babel/pull/10171) Don't rely on getOwnPropertyDescriptors in objectSpread2 ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-export-default-from`, `babel-plugin-proposal-export-namespace-from`
+  * [#10172](https://github.com/babel/babel/pull/10172) fix: register injected importDeclaration ([@JLHwung](https://github.com/JLHwung))
+
+## v7.5.1 (2019-07-06)
+
+#### :bug: Bug Fix
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`
+  * [#10170](https://github.com/babel/babel/pull/10170) Fix objectSpread2 backward compatibility ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-transform-typescript`
+  * [#10167](https://github.com/babel/babel/pull/10167) Retain typescript export-from-source ([@Wolvereness](https://github.com/Wolvereness))
+
+## v7.5.0 (2019-07-04)
+
+#### :eyeglasses: Spec Compliance
+* `babel-parser`
+  * [#10099](https://github.com/babel/babel/pull/10099) Disallow "let" as name at lexical bindings ([@g-plane](https://github.com/g-plane))
+
+#### :rocket: New Feature
+* `babel-parser`
+  * [#10091](https://github.com/babel/babel/pull/10091) BigInt type for Flow ([@tanhauhau](https://github.com/tanhauhau))
+  * [#9450](https://github.com/babel/babel/pull/9450) Implement f# pipeline in parser ([@mAAdhaTTah](https://github.com/mAAdhaTTah))
+  * [#9912](https://github.com/babel/babel/pull/9912) [legacy decorators] Allow decorating generator methods ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9864](https://github.com/babel/babel/pull/9864) [@babel/parser] Add "allowUndeclaredExports" option ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-dynamic-import`, `babel-preset-env-standalone`, `babel-preset-env`
+  * [#10109](https://github.com/babel/babel/pull/10109) Add @babel/plugin-proposal-dynamic-import to @babel/preset-env ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-dynamic-import`, `babel-plugin-transform-modules-amd`, `babel-plugin-transform-modules-commonjs`, `babel-plugin-transform-modules-systemjs`
+  * [#9552](https://github.com/babel/babel/pull/9552) Create @babel/plugin-proposal-dynamic-import ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-pipeline-operator`, `babel-plugin-syntax-pipeline-operator`
+  * [#9984](https://github.com/babel/babel/pull/9984) Transform for F# Pipeline ([@thiagoarrais](https://github.com/thiagoarrais))
+* `babel-plugin-transform-typescript`, `babel-types`
+  * [#9785](https://github.com/babel/babel/pull/9785) Implement TypeScript namespace support ([@Wolvereness](https://github.com/Wolvereness))
+
+#### :bug: Bug Fix
+* `babel-plugin-proposal-do-expressions`, `babel-traverse`
+  * [#10072](https://github.com/babel/babel/pull/10072) fix await and yield for do expression ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-helpers`, `babel-plugin-transform-react-constant-elements`
+  * [#10155](https://github.com/babel/babel/pull/10155) Added es3 backward compatibility for react helper code ([@sormy](https://github.com/sormy))
+* `babel-preset-env`
+  * [#10127](https://github.com/babel/babel/pull/10127) Bump compat-table and updating preset-env mappings ([@existentialism](https://github.com/existentialism))
+  * [#8897](https://github.com/babel/babel/pull/8897) Allow `defaults` query in preset-env ([@existentialism](https://github.com/existentialism))
+* `babel-parser`
+  * [#10132](https://github.com/babel/babel/pull/10132) fix import typeof in declare module ([@tanhauhau](https://github.com/tanhauhau))
+  * [#10084](https://github.com/babel/babel/pull/10084) flow - allow type parameter defaults in function declarations ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-types`
+  * [#10126](https://github.com/babel/babel/pull/10126) fix exportKind declaration in babel-types ([@zxbodya](https://github.com/zxbodya))
+* `babel-node`
+  * [#9951](https://github.com/babel/babel/pull/9951) Prevents exception on PnP ([@arcanis](https://github.com/arcanis))
+* `babel-generator`
+  * [#10041](https://github.com/babel/babel/pull/10041) Fix printer for explicitly inexact Flow types ([@mrtnzlml](https://github.com/mrtnzlml))
+* `babel-plugin-transform-typescript`
+  * [#10034](https://github.com/babel/babel/pull/10034) Use scope for typescript export removals ([@Wolvereness](https://github.com/Wolvereness))
+  * [#10019](https://github.com/babel/babel/pull/10019) fix(typescript): erase default export if exporting a TS type ([@airato](https://github.com/airato))
+* `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-class-properties`, `babel-traverse`
+  * [#10029](https://github.com/babel/babel/pull/10029) Fixed computed keys for class expression ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`, `babel-preset-env`
+  * [#9384](https://github.com/babel/babel/pull/9384) Retry to fix object spread helper compatibility ([@saschanaz](https://github.com/saschanaz))
+* `babel-plugin-transform-destructuring`
+  * [#10013](https://github.com/babel/babel/pull/10013) fix destructuring rest with template literal ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-helper-create-class-features-plugin`, `babel-plugin-transform-typescript`
+  * [#9610](https://github.com/babel/babel/pull/9610) Use `injectInitialization` to generate ts parameter properties ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :nail_care: Polish
+* `babel-core`
+  * [#10157](https://github.com/babel/babel/pull/10157) Fix incorrect usage of $o instead of %o in debug ([@ChlorideCull](https://github.com/ChlorideCull))
+* `babel-helpers`
+  * [#10117](https://github.com/babel/babel/pull/10117) Simplify the helpers for classPrivateField{Get,Set} ([@arv](https://github.com/arv))
+* `babel-plugin-transform-typescript`
+  * [#10047](https://github.com/babel/babel/pull/10047) Refactor isImportTypeOnly helper function ([@Andarist](https://github.com/Andarist))
+
+#### :memo: Documentation
+* `babel-plugin-proposal-partial-application`, `babel-plugin-syntax-partial-application`
+  * [#10103](https://github.com/babel/babel/pull/10103) docs: update readmes ([@xtuc](https://github.com/xtuc))
+
+## v7.4.5 (2019-05-21)
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#9998](https://github.com/babel/babel/pull/9998) Fix location for optional params in arrow functions ([@danez](https://github.com/danez))
+  * [#9982](https://github.com/babel/babel/pull/9982) Avoid unnecessary work during lookahead ([@danez](https://github.com/danez))
+  * [#9922](https://github.com/babel/babel/pull/9922) fix: allow shebang directive ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-preset-env`
+  * [#10002](https://github.com/babel/babel/pull/10002) Update preset-env dependencies and fix fixtures ([@danez](https://github.com/danez))
+  * [#9978](https://github.com/babel/babel/pull/9978) Fix mobile browsers support in preset-env ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9902](https://github.com/babel/babel/pull/9902) Fix destructuring assignments being transpiled for edge 15 ([@eps1lon](https://github.com/eps1lon))
+* `babel-plugin-transform-typescript`
+  * [#9944](https://github.com/babel/babel/pull/9944) fix(typescript): erase type exports ([@airato](https://github.com/airato))
+
+#### :nail_care: Polish
+* `babel-parser`
+  * [#9995](https://github.com/babel/babel/pull/9995) Do not use lookahead when parsing construct signature declarations in TS ([@danez](https://github.com/danez))
+  * [#9989](https://github.com/babel/babel/pull/9989) Only compute Position if not already in state ([@danez](https://github.com/danez))
+  * [#9988](https://github.com/babel/babel/pull/9988) Do not use lookahead when parsing jsx expression containers ([@danez](https://github.com/danez))
+  * [#9987](https://github.com/babel/babel/pull/9987) Do not use lookahead when parsing imports in declare module in flow ([@danez](https://github.com/danez))
+  * [#9985](https://github.com/babel/babel/pull/9985) Do not use lookahead when parsing declare module or declare module.exports in flow ([@danez](https://github.com/danez))
+  * [#9983](https://github.com/babel/babel/pull/9983) Do not use lookahead when parsing dynamic import or import.meta ([@danez](https://github.com/danez))
+  * [#9979](https://github.com/babel/babel/pull/9979) Remove guardedHandlers from ASTs ([@danez](https://github.com/danez))
+* `babel-preset-env`
+  * [#9992](https://github.com/babel/babel/pull/9992) use console.warn for warning ([@schu34](https://github.com/schu34))
+* `babel-core`
+  * [#9945](https://github.com/babel/babel/pull/9945) Fixed null error in plugin opts and added a test for it ([@divbhasin](https://github.com/divbhasin))
+* `babel-core`, `babel-traverse`
+  * [#9909](https://github.com/babel/babel/pull/9909) Add missing space in error messages ([@pnavarrc](https://github.com/pnavarrc))
+
+#### :house: Internal
+* `babel-node`
+  * [#9914](https://github.com/babel/babel/pull/9914) [babel-node] Do not hardcode node flags ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.4.4 (2019-04-26)
+
+#### :bug: Bug Fix
+* `babel-plugin-transform-flow-comments`
+  * [#9897](https://github.com/babel/babel/pull/9897) fix flow-comments - class type paramters and implements ([@tanhauhau](https://github.com/tanhauhau))
+  * [#9893](https://github.com/babel/babel/pull/9893) fix flow-comment - object destructuring ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-parser`
+  * [#9766](https://github.com/babel/babel/pull/9766) Add TS support to @babel/parser's Scope ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9865](https://github.com/babel/babel/pull/9865) Always register global bindings as exportable ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9887](https://github.com/babel/babel/pull/9887) Fix TypeScript readonly error location ([@existentialism](https://github.com/existentialism))
+  * [#9869](https://github.com/babel/babel/pull/9869) ! remove constant context assertions ([@tanhauhau](https://github.com/tanhauhau))
+  * [#9890](https://github.com/babel/babel/pull/9890) Fix parsing typescript bodiless methods with the estree plugin also enabled ([@devongovett](https://github.com/devongovett))
+* `babel-traverse`
+  * [#9870](https://github.com/babel/babel/pull/9870) Fix flow types in traverse/path/family and enable flow ([@danez](https://github.com/danez))
+* `babel-plugin-proposal-class-properties`, `babel-plugin-transform-modules-commonjs`, `babel-types`
+  * [#9861](https://github.com/babel/babel/pull/9861) Fix: PrivateName Identifier should not be isReferenced. ([@coreyfarrell](https://github.com/coreyfarrell))
+* `babel-types`
+  * [#9832](https://github.com/babel/babel/pull/9832) Fix typo in cloneNode. ([@evandervalk](https://github.com/evandervalk))
+
+
+## v7.4.3 (2019-04-02)
+
+#### :eyeglasses: Spec Compliance
+* `babel-parser`
+  * [#9769](https://github.com/babel/babel/pull/9769) Don't accept '\08' or '\09' in strict mode. ([@danez](https://github.com/danez))
+  * [#9768](https://github.com/babel/babel/pull/9768) Correctly check for-in and for-of loop for invalid left-hand side. ([@danez](https://github.com/danez))
+  * [#9767](https://github.com/babel/babel/pull/9767) Parse right-hand-side of for/of as an assignment expression. ([@danez](https://github.com/danez))
+  * [#9748](https://github.com/babel/babel/pull/9748) [typescript] parsing template literal as type . ([@tanhauhau](https://github.com/tanhauhau))
+
+#### :rocket: New Feature
+* `babel-plugin-transform-runtime`
+  * [#9754](https://github.com/babel/babel/pull/9754) [runtime-corejs3] Only polyfill instance methods when it might be needed. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :bug: Bug Fix
+* `babel-polyfill`
+  * [#9780](https://github.com/babel/babel/pull/9780) Closes [#9232](https://github.com/babel/babel/issues/9232), add some missed modules to `@babel/polyfill/noConflict`. ([@zloirock](https://github.com/zloirock))
+* `babel-cli`
+  * [#9807](https://github.com/babel/babel/pull/9807) Upgrade lodash to 4.17.11. ([@danez](https://github.com/danez))
+* `babel-helper-module-transforms`, `babel-plugin-transform-modules-commonjs`
+  * [#9802](https://github.com/babel/babel/pull/9802) Fix lazy option of babel-plugin-transform-modules-commonjs. ([@AndreasCag](https://github.com/AndreasCag))
+* `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-private-methods`
+  * [#9801](https://github.com/babel/babel/pull/9801) Fix super method call in private instance method calling overridden method. ([@MattiasBuelens](https://github.com/MattiasBuelens))
+* `babel-plugin-proposal-object-rest-spread`, `babel-plugin-transform-destructuring`
+  * [#9416](https://github.com/babel/babel/pull/9416) Destructuring: Fix handling of impure computed keys with object rest. ([@motiz88](https://github.com/motiz88))
+* `babel-plugin-transform-destructuring`
+  * [#9412](https://github.com/babel/babel/pull/9412) Destructuring: Fix array unpacking assignments with holes on RHS. ([@motiz88](https://github.com/motiz88))
+* `babel-traverse`
+  * [#9415](https://github.com/babel/babel/pull/9415) @babel/traverse: Fix NodePath.getData. ([@71](https://github.com/71))
+* `babel-parser`
+  * [#9760](https://github.com/babel/babel/pull/9760) Allow HTML comments on first line. ([@danez](https://github.com/danez))
+  * [#9700](https://github.com/babel/babel/pull/9700) Fix compatibility between estree and TS plugin. ([@danez](https://github.com/danez))
+* `babel-helpers`
+  * [#9756](https://github.com/babel/babel/pull/9756) Allow coreJS Symbol to be type object. ([@conartist6](https://github.com/conartist6))
+* `babel-preset-env`
+  * [#9752](https://github.com/babel/babel/pull/9752) Normalize `core-js` entry points. ([@zloirock](https://github.com/zloirock))
+
+#### :nail_care: Polish
+* `babel-parser`
+  * [#9762](https://github.com/babel/babel/pull/9762) Optimize parseBindingAtom code to get better error messages. ([@danez](https://github.com/danez))
+* `babel-core`, `babel-plugin-transform-for-of`
+  * [#9698](https://github.com/babel/babel/pull/9698) Move array reference into `for` head initializer. ([@danez](https://github.com/danez))
+
+#### :house: Internal
+* Other
+  * [#9806](https://github.com/babel/babel/pull/9806) Update test262. ([@danez](https://github.com/danez))
+* `babel-parser`, `babel-preset-typescript`
+  * [#9761](https://github.com/babel/babel/pull/9761) Explicit labels for tokenTypes. ([@danez](https://github.com/danez))
+
+
+## v7.4.2 (2019-03-21)
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#9725](https://github.com/babel/babel/pull/9725) Modules might be in loose mode when checking for undecl exports ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9719](https://github.com/babel/babel/pull/9719) Fix scope checks with enabled flow plugin ([@danez](https://github.com/danez))
+* `babel-helpers`, `babel-plugin-transform-named-capturing-groups-regex`
+  * [#9726](https://github.com/babel/babel/pull/9726) Fix typo in wrapRegExp helper ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-preset-env`
+  * [#9724](https://github.com/babel/babel/pull/9724) Closes [#9713](https://github.com/babel/babel/issues/9713) ([@zloirock](https://github.com/zloirock))
+
+#### :nail_care: Polish
+* `babel-preset-env`
+  * [#9732](https://github.com/babel/babel/pull/9732) Mark the core-js warning as such ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9716](https://github.com/babel/babel/pull/9716) Tweak preset-env corejs/useBuiltIns warning and error messages ([@existentialism](https://github.com/existentialism))
+
+#### :house: Internal
+* [#9718](https://github.com/babel/babel/pull/9718) Bump Babel deps ([@existentialism](https://github.com/existentialism))
+
+## v7.4.1 (2019-03-20)
+
+#### :bug: Bug Fix
+* `babel-preset-env`
+  * [#9711](https://github.com/babel/babel/pull/9711) Alias @babel/preset-env/data/built-ins.json.js ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9709](https://github.com/babel/babel/pull/9709) Bring back isPluginRequired ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.4.0 (2019-03-19)
+
+#### :eyeglasses: Spec Compliance
+* `babel-parser`
+  * [#9529](https://github.com/babel/babel/pull/9529) Add `readonly` to TypeScript type modifier ([@tanhauhau](https://github.com/tanhauhau))
+  * [#9534](https://github.com/babel/babel/pull/9534) TypeScript Constant contexts ([@tanhauhau](https://github.com/tanhauhau))
+  * [#9637](https://github.com/babel/babel/pull/9637) Update identifier parsing per Unicode v12 ([@mathiasbynens](https://github.com/mathiasbynens))
+  * [#9616](https://github.com/babel/babel/pull/9616) Allow any reserved word in `export {} from` specifiers ([@danez](https://github.com/danez))
+  * [#9612](https://github.com/babel/babel/pull/9612) [TS] Disallow type casts in arrow parameters ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9607](https://github.com/babel/babel/pull/9607) Refactor parsing object members ([@danez](https://github.com/danez))
+  * [#9599](https://github.com/babel/babel/pull/9599) Disallow duplicate params in methods ([@danez](https://github.com/danez))
+  * [#9586](https://github.com/babel/babel/pull/9586) Treat for loop body as part of loop scope ([@danez](https://github.com/danez))
+* `babel-parser`, `babel-plugin-transform-typescript`
+  * [#9641](https://github.com/babel/babel/pull/9641) Allow context type annotation on getters/setters ([@matt-tingen](https://github.com/matt-tingen))
+* `babel-plugin-proposal-unicode-property-regex`, `babel-plugin-transform-dotall-regex`, `babel-plugin-transform-unicode-regex`
+  * [#9636](https://github.com/babel/babel/pull/9636) Update babel-plugin-proposal-unicode-property-regex for Unicode v12 ([@mathiasbynens](https://github.com/mathiasbynens))
+* `babel-generator`, `babel-parser`, `babel-plugin-transform-flow-strip-types`, `babel-plugin-transform-modules-systemjs`
+  * [#9589](https://github.com/babel/babel/pull/9589) Check exported bindings are defined ([@danez](https://github.com/danez))
+* `babel-generator`, `babel-parser`, `babel-plugin-transform-classes`, `babel-plugin-transform-flow-comments`, `babel-plugin-transform-flow-strip-types`, `babel-plugin-transform-new-target`
+  * [#9493](https://github.com/babel/babel/pull/9493) Introduce scope tracking in the parser ([@danez](https://github.com/danez))
+
+#### :rocket: New Feature
+* `babel-helpers`, `babel-plugin-proposal-class-properties`, `babel-plugin-proposal-decorators`, `babel-plugin-proposal-object-rest-spread`, `babel-plugin-transform-runtime`, `babel-plugin-transform-typescript`, `babel-polyfill`, `babel-preset-env`, `babel-register`, `babel-runtime-corejs2`, `babel-runtime-corejs3`
+  * [#7646](https://github.com/babel/babel/pull/7646) Update to `core-js@3` ([@zloirock](https://github.com/zloirock))
+* `babel-template`
+  * [#9648](https://github.com/babel/babel/pull/9648) Add %%placeholders%% support to @babel/template ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-parser`, `babel-plugin-proposal-partial-application`
+  * [#9474](https://github.com/babel/babel/pull/9474) Partial application plugin ([@byara](https://github.com/byara))
+* `babel-generator`, `babel-helper-create-class-features-plugin`, `babel-helpers`, `babel-plugin-proposal-private-methods`
+  * [#9446](https://github.com/babel/babel/pull/9446) Private Static Class Methods (Stage 3) ([@tim-mc](https://github.com/tim-mc))
+* `babel-generator`, `babel-types`
+  * [#9542](https://github.com/babel/babel/pull/9542) Add placeholders support to @babel/types and @babel/generator ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-parser`
+  * [#9364](https://github.com/babel/babel/pull/9364) Add parser support for placeholders ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-generator`, `babel-parser`, `babel-plugin-syntax-partial-application`, `babel-types`
+  * [#9343](https://github.com/babel/babel/pull/9343) Partial Application Syntax: Stage 1 ([@byara](https://github.com/byara))
+
+#### :bug: Bug Fix
+* `babel-helper-create-class-features-plugin`, `babel-helper-replace-supers`, `babel-plugin-proposal-private-methods`
+  * [#9704](https://github.com/babel/babel/pull/9704) Fix `super` Method Calls in Class Private Methods ([@tim-mc](https://github.com/tim-mc))
+* `babel-parser`
+  * [#9699](https://github.com/babel/babel/pull/9699) Correctly parse TS TypeAssertions around arrow functions ([@danez](https://github.com/danez))
+  * [#9600](https://github.com/babel/babel/pull/9600) Fix scope check for 2nd+ lexical bindings ([@danez](https://github.com/danez))
+  * [#9593](https://github.com/babel/babel/pull/9593) [TS] Correctly forget `await`s after parsing async arrows with type args ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9585](https://github.com/babel/babel/pull/9585) Fix strict mode prescanning with EmptyStatement ([@danez](https://github.com/danez))
+* `babel-core`, `babel-plugin-transform-for-of`
+  * [#9697](https://github.com/babel/babel/pull/9697) Correctly preserve reference to array in for-of loop ([@danez](https://github.com/danez))
+* `babel-plugin-transform-typescript`
+  * [#9693](https://github.com/babel/babel/pull/9693) [plugin-transform-typescript] Fix transpiling of TS abstract classes with decorators  ([@agoldis](https://github.com/agoldis))
+* `babel-traverse`, `babel-types`
+  * [#9692](https://github.com/babel/babel/pull/9692) Fix TSFunctionType visitors definition ([@penielse](https://github.com/penielse))
+* `babel-plugin-proposal-object-rest-spread`
+  * [#9628](https://github.com/babel/babel/pull/9628) [proposal-object-rest-spread] fix templateLiteral in extractNormalizedKeys  ([@pnowak](https://github.com/pnowak))
+* `babel-plugin-transform-modules-systemjs`
+  * [#9639](https://github.com/babel/babel/pull/9639) System modules - Hoist classes like other variables ([@guybedford](https://github.com/guybedford))
+* `babel-generator`, `babel-parser`
+  * [#9618](https://github.com/babel/babel/pull/9618) Disallow escape sequences in contextual keywords ([@danez](https://github.com/danez))
+* `babel-helper-split-export-declaration`, `babel-plugin-transform-modules-commonjs`, `babel-traverse`
+  * [#9613](https://github.com/babel/babel/pull/9613) Don't add params of anonymous exported function decls to the outer scope ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-transform-parameters`, `babel-plugin-transform-typescript`, `babel-types`
+  * [#9605](https://github.com/babel/babel/pull/9605) [plugin-transform-typescript] Strip type imports used in Enums and object types ([@echenley](https://github.com/echenley))
+* `babel-helper-call-delegate`, `babel-plugin-transform-parameters`
+  * [#9601](https://github.com/babel/babel/pull/9601) Don't loose "this" in helper-call-delegate ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-object-rest-spread`, `babel-plugin-transform-modules-commonjs`, `babel-traverse`, `babel-types`
+  * [#9492](https://github.com/babel/babel/pull/9492) Mark FOO in "var { x: FOO }˝ as a binding, not as a reference ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-preset-env`
+  * [#9595](https://github.com/babel/babel/pull/9595) preset-env: Sort versions before determining lowest ([@jridgewell](https://github.com/jridgewell))
+* `babel-helper-define-map`, `babel-helper-hoist-variables`, `babel-parser`, `babel-plugin-proposal-object-rest-spread`, `babel-plugin-transform-block-scoping`, `babel-plugin-transform-destructuring`, `babel-plugin-transform-modules-systemjs`, `babel-traverse`, `babel-types`
+  * [#9518](https://github.com/babel/babel/pull/9518) Use `for..of Object.keys` instead of `for..in` ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :nail_care: Polish
+* `babel-parser`
+  * [#9646](https://github.com/babel/babel/pull/9646) Remove input and length from state ([@danez](https://github.com/danez))
+  * [#9645](https://github.com/babel/babel/pull/9645) Reorganize token types and use a map for them ([@danez](https://github.com/danez))
+  * [#9591](https://github.com/babel/babel/pull/9591) Remove always false param allowExpressionBody ([@danez](https://github.com/danez))
+* `babel-standalone`, `babel-types`
+  * [#9025](https://github.com/babel/babel/pull/9025) Make babel-standalone an ESModule and enable flow ([@danez](https://github.com/danez))
+* `babel-generator`
+  * [#9579](https://github.com/babel/babel/pull/9579) change var name for coherence ([@tanohzana](https://github.com/tanohzana))
+
+#### :house: Internal
+* Other
+  * [#9588](https://github.com/babel/babel/pull/9588) Publish to npm using a GitHub action ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9640](https://github.com/babel/babel/pull/9640) Switch from rollup-stream to rollup ([@danez](https://github.com/danez))
+  * [#9647](https://github.com/babel/babel/pull/9647) Add WarningsToErrorsPlugin to webpack to avoid missing build problems on CI ([@danez](https://github.com/danez))
+  * [#9624](https://github.com/babel/babel/pull/9624) Update dependencies ([@danez](https://github.com/danez))
+  * [#9623](https://github.com/babel/babel/pull/9623) Add editorconfig for Makefile ([@danez](https://github.com/danez))
+  * [#9587](https://github.com/babel/babel/pull/9587) Update test262 ([@danez](https://github.com/danez))
+  * [#9582](https://github.com/babel/babel/pull/9582) Minify bundles on circle for repl ([@danez](https://github.com/danez))
+* `babel-register`
+  * [#9678](https://github.com/babel/babel/pull/9678) Remove dependency on home-or-tmp package ([@AmirS](https://github.com/AmirS))
+
+## v7.3.4 (2019-02-25)
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#9572](https://github.com/babel/babel/pull/9572) Fix TypeScript parsers missing token check (#9571) ([@elevatebart](https://github.com/elevatebart))
+  * [#9521](https://github.com/babel/babel/pull/9521) Also check AssignmentPatterns for duplicate export name ([@danez](https://github.com/danez))
+* `babel-helper-create-class-features-plugin`, `babel-helper-replace-supers`, `babel-plugin-proposal-class-properties`, `babel-traverse`
+  * [#9508](https://github.com/babel/babel/pull/9508) Use correct "this" in static fields ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-preset-env`
+  * [#9566](https://github.com/babel/babel/pull/9566) Closes [#9465](https://github.com/babel/babel/issues/9465) ([@zloirock](https://github.com/zloirock))
+* `babel-types`
+  * [#9539](https://github.com/babel/babel/pull/9539) babel-types is* type checks accept null | undefiend as value TS type ([@ian-craig](https://github.com/ian-craig))
+* `babel-plugin-transform-block-scoping`, `babel-traverse`
+  * [#9532](https://github.com/babel/babel/pull/9532) Migrate some duplicate binding tests to traverse ([@danez](https://github.com/danez))
+* `babel-generator`
+  * [#9524](https://github.com/babel/babel/pull/9524) Fix typescript generator params ([@tanhauhau](https://github.com/tanhauhau))
+  * [#9523](https://github.com/babel/babel/pull/9523) Fix flow babel-generator function parantheses ([@tanhauhau](https://github.com/tanhauhau))
+
+#### :house: Internal
+* Other
+  * [#9561](https://github.com/babel/babel/pull/9561) Update CHANGELOG.md using the "Trigger GitHub release" action ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-object-rest-spread`, `babel-plugin-transform-modules-systemjs`
+  * [#9541](https://github.com/babel/babel/pull/9541) Enable eqeqeq rule in eslint ([@danez](https://github.com/danez))
+* `babel-generator`, `babel-parser`, `babel-plugin-transform-flow-strip-types`, `babel-traverse`
+  * [#9522](https://github.com/babel/babel/pull/9522) Make tests spec compliant by avoiding duplicate declarations in input files ([@danez](https://github.com/danez))
+* `babel-plugin-transform-proto-to-assign`
+  * [#9533](https://github.com/babel/babel/pull/9533) Add import/no-extraneous-dependencies to ESLint ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.3.3 (2019-02-15)
+
+#### :eyeglasses: Spec Compliancy
+* `babel-generator`
+  * [#9501](https://github.com/babel/babel/pull/9501) Correctly output escapes in directives ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#9477](https://github.com/babel/babel/pull/9477) Fix regression with let ([@danez](https://github.com/danez))
+  * [#9431](https://github.com/babel/babel/pull/9431) Typescript function destructured params ([@mhcgrq](https://github.com/mhcgrq))
+  * [#9463](https://github.com/babel/babel/pull/9463) Fix range for TypeScript optional parameter in arrow function ([@existentialism](https://github.com/existentialism))
+
+#### :nail_care: Polish
+* `babel-plugin-proposal-class-properties`, `babel-plugin-transform-classes`, `babel-plugin-transform-parameters`
+  * [#9458](https://github.com/babel/babel/pull/9458) Fix duplicated assertThisInitialized calls in constructors ([@rubennorte](https://github.com/rubennorte))
+
+#### :house: Internal
+* Other
+  * [#9517](https://github.com/babel/babel/pull/9517) Add duplicate-package-checker-webpack-plugin ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9469](https://github.com/babel/babel/pull/9469) Exclude generate @babel/types files from coverage report ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-parser`
+  * [#9491](https://github.com/babel/babel/pull/9491) Better error output in parser tests ([@danez](https://github.com/danez))
+## v7.3.2 (2019-02-04)
+
+Various spec compliancy fixes and better support for smart pipelines and private methods.
+
+Thanks @gverni, @naffiq, @spondbob and @dstaley for their first PRs!
+
+#### :eyeglasses: Spec Compliancy
+* `babel-parser`
+  * [#9403](https://github.com/babel/babel/pull/9403) Fix line continuation with Unicode line terminators. ([@danez](https://github.com/danez))
+  * [#9400](https://github.com/babel/babel/pull/9400) Make yield a contextual keyword. ([@danez](https://github.com/danez))
+  * [#9398](https://github.com/babel/babel/pull/9398) Correctly fail for invalid yield in for. ([@danez](https://github.com/danez))
+  * [#9375](https://github.com/babel/babel/pull/9375) Make let a contextual keyword. ([@danez](https://github.com/danez))
+
+#### :rocket: New Feature
+* `babel-plugin-proposal-pipeline-operator`
+  * [#9401](https://github.com/babel/babel/pull/9401) Support for await and yield in pipelines. ([@thiagoarrais](https://github.com/thiagoarrais))
+
+#### :bug: Bug Fix
+* `babel-plugin-proposal-private-methods`, `babel-types`
+  * [#9453](https://github.com/babel/babel/pull/9453) Fix duplicate definition error in private class methods. ([@gverni](https://github.com/gverni))
+* `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-private-methods`
+  * [#9423](https://github.com/babel/babel/pull/9423) Transform private async and generator functions. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-object-rest-spread`, `babel-plugin-transform-destructuring`
+  * [#9414](https://github.com/babel/babel/pull/9414) Destructuring: Create assignments from ForX non-declaration patterns. ([@motiz88](https://github.com/motiz88))
+* `babel-plugin-transform-typescript`
+  * [#9095](https://github.com/babel/babel/pull/9095) Retain JSX pragma if defined as a comment. ([@dstaley](https://github.com/dstaley))
+* `babel-parser`
+  * [#9406](https://github.com/babel/babel/pull/9406) Fix location/range on TypeScript ExportNamedDeclarations. ([@existentialism](https://github.com/existentialism))
+  * [#9371](https://github.com/babel/babel/pull/9371) Allow toplevel await with option and correctly mark await keyword as unexpected. ([@danez](https://github.com/danez))
+* `babel-plugin-transform-typescript`, `babel-types`
+  * [#8738](https://github.com/babel/babel/pull/8738) Fix typescript side effects. ([@yuri-karadzhov](https://github.com/yuri-karadzhov))
+* `babel-generator`, `babel-types`
+  * [#9396](https://github.com/babel/babel/pull/9396) Fix support for Flow's QualifiedTypeIdentifier. ([@existentialism](https://github.com/existentialism))
+
+#### :nail_care: Polish
+* `babel-parser`
+  * [#9405](https://github.com/babel/babel/pull/9405) Simplify await and yield tracking in params. ([@danez](https://github.com/danez))
+* `babel-parser`, `babel-preset-typescript`
+  * [#9402](https://github.com/babel/babel/pull/9402) Unify reserved word checking and update error messages. ([@danez](https://github.com/danez))
+
+## v7.3.1 (2019-01-22)
+
+This release fixes some regressions introduced in v7.3.0
+
+#### :bug: Bug Fix
+* `babel-helpers`, `babel-plugin-proposal-object-rest-spread`, `babel-preset-env`
+  * [#9379](https://github.com/babel/babel/pull/9379) Revert "Differentiate object spread and non-spread properties (#9341)". ([@danez](https://github.com/danez))
+* `babel-parser`
+  * [#9377](https://github.com/babel/babel/pull/9377) fix new keyword broken by recent refactoring. ([@danez](https://github.com/danez))
+
+## v7.3.0 (2019-01-21)
+
+Thanks to @jamesgeorge007 and @armano2 for their first PR!
+
+#### :eyeglasses: Spec Compliancy
+* `babel-parser`
+  * [#9314](https://github.com/babel/babel/pull/9314) Disallow async functions as loop body. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9315](https://github.com/babel/babel/pull/9315) Parse class heritage as strict mode code. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9313](https://github.com/babel/babel/pull/9313) Disallow `new import(x)` and `import(x,)`. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9311](https://github.com/babel/babel/pull/9311) Disallow trailing comma after rest. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :rocket: New Feature
+* `babel-helper-create-class-features-plugin`, `babel-helpers`, `babel-plugin-proposal-private-methods`
+  * [#9101](https://github.com/babel/babel/pull/9101) Private Class Methods Stage 3: Private Accessors. ([@tim-mc](https://github.com/tim-mc))
+* `babel-plugin-proposal-pipeline-operator`, `babel-plugin-syntax-pipeline-operator`
+  * [#9179](https://github.com/babel/babel/pull/9179) Transform for the smart pipeline operator proposal. ([@thiagoarrais](https://github.com/thiagoarrais))
+* `babel-preset-env-standalone`, `babel-preset-env`
+  * [#9345](https://github.com/babel/babel/pull/9345) Add support for transform-named-capturing-groups-regex in preset-env. ([@existentialism](https://github.com/existentialism))
+* `babel-helpers`, `babel-plugin-transform-named-capturing-groups-regex`
+  * [#7105](https://github.com/babel/babel/pull/7105) Add @babel/plugin-transform-named-capturing-groups-regex. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-preset-env`
+  * [#9323](https://github.com/babel/babel/pull/9323) Add support for proposal-json-strings in preset-env. ([@existentialism](https://github.com/existentialism))
+* `babel-generator`, `babel-types`
+  * [#9309](https://github.com/babel/babel/pull/9309) Add emit and builder for TSImportType. ([@hzoo](https://github.com/hzoo))
+* `babel-parser`
+  * [#9302](https://github.com/babel/babel/pull/9302) @babel/parser(ts): Add parsing of type import. ([@armano2](https://github.com/armano2))
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#9336](https://github.com/babel/babel/pull/9336) Disallow usage of invalid keyword after export abstract statement in Typescript. ([@armano2](https://github.com/armano2))
+  * [#9328](https://github.com/babel/babel/pull/9328) Fix handling newline with TypeScript declare and abstract classes. ([@existentialism](https://github.com/existentialism))
+  * [#9335](https://github.com/babel/babel/pull/9335) Fix range on TypeScript index signature parameters. ([@existentialism](https://github.com/existentialism))
+  * [#9292](https://github.com/babel/babel/pull/9292) Throw error if TypeScript class has empty implements. ([@existentialism](https://github.com/existentialism))
+  * [#9284](https://github.com/babel/babel/pull/9284) Fix location for typescript type assertions in AST. ([@danez](https://github.com/danez))
+  * [#9276](https://github.com/babel/babel/pull/9276) Ensure modifiers are included in TSParameterProperty ranges. ([@existentialism](https://github.com/existentialism))
+  * [#9230](https://github.com/babel/babel/pull/9230) babel-parser: typescript: add missing bigint keyword. ([@armano2](https://github.com/armano2))
+* `babel-types`
+  * [#9333](https://github.com/babel/babel/pull/9333) Copy "optional" property when cloning Identifier node. ([@unconfident](https://github.com/unconfident))
+* `babel-helper-create-class-features-plugin`, `babel-helpers`, `babel-plugin-proposal-decorators`
+  * [#9244](https://github.com/babel/babel/pull/9244) [decorators] Set method names at compile time instead of at runtime. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-helper-builder-react-jsx`, `babel-plugin-transform-react-jsx`
+  * [#9119](https://github.com/babel/babel/pull/9119) Revert "Revert babel-helper-builder-react-jsx change from #4988". ([@danez](https://github.com/danez))
+* `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-private-methods`
+  * [#9248](https://github.com/babel/babel/pull/9248) [private methods] Define private methods before executing initializers. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-preset-env`
+  * [#9219](https://github.com/babel/babel/pull/9219) Fix handling scoped packages in preset-env include/exclude options. ([@existentialism](https://github.com/existentialism))
+
+#### :nail_care: Polish
+* `babel-parser`
+  * [#9348](https://github.com/babel/babel/pull/9348) Parser Performance Collection. ([@danez](https://github.com/danez))
+
+#### :memo: Documentation
+* [#9370](https://github.com/babel/babel/pull/9370) add v7 downloads [skip ci]. ([@hzoo](https://github.com/hzoo))
+
+#### :house: Internal
+* `babel-parser`
+  * [#9312](https://github.com/babel/babel/pull/9312) Merge declaration and init of props in parser's state. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-types`
+  * [#9245](https://github.com/babel/babel/pull/9245) [@babel/types] Moved generators related to babel-types into the babel-types package directory.. ([@cameron-martin](https://github.com/cameron-martin))
+* Other
+  * [#9288](https://github.com/babel/babel/pull/9288) Test262 update. ([@existentialism](https://github.com/existentialism))
+  * [#9290](https://github.com/babel/babel/pull/9290) Use 2014-present in license. ([@xtuc](https://github.com/xtuc))
+  * [#9271](https://github.com/babel/babel/pull/9271) Bump license years for 2019. ([@berlamhenderson](https://github.com/berlamhenderson))
+* `babel-helpers`
+  * [#9166](https://github.com/babel/babel/pull/9166) Add mixins support to the _decorate helper. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.2.5 (2018-12-21)
+
+`@babel/polyfill` didn't get published correctly in v7.2.3 (#9227).
+
+## v7.2.4 (2018-12-20)
+
+Minify `@babel/standalone` and `@babel/preset-env-standalone`.
+
+## v7.2.3 (2018-12-20)
+
+This is a small release, mainly to test Lerna 3.
+We force-published `@babel/polyfill` and `@babel/preset-env`, since they should have been released respectively in v7.1.0 and v7.2.2 but for different reasons they didn't get updated.
+
+Half of the commits in this release are made by first time contributors! Thanks to @cameron-martin, @cphamlet, @tanhauhau and @jedwards1211. :tada:
+
+#### :rocket: New Feature
+* [#9110](https://github.com/babel/babel/pull/9110) Added type-level mapping between aliases and nodes that have that alias. ([@cameron-martin](https://github.com/cameron-martin))
+
+#### :bug: Bug Fix
+* `babel-plugin-transform-flow-strip-types`
+  * [#9197](https://github.com/babel/babel/pull/9197) Strips flow directive fully. ([@tanhauhau](https://github.com/tanhauhau))
+* `babel-parser`
+  * [#9184](https://github.com/babel/babel/pull/9184) Allow keywords to be used in type annotations. ([@danez](https://github.com/danez))
+
+#### :house: Internal
+* `babel-plugin-proposal-class-properties`, `babel-plugin-proposal-decorators`, `babel-plugin-proposal-private-methods`, `babel-traverse`
+  * [#9206](https://github.com/babel/babel/pull/9206) Use @babel/eslint-plugin-developement. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.2.2 (2018-12-15)
+
+Mostly bug fixes and internal changes.
+Thanks to @paleite, @saschanaz and @joeldenning for their first PRs!
+
+#### :bug: Bug Fix
+* `babel-plugin-transform-destructuring`, `babel-plugin-transform-spread`
+  * [#9108](https://github.com/babel/babel/pull/9108) Correctly transform spreads to use proper concat method. ([@danez](https://github.com/danez))
+* `babel-parser`
+  * [#9168](https://github.com/babel/babel/pull/9168) [parser] Handle flow comments with leading spaces. ([@vikr01](https://github.com/vikr01))
+* `babel-helper-module-transforms`, `babel-plugin-transform-modules-commonjs`
+  * [#9171](https://github.com/babel/babel/pull/9171) Fix transforming empty export statement. ([@danez](https://github.com/danez))
+* `babel-node`
+  * [#9148](https://github.com/babel/babel/pull/9148) Fix --root-mode option in babel-node. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-transform-classes`
+  * [#9135](https://github.com/babel/babel/pull/9135) Inherit properties in function from method in loose mode. ([@rubennorte](https://github.com/rubennorte))
+* `babel-preset-env`
+  * [#9140](https://github.com/babel/babel/pull/9140) Disable parameter-destructuring in Edge 18. ([@saschanaz](https://github.com/saschanaz))
+* `babel-plugin-transform-arrow-functions`, `babel-traverse`
+  * [#9060](https://github.com/babel/babel/pull/9060) Not depending on return value of super(). Closes [#9020](https://github.com/babel/babel/issues/9020).. ([@joeldenning](https://github.com/joeldenning))
+
+#### :house: Internal
+* `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-nullish-coalescing-operator`, `babel-plugin-syntax-bigint`, `babel-plugin-transform-dotall-regex`
+  * [#9176](https://github.com/babel/babel/pull/9176) Fix package.json repository URLs. ([@paleite](https://github.com/paleite))
+* Other
+  * [#9158](https://github.com/babel/babel/pull/9158) add triage label to new issues [skip ci]. ([@danez](https://github.com/danez))
+  * [#9143](https://github.com/babel/babel/pull/9143) Fix a typo from the issue template for bugs. ([@saschanaz](https://github.com/saschanaz))
+  * [#9133](https://github.com/babel/babel/pull/9133) Move to travis vm based builds. ([@danez](https://github.com/danez))
+  * [#9132](https://github.com/babel/babel/pull/9132) Ensure we always use repository versions of babel dependencies in tests. ([@danez](https://github.com/danez))
+  * [#9131](https://github.com/babel/babel/pull/9131) Update issue templates [skip ci]. ([@hzoo](https://github.com/hzoo))
+* `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-class-properties`, `babel-plugin-proposal-decorators`
+  * [#9059](https://github.com/babel/babel/pull/9059) Move decorators transform to @babel/helper-create-class-features-plugin. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-core`, `babel-parser`, `babel-template`
+  * [#9128](https://github.com/babel/babel/pull/9128) Fix running flow on travis and update flow. ([@danez](https://github.com/danez))
+
+## v7.2.1 (2018-12-04)
+
+This release fixes a regression introduced in v7.2.0 (https://github.com/babel/babel/issues/9120)
+
+#### :bug: Bug Fix
+* `babel-helper-create-class-features-plugin`
+  * [#9121](https://github.com/babel/babel/pull/9121) Don't use isClassPrivateMethod because it isn't supported in <7.2.0. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.2.0 (2018-12-03)
+
+You can read more about this release at https://babeljs.io/blog/2018/12/03/7.2.0.
+
+#### :rocket: New Feature
+* `babel-parser`
+  * [#8289](https://github.com/babel/babel/pull/8289) Implement Smart Pipeline proposal in @babel/parser. ([@mAAdhaTTah](https://github.com/mAAdhaTTah))
+* `babel-core`
+  * [#8986](https://github.com/babel/babel/pull/8986) Export @babel/parser#tokTypes in @babel/core. ([@kaicataldo](https://github.com/kaicataldo))
+* `babel-node`
+  * [#9078](https://github.com/babel/babel/pull/9078) Pass `rootMode` from `@babel/node`.. ([@wtgtybhertgeghgtwtg](https://github.com/wtgtybhertgeghgtwtg))
+* `babel-generator`, `babel-helpers`, `babel-plugin-class-features`, `babel-plugin-proposal-private-methods`, `babel-plugin-syntax-class-properties`, `babel-types`
+  * [#8654](https://github.com/babel/babel/pull/8654) Private class methods stage 3. ([@tim-mc](https://github.com/tim-mc))
+* `babel-preset-env`
+  * [#9048](https://github.com/babel/babel/pull/9048) Update mappings for node 10 in preset-env. ([@existentialism](https://github.com/existentialism))
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#9114](https://github.com/babel/babel/pull/9114) Parse non-octals with leading zeros in non strict mode correctly. ([@danez](https://github.com/danez))
+  * [#9074](https://github.com/babel/babel/pull/9074) Disallow await inside arrow functions. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9069](https://github.com/babel/babel/pull/9069) [flow] Allow type casts in array patterns inside arrow parameters. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#9058](https://github.com/babel/babel/pull/9058) Fix compatibility between typescript and jsx plugins in interface declarations. ([@danez](https://github.com/danez))
+  * [#9055](https://github.com/babel/babel/pull/9055) Fix bug with parsing TS generic async arrow function. ([@existentialism](https://github.com/existentialism))
+  * [#9035](https://github.com/babel/babel/pull/9035) Fix parsing typescript function types with destructuring. ([@danez](https://github.com/danez))
+* `babel-helper-fixtures`, `babel-parser`
+  * [#9113](https://github.com/babel/babel/pull/9113) Ignore empty fixture directories and fix fixtures in the parser. ([@danez](https://github.com/danez))
+* `babel-preset-env`
+  * [#9091](https://github.com/babel/babel/pull/9091) Update mapping for regex unicode plugin in preset-env. ([@existentialism](https://github.com/existentialism))
+* `babel-plugin-transform-destructuring`
+  * [#8916](https://github.com/babel/babel/pull/8916) Fix destructuring assignment in arrow functions without block. ([@RubenVerborgh](https://github.com/RubenVerborgh))
+* `babel-plugin-proposal-optional-chaining`
+  * [#9073](https://github.com/babel/babel/pull/9073) Microbouji patch/8136. ([@jridgewell](https://github.com/jridgewell))
+* `babel-core`, `babel-helper-wrap-function`, `babel-plugin-proposal-async-generator-functions`, `babel-plugin-proposal-function-sent`, `babel-plugin-transform-async-to-generator`, `babel-plugin-transform-classes`
+  * [#9039](https://github.com/babel/babel/pull/9039) Fix recursive async function expressions. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-core`
+  * [#9034](https://github.com/babel/babel/pull/9034) Normalize presets before merging config with others.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :nail_care: Polish
+* `babel-generator`
+  * [#9089](https://github.com/babel/babel/pull/9089) Remove unused variable. ([@Gcaufy](https://github.com/Gcaufy))
+* `babel-node`
+  * [#9079](https://github.com/babel/babel/pull/9079) Move `fs-readdir-recursive` and `output-file-sync` to `devDependencies` for `@babel/node`.. ([@wtgtybhertgeghgtwtg](https://github.com/wtgtybhertgeghgtwtg))
+* `babel-parser`
+  * [#9046](https://github.com/babel/babel/pull/9046) a better error message for disallowed trailing commas/additional parameters after rest elements in function params. ([@morozRed](https://github.com/morozRed))
+* `babel-*`
+  * [#8769](https://github.com/babel/babel/pull/8769) Add plugins name. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :house: Internal
+* `babel-helper-create-class-features-plugin`, `babel-plugin-proposal-class-properties`, `babel-plugin-proposal-private-methods`
+  * [#9083](https://github.com/babel/babel/pull/9083) Make @babel/plugin-class-features a normal helper package. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* Other
+  * [#9096](https://github.com/babel/babel/pull/9096) Add node 11 to CI and remove node 9. ([@danez](https://github.com/danez))
+  * [#9094](https://github.com/babel/babel/pull/9094) Skip minifying standalone in non-publish runs. ([@danez](https://github.com/danez))
+* `babel-types`
+  * [#9093](https://github.com/babel/babel/pull/9093) Fix warning when using prettier in code generators. ([@danez](https://github.com/danez))
+* `babel-generator`
+  * [#9089](https://github.com/babel/babel/pull/9089) Remove unused variable. ([@Gcaufy](https://github.com/Gcaufy))
+
+## v7.1.6 (2018-11-13)
+
+#### :bug: Bug Fix
+* `babel-generator`
+  * [#9003](https://github.com/babel/babel/pull/9003) Fix retainLines regression for arrow functions. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-types`
+  * [#8997](https://github.com/babel/babel/pull/8997) Fix cloneNode with typeAnnotation.. ([@neoziro](https://github.com/neoziro))
+* `babel-plugin-transform-flow-strip-types`, `babel-plugin-transform-react-jsx`
+  * [#8701](https://github.com/babel/babel/pull/8701) Fix "TypeError: comments is not iterable". ([@AlicanC](https://github.com/AlicanC))
+* `babel-core`
+  * [#9004](https://github.com/babel/babel/pull/9004) Fix browser files to have the same API as the nodejs ones. ([@danez](https://github.com/danez))
+* Other
+  * [#9007](https://github.com/babel/babel/pull/9007) [Types] fix generated TS/Flow comment types. ([@ljqx](https://github.com/ljqx))
+* `babel-preset-env`
+  * [#8555](https://github.com/babel/babel/pull/8555) preset-env: fix `opera` from `esmodules` target and Browserslist not used. ([@ylemkimon](https://github.com/ylemkimon))
+* `babel-plugin-proposal-decorators`, `babel-traverse`
+  * [#8970](https://github.com/babel/babel/pull/8970) [decorators] Correctly insert `_initialize(this)` after `super()`.. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-parser`
+  * [#8972](https://github.com/babel/babel/pull/8972) Fix several edge cases with context expression state. ([@danez](https://github.com/danez))
+
+#### :nail_care: Polish
+* `babel-parser`
+  * [#8984](https://github.com/babel/babel/pull/8984) Rename primitive types to reserved types. ([@danez](https://github.com/danez))
+
+#### :house: Internal
+* [#8982](https://github.com/babel/babel/pull/8982) fix publish command [skip ci]. ([@hzoo](https://github.com/hzoo))
+* [#8988](https://github.com/babel/babel/pull/8988) Remove definition of micromatch which was removed.. ([@danez](https://github.com/danez))
+
+## v7.1.5 (2018-11-06)
+
+#### :eyeglasses: Spec Compliancy
+* `babel-parser`, `babylon`
+  * [#7727](https://github.com/babel/babel/pull/7727) Fix await in function name and parameters. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :rocket: New Feature
+* `babel-parser`
+  * [#8828](https://github.com/babel/babel/pull/8828) Typescript: Validate tuple type element positions. ([@Retsam](https://github.com/Retsam))
+  * [#8883](https://github.com/babel/babel/pull/8883) [flow] Add support for parsing `_` as implicit instantiation in call/new. ([@jbrown215](https://github.com/jbrown215))
+* `babel-core`, `babel-generator`, `babel-parser`, `babel-plugin-syntax-typescript`, `babel-traverse`
+  * [#8448](https://github.com/babel/babel/pull/8448) Remove Babylon plugins for features already merged to the ECMAScript spec. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-parser`, `babel-types`
+  * [#8884](https://github.com/babel/babel/pull/8884) [flow] Explicit inexact objects with `...`. ([@jbrown215](https://github.com/jbrown215))
+* `babel-preset-env`
+  * [#8898](https://github.com/babel/babel/pull/8898) Update preset-env data. ([@existentialism](https://github.com/existentialism))
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#8956](https://github.com/babel/babel/pull/8956) Do not allow TypeCastExpressions w/o parens . ([@danez](https://github.com/danez))
+  * [#8954](https://github.com/babel/babel/pull/8954) Allow function types in type params within arrow return types. ([@danez](https://github.com/danez))
+  * [#8866](https://github.com/babel/babel/pull/8866) Closes [#8865](https://github.com/babel/babel/issues/8865). ([@byronluk](https://github.com/byronluk))
+* `babel-core`
+  * [#8910](https://github.com/babel/babel/pull/8910) Resolve babel.config.js 'babelrcRoots' values relative to the config file.. ([@loganfsmyth](https://github.com/loganfsmyth))
+  * [#8950](https://github.com/babel/babel/pull/8950) Fix message when plugin of a wrong type is passed. ([@everdimension](https://github.com/everdimension))
+* `babel-plugin-transform-block-scoping`
+  * [#8937](https://github.com/babel/babel/pull/8937) rename colliding let bindings with for loop init. ([@byronluk](https://github.com/byronluk))
+  * [#8914](https://github.com/babel/babel/pull/8914) Treat break inside block inside loop. ([@thiagoarrais](https://github.com/thiagoarrais))
+* `babel-preset-env`
+  * [#8926](https://github.com/babel/babel/pull/8926) preset-env: Edge support for arrow param destructuring. ([@benmosher](https://github.com/benmosher))
+* `babel-generator`
+  * [#8868](https://github.com/babel/babel/pull/8868) fix single-arg async arrows when retainLines=true. ([@ryanwmarsh](https://github.com/ryanwmarsh))
+* `babel-traverse`
+  * [#8880](https://github.com/babel/babel/pull/8880) fix: Expression x === 'y' && '' should not evaluate to undefined.. ([@Cyp](https://github.com/Cyp))
+
+#### :nail_care: Polish
+* [#8873](https://github.com/babel/babel/pull/8873) fixed an extra word. ([@vvyomjjain](https://github.com/vvyomjjain))
+
+## v7.1.4 (2018-10-11)
+
+Just re-published `@babel/traverse` without `**` so that it works in Node 6.
+
+## v7.1.3 (2018-10-11)
+
+#### :bug: Bug Fix
+* `babel-generator`, `babel-parser`, `babel-plugin-transform-typescript`, `babel-types`
+  * [#8720](https://github.com/babel/babel/pull/8720) Typescript - Tuple elements can be optional. ([@Retsam](https://github.com/Retsam))
+* `babel-traverse`
+  * [#8833](https://github.com/babel/babel/pull/8833) Insertafter jsx fix. ([@kevintab95](https://github.com/kevintab95))
+* `babel-parser`
+  * [#8830](https://github.com/babel/babel/pull/8830) Correct handling of newline after async with paren-less arrow func. ([@Retsam](https://github.com/Retsam))
+  * [#8756](https://github.com/babel/babel/pull/8756) class private methods and properties: should not allow spaces between # and identifier. ([@macabeus](https://github.com/macabeus))
+  * [#8804](https://github.com/babel/babel/pull/8804) Fix parsing of slash after class expression. ([@existentialism](https://github.com/existentialism))
+  * [#8767](https://github.com/babel/babel/pull/8767) [decorators] [typescript] Parse type parameters. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#8792](https://github.com/babel/babel/pull/8792) Fix perf issue in typescript parser plugin. ([@matthewrobertson](https://github.com/matthewrobertson))
+* `babel-generator`, `babel-parser`, `babel-plugin-transform-typescript`, `babel-types`
+  * [#8805](https://github.com/babel/babel/pull/8805) Typescript - Tuples can include rest elements. ([@Retsam](https://github.com/Retsam))
+* `babel-types`
+  * [#8791](https://github.com/babel/babel/pull/8791) types: allow jsxEmptyExpression inside jsxExpressionContainer. ([@tvooo](https://github.com/tvooo))
+* `babel-plugin-transform-modules-systemjs`
+  * [#8820](https://github.com/babel/babel/pull/8820) System module format - fixes function hoisting failure case. ([@guybedford](https://github.com/guybedford))
+* `babel-plugin-transform-destructuring`
+  * [#8793](https://github.com/babel/babel/pull/8793) Ensure destructuring's computed key handling matches object-rest-spread. ([@existentialism](https://github.com/existentialism))
+
+## 7.1.2 (2018-09-28)
+
+Same as v7.1.1, except compiled against Node 6 instead of Node 8 by accident (e.g had `async functions`).
+
+## v7.1.1 (2018-09-28)
+
+> EDIT: had a publish issue here as well where it compiled against Node 8 instead of Node 6 so 7.1.2 will fix this.
+> Also force publish `@babel/runtime` and `@babel/runtime-corejs2`. We need to fix the publishing around that since Lerna doesn't pickup the `@babel/helpers` changes as there is no "dependency"
+
+#### :bug: Bug Fix
+* `babel-generator`, `babel-parser`, `babel-types`
+  * [#8755](https://github.com/babel/babel/pull/8755) TypeScript: reserve `unknown` as TSUnknownKeyword. ([@g-plane](https://github.com/g-plane))
+* `babel-plugin-transform-destructuring`
+  * [#8535](https://github.com/babel/babel/pull/8535)  Do not unpack array patterns that update a referenced binding. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-plugin-proposal-decorators`
+  * [#8742](https://github.com/babel/babel/pull/8742) [decorators] Support async and generator methods. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-helpers`, `babel-plugin-proposal-decorators`
+  * [#8761](https://github.com/babel/babel/pull/8761) [decorators] Fields are enumerable. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-generator`
+  * [#8751](https://github.com/babel/babel/pull/8751) Fix some missing parens cases with OptionalMemberExpression in generator. ([@existentialism](https://github.com/existentialism))
+  * [#8727](https://github.com/babel/babel/pull/8727) Handle throw expressions in generator. ([@existentialism](https://github.com/existentialism))
+
+#### :house: Internal
+* Other
+  * [#8780](https://github.com/babel/babel/pull/8780) Run test262 tests for exportNamespaceFrom. ([@existentialism](https://github.com/existentialism))
+* `babel-helper-transform-fixture-test-runner`
+  * [#8768](https://github.com/babel/babel/pull/8768) Use babel-check-duplicated-nodes. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.1.0 (2018-09-17)
+
+Check http://babeljs.io/blog/2018/09/17/7.1.0
+
+#### :rocket: New Feature
+* `babel-cli`, `babel-core`
+  * [#8660](https://github.com/babel/babel/pull/8660) Better support monorepos by allowing users to opt into automatically resolving 'root' with `rootMode: "upward"`.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-helper-transform-fixture-test-runner`
+  * [#7582](https://github.com/babel/babel/pull/7582) Allow regular plugins/presets resolution algorithm for packages outsi…. ([@Andarist](https://github.com/Andarist))
+* `babel-helpers`, `babel-plugin-proposal-decorators`, `babel-plugin-syntax-decorators`
+  * [#7976](https://github.com/babel/babel/pull/7976) Add support for the new decorators proposal. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-helpers`, `babel-plugin-proposal-class-properties`
+  * [#8205](https://github.com/babel/babel/pull/8205) Private Static Fields Features: Stage 3. ([@rricard](https://github.com/rricard))
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#8698](https://github.com/babel/babel/pull/8698) Fix parsing of newline between 'async' and 'function'. ([@existentialism](https://github.com/existentialism))
+  * [#8677](https://github.com/babel/babel/pull/8677) Fix typescript parsing typed object shorthand methods. ([@existentialism](https://github.com/existentialism))
+* `babel-plugin-transform-typescript`
+  * [#8682](https://github.com/babel/babel/pull/8682) Fix TSParameterProperty getting lost with transform-classes. ([@existentialism](https://github.com/existentialism))
+  * [#8695](https://github.com/babel/babel/pull/8695) Adjust TSParameterProperty handling to work with transform-parameters. ([@existentialism](https://github.com/existentialism))
+  * [#8666](https://github.com/babel/babel/pull/8666) Fix typescript import elision. ([@Retsam](https://github.com/Retsam))
+* `babel-preset-env`
+  * [#8693](https://github.com/babel/babel/pull/8693) Fix es6.string.iterator mapping in babel-preset-env. ([@existentialism](https://github.com/existentialism))
+* `babel-core`, `babel-plugin-proposal-class-properties`, `babel-plugin-proposal-decorators`, `babel-plugin-transform-runtime`
+  * [#8659](https://github.com/babel/babel/pull/8659) Fix version checks in .availableHelper and transform-runtime definitions.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* Other
+  * [#8627](https://github.com/babel/babel/pull/8627) ts generator: allow reserved keywords in interfaces. ([@43081j](https://github.com/43081j))
+* `babel-plugin-transform-parameters`
+  * [#8414](https://github.com/babel/babel/pull/8414) Allow patterns as argument of RestElement. ([@microbouji](https://github.com/microbouji))
+* `babel-core`, `babel-plugin-transform-runtime`
+  * [#8624](https://github.com/babel/babel/pull/8624) Verify 'sourceMap' option with hasOwnProperty, and verify string-typed 'version'. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-helpers`, `babel-plugin-proposal-class-properties`
+  * [#8614](https://github.com/babel/babel/pull/8614) [static private] Unify loose handling of static and instance props. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :nail_care: Polish
+* `babel-plugin-transform-runtime`
+  * [#8581](https://github.com/babel/babel/pull/8581) Fix grammar in error message at @babel/plugin-transform-runtime. ([@tricknotes](https://github.com/tricknotes))
+* `babel-parser`
+  * [#8576](https://github.com/babel/babel/pull/8576) More helpful errorr message for missing decoratorsBeforeExport in parser. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :memo: Documentation
+* [#8561](https://github.com/babel/babel/pull/8561) Added pronounciation of babel. ([@siddhant1](https://github.com/siddhant1))
+
+#### :house: Internal
+* `babel-core`
+  * [#8714](https://github.com/babel/babel/pull/8714) Fix Flow error with new versionRange test.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* Other
+  * [#8679](https://github.com/babel/babel/pull/8679) remove force publish, temp tag [skip ci]. ([@hzoo](https://github.com/hzoo))
+* `babel-plugin-transform-runtime`
+  * [#8661](https://github.com/babel/babel/pull/8661) Makefile: run fix json on fix. ([@xtuc](https://github.com/xtuc))
+* `babel-*`
+  * [#8658](https://github.com/babel/babel/pull/8658) Format fixture options.json with Prettier.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-parser`
+  * [#8630](https://github.com/babel/babel/pull/8630) Bump flow to 0.80 and fix sourceType error. ([@existentialism](https://github.com/existentialism))
+  * [#8610](https://github.com/babel/babel/pull/8610) types: missing `unambiguous` sourceType. ([@xtuc](https://github.com/xtuc))
+  * [#8170](https://github.com/babel/babel/pull/8170) @babel/parser: expose a TypeScript definition file from package. ([@AviVahl](https://github.com/AviVahl))
+* `babel-*`
+  * [#8573](https://github.com/babel/babel/pull/8573) add access public to all packages [skip ci]. ([@hzoo](https://github.com/hzoo))
+
+## v7.0.1 (2018-09-11)
+
+Doing a quick patch regarding helpers versioning to prevent future issues: https://github.com/babel/babel/pull/8659
+
+## v7.0.0 (2018-08-27)
+
+No change from rc.4. Finally released as https://babeljs.io/blog/2018/08/27/7.0.0!
+
+## v7.0.0-rc.4 (2018-08-27)
+
+> Similar to removing proposals in `@babel/polyfill`, we are removing them in `transform-runtime`
+
+#### :boom: Breaking Change
+* `babel-plugin-transform-runtime`
+  * [#8547](https://github.com/babel/babel/pull/8547) Remove nonstandard functions and fake prototype methods from babel-runtime. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-parser`
+  * [#8539](https://github.com/babel/babel/pull/8539) Update parser whitespace for clarity. ([@jridgewell](https://github.com/jridgewell))
+
+#### :bug: Bug Fix
+* `babel-register`
+  * [#8553](https://github.com/babel/babel/pull/8553) bump source-map-support. ([@hzoo](https://github.com/hzoo))
+* `babel-core`
+  * [#8546](https://github.com/babel/babel/pull/8546) Default highlightCode:true for the parser highlighting.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :house: Internal
+* Other
+  * [#8554](https://github.com/babel/babel/pull/8554) Lerna: remove exact [skip ci]. ([@hzoo](https://github.com/hzoo))
+* `babel-parser`
+  * [#8540](https://github.com/babel/babel/pull/8540) Cleanup getLineInfo. ([@jridgewell](https://github.com/jridgewell))
+  * [#8541](https://github.com/babel/babel/pull/8541) Update to ES6 String methods. ([@jridgewell](https://github.com/jridgewell))
+  * [#8537](https://github.com/babel/babel/pull/8537) Flatten TokenType class hierarchy. ([@jridgewell](https://github.com/jridgewell))
+  * [#8539](https://github.com/babel/babel/pull/8539) Update parser whitespace for clarity. ([@jridgewell](https://github.com/jridgewell))
+
+## v7.0.0-rc.3 (2018-08-24)
+
+#### :boom: Breaking Change
+* `babel-preset-env`
+  * [#8509](https://github.com/babel/babel/pull/8509) Add browserslist 4 support.. ([@yavorsky](https://github.com/yavorsky))
+* `babel-plugin-transform-runtime`
+  * [#8518](https://github.com/babel/babel/pull/8518) Make 'useESModules' only toggle CJS vs ESM helpers when importing file is ESM.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :rocket: New Feature
+* `babel-plugin-transform-runtime`
+  * [#8520](https://github.com/babel/babel/pull/8520) Expose opt-in useESModules:"auto" from transform-runtime to toggle based on 'supportsStaticESM'. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :bug: Bug Fix
+* `babel-helpers`, `babel-plugin-transform-classes`, `babel-preset-env`
+  * [#8501](https://github.com/babel/babel/pull/8501) [_wrapNativeSuper] Don't wrap non-native constructors. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-generator`, `babel-traverse`, `babel-types`
+  * [#8478](https://github.com/babel/babel/pull/8478) Fix path.scope.rename() to not change break clauses. ([@rafeca](https://github.com/rafeca))
+* `babel-plugin-proposal-object-rest-spread`
+  * [#8514](https://github.com/babel/babel/pull/8514) fix: object rest with default values bug. ([@jquense](https://github.com/jquense))
+* `babel-traverse`
+  * [#8505](https://github.com/babel/babel/pull/8505) Rename exported functions where name conflicts with param.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :house: Internal
+* `babel-plugin-transform-object-set-prototype-of-to-assign`
+  * [#8409](https://github.com/babel/babel/pull/8409) Add LICENSE file to published npm packages [skip ci]. ([@opichals](https://github.com/opichals))
+* Other
+  * [#8504](https://github.com/babel/babel/pull/8504) Update Babel to rc.2. ([@hzoo](https://github.com/hzoo))
+
+## v7.0.0-rc.2 (2018-08-21)
+
+A notable change is the addition of https://github.com/babel/babel/pull/8485 which enables https://github.com/babel/babel-loader/pull/660 (automatically doing `modules: false` for `@babel/preset-env` when using `babel-loader`.
+
+#### :boom: Breaking Change
+* `babel-core`
+  * [#8470](https://github.com/babel/babel/pull/8470) Remove File#resolveModuleSource. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+  * [#8473](https://github.com/babel/babel/pull/8473) Allow babel-plugin/preset prefix to not be a prefix, when used in a scope.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-core`, `babel-parser`, `babel-plugin-syntax-decorators`
+  * [#8465](https://github.com/babel/babel/pull/8465) Require decoratorsBeforeExport option for decorators. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+#### :rocket: New Feature
+* `babel-preset-env`
+  * [#8500](https://github.com/babel/babel/pull/8500) Add missing es7.promise.finally polyfill when using useBuiltIns: usage. ([@jsnajdr](https://github.com/jsnajdr))
+* `babel-cli`, `babel-core`, `babel-node`, `babel-preset-env`, `babel-register`
+  * [#8485](https://github.com/babel/babel/pull/8485) Allow preset-env to toggle module handling based on flags from the caller (like babel-loader). ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-core`
+  * [#8474](https://github.com/babel/babel/pull/8474) Preserve 'false'-options for disabled plugins/presets.. ([@loganfsmyth](https://github.com/loganfsmyth))
+  * [#8473](https://github.com/babel/babel/pull/8473) Allow babel-plugin/preset prefix to not be a prefix, when used in a scope.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-helper-transform-fixture-test-runner`, `babel-plugin-transform-runtime`
+  * [#8435](https://github.com/babel/babel/pull/8435) Allow transform-runtime to insert runtime references with absolute paths.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :bug: Bug Fix
+* `babel-parser`
+  * [#8488](https://github.com/babel/babel/pull/8488) Fix trailingComments for FunctionExpression that is CallExpression arguments. ([@jiaxuan](https://github.com/jiaxuan))
+* `babel-core`
+  * [#8493](https://github.com/babel/babel/pull/8493) Take top-level config source into consideration when processing nested env/overrides.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-helpers`, `babel-plugin-proposal-decorators`
+  * [#7429](https://github.com/babel/babel/pull/7429) Fix default descriptor setting for class properties with decorators. ([@yhpark](https://github.com/yhpark))
+* `babel-plugin-transform-parameters`
+  * [#8479](https://github.com/babel/babel/pull/8479) Fixes setter paratemer default value. ([@nikolayemrikh](https://github.com/nikolayemrikh))
+
+#### :nail_care: Polish
+* `babel-core`
+  * [#8494](https://github.com/babel/babel/pull/8494) Cache individual programmatic descriptors along with the overall list.. ([@loganfsmyth](https://github.com/loganfsmyth))
+  * [#8493](https://github.com/babel/babel/pull/8493) Take top-level config source into consideration when processing nested env/overrides.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :house: Internal
+* `babel-core`
+  * [#8493](https://github.com/babel/babel/pull/8493) Take top-level config source into consideration when processing nested env/overrides.. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-plugin-transform-classes`
+  * [#8472](https://github.com/babel/babel/pull/8472) Remove unused file. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+
+## v7.0.0-rc.1 (2018-08-09)
+
+Same as rc.0 but fixes the peerDep issue #8443. It's changed to just be ^7.0.0-0
+
+## v7.0.0-rc.0 (2018-08-09)
+
+> This had an issue with `peerDependencies` so please use `rc.1`.
+
+Alright finally at the end 🙂. Shouldn't have anymore breaking changes and going to wait some time to fix bugs/regressions
+
+> Summary: `@babel/polyfill` will not include proposal polyfills by default and fixed a regression.
+
+#### :boom: Breaking Change
+* `babel-polyfill`
+  * [#8440](https://github.com/babel/babel/pull/8440) remove proposals polyfills from default import [skip ci]. ([@hzoo](https://github.com/hzoo))
+
+> Will add this to the upgrade guide/polyfill docs. I guess we could include a `babel-upgrade` for this too, not sure.
+
+#### :bug: Bug Fix
+* `babel-cli`
+  * [#8436](https://github.com/babel/babel/pull/8436) Require v1.1.0 so that correct filter params are passed.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+## v7.0.0-beta.56 (2018-08-03)
+
+- Separate `@babel/runtime`: should work for helpers alone and opt-into core-js if necessary.
+- More details in http://babeljs.io/docs/en/next/babel-runtime, http://babeljs.io/docs/en/next/babel-plugin-transform-runtime (via https://github.com/babel/babel/pull/8266, https://github.com/babel/website/pull/1714)
+- `babel-upgrade` issue: https://github.com/babel/babel-upgrade/issues/70
+
+#### :boom: Breaking Change
+* `babel-plugin-transform-regenerator`, `babel-plugin-transform-runtime`, `babel-runtime-corejs2`, `babel-runtime`
+  * [#8266](https://github.com/babel/babel/pull/8266) Split @babel/runtime into 2 modules via @babel/runtime-corejs2. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-core`, `babel-helper-module-imports`, `babel-helpers`, `babel-plugin-external-helpers`, `babel-plugin-transform-runtime`
+  * [#8398](https://github.com/babel/babel/pull/8398) Only reference helpers from external/runtime helpers if they are known to be available.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :rocket: New Feature
+* `babel-plugin-transform-regenerator`, `babel-plugin-transform-runtime`, `babel-runtime-corejs2`, `babel-runtime`
+  * [#8266](https://github.com/babel/babel/pull/8266) Split @babel/runtime into 2 modules via @babel/runtime-corejs2. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :bug: Bug Fix
+* `babel-parser`, `babel-plugin-transform-typescript`
+  * [#8408](https://github.com/babel/babel/pull/8408) Allow TSInterfaceDeclaration to be default export. ([@existentialism](https://github.com/existentialism))
+* `babel-preset-env`
+  * [#8403](https://github.com/babel/babel/pull/8403) Ensure esmodule targets are parsed by browserslist. ([@existentialism](https://github.com/existentialism))
+* Other
+  * [#8024](https://github.com/babel/babel/pull/8024) Run transform-runtime on the standalone bundle so it stays ES5-compatible.. ([@loganfsmyth](https://github.com/loganfsmyth))
+
+#### :memo: Documentation
+* [#8412](https://github.com/babel/babel/pull/8412) Update Documentation[skip ci]. ([@leongjiameng](https://github.com/leongjiameng))
+
+## v7.0.0-beta.55 (2018-07-28)
+
+Breaking Change in beta:
+
+> Throws an error on using Stage presets: https://babeljs.io/blog/2018/07/27/removing-babels-stage-presets
+
+#### :boom: Breaking Change
+* `babel-core`, `babel-plugin-proposal-class-properties`, `babel-plugin-proposal-decorators`, `babel-preset-stage-0`, `babel-preset-stage-1`, `babel-preset-stage-2`, `babel-preset-stage-3`, `babel-standalone`
+  * [#8293](https://github.com/babel/babel/pull/8293) Remove Stage presets. ([@hzoo](https://github.com/hzoo))
+
+#### :rocket: New Feature
+* `babel-generator`, `babel-parser`, `babel-plugin-transform-typescript`, `babel-types`
+  * [#7754](https://github.com/babel/babel/pull/7754) TypeScript: Support type arguments on tagged templates. ([@andy-ms](https://github.com/andy-ms))
+
+#### :bug: Bug Fix
+* `babel-cli`, `babel-core`, `babel-generator`
+  * [#8380](https://github.com/babel/babel/pull/8380) Ensure that Identifier source mappings explicitly start and stop on the generated range. ([@loganfsmyth](https://github.com/loganfsmyth))
+* `babel-preset-env`
+  * [#8391](https://github.com/babel/babel/pull/8391) Ensure preset-env doesn't clobber browserslist defaults. ([@existentialism](https://github.com/existentialism))
+* `babel-core`
+  * [#8376](https://github.com/babel/babel/pull/8376) Fix order of optional argument reordering. ([@Qix-](https://github.com/Qix-))
+  * [#8381](https://github.com/babel/babel/pull/8381) Allow an Array for `babelrcRoots`.. ([@wtgtybhertgeghgtwtg](https://github.com/wtgtybhertgeghgtwtg))
+  * [#8342](https://github.com/babel/babel/pull/8342) Do not mutate ast. ([@thiagoarrais](https://github.com/thiagoarrais))
+* `babel-parser`
+  * [#8374](https://github.com/babel/babel/pull/8374) Correctly parse interface methods named 'static'. ([@bakkot](https://github.com/bakkot))
+
+#### :nail_care: Polish
+* `babel-parser`
+  * [#8355](https://github.com/babel/babel/pull/8355) remove .then from `dynamic import` parser exception message. ([@dnalborczyk](https://github.com/dnalborczyk))
+
+#### :house: Internal
+* `babel-core`, `babel-preset-stage-0`, `babel-preset-stage-1`, `babel-preset-stage-2`, `babel-preset-stage-3`, `babel-standalone`
+  * [#8397](https://github.com/babel/babel/pull/8397) Remove our own use of stage presets. ([@hzoo](https://github.com/hzoo))
+* `babel-helpers`, `babel-plugin-proposal-class-properties`
+  * [#8318](https://github.com/babel/babel/pull/8318) Save full descriptor instead of only value for private fields.. ([@nicolo-ribaudo](https://github.com/nicolo-ribaudo))
+* `babel-core`
+  * [#8381](https://github.com/babel/babel/pull/8381) Allow an Array for `babelrcRoots`.. ([@wtgtybhertgeghgtwtg](https://github.com/wtgtybhertgeghgtwtg))
+* `babel-cli`, `babel-core`, `babel-generator`, `babel-helper-define-map`, `babel-helper-fixtures`, `babel-helper-module-imports`, `babel-helper-module-transforms`, `babel-helper-regex`, `babel-helper-simple-access`, `babel-helper-transform-fixture-test-runner`, `babel-node`, `babel-plugin-transform-block-scoping`, `babel-register`, `babel-template`, `babel-traverse`, `babel-types`
+  * [#8377](https://github.com/babel/babel/pull/8377) Bumped lodash to 4.17.10. ([@Berkmann18](https://github.com/Berkmann18))
+
 ## v7.0.0-beta.54 (2018-07-16)
 
 > Regarding https://github.com/babel/babel/issues/8184, we aren't using `micromatch` for paths, just basic `*/**` substitution now. For anything more complicated we will recommend using a regex/`.js` config.
@@ -40,7 +1052,7 @@ See [Babylon's CHANGELOG](packages/babylon/CHANGELOG.md) for the Babylon pre-7.0
 ## v7.0.0-beta.53 (2018-07-11)
 
 - Fix for regression with paths on windows due to micromatch upgrade, remove yearly presets (not published)
-- (There was an issue with the Stage presets in this release, but it is also deprecated) 
+- (There was an issue with the Stage presets in this release, but it is also deprecated)
 
 #### :boom: Breaking Change
 * `babel-*`
@@ -1694,7 +2706,7 @@ Initial release of typescript equivalent of how Babel handles flow with a new `b
 * `babel-plugin-check-es2015-constants`
   * [#5930](https://github.com/babel/babel/pull/5930) Spec compliancy of check-es2015-constants plugin. ([@maurobringolf](https://github.com/maurobringolf))
 
-> Instead of throwing a compile time error when const is violated, Babel should insert a throw statement before the violation. 
+> Instead of throwing a compile time error when const is violated, Babel should insert a throw statement before the violation.
 
 #### :boom: Breaking Change
 * `babel-plugin-transform-flow-comments`
@@ -2261,7 +3273,7 @@ Also started Babel to compile itself with Babel 7! (We'll be working on making i
 
 #### :nail_care: Polish
 * `babel-register`
-  * [#5411](https://github.com/babel/babel/pull/5411) Seperate version env cache files. ([@pwmckenna](https://github.com/pwmckenna))
+  * [#5411](https://github.com/babel/babel/pull/5411) Separate version env cache files. ([@pwmckenna](https://github.com/pwmckenna))
 
 #### :memo: Documentation
 * `babel-plugin-transform-runtime`
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9c5a3ec7910c..e7b9bd953b54 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -310,7 +310,7 @@ Note that the code shown in Chrome DevTools is compiled code and therefore diffe
 - Create a new issue that describes the proposal (ex: [#538](https://github.com/babel/babylon/issues/538)). Include any relevant information like proposal repo/author, examples, parsing approaches, meeting notes, presentation slides, and more.
 - The pull request should include:
   - [ ] An update to the [plugins](https://github.com/babel/babel/tree/master/packages/babel-parser#plugins) part of the readme. Add a new entry to that list for the new plugin flag (and link to the proposal)
-  - [ ] If any new nodes or modifications need to be added to the AST, update [ast/spec.md](https://github.com/babel/babel/bloc/master/packages/babel-parser/ast/spec.md)
+  - [ ] If any new nodes or modifications need to be added to the AST, update [ast/spec.md](https://github.com/babel/babel/blob/master/packages/babel-parser/ast/spec.md)
   - [ ] Make sure you use the `this.hasPlugin("plugin-name-here")` check in the babel parser so that your new plugin code only runs when that flag is turned on (not default behavior)
   - [ ] Add failing/passing tests according to spec behavior
 - Start working about the Babel transform itself!
diff --git a/Gulpfile.js b/Gulpfile.js
index a03b34f15915..5df9882ca3f2 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -6,19 +6,17 @@ const chalk = require("chalk");
 const newer = require("gulp-newer");
 const babel = require("gulp-babel");
 const gulpWatch = require("gulp-watch");
-const gutil = require("gulp-util");
+const fancyLog = require("fancy-log");
 const filter = require("gulp-filter");
 const gulp = require("gulp");
 const path = require("path");
 const webpack = require("webpack");
 const merge = require("merge-stream");
-const rollup = require("rollup-stream");
-const source = require("vinyl-source-stream");
-const buffer = require("vinyl-buffer");
+const rollup = require("rollup");
 const rollupBabel = require("rollup-plugin-babel");
 const rollupNodeResolve = require("rollup-plugin-node-resolve");
-const registerStandalonePackageTask = require("./scripts/gulp-tasks")
-  .registerStandalonePackageTask;
+const rollupReplace = require("rollup-plugin-replace");
+const { registerStandalonePackageTask } = require("./scripts/gulp-tasks");
 
 const sources = ["codemods", "packages"];
 
@@ -36,13 +34,9 @@ function getIndexFromPackage(name) {
   return `${name}/src/index.js`;
 }
 
-function compilationLogger(rollup) {
+function compilationLogger() {
   return through.obj(function(file, enc, callback) {
-    gutil.log(
-      `Compiling '${chalk.cyan(file.relative)}'${
-        rollup ? " with rollup " : ""
-      }...`
-    );
+    fancyLog(`Compiling '${chalk.cyan(file.relative)}'...`);
     callback(null, file);
   });
 }
@@ -50,7 +44,7 @@ function compilationLogger(rollup) {
 function errorsLogger() {
   return plumber({
     errorHandler(err) {
-      gutil.log(err.stack);
+      fancyLog(err.stack);
     },
   });
 }
@@ -91,32 +85,40 @@ function buildBabel(exclude) {
 }
 
 function buildRollup(packages) {
-  return merge(
+  return Promise.all(
     packages.map(pkg => {
-      return rollup({
-        input: getIndexFromPackage(pkg),
-        format: "cjs",
-        plugins: [
-          rollupBabel({
-            envName: "babel-parser",
-          }),
-          rollupNodeResolve(),
-        ],
-      })
-        .pipe(source("index.js"))
-        .pipe(buffer())
-        .pipe(errorsLogger())
-        .pipe(compilationLogger(/* rollup */ true))
-        .pipe(gulp.dest(path.join(pkg, "lib")));
+      const input = getIndexFromPackage(pkg);
+      fancyLog(`Compiling '${chalk.cyan(input)}' with rollup ...`);
+      return rollup
+        .rollup({
+          input,
+          plugins: [
+            rollupReplace({
+              "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV),
+            }),
+            rollupBabel({
+              envName: "babel-parser",
+            }),
+            rollupNodeResolve(),
+          ],
+        })
+        .then(bundle => {
+          return bundle.write({
+            file: path.join(pkg, "lib/index.js"),
+            format: "cjs",
+            name: "babel-parser",
+            sourcemap: process.env.NODE_ENV !== "production",
+          });
+        });
     })
   );
 }
 
-gulp.task("build", function() {
-  const bundles = ["packages/babel-parser"];
+const bundles = ["packages/babel-parser"];
 
-  return merge([buildBabel(/* exclude */ bundles), buildRollup(bundles)]);
-});
+gulp.task("build-rollup", () => buildRollup(bundles));
+gulp.task("build-babel", () => buildBabel(/* exclude */ bundles));
+gulp.task("build", gulp.parallel("build-rollup", "build-babel"));
 
 gulp.task("default", gulp.series("build"));
 
@@ -138,7 +140,7 @@ registerStandalonePackageTask(
   "babel",
   "Babel",
   path.join(__dirname, "packages"),
-  require("./packages/babel-core/package.json").version
+  require("./packages/babel-standalone/package.json").version
 );
 
 const presetEnvWebpackPlugins = [
@@ -167,6 +169,6 @@ registerStandalonePackageTask(
   "babel-preset-env",
   "babelPresetEnv",
   path.join(__dirname, "packages"),
-  require("./packages/babel-preset-env/package.json").version,
+  require("./packages/babel-preset-env-standalone/package.json").version,
   presetEnvWebpackPlugins
 );
diff --git a/LICENSE b/LICENSE
index a06ec0e70f28..f31575ec773b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2018 Sebastian McKenzie and other contributors
+Copyright (c) 2014-present Sebastian McKenzie and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/Makefile b/Makefile
index 0e50484068f1..5fa5cb0cfdbf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 MAKEFLAGS = -j1
-FLOW_COMMIT = bea8b83f50f597454941d2a7ecef6e93a881e576
-TEST262_COMMIT = f90a52b39609a620c0854e0bd0b3a906c930fd17
+FLOW_COMMIT = 09669846b7a7ca5a6c23c12d56bb3bebdafd67e9
+TEST262_COMMIT = de567d3aa5de4eaa11e00131d26b9fe77997dfb0
 
 # Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
 export FORCE_COLOR = true
@@ -11,12 +11,13 @@ SOURCES = packages codemods
 
 build: clean clean-lib
 	./node_modules/.bin/gulp build
+	node ./packages/babel-standalone/scripts/generate.js
 	node ./packages/babel-types/scripts/generateTypeHelpers.js
 	# call build again as the generated files might need to be compiled again.
 	./node_modules/.bin/gulp build
 	# generate flow and typescript typings
-	node scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
-	node scripts/generators/typescript.js > ./packages/babel-types/lib/index.d.ts
+	node packages/babel-types/scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
+	node packages/babel-types/scripts/generators/typescript.js > ./packages/babel-types/lib/index.d.ts
 ifneq ("$(BABEL_COVERAGE)", "true")
 	make build-standalone
 	make build-preset-env-standalone
@@ -28,6 +29,12 @@ build-standalone:
 build-preset-env-standalone:
 	./node_modules/.bin/gulp build-babel-preset-env-standalone
 
+prepublish-build-standalone:
+	BABEL_ENV=production IS_PUBLISH=true ./node_modules/.bin/gulp build-babel-standalone
+
+prepublish-build-preset-env-standalone:
+	BABEL_ENV=production IS_PUBLISH=true ./node_modules/.bin/gulp build-babel-preset-env-standalone
+
 build-dist: build
 	cd packages/babel-polyfill; \
 	scripts/build-dist.sh
@@ -40,7 +47,8 @@ watch: clean clean-lib
 	# development too.
 	BABEL_ENV=development ./node_modules/.bin/gulp build-no-bundle
 	node ./packages/babel-types/scripts/generateTypeHelpers.js
-	node scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
+	node packages/babel-types/scripts/generators/flow.js > ./packages/babel-types/lib/index.js.flow
+	node packages/babel-types/scripts/generators/typescript.js > ./packages/babel-types/lib/index.d.ts
 	BABEL_ENV=development ./node_modules/.bin/gulp watch
 
 flow:
@@ -56,6 +64,7 @@ fix-json:
 	./node_modules/.bin/prettier "{packages,codemod}/*/test/fixtures/**/options.json" --write --loglevel warn
 
 clean: test-clean
+	rm -f .npmrc
 	rm -rf packages/babel-polyfill/browser*
 	rm -rf packages/babel-polyfill/dist
 	rm -rf coverage
@@ -82,7 +91,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:
@@ -96,7 +105,7 @@ test-flow-update-whitelist:
 bootstrap-test262:
 	rm -rf ./build/test262
 	mkdir -p ./build
-	git clone --branch=master --single-branch --shallow-since=2017-01-01 https://github.com/tc39/test262.git ./build/test262
+	git clone --branch=master --single-branch --shallow-since=2019-01-01 https://github.com/tc39/test262.git ./build/test262
 	cd build/test262 && git checkout $(TEST262_COMMIT)
 
 test-test262:
@@ -115,22 +124,39 @@ prepublish-build:
 	rm -rf packages/babel-runtime/helpers
 	rm -rf packages/babel-runtime-corejs2/helpers
 	rm -rf packages/babel-runtime-corejs2/core-js
-	BABEL_ENV=production make build-dist
+	NODE_ENV=production BABEL_ENV=production make build-dist
 	make clone-license
 
 prepublish:
-	git pull --rebase
+	make bootstrap-only
 	make prepublish-build
 	make test
 
+new-version:
+	git pull --rebase
+	./node_modules/.bin/lerna version --force-publish="@babel/runtime,@babel/runtime-corejs2,@babel/runtime-corejs3,@babel/standalone,@babel/preset-env-standalone"
+
+# NOTE: Run make new-version first
 publish: prepublish
-	# --only-explicit-updates
-	./node_modules/.bin/lerna publish
+	./node_modules/.bin/lerna publish from-git --require-scripts
 	make clean
 
-bootstrap: clean-all
+publish-ci: prepublish
+ifneq ("$(NPM_TOKEN)", "")
+	echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
+else
+	echo "Missing NPM_TOKEN env var"
+	exit 1
+endif
+	./node_modules/.bin/lerna publish from-git --require-scripts --yes
+	rm -f .npmrc
+	make clean
+
+bootstrap-only: clean-all
 	yarn --ignore-engines
 	./node_modules/.bin/lerna bootstrap -- --ignore-engines
+
+bootstrap: bootstrap-only
 	make build
 	cd packages/babel-plugin-transform-runtime; \
 	node scripts/build-dist.js
diff --git a/README.md b/README.md
index cc2f50d52efa..579b85a7cd88 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,16 @@
   The compiler for writing next generation JavaScript.
 </p>
 
+<p align="center">
+    <a href="https://www.npmjs.com/package/@babel/core"><img alt="v7 npm Downloads" src="https://img.shields.io/npm/dm/@babel/core.svg?maxAge=43200&label=v7%20downloads"></a>
+  <a href="https://www.npmjs.com/package/babel-core"><img alt="v6 npm Downloads" src="https://img.shields.io/npm/dm/babel-core.svg?maxAge=43200&label=v6%20downloads"></a>
+</p>
 <p align="center">
   <a href="https://travis-ci.org/babel/babel"><img alt="Travis Status" src="https://img.shields.io/travis/babel/babel/master.svg?label=travis&maxAge=43200"></a>
   <a href="https://circleci.com/gh/babel/babel"><img alt="CircleCI Status" src="https://img.shields.io/circleci/project/github/babel/babel/master.svg?label=circle&maxAge=43200"></a>
   <a href="https://codecov.io/github/babel/babel"><img alt="Coverage Status" src="https://img.shields.io/codecov/c/github/babel/babel/master.svg?maxAge=43200"></a>
   <a href="https://slack.babeljs.io/"><img alt="Slack Status" src="https://slack.babeljs.io/badge.svg"></a>
-  <a href="https://www.npmjs.com/package/babel-core"><img alt="npm Downloads" src="https://img.shields.io/npm/dm/babel-core.svg?maxAge=43200"></a>
+  <a href="https://twitter.com/intent/follow?screen_name=babeljs"><img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/babeljs.svg?style=social&label=Follow"></a>
 </p>
 
 <h2 align="center">Supporting Babel</h2>
@@ -27,11 +31,11 @@
 Babel (pronounced ["babble"](https://soundcloud.com/sebmck/how-to-pronounce-babel))  is a community-driven project used by many companies and projects, and is maintained by a group of [volunteers](https://babeljs.io/team). If you'd like to help support the future of the project, please consider:
 
 - Giving developer time on the project. (Message us on [Twitter](https://twitter.com/babeljs) or [Slack](https://slack.babeljs.io/) for guidance!)
-- Giving funds by becoming a sponsor (see below)!
+- Giving funds by becoming a sponsor on [Open Collective](https://opencollective.com/babel) or [Patreon](https://www.patreon.com/henryzhu)!
 
-## Open Collective Sponsors
+## Sponsors
 
-Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/babel#sponsor)]
+Our top sponsors are shown below! [[Become a sponsor](https://opencollective.com/babel#sponsor)]
 
 <a href="https://opencollective.com/babel/sponsor/0/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/0/avatar.svg"></a>
 <a href="https://opencollective.com/babel/sponsor/1/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/1/avatar.svg"></a>
@@ -48,35 +52,6 @@ Become a sponsor and get your logo on our README on Github with a link to your s
   <a href="https://opencollective.com/babel/sponsor/12/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/12/avatar.svg"></a>
   <a href="https://opencollective.com/babel/sponsor/13/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/13/avatar.svg"></a>
   <a href="https://opencollective.com/babel/sponsor/14/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/14/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/15/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/15/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/16/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/16/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/17/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/17/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/18/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/18/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/19/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/19/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/20/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/20/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/21/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/21/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/22/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/22/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/23/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/23/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/24/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/24/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/25/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/25/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/26/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/26/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/27/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/27/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/28/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/28/avatar.svg"></a>
-  <a href="https://opencollective.com/babel/sponsor/29/website" target="_blank"><img src="https://opencollective.com/babel/sponsor/29/avatar.svg"></a>
-
-## Patreon Sponsors
-
-Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://www.patreon.com/henryzhu)]
-
-## Silver
-
-<a href="https://issue.sh/?utm_medium=github&utm_campaign=babel" target="_blank"><img src="https://user-images.githubusercontent.com/5557143/43912065-c8cdff78-9c33-11e8-829a-0b4166ccc215.png"></a>
-
-## Bronze
-
-<a href="http://teamextension.io/" target="_blank"><img src="https://teamextension.io/dist/img/logo/te-logo-compact.png" height="64"></a>
-<a href="https://webflow.com/" target="_blank"><img src="https://opencollective.com/proxy/images/?src=https%3A%2F%2Fopencollective-production.s3-us-west-1.amazonaws.com%2F4a5024b0-8cf2-11e7-b1a2-b30b1de1463c.png&height=64"></a>
-<p><a href="https://twitter.com/mikesherov">Mike Sherov</a></p>
 
 ## Intro
 
@@ -103,11 +78,11 @@ Try it out at our [REPL](https://babeljs.io/repl/build/master#?code_lz=NoRgNATGD
 
 ### Who maintains Babel?
 
-Mostly a handful of volunteers! Please check out our [team page](https://babeljs.io/team)!
+Mostly a handful of volunteers, funded by you! Please check out our [team page](https://babeljs.io/team)!
 
 ### Looking for support?
 
-For questions and support please visit join our [Slack Community](https://slack.babeljs.io/) (you can sign-up [here](https://slack.babeljs.io/) for an invite), ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/babeljs), or ping us on [Twitter](https://twitter.com/babeljs).
+For questions and support please join our [Slack Community](https://slack.babeljs.io/) (you can sign-up [here](https://slack.babeljs.io/) for an invite), ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/babeljs), or ping us on [Twitter](https://twitter.com/babeljs).
 
 ### Is there a Babel song?
 
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000000..7fe81999cccc
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+This is the list of versions of `babel` which are
+currently being supported with security updates.
+
+| Version  | Supported          |
+| -------- | ------------------ |
+| 7.x      | :white_check_mark: |
+| 6.26.x   | :white_check_mark: |
+| < 6.26.0 | :x:                |
+
+## Reporting a Vulnerability
+
+To report a vulnerability please send an email with the details to security@babeljs.io. 
+This will help us to assess the risk and start the necessary steps.
+
+Thanks for helping to keep babel secure.
diff --git a/SONG.md b/SONG.md
index a6939e15af28..234b5ed3e373 100644
--- a/SONG.md
+++ b/SONG.md
@@ -19,7 +19,8 @@ Generators, const and let
 I used them all without regret  
 And it’s a terse and a destructured Hallelujah  
 
-Hallelujah etc.
+Hallelujah, Hallelujah  
+Hallelujah, Hallelujah
 
 Well my faith was strong but I needed proof  
 The standard was my source of truth  
@@ -28,7 +29,9 @@ So even though you weren’t impressed
 I checked the build against the spec  
 And it’s a more-or-less compliant Hallelujah  
 
-Hallelujah etc.
+
+Hallelujah, Hallelujah  
+Hallelujah, Hallelujah
 
 Now you say the build step’s too complex  
 And you claim no need for ES Next  
@@ -37,7 +40,9 @@ But your code grows older with each line
 It’s a joyless dirge on a withered vine  
 It’s a threnody for a bygone Hallelujah  
 
-Hallelujah etc.
+
+Hallelujah, Hallelujah  
+Hallelujah, Hallelujah
 
 Yes I learned about the danger signs  
 How they’d polyfilled a thousand lines  
@@ -46,7 +51,9 @@ Still I disregarded common sense
 Now my source is small but the build’s immense  
 And it’s a slow and unresponsive Hallelujah  
 
-Hallelujah etc.
+
+Hallelujah, Hallelujah  
+Hallelujah, Hallelujah
 
 There was a time when they let me know  
 What’s really going on below  
@@ -55,7 +62,9 @@ And debugging’s not a progress march
 It’s a frenzied fumble in the dark  
 It’s a labyrinthine search for Hallelujah  
 
-Hallelujah etc.
+
+Hallelujah, Hallelujah  
+Hallelujah, Hallelujah
 
 Well, maybe there’s a god up there  
 But all I ever got from prayers  
@@ -64,6 +73,8 @@ And that anguished cry you hear at night
 Is the plugin I forgot to write  
 It’s a cold and it’s a broken Hallelujah  
 
-Hallelujah etc.
+
+Hallelujah, Hallelujah  
+Hallelujah, Hallelujah
 
 [Angus Croll](https://github.com/angus-c)  
diff --git a/babel.config.js b/babel.config.js
index ce4eb1d5653c..82966a7f07ca 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -5,21 +5,26 @@ module.exports = function(api) {
 
   const includeCoverage = process.env.BABEL_COVERAGE === "true";
 
-  const envOpts = {
+  const envOptsNoTargets = {
     loose: true,
     modules: false,
     exclude: ["transform-typeof-symbol"],
   };
+  const envOpts = Object.assign({}, envOptsNoTargets);
 
   let convertESM = true;
   let ignoreLib = true;
   let includeRuntime = false;
+  const nodeVersion = "6.9";
 
   switch (env) {
     // Configs used during bundling builds.
     case "babel-parser":
       convertESM = false;
       ignoreLib = false;
+      envOpts.targets = {
+        node: nodeVersion,
+      };
       break;
     case "standalone":
       convertESM = false;
@@ -29,7 +34,7 @@ module.exports = function(api) {
     case "production":
       // Config during builds before publish.
       envOpts.targets = {
-        node: "6.9",
+        node: nodeVersion,
       };
       break;
     case "development":
@@ -93,6 +98,11 @@ module.exports = function(api) {
           convertESM ? "@babel/transform-modules-commonjs" : null,
         ].filter(Boolean),
       },
+      {
+        test: "./packages/babel-polyfill",
+        presets: [["@babel/env", envOptsNoTargets]],
+        plugins: [["@babel/transform-modules-commonjs", { lazy: false }]],
+      },
       {
         // The vast majority of our src files are modules, but we use
         // unambiguous to keep things simple until we get around to renaming
@@ -111,9 +121,11 @@ module.exports = function(api) {
           "packages/babel-runtime",
           /[\\/]node_modules[\\/](?:@babel\/runtime|babel-runtime|core-js)[\\/]/,
         ],
-        plugins: [includeRuntime ? "@babel/transform-runtime" : null].filter(
-          Boolean
-        ),
+        plugins: [
+          includeRuntime
+            ? ["@babel/transform-runtime", { version: "7.4.4" }]
+            : null,
+        ].filter(Boolean),
       },
     ].filter(Boolean),
   };
diff --git a/codecov.yml b/codecov.yml
index 9937c4cc4949..ed4545a1bf7d 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -8,3 +8,5 @@ coverage:
         target: "80%"
     patch:
       enabled: false
+ignore:
+  - packages/babel-types/src/*/generated/index.js
diff --git a/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/input.js b/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/input.js
deleted file mode 100644
index 520eab559fbd..000000000000
--- a/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-try {
-  throw 0;
-} catch (e) {
-  let e = new TypeError('Duplicate variable declaration; will throw an error.');
-}
diff --git a/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/options.json b/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/options.json
deleted file mode 100644
index ab01b7471a66..000000000000
--- a/codemods/babel-plugin-codemod-optional-catch-binding/test/fixtures/codemod-optional-catch-binding/try-catch-block-duplicate-variable-declaration/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "plugins": ["../../../../lib"],
-  "throws": "Duplicate declaration \"e\""
-}
diff --git a/eslint-local-rules.js b/eslint-local-rules.js
deleted file mode 100644
index 73af83e4840e..000000000000
--- a/eslint-local-rules.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-const noDeprecatedClone = require("./scripts/eslint_rules/no-deprecated-clone");
-const noUndefinedIdentifier = require("./scripts/eslint_rules/no-undefined-identifier");
-
-module.exports = {
-  "no-deprecated-clone": noDeprecatedClone,
-  "no-undefined-identifier": noUndefinedIdentifier,
-};
diff --git a/lerna.json b/lerna.json
index 0a083def2273..10d091d9337f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,34 +1,34 @@
 {
-  "lerna": "2.11.0",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "changelog": {
     "repo": "babel/babel",
     "cacheDir": ".changelog",
     "labels": {
-      "PR: Spec Compliancy :eyeglasses:": ":eyeglasses: Spec Compliancy",
+      "PR: Spec Compliance :eyeglasses:": ":eyeglasses: Spec Compliance",
       "PR: Breaking Change :boom:": ":boom: Breaking Change",
       "PR: New Feature :rocket:": ":rocket: New Feature",
       "PR: Bug Fix :bug:": ":bug: Bug Fix",
       "PR: Polish :nail_care:": ":nail_care: Polish",
       "PR: Docs :memo:": ":memo: Documentation",
-      "PR: Internal :house:": ":house: Internal"
+      "PR: Internal :house:": ":house: Internal",
+      "PR: Performance :running_woman:": ":running_woman: Performance"
     }
   },
-  "commands": {
+  "command": {
     "publish": {
-      "ignore": [
+      "ignoreChanges": [
         "*.md",
-        "*.json",
         "*.txt",
         "test/**",
         "codemods/**",
-        "package.json"
+        "# We ignore every JSON file, except for built-in-modules, built-ins and plugins defined in babel-preset-env/data.",
+        "@(!(built-in-modules|built-ins|plugins|package)).json"
       ]
     }
   },
   "packages": [
-    "packages/*",
-    "codemods/*"
+    "codemods/*",
+    "packages/*"
   ],
   "npmClient": "yarn",
   "npmClientArgs": [
diff --git a/lib/third-party-libs.js.flow b/lib/third-party-libs.js.flow
index 74913a5df11a..c21a2797acfe 100644
--- a/lib/third-party-libs.js.flow
+++ b/lib/third-party-libs.js.flow
@@ -2,12 +2,6 @@
  * Basic declarations for the npm modules we use.
  */
 
-declare module "micromatch" {
-  declare module.exports: {
-    (Array<string>, Array<string>, ?{ nocase: boolean }): Array<string>,
-  };
-}
-
 declare module "resolve" {
   declare export default {
     sync: (string, {| basedir: string |}) => string;
@@ -33,16 +27,31 @@ declare module "lodash/merge" {
 }
 
 declare module "semver" {
+  declare class SemVer {
+    build: Array<string>;
+    loose: ?boolean;
+    major: number;
+    minor: number;
+    patch: number;
+    prerelease: Array<string | number>;
+    raw: string;
+    version: string;
+
+    constructor(version: string | SemVer): SemVer;
+  }
+
   declare module.exports: {
-    valid(v: string): boolean;
+    SemVer: SemVer;
+
+    coerce(version: string | SemVer): SemVer | null;
     gt(v1: string, v2: string): boolean;
+    intersects(r1: string, r2: string): boolean;
     lt(v1: string, v2: string): boolean;
     major(v: string): number;
     minor(v: string): number;
     patch(v: string): number;
     satisfies(v1: string, r1: string): boolean;
-
-    intersects(r1: string, r2: string): boolean;
+    valid(v: string): boolean;
   }
 }
 
@@ -186,3 +195,13 @@ declare module "js-levenshtein" {
     (string, string): number,
   };
 }
+
+declare module "core-js-compat/data" {
+  declare type Target = "node" | "chrome" | "opera" | "edge" | "firefox" | "safari" | "ie" | "ios" | "android" | "electron" | "samsung";
+
+  declare module.exports: {
+    [key: string]: {
+      [target: Target]: string;
+    }
+  }
+}
diff --git a/package.json b/package.json
index 3dd415a9d732..bd04e0638455 100644
--- a/package.json
+++ b/package.json
@@ -6,73 +6,75 @@
     "build": "make build",
     "fix": "make fix",
     "lint": "make lint",
-    "precommit": "lint-staged",
     "test": "make test"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.0.0",
-    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
-    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
+    "@babel/cli": "^7.4.4",
+    "@babel/core": "^7.4.5",
+    "@babel/eslint-plugin-development": "^1.0.1",
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/plugin-proposal-export-namespace-from": "^7.2.0",
+    "@babel/plugin-proposal-numeric-separator": "^7.2.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.4.4",
+    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/preset-env": "^7.4.5",
     "@babel/preset-flow": "^7.0.0",
-    "@babel/register": "^7.0.0",
-    "@babel/runtime": "^7.0.0",
-    "babel-core": "^7.0.0-0",
-    "babel-eslint": "^9.0.0",
-    "babel-jest": "^23.4.0",
-    "babel-loader": "8.0.0-beta.4",
-    "babel-plugin-transform-charcodes": "^0.1.0",
-    "browserify": "^16.2.2",
+    "@babel/register": "^7.4.4",
+    "@babel/runtime": "^7.4.5",
+    "babel-eslint": "^11.0.0-beta.0",
+    "babel-jest": "^24.8.0",
+    "babel-loader": "^8.0.6",
+    "babel-plugin-transform-charcodes": "^0.2.0",
+    "browserify": "^16.2.3",
     "bundle-collapser": "^1.2.1",
-    "chalk": "^2.3.2",
-    "charcodes": "^0.1.0",
+    "chalk": "^2.4.2",
+    "charcodes": "^0.2.0",
     "derequire": "^2.0.2",
+    "duplicate-package-checker-webpack-plugin": "^2.1.0",
     "enhanced-resolve": "^3.0.0",
-    "eslint": "^5.3.0",
-    "eslint-config-babel": "^8.0.0",
-    "eslint-plugin-flowtype": "^2.50.0",
-    "eslint-plugin-local-rules": "0.1.0",
-    "eslint-plugin-prettier": "^2.6.2",
-    "flow-bin": "^0.80.0",
-    "graceful-fs": "^4.1.11",
-    "gulp": "^4.0.0",
-    "gulp-babel": "^8.0.0-beta.2",
+    "eslint": "^5.16.0",
+    "eslint-config-babel": "^9.0.0",
+    "eslint-plugin-flowtype": "^3.8.2",
+    "eslint-plugin-import": "^2.17.2",
+    "eslint-plugin-prettier": "^3.1.0",
+    "fancy-log": "^1.3.3",
+    "flow-bin": "^0.94.0",
+    "graceful-fs": "^4.1.15",
+    "gulp": "^4.0.2",
+    "gulp-babel": "^8.0.0",
     "gulp-filter": "^5.1.0",
     "gulp-newer": "^1.0.0",
-    "gulp-plumber": "^1.0.1",
-    "gulp-rename": "^1.2.2",
-    "gulp-uglify": "^3.0.0",
-    "gulp-util": "^3.0.7",
-    "gulp-watch": "^5.0.0",
-    "husky": "^0.14.3",
-    "jest": "^23.4.1",
-    "lerna": "^2.11.0",
+    "gulp-plumber": "^1.2.1",
+    "gulp-rename": "^1.4.0",
+    "gulp-uglify": "^3.0.2",
+    "gulp-watch": "^5.0.1",
+    "husky": "^2.3.0",
+    "jest": "^24.8.0",
+    "lerna": "^3.14.2",
     "lerna-changelog": "^0.5.0",
-    "lint-staged": "^6.0.1",
-    "lodash": "^4.17.10",
+    "lint-staged": "^8.1.7",
+    "lodash": "^4.17.13",
     "merge-stream": "^1.0.1",
     "output-file-sync": "^2.0.0",
-    "prettier": "^1.13.7",
-    "pump": "^1.0.2",
-    "rimraf": "^2.4.3",
-    "rollup-plugin-babel": "^4.0.0-beta.0",
-    "rollup-plugin-node-resolve": "^3.0.2",
-    "rollup-stream": "^1.24.1",
+    "prettier": "^1.17.1",
+    "pump": "^3.0.0",
+    "rimraf": "^2.6.3",
+    "rollup": "^1.12.0",
+    "rollup-plugin-babel": "^4.0.0",
+    "rollup-plugin-node-resolve": "^5.0.0",
+    "rollup-plugin-replace": "^2.2.0",
     "test262-stream": "^1.2.0",
     "through2": "^2.0.0",
-    "uglify-js": "^2.4.16",
-    "vinyl-buffer": "^1.0.1",
-    "vinyl-source-stream": "^2.0.0",
+    "warnings-to-errors-webpack-plugin": "^2.0.0",
     "webpack": "^3.4.1",
     "webpack-dependency-suite": "^2.4.4",
     "webpack-stream": "^4.0.0"
   },
+  "resolutions": {
+    "@lerna/**/@lerna/collect-updates": "https://github.com/babel/lerna.git#babel-collect-updates"
+  },
   "engines": {
-    "node": ">= 6.9.0 <= 11.0.0-0",
+    "node": ">= 6.9.0 < 13.0.0",
     "npm": ">= 3.x <= 6.x",
     "yarn": ">=0.27.5 || >=1.0.0-20170811"
   },
@@ -81,6 +83,11 @@
       "eslint --format=codeframe"
     ]
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
   "jest": {
     "collectCoverageFrom": [
       "packages/*/src/**/*.mjs",
@@ -102,7 +109,9 @@
       "_browser\\.js"
     ],
     "testEnvironment": "node",
-    "setupTestFrameworkScriptFile": "<rootDir>/test/testSetupFile.js",
+    "setupFilesAfterEnv": [
+      "<rootDir>/test/testSetupFile.js"
+    ],
     "transformIgnorePatterns": [
       "/node_modules/",
       "<rootDir>/packages/babel-standalone/babel(\\.min)?\\.js",
@@ -121,6 +130,10 @@
       "/test/tmp/",
       "/test/__data__/",
       "<rootDir>/build/"
-    ]
-  }
+    ],
+    "moduleNameMapper": {
+      "^@babel/([a-zA-Z0-9_-]+)$": "<rootDir>/packages/babel-$1/"
+    }
+  },
+  "dependencies": {}
 }
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
index e5446c644c0e..0b4bd8731363 100644
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/cli",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Babel command line.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -23,21 +23,21 @@
     "convert-source-map": "^1.1.0",
     "fs-readdir-recursive": "^1.1.0",
     "glob": "^7.0.0",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.13",
     "mkdirp": "^0.5.1",
     "output-file-sync": "^2.0.0",
     "slash": "^2.0.0",
     "source-map": "^0.5.0"
   },
   "optionalDependencies": {
-    "chokidar": "^2.0.3"
+    "chokidar": "^2.0.4"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/helper-fixtures": "^7.0.0"
+    "@babel/core": "^7.5.5",
+    "@babel/helper-fixtures": "^7.5.5"
   },
   "bin": {
     "babel": "./bin/babel.js",
diff --git a/packages/babel-cli/src/babel/file.js b/packages/babel-cli/src/babel/file.js
index 31433b33da3f..f0678e27ed39 100644
--- a/packages/babel-cli/src/babel/file.js
+++ b/packages/babel-cli/src/babel/file.js
@@ -137,7 +137,11 @@ export default async function({ cliOptions, babelOptions }) {
         const dirname = filename;
 
         util
-          .readdirForCompilable(filename, cliOptions.includeDotfiles)
+          .readdirForCompilable(
+            filename,
+            cliOptions.includeDotfiles,
+            cliOptions.extensions,
+          )
           .forEach(function(filename) {
             _filenames.push(path.join(dirname, filename));
           });
diff --git a/packages/babel-cli/src/babel/options.js b/packages/babel-cli/src/babel/options.js
index 16a9c025bcd9..41cc0fb83e7f 100644
--- a/packages/babel-cli/src/babel/options.js
+++ b/packages/babel-cli/src/babel/options.js
@@ -22,7 +22,7 @@ commander.option(
   "comma-separated list of plugin names",
   collect,
 );
-commander.option("--config-file [path]", "Path a to .babelrc file to use");
+commander.option("--config-file [path]", "Path to a .babelrc file to use");
 commander.option(
   "--env-name [name]",
   "The name of the 'env' to use when loading configs and plugins. " +
@@ -81,7 +81,7 @@ commander.option(
   "print a comment after any injected non-user code",
 );
 
-// General soucemap formatting.
+// General source map formatting.
 commander.option("-s, --source-maps [true|false|inline|both]", "", booleanify);
 commander.option(
   "--source-map-target [string]",
@@ -221,36 +221,47 @@ export default function parseArgv(args: Array<string>) {
 
   const opts = commander.opts();
 
+  const babelOptions = {
+    presets: opts.presets,
+    plugins: opts.plugins,
+    rootMode: opts.rootMode,
+    configFile: opts.configFile,
+    envName: opts.envName,
+    sourceType: opts.sourceType,
+    ignore: opts.ignore,
+    only: opts.only,
+    retainLines: opts.retainLines,
+    compact: opts.compact,
+    minified: opts.minified,
+    auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
+    auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
+    sourceMaps: opts.sourceMaps,
+    sourceFileName: opts.sourceFileName,
+    sourceRoot: opts.sourceRoot,
+    moduleRoot: opts.moduleRoot,
+    moduleIds: opts.moduleIds,
+    moduleId: opts.moduleId,
+
+    // Commander will default the "--no-" arguments to true, but we want to
+    // leave them undefined so that @babel/core can handle the
+    // default-assignment logic on its own.
+    babelrc: opts.babelrc === true ? undefined : opts.babelrc,
+    highlightCode: opts.highlightCode === true ? undefined : opts.highlightCode,
+    comments: opts.comments === true ? undefined : opts.comments,
+  };
+
+  // If the @babel/cli version is newer than the @babel/core version, and we have added
+  // new options for @babel/core, we'll potentially get option validation errors from
+  // @babel/core. To avoid that, we delete undefined options, so @babel/core will only
+  // give the error if users actually pass an unsupported CLI option.
+  for (const key of Object.keys(babelOptions)) {
+    if (babelOptions[key] === undefined) {
+      delete babelOptions[key];
+    }
+  }
+
   return {
-    babelOptions: {
-      presets: opts.presets,
-      plugins: opts.plugins,
-      rootMode: opts.rootMode,
-      configFile: opts.configFile,
-      envName: opts.envName,
-      sourceType: opts.sourceType,
-      ignore: opts.ignore,
-      only: opts.only,
-      retainLines: opts.retainLines,
-      compact: opts.compact,
-      minified: opts.minified,
-      auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
-      auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
-      sourceMaps: opts.sourceMaps,
-      sourceFileName: opts.sourceFileName,
-      sourceRoot: opts.sourceRoot,
-      moduleRoot: opts.moduleRoot,
-      moduleIds: opts.moduleIds,
-      moduleId: opts.moduleId,
-
-      // Commander will default the "--no-" arguments to true, but we want to
-      // leave them undefined so that @babel/core can handle the
-      // default-assignment logic on its own.
-      babelrc: opts.babelrc === true ? undefined : opts.babelrc,
-      highlightCode:
-        opts.highlightCode === true ? undefined : opts.highlightCode,
-      comments: opts.comments === true ? undefined : opts.comments,
-    },
+    babelOptions,
     cliOptions: {
       filename: opts.filename,
       filenames,
diff --git a/packages/babel-cli/src/babel/util.js b/packages/babel-cli/src/babel/util.js
index ad972fd0cd15..99c9ae9b00cd 100644
--- a/packages/babel-cli/src/babel/util.js
+++ b/packages/babel-cli/src/babel/util.js
@@ -29,8 +29,11 @@ export function readdir(
 export function readdirForCompilable(
   dirname: string,
   includeDotfiles: boolean,
+  altExts?: Array<string>,
 ) {
-  return readdir(dirname, includeDotfiles, isCompilableExtension);
+  return readdir(dirname, includeDotfiles, function(filename) {
+    return isCompilableExtension(filename, altExts);
+  });
 }
 
 /**
diff --git a/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/in-files/src/bar/bar.es b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/in-files/src/bar/bar.es
new file mode 100644
index 000000000000..9e99278492df
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/in-files/src/bar/bar.es	
@@ -0,0 +1 @@
+ (() => 42)
\ No newline at end of file
diff --git a/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/in-files/src/foo.es b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/in-files/src/foo.es
new file mode 100644
index 000000000000..4bc9539528d4
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/in-files/src/foo.es	
@@ -0,0 +1 @@
+arr.map(x => x * MULTIPLIER);
diff --git a/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/options.json b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/options.json
new file mode 100644
index 000000000000..cb501c3b853c
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/options.json	
@@ -0,0 +1,3 @@
+{
+  "args": ["src", "--out-file", "test.js", "--extensions", ".es"]
+}
diff --git a/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/out-files/test.js b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/out-files/test.js
new file mode 100644
index 000000000000..d3e579815a50
--- /dev/null
+++ b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/out-files/test.js	
@@ -0,0 +1,10 @@
+"use strict";
+
+(function () {
+  return 42;
+});
+"use strict";
+
+arr.map(function (x) {
+  return x * MULTIPLIER;
+});
diff --git a/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/stdout.txt b/packages/babel-cli/test/fixtures/babel/dir --out-file --extensions/stdout.txt
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/babel-cli/test/index.js b/packages/babel-cli/test/index.js
index 0654cadf0d16..64f64273319c 100644
--- a/packages/babel-cli/test/index.js
+++ b/packages/babel-cli/test/index.js
@@ -86,7 +86,7 @@ const assertTest = function(stdout, stderr, opts, cwd) {
   }
 
   if (opts.outFiles) {
-    const actualFiles = readDir(path.join(tmpLoc), fileFilter);
+    const actualFiles = readDir(tmpLoc, fileFilter);
 
     Object.keys(actualFiles).forEach(function(filename) {
       if (
@@ -171,12 +171,12 @@ const buildTest = function(binName, testName, opts) {
 };
 
 fs.readdirSync(fixtureLoc).forEach(function(binName) {
-  if (binName[0] === ".") return;
+  if (binName.startsWith(".")) return;
 
   const suiteLoc = path.join(fixtureLoc, binName);
   describe("bin/" + binName, function() {
     fs.readdirSync(suiteLoc).forEach(function(testName) {
-      if (testName[0] === ".") return;
+      if (testName.startsWith(".")) return;
 
       const testLoc = path.join(suiteLoc, testName);
 
diff --git a/packages/babel-code-frame/package.json b/packages/babel-code-frame/package.json
index 7e0609b321b4..0b753eb11230 100644
--- a/packages/babel-code-frame/package.json
+++ b/packages/babel-code-frame/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/code-frame",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Generate errors that contain a code frame that point to source locations.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
diff --git a/packages/babel-code-frame/src/index.js b/packages/babel-code-frame/src/index.js
index 11e0095aa8ab..0aae7fabcd23 100644
--- a/packages/babel-code-frame/src/index.js
+++ b/packages/babel-code-frame/src/index.js
@@ -76,7 +76,7 @@ function getMarkerLines(
       } else if (i === 0) {
         const sourceLength = source[lineNumber - 1].length;
 
-        markerLines[lineNumber] = [startColumn, sourceLength - startColumn];
+        markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
       } else if (i === lineDiff) {
         markerLines[lineNumber] = [0, endColumn];
       } else {
@@ -112,15 +112,16 @@ export function codeFrameColumns(
   const maybeHighlight = (chalkFn, string) => {
     return highlighted ? chalkFn(string) : string;
   };
-  if (highlighted) rawLines = highlight(rawLines, opts);
-
   const lines = rawLines.split(NEWLINE);
   const { start, end, markerLines } = getMarkerLines(loc, lines, opts);
   const hasColumns = loc.start && typeof loc.start.column === "number";
 
   const numberMaxWidth = String(end).length;
 
-  let frame = lines
+  const highlightedLines = highlighted ? highlight(rawLines, opts) : rawLines;
+
+  let frame = highlightedLines
+    .split(NEWLINE)
     .slice(start, end)
     .map((line, index) => {
       const number = start + 1 + index;
diff --git a/packages/babel-code-frame/test/index.js b/packages/babel-code-frame/test/index.js
index c06214c5b4e5..23f724ee3209 100644
--- a/packages/babel-code-frame/test/index.js
+++ b/packages/babel-code-frame/test/index.js
@@ -102,6 +102,45 @@ describe("@babel/code-frame", function() {
     );
   });
 
+  test("opts.highlightCode with multiple columns and lines", function() {
+    // prettier-ignore
+    const rawLines = [
+      "function a(b, c) {", 
+      "  return b + c;", 
+      "}"
+    ].join("\n");
+
+    const result = codeFrameColumns(
+      rawLines,
+      {
+        start: {
+          line: 1,
+          column: 1,
+        },
+        end: {
+          line: 3,
+          column: 1,
+        },
+      },
+      {
+        highlightCode: true,
+        message: "Message about things",
+      },
+    );
+    const stripped = stripAnsi(result);
+    expect(stripped).toEqual(
+      // prettier-ignore
+      [
+        "> 1 | function a(b, c) {",
+        "    | ^^^^^^^^^^^^^^^^^^",
+        "> 2 |   return b + c;",
+        "    | ^^^^^^^^^^^^^^^",
+        "> 3 | }",
+        "    | ^ Message about things",
+      ].join('\n'),
+    );
+  });
+
   test("opts.linesAbove", function() {
     const rawLines = [
       "/**",
diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json
index e6fbbdc26ef8..56efb4a95fc5 100644
--- a/packages/babel-core/package.json
+++ b/packages/babel-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/core",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Babel compiler core.",
   "main": "lib/index.js",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
@@ -33,23 +33,23 @@
     "./lib/transform-file.js": "./lib/transform-file-browser.js"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.0.0",
-    "@babel/generator": "^7.0.0",
-    "@babel/helpers": "^7.1.0",
-    "@babel/parser": "^7.1.0",
-    "@babel/template": "^7.1.0",
-    "@babel/traverse": "^7.1.0",
-    "@babel/types": "^7.0.0",
+    "@babel/code-frame": "^7.5.5",
+    "@babel/generator": "^7.5.5",
+    "@babel/helpers": "^7.5.5",
+    "@babel/parser": "^7.5.5",
+    "@babel/template": "^7.4.4",
+    "@babel/traverse": "^7.5.5",
+    "@babel/types": "^7.5.5",
     "convert-source-map": "^1.1.0",
-    "debug": "^3.1.0",
-    "json5": "^0.5.0",
-    "lodash": "^4.17.10",
+    "debug": "^4.1.0",
+    "json5": "^2.1.0",
+    "lodash": "^4.17.13",
     "resolve": "^1.3.2",
     "semver": "^5.4.1",
     "source-map": "^0.5.0"
   },
   "devDependencies": {
-    "@babel/helper-transform-fixture-test-runner": "^7.0.0",
-    "@babel/register": "^7.0.0"
+    "@babel/helper-transform-fixture-test-runner": "^7.5.5",
+    "@babel/register": "^7.5.5"
   }
 }
diff --git a/packages/babel-core/src/config/caching.js b/packages/babel-core/src/config/caching.js
index c8db5a166c71..5b915e7f7767 100644
--- a/packages/babel-core/src/config/caching.js
+++ b/packages/babel-core/src/config/caching.js
@@ -54,6 +54,7 @@ function makeCachedFunction<
   ArgT,
   ResultT,
   SideChannel,
+  // $FlowIssue https://github.com/facebook/flow/issues/4528
   Cache: CacheMap<ArgT, ResultT, SideChannel>,
 >(
   callCache: Cache,
diff --git a/packages/babel-core/src/config/config-chain.js b/packages/babel-core/src/config/config-chain.js
index b9e13a130797..3bbedcdff1a9 100644
--- a/packages/babel-core/src/config/config-chain.js
+++ b/packages/babel-core/src/config/config-chain.js
@@ -67,7 +67,7 @@ export function buildPresetChain(
   return {
     plugins: dedupDescriptors(chain.plugins),
     presets: dedupDescriptors(chain.presets),
-    options: chain.options,
+    options: chain.options.map(o => normalizeOptions(o)),
   };
 }
 
@@ -155,6 +155,7 @@ export function buildRootChain(
   }
 
   let { babelrc, babelrcRoots } = opts;
+  let babelrcRootsDirectory = context.cwd;
 
   const configFileChain = emptyChain();
   if (configFile) {
@@ -168,6 +169,7 @@ export function buildRootChain(
       babelrc = validatedFile.options.babelrc;
     }
     if (babelrcRoots === undefined) {
+      babelrcRootsDirectory = validatedFile.dirname;
       babelrcRoots = validatedFile.options.babelrcRoots;
     }
 
@@ -185,7 +187,7 @@ export function buildRootChain(
   if (
     (babelrc === true || babelrc === undefined) &&
     pkgData &&
-    babelrcLoadEnabled(context, pkgData, babelrcRoots)
+    babelrcLoadEnabled(context, pkgData, babelrcRoots, babelrcRootsDirectory)
   ) {
     ({ ignore: ignoreFile, config: babelrcFile } = findRelativeConfig(
       pkgData,
@@ -229,6 +231,7 @@ function babelrcLoadEnabled(
   context: ConfigContext,
   pkgData: FilePackageData,
   babelrcRoots: BabelrcSearch | void,
+  babelrcRootsDirectory: string,
 ): boolean {
   if (typeof babelrcRoots === "boolean") return babelrcRoots;
 
@@ -243,7 +246,9 @@ function babelrcLoadEnabled(
   let babelrcPatterns = babelrcRoots;
   if (!Array.isArray(babelrcPatterns)) babelrcPatterns = [babelrcPatterns];
   babelrcPatterns = babelrcPatterns.map(pat => {
-    return typeof pat === "string" ? path.resolve(context.cwd, pat) : pat;
+    return typeof pat === "string"
+      ? path.resolve(babelrcRootsDirectory, pat)
+      : pat;
   });
 
   // Fast path to avoid having to match patterns if the babelrc is just
@@ -253,10 +258,12 @@ function babelrcLoadEnabled(
   }
 
   return babelrcPatterns.some(pat => {
-    if (typeof pat === "string") pat = pathPatternToRegex(pat, context.cwd);
+    if (typeof pat === "string") {
+      pat = pathPatternToRegex(pat, babelrcRootsDirectory);
+    }
 
     return pkgData.directories.some(directory => {
-      return matchPattern(pat, context.cwd, directory, context);
+      return matchPattern(pat, babelrcRootsDirectory, directory, context);
     });
   });
 }
diff --git a/packages/babel-core/src/config/files/configuration.js b/packages/babel-core/src/config/files/configuration.js
index 279da6b7cf08..ab3353f6fde3 100644
--- a/packages/babel-core/src/config/files/configuration.js
+++ b/packages/babel-core/src/config/files/configuration.js
@@ -10,7 +10,7 @@ import {
   makeWeakCache,
   type CacheConfigurator,
 } from "../caching";
-import makeAPI from "../helpers/config-api";
+import makeAPI, { type PluginAPI } from "../helpers/config-api";
 import { makeStaticFileCache } from "./utils";
 import pathPatternToRegex from "../pattern-to-regex";
 import type { FilePackageData, RelativeConfig, ConfigFile } from "./types";
@@ -114,7 +114,7 @@ export function findRootConfig(
 
   const conf = readConfig(filepath, envName, caller);
   if (conf) {
-    debug("Found root config %o in $o.", BABEL_CONFIG_JS_FILENAME, dirname);
+    debug("Found root config %o in %o.", BABEL_CONFIG_JS_FILENAME, dirname);
   }
   return conf;
 }
@@ -132,7 +132,7 @@ export function loadConfig(
     throw new Error(`Config file ${filepath} contains no configuration data`);
   }
 
-  debug("Loaded config %o from $o.", name, dirname);
+  debug("Loaded config %o from %o.", name, dirname);
   return conf;
 }
 
@@ -150,7 +150,7 @@ const LOADING_CONFIGS = new Set();
 
 const readConfigJS = makeStrongCache(
   (
-    filepath,
+    filepath: string,
     cache: CacheConfigurator<{
       envName: string,
       caller: CallerMetadata | void,
@@ -193,7 +193,7 @@ const readConfigJS = makeStrongCache(
     }
 
     if (typeof options === "function") {
-      options = options(makeAPI(cache));
+      options = ((options: any): (api: PluginAPI) => {})(makeAPI(cache));
 
       if (!cache.configured()) throwConfigError();
     }
diff --git a/packages/babel-core/src/config/files/plugins.js b/packages/babel-core/src/config/files/plugins.js
index 6bef09039d8f..be20468d1615 100644
--- a/packages/babel-core/src/config/files/plugins.js
+++ b/packages/babel-core/src/config/files/plugins.js
@@ -132,7 +132,7 @@ function resolveStandardizedName(
     } catch (e2) {}
 
     if (resolvedOppositeType) {
-      e.message += `\n- Did you accidentally pass a ${type} as a ${oppositeType}?`;
+      e.message += `\n- Did you accidentally pass a ${oppositeType} as a ${type}?`;
     }
 
     throw e;
diff --git a/packages/babel-core/src/config/full.js b/packages/babel-core/src/config/full.js
index af4212953f67..88c65ff882be 100644
--- a/packages/babel-core/src/config/full.js
+++ b/packages/babel-core/src/config/full.js
@@ -202,7 +202,7 @@ const loadDescriptor = makeWeakCache(
     if (typeof item.then === "function") {
       throw new Error(
         `You appear to be using an async plugin, ` +
-          `which your current version of Babel does not support.` +
+          `which your current version of Babel does not support. ` +
           `If you're using a published plugin, ` +
           `you may need to upgrade your @babel/core version.`,
       );
diff --git a/packages/babel-core/src/config/helpers/config-api.js b/packages/babel-core/src/config/helpers/config-api.js
index fa106f0ce24b..a93756ae9fa3 100644
--- a/packages/babel-core/src/config/helpers/config-api.js
+++ b/packages/babel-core/src/config/helpers/config-api.js
@@ -55,6 +55,7 @@ export default function makeAPI(
     async: () => false,
     caller,
     assertVersion,
+    tokTypes: undefined,
   };
 }
 
diff --git a/packages/babel-core/src/config/validation/option-assertions.js b/packages/babel-core/src/config/validation/option-assertions.js
index 321e1c063229..87244b4f16b3 100644
--- a/packages/babel-core/src/config/validation/option-assertions.js
+++ b/packages/babel-core/src/config/validation/option-assertions.js
@@ -231,7 +231,7 @@ function assertIgnoreItem(loc: GeneralPath, value: mixed): IgnoreItem {
     throw new Error(
       `${msg(
         loc,
-      )} must be an array of string/Funtion/RegExp values, or undefined`,
+      )} must be an array of string/Function/RegExp values, or undefined`,
     );
   }
   return value;
@@ -337,7 +337,7 @@ function assertPluginItem(loc: GeneralPath, value: mixed): PluginItem {
       if (
         opts !== undefined &&
         opts !== false &&
-        (typeof opts !== "object" || Array.isArray(opts))
+        (typeof opts !== "object" || Array.isArray(opts) || opts === null)
       ) {
         throw new Error(
           `${msg(access(loc, 1))} must be an object, false, or undefined`,
diff --git a/packages/babel-core/src/config/validation/options.js b/packages/babel-core/src/config/validation/options.js
index c790adfac9f9..3ee072ae344f 100644
--- a/packages/babel-core/src/config/validation/options.js
+++ b/packages/babel-core/src/config/validation/options.js
@@ -350,7 +350,7 @@ function validateNested(loc: NestingPath, opts: {}) {
       NONPRESET_VALIDATORS[key] ||
       BABELRC_VALIDATORS[key] ||
       ROOT_VALIDATORS[key] ||
-      throwUnknownError;
+      (throwUnknownError: Validator<void>);
 
     validator(optLoc, opts[key]);
   });
diff --git a/packages/babel-core/src/index.js b/packages/babel-core/src/index.js
index 075351715ab1..e7ae7c0edfc6 100644
--- a/packages/babel-core/src/index.js
+++ b/packages/babel-core/src/index.js
@@ -10,6 +10,8 @@ export { version } from "../package.json";
 export { getEnv } from "./config/helpers/environment";
 
 export * as types from "@babel/types";
+export { tokTypes } from "@babel/parser";
+
 export { default as traverse } from "@babel/traverse";
 export { default as template } from "@babel/template";
 
diff --git a/packages/babel-core/src/transform-file-browser.js b/packages/babel-core/src/transform-file-browser.js
index ed74df780202..fc1b12af0e50 100644
--- a/packages/babel-core/src/transform-file-browser.js
+++ b/packages/babel-core/src/transform-file-browser.js
@@ -1,14 +1,29 @@
 // @flow
-import type { FileResult } from "./transformation";
 
-export default function transformFile(
-  filename: string,
-  opts?: Object = {},
-  callback: (?Error, FileResult | null) => void,
+// duplicated from transform-file so we do not have to import anything here
+type TransformFile = {
+  (filename: string, callback: Function): void,
+  (filename: string, opts: ?Object, callback: Function): void,
+};
+
+export const transformFile: TransformFile = (function transformFile(
+  filename,
+  opts,
+  callback,
 ) {
   if (typeof opts === "function") {
     callback = opts;
   }
 
   callback(new Error("Transforming files is not supported in browsers"), null);
+}: Function);
+
+export function transformFileSync() {
+  throw new Error("Transforming files is not supported in browsers");
+}
+
+export function transformFileAsync() {
+  return Promise.reject(
+    new Error("Transforming files is not supported in browsers"),
+  );
 }
diff --git a/packages/babel-core/src/transform-file-sync-browser.js b/packages/babel-core/src/transform-file-sync-browser.js
deleted file mode 100644
index 144242f3e383..000000000000
--- a/packages/babel-core/src/transform-file-sync-browser.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// @flow
-
-export default function transformFileSync() {
-  throw new Error("Transforming files is not supported in browsers");
-}
diff --git a/packages/babel-core/src/transform-file.js b/packages/babel-core/src/transform-file.js
index 1011bd8a4d89..d3c9ab640fc3 100644
--- a/packages/babel-core/src/transform-file.js
+++ b/packages/babel-core/src/transform-file.js
@@ -9,6 +9,14 @@ import {
   type FileResultCallback,
 } from "./transformation";
 
+import typeof * as transformFileBrowserType from "./transform-file-browser";
+import typeof * as transformFileType from "./transform-file";
+
+// Kind of gross, but essentially asserting that the exports of this module are the same as the
+// exports of transform-file-browser, since this file may be replaced at bundle time with
+// transform-file-browser.
+((({}: any): $Exact<transformFileBrowserType>): $Exact<transformFileType>);
+
 type TransformFile = {
   (filename: string, callback: FileResultCallback): void,
   (filename: string, opts: ?InputOptions, callback: FileResultCallback): void,
diff --git a/packages/babel-core/src/transformation/file/file.js b/packages/babel-core/src/transformation/file/file.js
index bbc28767180e..a0a9f65bcdf4 100644
--- a/packages/babel-core/src/transformation/file/file.js
+++ b/packages/babel-core/src/transformation/file/file.js
@@ -183,7 +183,7 @@ export default class File {
     // and this fails because a prerelease version can only satisfy a range
     // if it is a prerelease within the same major/minor/patch range.
     //
-    // Note: If this is found to have issues, please also revist the logic in
+    // Note: If this is found to have issues, please also revisit the logic in
     // transform-runtime's definitions.js file.
     if (semver.valid(versionRange)) versionRange = `^${versionRange}`;
 
@@ -203,6 +203,9 @@ export default class File {
       if (res) return res;
     }
 
+    // make sure that the helper exists
+    helpers.ensure(name);
+
     const uid = (this.declarations[name] = this.scope.generateUidIdentifier(
       name,
     ));
diff --git a/packages/babel-core/src/transformation/file/merge-map.js b/packages/babel-core/src/transformation/file/merge-map.js
index 991373862e1e..ff2e65b042b8 100644
--- a/packages/babel-core/src/transformation/file/merge-map.js
+++ b/packages/babel-core/src/transformation/file/merge-map.js
@@ -94,7 +94,7 @@ export default function mergeSourceMap(
 }
 
 function makeMappingKey(item: { line: number, columnStart: number }) {
-  return JSON.stringify([item.line, item.columnStart]);
+  return `${item.line}/${item.columnStart}`;
 }
 
 function eachOverlappingGeneratedOutputRange(
diff --git a/packages/babel-core/src/transformation/index.js b/packages/babel-core/src/transformation/index.js
index 8174f7bd8228..a03c4db0cf2a 100644
--- a/packages/babel-core/src/transformation/index.js
+++ b/packages/babel-core/src/transformation/index.js
@@ -93,7 +93,7 @@ function transformFile(file: File, pluginPasses: PluginPasses): void {
         if (isThenable(result)) {
           throw new Error(
             `You appear to be using an plugin with an async .pre, ` +
-              `which your current version of Babel does not support.` +
+              `which your current version of Babel does not support. ` +
               `If you're using a published plugin, you may need to upgrade ` +
               `your @babel/core version.`,
           );
@@ -117,7 +117,7 @@ function transformFile(file: File, pluginPasses: PluginPasses): void {
         if (isThenable(result)) {
           throw new Error(
             `You appear to be using an plugin with an async .post, ` +
-              `which your current version of Babel does not support.` +
+              `which your current version of Babel does not support. ` +
               `If you're using a published plugin, you may need to upgrade ` +
               `your @babel/core version.`,
           );
@@ -131,6 +131,7 @@ function isThenable(val: mixed): boolean {
   return (
     !!val &&
     (typeof val === "object" || typeof val === "function") &&
+    !!val.then &&
     typeof val.then === "function"
   );
 }
diff --git a/packages/babel-core/src/transformation/util/missing-plugin-helper.js b/packages/babel-core/src/transformation/util/missing-plugin-helper.js
index 2f1090c9110e..b0642c50c3cf 100644
--- a/packages/babel-core/src/transformation/util/missing-plugin-helper.js
+++ b/packages/babel-core/src/transformation/util/missing-plugin-helper.js
@@ -1,16 +1,6 @@
 // @flow
 
 const pluginNameMap = {
-  asyncGenerators: {
-    syntax: {
-      name: "@babel/plugin-syntax-async-generators",
-      url: "https://git.io/vb4SY",
-    },
-    transform: {
-      name: "@babel/plugin-proposal-async-generator-functions",
-      url: "https://git.io/vb4yp",
-    },
-  },
   classProperties: {
     syntax: {
       name: "@babel/plugin-syntax-class-properties",
@@ -143,26 +133,6 @@ const pluginNameMap = {
       url: "https://git.io/vb4yS",
     },
   },
-  objectRestSpread: {
-    syntax: {
-      name: "@babel/plugin-syntax-object-rest-spread",
-      url: "https://git.io/vb4y5",
-    },
-    transform: {
-      name: "@babel/plugin-proposal-object-rest-spread",
-      url: "https://git.io/vb4Ss",
-    },
-  },
-  optionalCatchBinding: {
-    syntax: {
-      name: "@babel/plugin-syntax-optional-catch-binding",
-      url: "https://git.io/vb4Sn",
-    },
-    transform: {
-      name: "@babel/plugin-proposal-optional-catch-binding",
-      url: "https://git.io/vb4SI",
-    },
-  },
   optionalChaining: {
     syntax: {
       name: "@babel/plugin-syntax-optional-chaining",
@@ -203,6 +173,41 @@ const pluginNameMap = {
       url: "https://git.io/vb4Sm",
     },
   },
+
+  // TODO: This plugins are now supported by default by @babel/parser: they can
+  // be removed from this list. Although removing them isn't a breaking change,
+  // it's better to keep a nice error message for users using older versions of
+  // the parser. They can be removed in Babel 8.
+  asyncGenerators: {
+    syntax: {
+      name: "@babel/plugin-syntax-async-generators",
+      url: "https://git.io/vb4SY",
+    },
+    transform: {
+      name: "@babel/plugin-proposal-async-generator-functions",
+      url: "https://git.io/vb4yp",
+    },
+  },
+  objectRestSpread: {
+    syntax: {
+      name: "@babel/plugin-syntax-object-rest-spread",
+      url: "https://git.io/vb4y5",
+    },
+    transform: {
+      name: "@babel/plugin-proposal-object-rest-spread",
+      url: "https://git.io/vb4Ss",
+    },
+  },
+  optionalCatchBinding: {
+    syntax: {
+      name: "@babel/plugin-syntax-optional-catch-binding",
+      url: "https://git.io/vb4Sn",
+    },
+    transform: {
+      name: "@babel/plugin-proposal-optional-catch-binding",
+      url: "https://git.io/vb4SI",
+    },
+  },
 };
 
 const getNameURLCombination = ({ name, url }) => `${name} (${url})`;
diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js
index 5c3a97c7a376..9f2f955f1d7e 100644
--- a/packages/babel-core/test/api.js
+++ b/packages/babel-core/test/api.js
@@ -154,6 +154,14 @@ describe("api", function() {
     );
   });
 
+  it("exposes types", function() {
+    expect(babel.types).toBeDefined();
+  });
+
+  it("exposes the parser's token types", function() {
+    expect(babel.tokTypes).toBeDefined();
+  });
+
   it("transformFile", function(done) {
     const options = {
       babelrc: false,
@@ -769,10 +777,10 @@ describe("api", function() {
         options,
         function(err) {
           expect(err.message).toMatch(
-            "Support for the experimental syntax 'asyncGenerators' isn't currently enabled (1:15):",
+            "Support for the experimental syntax 'logicalAssignment' isn't currently enabled (1:3):",
           );
           expect(err.message).toMatch(
-            "Add @babel/plugin-proposal-async-generator-functions (https://git.io/vb4yp) to the " +
+            "Add @babel/plugin-proposal-logical-assignment-operators (https://git.io/vAlRe) to the " +
               "'plugins' section of your Babel config to enable transformation.",
           );
           done();
@@ -780,4 +788,28 @@ describe("api", function() {
       );
     });
   });
+
+  describe("missing helpers", function() {
+    it("should always throw", function() {
+      expect(() =>
+        babel.transformSync(``, {
+          configFile: false,
+          plugins: [
+            function() {
+              return {
+                visitor: {
+                  Program(path) {
+                    try {
+                      path.pushContainer("body", this.addHelper("fooBar"));
+                    } catch {}
+                    path.pushContainer("body", this.addHelper("fooBar"));
+                  },
+                },
+              };
+            },
+          ],
+        }),
+      ).toThrow();
+    });
+  });
 });
diff --git a/packages/babel-core/test/fixtures/api/parsing-errors/syntax-and-transform/file.js b/packages/babel-core/test/fixtures/api/parsing-errors/syntax-and-transform/file.js
index a0eb4637c6d8..0cb4253cd41b 100644
--- a/packages/babel-core/test/fixtures/api/parsing-errors/syntax-and-transform/file.js
+++ b/packages/babel-core/test/fixtures/api/parsing-errors/syntax-and-transform/file.js
@@ -1,4 +1 @@
-async function* agf() {
-  await 1;
-  yield 2;
-}
+a ||= 2;
diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-1169/output.js b/packages/babel-core/test/fixtures/transformation/misc/regression-1169/output.js
index d2974e11c46d..910053ac4d12 100644
--- a/packages/babel-core/test/fixtures/transformation/misc/regression-1169/output.js
+++ b/packages/babel-core/test/fixtures/transformation/misc/regression-1169/output.js
@@ -2,8 +2,8 @@ function foo() {
   var input = ['a', 'b', 'c'];
   var output = {};
 
-  for (var _i = 0; _i < input.length; _i++) {
-    var c = input[_i];
+  for (var _i = 0, _input = input; _i < _input.length; _i++) {
+    var c = _input[_i];
     var name = c;
     output[name] = name;
   }
diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js b/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js
index 11385a0a000b..ec30a24e9b09 100644
--- a/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js
+++ b/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
@@ -40,19 +40,21 @@ function () {
                 return _context.stop();
             }
           }
-        }, _callee, this);
+        }, _callee);
       }));
 
-      return function bar() {
+      function bar() {
         return _bar.apply(this, arguments);
-      };
+      }
+
+      return bar;
     }()
   }]);
 
   return Foo;
 }();
 
-exports.default = Foo;
+exports["default"] = Foo;
 
 function foo() {
   return _foo.apply(this, arguments);
@@ -84,7 +86,7 @@ function _foo() {
                         return _context2.stop();
                     }
                   }
-                }, _callee2, this);
+                }, _callee2);
               }));
               return _bar2.apply(this, arguments);
             };
@@ -98,7 +100,7 @@ function _foo() {
             return _context3.stop();
         }
       }
-    }, _callee3, this);
+    }, _callee3);
   }));
   return _foo.apply(this, arguments);
 }
diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json b/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json
index 2f59220d176b..489d3a868c4b 100644
--- a/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json
+++ b/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json
@@ -1,5 +1,8 @@
 {
   "compact": false,
   "presets": ["env"],
-  "plugins": ["external-helpers", "proposal-object-rest-spread"]
+  "plugins": [
+    ["external-helpers", { "helperVersion": "7.1.5" }],
+    "proposal-object-rest-spread"
+  ]
 }
diff --git a/packages/babel-core/test/option-manager.js b/packages/babel-core/test/option-manager.js
index 28830f58f33d..4a6301ab4777 100644
--- a/packages/babel-core/test/option-manager.js
+++ b/packages/babel-core/test/option-manager.js
@@ -38,6 +38,17 @@ describe("option-manager", () => {
       expect(calls).toEqual([]);
     });
 
+    it("throws for null options", () => {
+      const { calls, plugin } = makePlugin();
+      expect(() => {
+        loadOptions({
+          plugins: [[plugin, null]],
+        }).toThrow(/.plugins[0][1] must be an object, false, or undefined/);
+      });
+
+      expect(calls).toEqual([]);
+    });
+
     it("should not throw if a repeated plugin has a different name", () => {
       const { calls: calls1, plugin: plugin1 } = makePlugin();
       const { calls: calls2, plugin: plugin2 } = makePlugin();
@@ -87,7 +98,6 @@ describe("option-manager", () => {
       expect(calls1).toEqual([{ arg: 1 }]);
       expect(calls2).toEqual([{ arg: 2 }]);
     });
-
     it("should merge .env[] presets with parent presets", () => {
       const { calls: calls1, plugin: preset1 } = makePlugin();
       const { calls: calls2, plugin: preset2 } = makePlugin();
diff --git a/packages/babel-core/test/resolution.js b/packages/babel-core/test/resolution.js
index 4280b27ddd76..203d76ec5769 100644
--- a/packages/babel-core/test/resolution.js
+++ b/packages/babel-core/test/resolution.js
@@ -400,7 +400,7 @@ describe("addon resolution", function() {
         presets: ["testplugin"],
       });
     }).toThrow(
-      /Cannot find module 'babel-preset-testplugin'.*\n- Did you accidentally pass a preset as a plugin\?/,
+      /Cannot find module 'babel-preset-testplugin'.*\n- Did you accidentally pass a plugin as a preset\?/,
     );
   });
 
@@ -414,7 +414,7 @@ describe("addon resolution", function() {
         plugins: ["testpreset"],
       });
     }).toThrow(
-      /Cannot find module 'babel-plugin-testpreset'.*\n- Did you accidentally pass a plugin as a preset\?/,
+      /Cannot find module 'babel-plugin-testpreset'.*\n- Did you accidentally pass a preset as a plugin\?/,
     );
   });
 
diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json
index 42155d2bd44c..815171acf262 100644
--- a/packages/babel-generator/package.json
+++ b/packages/babel-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/generator",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Turns an AST into code.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -14,14 +14,14 @@
     "lib"
   ],
   "dependencies": {
-    "@babel/types": "^7.0.0",
+    "@babel/types": "^7.5.5",
     "jsesc": "^2.5.1",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.13",
     "source-map": "^0.5.0",
     "trim-right": "^1.0.1"
   },
   "devDependencies": {
-    "@babel/helper-fixtures": "^7.0.0",
-    "@babel/parser": "^7.0.0"
+    "@babel/helper-fixtures": "^7.5.5",
+    "@babel/parser": "^7.5.5"
   }
 }
diff --git a/packages/babel-generator/src/buffer.js b/packages/babel-generator/src/buffer.js
index f49bfad8c545..fd64201a921b 100644
--- a/packages/babel-generator/src/buffer.js
+++ b/packages/babel-generator/src/buffer.js
@@ -235,7 +235,7 @@ export default class Buffer {
   source(prop: string, loc: Location, force?: boolean): void {
     if (prop && !loc) return;
 
-    // Since this is called extremly often, we re-use the same _sourcePosition
+    // Since this is called extremely often, we re-use the same _sourcePosition
     // object for the whole lifetime of the buffer.
     this._normalizePosition(prop, loc, this._sourcePosition, force);
   }
diff --git a/packages/babel-generator/src/generators/base.js b/packages/babel-generator/src/generators/base.js
index 49a1cb2c88b5..dd45014377f6 100644
--- a/packages/babel-generator/src/generators/base.js
+++ b/packages/babel-generator/src/generators/base.js
@@ -50,8 +50,45 @@ export function Directive(node: Object) {
   this.semicolon();
 }
 
+// These regexes match an even number of \ followed by a quote
+const unescapedSingleQuoteRE = /(?:^|[^\\])(?:\\\\)*'/;
+const unescapedDoubleQuoteRE = /(?:^|[^\\])(?:\\\\)*"/;
+
+export function DirectiveLiteral(node: Object) {
+  const raw = this.getPossibleRaw(node);
+  if (raw != null) {
+    this.token(raw);
+    return;
+  }
+
+  const { value } = node;
+
+  // NOTE: In directives we can't change escapings,
+  // because they change the behavior.
+  // e.g. "us\x65 string" (\x65 is e) is not a "use strict" directive.
+
+  if (!unescapedDoubleQuoteRE.test(value)) {
+    this.token(`"${value}"`);
+  } else if (!unescapedSingleQuoteRE.test(value)) {
+    this.token(`'${value}'`);
+  } else {
+    throw new Error(
+      "Malformed AST: it is not possible to print a directive containing" +
+        " both unescaped single and double quotes.",
+    );
+  }
+}
+
 export function InterpreterDirective(node: Object) {
   this.token(`#!${node.value}\n`);
 }
 
-export { StringLiteral as DirectiveLiteral } from "./types";
+export function Placeholder(node: Object) {
+  this.token("%%");
+  this.print(node.name);
+  this.token("%%");
+
+  if (node.expectedNode === "Statement") {
+    this.semicolon();
+  }
+}
diff --git a/packages/babel-generator/src/generators/classes.js b/packages/babel-generator/src/generators/classes.js
index 22780dc3f03b..e8c62339a6d2 100644
--- a/packages/babel-generator/src/generators/classes.js
+++ b/packages/babel-generator/src/generators/classes.js
@@ -140,6 +140,12 @@ export function ClassMethod(node: Object) {
   this.print(node.body, node);
 }
 
+export function ClassPrivateMethod(node: Object) {
+  this._classMethodHead(node);
+  this.space();
+  this.print(node.body, node);
+}
+
 export function _classMethodHead(node) {
   this.printJoin(node.decorators, node);
 
diff --git a/packages/babel-generator/src/generators/flow.js b/packages/babel-generator/src/generators/flow.js
index d46118debd48..225428b00801 100644
--- a/packages/babel-generator/src/generators/flow.js
+++ b/packages/babel-generator/src/generators/flow.js
@@ -409,7 +409,7 @@ export function ObjectTypeAnnotation(node: Object) {
       indent: true,
       statement: true,
       iterator: () => {
-        if (props.length !== 1) {
+        if (props.length !== 1 || node.inexact) {
           this.token(",");
           this.space();
         }
@@ -419,6 +419,15 @@ export function ObjectTypeAnnotation(node: Object) {
     this.space();
   }
 
+  if (node.inexact) {
+    this.indent();
+    this.token("...");
+    if (props.length) {
+      this.newline();
+    }
+    this.dedent();
+  }
+
   if (node.exact) {
     this.token("|}");
   } else {
diff --git a/packages/babel-generator/src/generators/methods.js b/packages/babel-generator/src/generators/methods.js
index 5dc17e065a20..1019aba04c7c 100644
--- a/packages/babel-generator/src/generators/methods.js
+++ b/packages/babel-generator/src/generators/methods.js
@@ -111,7 +111,25 @@ export function ArrowFunctionExpression(node: Object) {
     t.isIdentifier(firstParam) &&
     !hasTypes(node, firstParam)
   ) {
-    this.print(firstParam, node);
+    if (
+      this.format.retainLines &&
+      node.loc &&
+      node.body.loc &&
+      node.loc.start.line < node.body.loc.start.line
+    ) {
+      this.token("(");
+      if (firstParam.loc && firstParam.loc.start.line > node.loc.start.line) {
+        this.indent();
+        this.print(firstParam, node);
+        this.dedent();
+        this._catchUp("start", node.body.loc);
+      } else {
+        this.print(firstParam, node);
+      }
+      this.token(")");
+    } else {
+      this.print(firstParam, node);
+    }
   } else {
     this._params(node);
   }
diff --git a/packages/babel-generator/src/generators/types.js b/packages/babel-generator/src/generators/types.js
index 4a5ed312a661..fdd090dd4113 100644
--- a/packages/babel-generator/src/generators/types.js
+++ b/packages/babel-generator/src/generators/types.js
@@ -7,6 +7,10 @@ export function Identifier(node: Object) {
   });
 }
 
+export function ArgumentPlaceholder() {
+  this.token("?");
+}
+
 export function RestElement(node: Object) {
   this.token("...");
   this.print(node.argument, node);
@@ -151,3 +155,15 @@ export function BigIntLiteral(node: Object) {
   }
   this.token(node.value);
 }
+
+export function PipelineTopicExpression(node: Object) {
+  this.print(node.expression, node);
+}
+
+export function PipelineBareFunction(node: Object) {
+  this.print(node.callee, node);
+}
+
+export function PipelinePrimaryTopicReference() {
+  this.token("#");
+}
diff --git a/packages/babel-generator/src/generators/typescript.js b/packages/babel-generator/src/generators/typescript.js
index c2e5f9d42cd3..c5d737892f2d 100644
--- a/packages/babel-generator/src/generators/typescript.js
+++ b/packages/babel-generator/src/generators/typescript.js
@@ -127,6 +127,9 @@ export function TSIndexSignature(node) {
 export function TSAnyKeyword() {
   this.word("any");
 }
+export function TSUnknownKeyword() {
+  this.word("unknown");
+}
 export function TSNumberKeyword() {
   this.word("number");
 }
@@ -228,7 +231,7 @@ export function tsPrintBraced(members, node) {
 }
 
 export function TSArrayType(node) {
-  this.print(node.elementType);
+  this.print(node.elementType, node);
   this.token("[]");
 }
 
@@ -238,6 +241,16 @@ export function TSTupleType(node) {
   this.token("]");
 }
 
+export function TSOptionalType(node) {
+  this.print(node.typeAnnotation, node);
+  this.token("?");
+}
+
+export function TSRestType(node) {
+  this.token("...");
+  this.print(node.typeAnnotation, node);
+}
+
 export function TSUnionType(node) {
   this.tsPrintUnionOrIntersectionType(node, "|");
 }
@@ -463,6 +476,21 @@ export function TSModuleBlock(node) {
   this.tsPrintBraced(node.body, node);
 }
 
+export function TSImportType(node) {
+  const { argument, qualifier, typeParameters } = node;
+  this.word("import");
+  this.token("(");
+  this.print(argument, node);
+  this.token(")");
+  if (qualifier) {
+    this.token(".");
+    this.print(qualifier, node);
+  }
+  if (typeParameters) {
+    this.print(typeParameters, node);
+  }
+}
+
 export function TSImportEqualsDeclaration(node) {
   const { isExport, id, moduleReference } = node;
   if (isExport) {
diff --git a/packages/babel-generator/src/node/parentheses.js b/packages/babel-generator/src/node/parentheses.js
index e78391c2bd58..8c38fa627239 100644
--- a/packages/babel-generator/src/node/parentheses.js
+++ b/packages/babel-generator/src/node/parentheses.js
@@ -35,7 +35,16 @@ export function NullableTypeAnnotation(node: Object, parent: Object): boolean {
   return t.isArrayTypeAnnotation(parent);
 }
 
-export { NullableTypeAnnotation as FunctionTypeAnnotation };
+export function FunctionTypeAnnotation(node: Object, parent: Object): boolean {
+  return (
+    // (() => A) | (() => B)
+    t.isUnionTypeAnnotation(parent) ||
+    // (() => A) & (() => B)
+    t.isIntersectionTypeAnnotation(parent) ||
+    // (() => A)[]
+    t.isArrayTypeAnnotation(parent)
+  );
+}
 
 export function UpdateExpression(node: Object, parent: Object): boolean {
   return (
@@ -127,6 +136,18 @@ export function TSTypeAssertion() {
   return true;
 }
 
+export function TSUnionType(node: Object, parent: Object): boolean {
+  return (
+    t.isTSArrayType(parent) ||
+    t.isTSOptionalType(parent) ||
+    t.isTSIntersectionType(parent) ||
+    t.isTSUnionType(parent) ||
+    t.isTSRestType(parent)
+  );
+}
+
+export { TSUnionType as TSIntersectionType };
+
 export function BinaryExpression(node: Object, parent: Object): boolean {
   // let i = (1 in []);
   // for ((1 in []);;);
@@ -166,6 +187,7 @@ export function YieldExpression(node: Object, parent: Object): boolean {
     t.isCallExpression(parent) ||
     t.isMemberExpression(parent) ||
     t.isNewExpression(parent) ||
+    (t.isAwaitExpression(parent) && t.isYieldExpression(node)) ||
     (t.isConditionalExpression(parent) && node === parent.test) ||
     isClassExtendsClause(node, parent)
   );
@@ -209,6 +231,7 @@ export function ConditionalExpression(node: Object, parent: Object): boolean {
     t.isBinary(parent) ||
     t.isConditionalExpression(parent, { test: node }) ||
     t.isAwaitExpression(parent) ||
+    t.isOptionalMemberExpression(parent) ||
     t.isTaggedTemplateExpression(parent) ||
     t.isTSTypeAssertion(parent) ||
     t.isTSAsExpression(parent)
@@ -219,6 +242,13 @@ export function ConditionalExpression(node: Object, parent: Object): boolean {
   return UnaryLike(node, parent);
 }
 
+export function OptionalMemberExpression(
+  node: Object,
+  parent: Object,
+): boolean {
+  return t.isCallExpression(parent) || t.isMemberExpression(parent);
+}
+
 export function AssignmentExpression(node: Object): boolean {
   if (t.isObjectPattern(node.left)) {
     return true;
diff --git a/packages/babel-generator/src/printer.js b/packages/babel-generator/src/printer.js
index 1b740ce0c48b..fb4715d491c5 100644
--- a/packages/babel-generator/src/printer.js
+++ b/packages/babel-generator/src/printer.js
@@ -363,14 +363,14 @@ export default class Printer {
     }
     if (needsParens) this.token("(");
 
-    this._printLeadingComments(node, parent);
+    this._printLeadingComments(node);
 
     const loc = t.isProgram(node) || t.isFile(node) ? null : node.loc;
     this.withSource("start", loc, () => {
-      this[node.type](node, parent);
+      printMethod.call(this, node, parent);
     });
 
-    this._printTrailingComments(node, parent);
+    this._printTrailingComments(node);
 
     if (needsParens) this.token(")");
 
@@ -472,12 +472,12 @@ export default class Printer {
     this.print(node, parent);
   }
 
-  _printTrailingComments(node, parent) {
-    this._printComments(this._getComments(false, node, parent));
+  _printTrailingComments(node) {
+    this._printComments(this._getComments(false, node));
   }
 
-  _printLeadingComments(node, parent) {
-    this._printComments(this._getComments(true, node, parent));
+  _printLeadingComments(node) {
+    this._printComments(this._getComments(true, node));
   }
 
   printInnerComments(node, indent = true) {
diff --git a/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/input.js b/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/input.js
new file mode 100644
index 000000000000..753a9cfbb2b5
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/input.js
@@ -0,0 +1,12 @@
+// One
+(1);
+
+/* Two */
+(2);
+
+(
+  // Three
+  3
+);
+
+(/* Four */ 4);
diff --git a/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/options.json b/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/options.json
new file mode 100644
index 000000000000..7c49b91ec9b2
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/options.json
@@ -0,0 +1,3 @@
+{
+  "parserOpts": {"createParenthesizedExpressions": true}
+}
diff --git a/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/output.js b/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/output.js
new file mode 100644
index 000000000000..b78500e8017f
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/comments/create-parenthesized-expressions/output.js
@@ -0,0 +1,10 @@
+// One
+(1);
+/* Two */
+
+(2);
+( // Three
+3);
+(
+/* Four */
+4);
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/compact/expression-statement/options.json b/packages/babel-generator/test/fixtures/compact/expression-statement/options.json
deleted file mode 100644
index 8a2a1d3bfa91..000000000000
--- a/packages/babel-generator/test/fixtures/compact/expression-statement/options.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "plugins": ["objectRestSpread"] }
diff --git a/packages/babel-generator/test/fixtures/edgecase/async-generator/options.json b/packages/babel-generator/test/fixtures/edgecase/async-generator/options.json
index 1ec463510a34..600c3f8fc13c 100644
--- a/packages/babel-generator/test/fixtures/edgecase/async-generator/options.json
+++ b/packages/babel-generator/test/fixtures/edgecase/async-generator/options.json
@@ -1 +1 @@
-{ "plugins": ["asyncGenerators", "classProperties"] }
+{ "plugins": ["classProperties"] }
diff --git a/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/input.js b/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/input.js
index 3d4fdd63e337..11f766a1c91d 100644
--- a/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/input.js
+++ b/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/input.js
@@ -4,7 +4,7 @@ function foo(l) {
   );
 }
 
-function foo() {
+function foo2() {
   return (
     1 && 2
   ) || 3;
diff --git a/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/output.js b/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/output.js
index eda704040f14..494b4cf7d5f8 100644
--- a/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/output.js
+++ b/packages/babel-generator/test/fixtures/edgecase/return-with-retainlines-option/output.js
@@ -4,7 +4,7 @@ function foo(l) {
 
 }
 
-function foo() {
+function foo2() {
   return (
     1 && 2 ||
     3);
diff --git a/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/input.js b/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/input.js
new file mode 100644
index 000000000000..b5a205cc36d6
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/input.js
@@ -0,0 +1,11 @@
+var fn = async (
+    arg
+) => {}
+
+async (x) =>
+{}
+
+async x => {}
+
+async (x
+) => {};
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/options.json b/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/options.json
new file mode 100644
index 000000000000..97925bbcb61b
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/options.json
@@ -0,0 +1,3 @@
+{
+  "retainLines": true
+}
diff --git a/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/output.js b/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/output.js
new file mode 100644
index 000000000000..6bb2ce5093e8
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/edgecase/single-arg-async-arrow-with-retainlines/output.js
@@ -0,0 +1,11 @@
+var fn = async (
+  arg
+) => {};
+
+async (x) =>
+{};
+
+async x => {};
+
+async (x) =>
+{};
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/edgecase/unary-op/options.json b/packages/babel-generator/test/fixtures/edgecase/unary-op/options.json
new file mode 100644
index 000000000000..a2e80d9ec294
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/edgecase/unary-op/options.json
@@ -0,0 +1,3 @@
+{
+  "strictMode": false
+}
diff --git a/packages/babel-generator/test/fixtures/escapes/jsonEscape/input.js b/packages/babel-generator/test/fixtures/escapes/jsonEscape/input.js
index 2305ada28e08..b999a74fa0c0 100644
--- a/packages/babel-generator/test/fixtures/escapes/jsonEscape/input.js
+++ b/packages/babel-generator/test/fixtures/escapes/jsonEscape/input.js
@@ -1 +1,2 @@
+0; // Not a directive
 "©";
diff --git a/packages/babel-generator/test/fixtures/escapes/jsonEscape/output.js b/packages/babel-generator/test/fixtures/escapes/jsonEscape/output.js
index 354db9cc775e..4da42cb39725 100644
--- a/packages/babel-generator/test/fixtures/escapes/jsonEscape/output.js
+++ b/packages/babel-generator/test/fixtures/escapes/jsonEscape/output.js
@@ -1 +1,2 @@
+0;// Not a directive
 "\u00A9";
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/declare-exports/input.js b/packages/babel-generator/test/fixtures/flow/declare-exports/input.js
index ea4a8c7cd463..97544d82b930 100644
--- a/packages/babel-generator/test/fixtures/flow/declare-exports/input.js
+++ b/packages/babel-generator/test/fixtures/flow/declare-exports/input.js
@@ -17,6 +17,7 @@ declare export * from 'asd';
 declare export { a, b };
 declare export {};
 declare export { c, d } from 'bar';
+var a, b;
 
 declare module B {
   declare export type B = {};
@@ -24,9 +25,9 @@ declare module B {
 }
 
 declare module "foo" { declare export type * from "bar"; }
-declare export opaque type Foo;
+declare export opaque type Foo1;
 declare export opaque type Bar<T>;
 declare export opaque type Baz: Foo;
-declare export opaque type Foo<T>: Bar<T>;
-declare export opaque type Foo<T>: Bar;
-declare export opaque type Foo: Bar<T>;
+declare export opaque type Foo3<T>: Bar<T>;
+declare export opaque type Foo4<T>: Bar;
+declare export opaque type Foo5: Bar<T>;
diff --git a/packages/babel-generator/test/fixtures/flow/declare-exports/output.js b/packages/babel-generator/test/fixtures/flow/declare-exports/output.js
index da22c014154d..59f3a4c56856 100644
--- a/packages/babel-generator/test/fixtures/flow/declare-exports/output.js
+++ b/packages/babel-generator/test/fixtures/flow/declare-exports/output.js
@@ -26,6 +26,7 @@ declare export * from 'asd';
 declare export { a, b };
 declare export {};
 declare export { c, d } from 'bar';
+var a, b;
 declare module B {
   declare export type B = {};
   declare export interface Moon {}
@@ -33,9 +34,9 @@ declare module B {
 declare module "foo" {
   declare export type * from "bar";
 }
-declare export opaque type Foo;
+declare export opaque type Foo1;
 declare export opaque type Bar<T>;
 declare export opaque type Baz: Foo;
-declare export opaque type Foo<T>: Bar<T>;
-declare export opaque type Foo<T>: Bar;
-declare export opaque type Foo: Bar<T>;
\ No newline at end of file
+declare export opaque type Foo3<T>: Bar<T>;
+declare export opaque type Foo4<T>: Bar;
+declare export opaque type Foo5: Bar<T>;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/def-site-variance/input.js b/packages/babel-generator/test/fixtures/flow/def-site-variance/input.js
index 5cda68f8e9c5..9f00e80993d1 100644
--- a/packages/babel-generator/test/fixtures/flow/def-site-variance/input.js
+++ b/packages/babel-generator/test/fixtures/flow/def-site-variance/input.js
@@ -1,10 +1,10 @@
 class C1<+T, -U> {}
 function f<+T, -U>() {}
 type T<+T, -U> = {};
-type T = { +p: T };
-type T = { -p: T };
-type T = { +[k:K]: V };
-type T = { -[k:K]: V };
+type T2 = { +p: T };
+type T3 = { -p: T };
+type T4 = { +[k:K]: V };
+type T5 = { -[k:K]: V };
 interface I { +p: T }
 interface I { -p: T }
 interface I { +[k:K]: V }
diff --git a/packages/babel-generator/test/fixtures/flow/def-site-variance/output.js b/packages/babel-generator/test/fixtures/flow/def-site-variance/output.js
index e411f4646133..5c2b69d1a6dd 100644
--- a/packages/babel-generator/test/fixtures/flow/def-site-variance/output.js
+++ b/packages/babel-generator/test/fixtures/flow/def-site-variance/output.js
@@ -3,16 +3,16 @@ class C1<+T, -U> {}
 function f<+T, -U>() {}
 
 type T<+T, -U> = {};
-type T = {
+type T2 = {
   +p: T
 };
-type T = {
+type T3 = {
   -p: T
 };
-type T = {
+type T4 = {
   +[k: K]: V
 };
-type T = {
+type T5 = {
   -[k: K]: V
 };
 interface I {
diff --git a/packages/babel-generator/test/fixtures/flow/implements/input.js b/packages/babel-generator/test/fixtures/flow/implements/input.js
index 32acd7162b81..0dd3e5458978 100644
--- a/packages/babel-generator/test/fixtures/flow/implements/input.js
+++ b/packages/babel-generator/test/fixtures/flow/implements/input.js
@@ -1,5 +1,5 @@
-class A implements B {}
-class A implements B, C {}
-declare class A implements B {}
-declare class A mixins B implements C {}
-declare class A implements B, C {}
+class A1 implements B {}
+class A2 implements B, C {}
+declare class A3 implements B {}
+declare class A4 mixins B implements C {}
+declare class A5 implements B, C {}
diff --git a/packages/babel-generator/test/fixtures/flow/implements/output.js b/packages/babel-generator/test/fixtures/flow/implements/output.js
index 6f2f01668147..b1bd305e650a 100644
--- a/packages/babel-generator/test/fixtures/flow/implements/output.js
+++ b/packages/babel-generator/test/fixtures/flow/implements/output.js
@@ -1,7 +1,7 @@
-class A implements B {}
+class A1 implements B {}
 
-class A implements B, C {}
+class A2 implements B, C {}
 
-declare class A implements B {}
-declare class A mixins B implements C {}
-declare class A implements B, C {}
\ No newline at end of file
+declare class A3 implements B {}
+declare class A4 mixins B implements C {}
+declare class A5 implements B, C {}
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/interface-types/input.js b/packages/babel-generator/test/fixtures/flow/interface-types/input.js
index e475f614c9e3..77d12fad914b 100644
--- a/packages/babel-generator/test/fixtures/flow/interface-types/input.js
+++ b/packages/babel-generator/test/fixtures/flow/interface-types/input.js
@@ -1,3 +1,4 @@
 type A = interface { p: string };
 type B = interface extends X { p: string };
 type C = interface extends X, Y { p: string };
+type D = interface extends X.Y<Z> { p: string };
diff --git a/packages/babel-generator/test/fixtures/flow/interface-types/output.js b/packages/babel-generator/test/fixtures/flow/interface-types/output.js
index 6fa9a97f7a1f..5f648bf74774 100644
--- a/packages/babel-generator/test/fixtures/flow/interface-types/output.js
+++ b/packages/babel-generator/test/fixtures/flow/interface-types/output.js
@@ -6,4 +6,7 @@ type B = interface extends X {
 };
 type C = interface extends X, Y {
   p: string
-};
\ No newline at end of file
+};
+type D = interface extends X.Y<Z> {
+  p: string
+};
diff --git a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/input.js b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/input.js
index 85decdae352b..ea741621024b 100644
--- a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/input.js
+++ b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/input.js
@@ -1,9 +1,9 @@
-interface A {}
-interface A extends B {}
-interface A<T> extends B<T>, C<T> {}
-interface A { foo: () => number; }
+interface A1 {}
+interface A2 extends B {}
+interface A3<T> extends B<T>, C<T> {}
+interface A4 { foo: () => number; }
 interface Dictionary { [index: string]: string; length: number; }
-class Foo implements Bar {}
-class Foo extends Bar implements Bat, Man<number> {}
-class Foo extends class Bar implements Bat {} {}
-class Foo extends class Bar implements Bat {} implements Man {}
+class Foo1 implements Bar {}
+class Foo2 extends Bar implements Bat, Man<number> {}
+class Foo3 extends class Bar implements Bat {} {}
+class Foo4 extends class Bar implements Bat {} implements Man {}
diff --git a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/output.js b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/output.js
index f6f4341fddb3..ef7fce8a5087 100644
--- a/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/output.js
+++ b/packages/babel-generator/test/fixtures/flow/interfaces-module-and-script/output.js
@@ -1,7 +1,7 @@
-interface A {}
-interface A extends B {}
-interface A<T> extends B<T>, C<T> {}
-interface A {
+interface A1 {}
+interface A2 extends B {}
+interface A3<T> extends B<T>, C<T> {}
+interface A4 {
   foo: () => number
 }
 interface Dictionary {
@@ -9,10 +9,10 @@ interface Dictionary {
   [index: string]: string,
 }
 
-class Foo implements Bar {}
+class Foo1 implements Bar {}
 
-class Foo extends Bar implements Bat, Man<number> {}
+class Foo2 extends Bar implements Bat, Man<number> {}
 
-class Foo extends class Bar implements Bat {} {}
+class Foo3 extends class Bar implements Bat {} {}
 
-class Foo extends class Bar implements Bat {} implements Man {}
\ No newline at end of file
+class Foo4 extends class Bar implements Bat {} implements Man {}
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/internal-slot/input.js b/packages/babel-generator/test/fixtures/flow/internal-slot/input.js
index 7888fc6cb43e..b00d3bd76f22 100644
--- a/packages/babel-generator/test/fixtures/flow/internal-slot/input.js
+++ b/packages/babel-generator/test/fixtures/flow/internal-slot/input.js
@@ -1,7 +1,7 @@
 declare class C { static [[foo]]: T }
 declare class C { [[foo]]: T }
-interface T { [[foo]]: X }
-interface T { [[foo]](): X }
-type T = { [[foo]]: X }
-type T = { [[foo]](): X }
-type T = { [[foo]]?: X }
+interface I { [[foo]]: X }
+interface I { [[foo]](): X }
+type T1 = { [[foo]]: X }
+type T2 = { [[foo]](): X }
+type T3 = { [[foo]]?: X }
diff --git a/packages/babel-generator/test/fixtures/flow/internal-slot/output.js b/packages/babel-generator/test/fixtures/flow/internal-slot/output.js
index a8c375a2c456..2a48fb9f186a 100644
--- a/packages/babel-generator/test/fixtures/flow/internal-slot/output.js
+++ b/packages/babel-generator/test/fixtures/flow/internal-slot/output.js
@@ -4,18 +4,18 @@ declare class C {
 declare class C {
   [[foo]]: T
 }
-interface T {
+interface I {
   [[foo]]: X
 }
-interface T {
+interface I {
   [[foo]]() => X
 }
-type T = {
+type T1 = {
   [[foo]]: X
 };
-type T = {
+type T2 = {
   [[foo]]() => X
 };
-type T = {
+type T3 = {
   [[foo]]?: X
-};
+};
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/input.js b/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/input.js
new file mode 100644
index 000000000000..08324814210d
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/input.js
@@ -0,0 +1,4 @@
+type T1 = { ... };
+type T2 = { a: { b: { c: {...}, ... }, ... } }
+type T3 = { foo: number, ... };
+type T4 = { foo: number, bar: string, ... };
diff --git a/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/options.json b/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/options.json
new file mode 100644
index 000000000000..eb4e948bfaa5
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/options.json
@@ -0,0 +1,3 @@
+{
+  "compact": true
+}
diff --git a/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/output.js b/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/output.js
new file mode 100644
index 000000000000..a0027248e9a5
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/flow/object-literal-types-compact/output.js
@@ -0,0 +1 @@
+type T1={...};type T2={a:{b:{c:{...},...},...}};type T3={foo:number,...};type T4={foo:number,bar:string,...};
diff --git a/packages/babel-generator/test/fixtures/flow/object-literal-types/input.js b/packages/babel-generator/test/fixtures/flow/object-literal-types/input.js
index 6d747ee65e10..9733370c5ff8 100644
--- a/packages/babel-generator/test/fixtures/flow/object-literal-types/input.js
+++ b/packages/babel-generator/test/fixtures/flow/object-literal-types/input.js
@@ -1,11 +1,15 @@
 type U = {};
 type V = {};
-type T = { ...U, };
-type T = { ...U, ...V };
-type T = { p: V, ...U };
-type T = { ...U, p: V, };
-type T = { ...{}|{ p: V, }};
-type T = { foo(): number }
-type T = { foo: () => number }
-type T = { [string]: U };
-type T = { [param: string]: U };
+type T1 = { ...U, };
+type T2 = { ...U, ...V };
+type T3 = { p: V, ...U };
+type T4 = { ...U, p: V, };
+type T5 = { ...{}|{ p: V, }};
+type T6 = { foo(): number }
+type T7 = { foo: () => number }
+type T8 = { [string]: U };
+type T9 = { [param: string]: U };
+type T10 = { ... };
+type T11 = { a: { b: { c: {...}, ... }, ... } }
+type T12 = { foo: number, ... };
+type T13 = { foo: number, bar: string, ... };
diff --git a/packages/babel-generator/test/fixtures/flow/object-literal-types/output.js b/packages/babel-generator/test/fixtures/flow/object-literal-types/output.js
index 952f62e3022e..2a3769b1abd5 100644
--- a/packages/babel-generator/test/fixtures/flow/object-literal-types/output.js
+++ b/packages/babel-generator/test/fixtures/flow/object-literal-types/output.js
@@ -1,30 +1,49 @@
 type U = {};
 type V = {};
-type T = { ...U
+type T1 = { ...U
 };
-type T = { ...U,
+type T2 = { ...U,
   ...V,
 };
-type T = {
+type T3 = {
   p: V,
   ...U,
 };
-type T = { ...U,
+type T4 = { ...U,
   p: V,
 };
-type T = { ...{} | {
+type T5 = { ...{} | {
     p: V
   }
 };
-type T = {
+type T6 = {
   foo(): number
 };
-type T = {
+type T7 = {
   foo: () => number
 };
-type T = {
+type T8 = {
   [string]: U
 };
-type T = {
+type T9 = {
   [param: string]: U
-};
\ No newline at end of file
+};
+type T10 = {...};
+type T11 = {
+  a: {
+    b: {
+      c: {...},
+      ...
+    },
+    ...
+  }
+};
+type T12 = {
+  foo: number,
+  ...
+};
+type T13 = {
+  foo: number,
+  bar: string,
+  ...
+};
diff --git a/packages/babel-generator/test/fixtures/flow/opaque-type-alias/input.js b/packages/babel-generator/test/fixtures/flow/opaque-type-alias/input.js
index 1988fcaeed71..3e77fce2b1ca 100644
--- a/packages/babel-generator/test/fixtures/flow/opaque-type-alias/input.js
+++ b/packages/babel-generator/test/fixtures/flow/opaque-type-alias/input.js
@@ -1,7 +1,7 @@
 opaque type ID = string;
 opaque type Foo<T> = Bar<T>;
 opaque type Maybe<T> = _Maybe<T, *>;
-export opaque type Foo = number;
+export opaque type Foo2 = number;
 
 opaque type union =
  | {type: "A"}
diff --git a/packages/babel-generator/test/fixtures/flow/opaque-type-alias/output.js b/packages/babel-generator/test/fixtures/flow/opaque-type-alias/output.js
index d5868b9298d7..293f54010947 100644
--- a/packages/babel-generator/test/fixtures/flow/opaque-type-alias/output.js
+++ b/packages/babel-generator/test/fixtures/flow/opaque-type-alias/output.js
@@ -1,10 +1,10 @@
 opaque type ID = string;
 opaque type Foo<T> = Bar<T>;
 opaque type Maybe<T> = _Maybe<T, *>;
-export opaque type Foo = number;
+export opaque type Foo2 = number;
 opaque type union = {
   type: "A"
 } | {
   type: "B"
 };
-opaque type overloads = (x: string) => number & (x: number) => string;
\ No newline at end of file
+opaque type overloads = ((x: string) => number) & ((x: number) => string);
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/parantheses/input.js b/packages/babel-generator/test/fixtures/flow/parantheses/input.js
new file mode 100644
index 000000000000..f7e2c3973871
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/flow/parantheses/input.js
@@ -0,0 +1,3 @@
+type A = (<T>(T) => $Foo<T>) & (<T>(T) => $Foo<T>);
+type B = (<T>(T) => $Foo<T>) | (<T>(T) => $Foo<T>);
+type C = (<T>(T) => $Foo<T>)[];
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/parantheses/output.js b/packages/babel-generator/test/fixtures/flow/parantheses/output.js
new file mode 100644
index 000000000000..f7e2c3973871
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/flow/parantheses/output.js
@@ -0,0 +1,3 @@
+type A = (<T>(T) => $Foo<T>) & (<T>(T) => $Foo<T>);
+type B = (<T>(T) => $Foo<T>) | (<T>(T) => $Foo<T>);
+type C = (<T>(T) => $Foo<T>)[];
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/predicates/input.js b/packages/babel-generator/test/fixtures/flow/predicates/input.js
index bbbbe2c8f2a6..8e614a82f184 100644
--- a/packages/babel-generator/test/fixtures/flow/predicates/input.js
+++ b/packages/babel-generator/test/fixtures/flow/predicates/input.js
@@ -12,6 +12,6 @@ function is_string(x): boolean %checks {
 
 var f = (x: mixed): %checks => typeof x === "string";
 
-const foo = (x: mixed): boolean %checks => typeof x === "string";
+const foo2 = (x: mixed): boolean %checks => typeof x === "string";
 
 (x): %checks => x !== null;
diff --git a/packages/babel-generator/test/fixtures/flow/predicates/output.js b/packages/babel-generator/test/fixtures/flow/predicates/output.js
index 23ddac63478f..bc1ac228aaa1 100644
--- a/packages/babel-generator/test/fixtures/flow/predicates/output.js
+++ b/packages/babel-generator/test/fixtures/flow/predicates/output.js
@@ -12,6 +12,6 @@ function is_string(x): boolean %checks {
 
 var f = (x: mixed): %checks => typeof x === "string";
 
-const foo = (x: mixed): boolean %checks => typeof x === "string";
+const foo2 = (x: mixed): boolean %checks => typeof x === "string";
 
 x: %checks => x !== null;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/string-literal-types/input.js b/packages/babel-generator/test/fixtures/flow/string-literal-types/input.js
index 6acd7f134271..a80478634827 100644
--- a/packages/babel-generator/test/fixtures/flow/string-literal-types/input.js
+++ b/packages/babel-generator/test/fixtures/flow/string-literal-types/input.js
@@ -1,2 +1,2 @@
-function createElement(tagName: "div"): HTMLDivElement {}
-function createElement(tagName: 'div'): HTMLDivElement {}
+function createElement1(tagName: "div"): HTMLDivElement {}
+function createElement2(tagName: 'div'): HTMLDivElement {}
diff --git a/packages/babel-generator/test/fixtures/flow/string-literal-types/output.js b/packages/babel-generator/test/fixtures/flow/string-literal-types/output.js
index 97251990f3ea..523469a5c34f 100644
--- a/packages/babel-generator/test/fixtures/flow/string-literal-types/output.js
+++ b/packages/babel-generator/test/fixtures/flow/string-literal-types/output.js
@@ -1,3 +1,3 @@
-function createElement(tagName: "div"): HTMLDivElement {}
+function createElement1(tagName: "div"): HTMLDivElement {}
 
-function createElement(tagName: 'div'): HTMLDivElement {}
\ No newline at end of file
+function createElement2(tagName: 'div'): HTMLDivElement {}
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/type-alias/input.js b/packages/babel-generator/test/fixtures/flow/type-alias/input.js
index ed16c5d28d5a..c1d567e6dfdd 100644
--- a/packages/babel-generator/test/fixtures/flow/type-alias/input.js
+++ b/packages/babel-generator/test/fixtures/flow/type-alias/input.js
@@ -1,7 +1,7 @@
 type FBID = number;
 type Foo<T> = Bar<T>;
 type Maybe<T> = _Maybe<T, *>;
-export type Foo = number;
+export type Foo2 = number;
 
 type union =
  | {type: "A"}
@@ -14,3 +14,5 @@ type overloads =
 ;
 
 type func = string => string;
+
+type D = X.Y<Z>;
diff --git a/packages/babel-generator/test/fixtures/flow/type-alias/output.js b/packages/babel-generator/test/fixtures/flow/type-alias/output.js
index dc12829d21c7..51933a7a774e 100644
--- a/packages/babel-generator/test/fixtures/flow/type-alias/output.js
+++ b/packages/babel-generator/test/fixtures/flow/type-alias/output.js
@@ -1,11 +1,12 @@
 type FBID = number;
 type Foo<T> = Bar<T>;
 type Maybe<T> = _Maybe<T, *>;
-export type Foo = number;
+export type Foo2 = number;
 type union = {
   type: "A"
 } | {
   type: "B"
 };
-type overloads = (x: string) => number & (x: number) => string;
+type overloads = ((x: string) => number) & ((x: number) => string);
 type func = (string) => string;
+type D = X.Y<Z>;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/type-annotations/input.js b/packages/babel-generator/test/fixtures/flow/type-annotations/input.js
index d94dd1ce665c..e7335c30b72a 100644
--- a/packages/babel-generator/test/fixtures/flow/type-annotations/input.js
+++ b/packages/babel-generator/test/fixtures/flow/type-annotations/input.js
@@ -1,130 +1,130 @@
-function foo(numVal: any) {}
-function foo(numVal: number) {}
-function foo(numVal: number, strVal: string) {}
-function foo(numVal: number, untypedVal) {}
-function foo(untypedVal, numVal: number) {}
-function foo(nullableNum: ?number) {}
-function foo(callback: () => void) {}
-function foo(callback: () => number) {}
-function foo(callback: (_: bool) => number) {}
-function foo(callback: (_1: bool, _2: string) => number) {}
-function foo(callback: (_1: bool, ...foo: Array<number>) => number) {}
-function foo(): number{}
-function foo():() => void {}
-function foo():(_:bool) => number{}
-function foo():(_?:bool) => number{}
-function foo(): {} {}
-function foo<T>() {}
-function foo<T,S>() {}
-function foo<T: F>() {}
-a = function<T,S>() {};
-a = { set fooProp(value: number) {} };
-a = { set fooProp(value: number): void {} };
-a = { get fooProp():number{} };
-a = { id<T>(x: T): T {} };
-a = { *id<T>(x: T): T {} };
-a = { async id<T>(x: T): T {} };
-a = { 123<T>(x: T): T {} };
-class Foo {
+function foo1(numVal: any) {}
+function foo2(numVal: number) {}
+function foo3(numVal: number, strVal: string) {}
+function foo4(numVal: number, untypedVal) {}
+function foo5(untypedVal, numVal: number) {}
+function foo6(nullableNum: ?number) {}
+function foo7(callback: () => void) {}
+function foo8(callback: () => number) {}
+function foo9(callback: (_: bool) => number) {}
+function foo10(callback: (_1: bool, _2: string) => number) {}
+function foo11(callback: (_1: bool, ...foo: Array<number>) => number) {}
+function foo12(): number{}
+function foo13():() => void {}
+function foo14():(_:bool) => number{}
+function foo15():(_?:bool) => number{}
+function foo16(): {} {}
+function foo17<T>() {}
+function foo18<T,S>() {}
+function foo19<T: F>() {}
+a1 = function<T,S>() {};
+a2 = { set fooProp(value: number) {} };
+a3 = { set fooProp(value: number): void {} };
+a4 = { get fooProp():number{} };
+a5 = { id<T>(x: T): T {} };
+a6 = { *id<T>(x: T): T {} };
+a7 = { async id<T>(x: T): T {} };
+a8 = { 123<T>(x: T): T {} };
+class Foo1 {
   set fooProp(value: number) {}
 }
-class Foo {
+class Foo2 {
   set fooProp(value: number): void {}
 }
-class Foo {
+class Foo3 {
   get fooProp(): number {}
 }
-var numVal: number;
-var numVal: empty;
-var numVal: mixed;
-var numVal: number = otherNumVal;
-var a: { numVal: number };
-var a: { numVal: number; };
-var a: { numVal: number; [indexer: string]: number };
-var a: ?{ numVal: number };
-var a: { numVal: number; strVal: string }
-var a: { subObj: {strVal: string} }
-var a: { subObj: ?{strVal: string} }
-var a: { param1: number; param2: string }
-var a: { param1: number; param2?: string }
-var a: { [a: number]: string; [b: number]: string; };
-var a: { add(x: number, ...y: Array<string>): void };
-var a: { subtract: (x: number, ...y: Array<string>) => void };
-var a: { id<T>(x: T): T; };
-var a:Array<number> = [1, 2, 3]
-a = class Foo<T> {}
-a = class Foo<T> extends Bar<T> {}
-class Foo<T> {}
-class Foo<T> extends Bar<T> {}
-class Foo<T> extends mixin(Bar) {}
-class Foo<T> {
+var numVal1: number;
+var numVal2: empty;
+var numVal3: mixed;
+var numVal4: number = otherNumVal;
+var a1: { numVal: number };
+var a2: { numVal: number; };
+var a3: { numVal: number; [indexer: string]: number };
+var a4: ?{ numVal: number };
+var a5: { numVal: number; strVal: string }
+var a6: { subObj: {strVal: string} }
+var a7: { subObj: ?{strVal: string} }
+var a8: { param1: number; param2: string }
+var a9: { param1: number; param2?: string }
+var a10: { [a: number]: string; [b: number]: string; };
+var a11: { add(x: number, ...y: Array<string>): void };
+var a12: { subtract: (x: number, ...y: Array<string>) => void };
+var a13: { id<T>(x: T): T; };
+var a14:Array<number> = [1, 2, 3]
+a13 = class Foo<T> {}
+a14 = class Foo<T> extends Bar<T> {}
+class Foo4<T> {}
+class Foo5<T> extends Bar<T> {}
+class Foo6<T> extends mixin(Bar) {}
+class Foo7<T> {
   bar<U>():number { return 42; }
 }
-class Foo {
+class Foo8 {
   "bar"<T>() {}
 }
-function foo(requiredParam, optParam?) {}
-class Foo {
+function foo20(requiredParam, optParam?) {}
+class Foo9 {
   prop1: string;
   prop2: number;
 }
-class Foo {
+class Foo10 {
   static prop1: string;
   prop2: number;
 }
-class Foo {
+class Foo11 {
   #prop1: string;
   prop2: number;
 }
-var x: number | string = 4;
+var x1: number | string = 4;
 class Array { concat(items:number | string) {}; }
-var x: () => number | () => string = fn;
-var x: typeof Y = Y;
-var x: typeof Y | number = Y;
-var {x}: {x: string; } = { x: "hello" };
-var {x}: {x: string } = { x: "hello" };
-var [x]: Array<string> = [ "hello" ];
-function foo({x}: { x: string; }) {}
-function foo([x]: Array<string>) {}
-function foo(...rest: Array<number>) {}
+var x2: () => number | () => string = fn;
+var x3: typeof Y = Y;
+var x4: typeof Y | number = Y;
+var {x5}: {x5: string; } = { x5: "hello" };
+var {x6}: {x6: string } = { x6: "hello" };
+var [x7]: Array<string> = [ "hello" ];
+function foo21({x}: { x: string; }) {}
+function foo22([x]: Array<string>) {}
+function foo23(...rest: Array<number>) {}
 (function (...rest: Array<number>) {});
 ((...rest: Array<number>) => rest);
-var a: Map<string, Array<string> >
-var a: Map<string, Array<string>>
-var a: number[]
-var a: ?string[]
-var a: Promise<bool>[]
-var a:(...rest:Array<number>) => number
-var identity: <T>(x: T) => T
-var identity: <T>(x: T, ...y:T[]) => T
-import type foo from "bar";
-import type { foo, bar } from "baz";
-import type { foo as bar } from "baz";
+var a15: Map<string, Array<string> >
+var a16: Map<string, Array<string>>
+var a17: number[]
+var a18: ?string[]
+var a19: Promise<bool>[]
+var a20:(...rest:Array<number>) => number
+var identity1: <T>(x: T) => T
+var identity2: <T>(x: T, ...y:T[]) => T
+import type foo24 from "bar";
+import type { foo25, bar1 } from "baz";
+import type { foo as bar2 } from "baz";
 import type from "foo";
-import type, { foo } from "bar";
+import type2, { foo26 } from "bar";
 import typeof * as namespace from "bar";
-import { type Foo } from "bar";
-import { typeof Foo } from "bar";
-import { type Foo as Bar } from "bar";
-import { typeof Foo as Bar } from "bar";
-export type { foo };
+import { type Foo12 } from "bar";
+import { typeof Foo13 } from "bar";
+import { type Foo as Bar1 } from "bar";
+import { typeof Foo as Bar2 } from "bar";
+export type { foo1 };
 export type { bar } from "bar";
 export interface baz { p: number }
 export interface qux<T> { p: T }
-var a: ?Array<?string>;
-var a: {| numVal: number |};
-var a: {| numVal: number; |};
-var a: {| numVal: number; [indexer: string]: number |};
-var a: ?{| numVal: number |};
-var a: {| numVal: number; strVal: string |}
-var a: {| subObj: {strVal: string} |}
-var a: {| subObj: ?{strVal: string} |}
-var a: {| param1: number; param2: string |}
-var a: {| param1: number; param2?: string |}
-var a: {| [a: number]: string; [b: number]: string; |};
-var a: {| add(x: number, ...y: Array<string>): void |};
-var a: {| subtract: (x: number, ...y: Array<string>) => void |};
-var a: {| id<T>(x: T): T; |};
-function foo(numVal: number = 2) {}
-function foo(numVal?: number = 2) {}
+var a21: ?Array<?string>;
+var a22: {| numVal: number |};
+var a23: {| numVal: number; |};
+var a24: {| numVal: number; [indexer: string]: number |};
+var a25: ?{| numVal: number |};
+var a26: {| numVal: number; strVal: string |}
+var a27: {| subObj: {strVal: string} |}
+var a28: {| subObj: ?{strVal: string} |}
+var a29: {| param1: number; param2: string |}
+var a30: {| param1: number; param2?: string |}
+var a31: {| [a: number]: string; [b: number]: string; |};
+var a32: {| add(x: number, ...y: Array<string>): void |};
+var a33: {| subtract: (x: number, ...y: Array<string>) => void |};
+var a34: {| id<T>(x: T): T; |};
+function foo27(numVal: number = 2) {}
+function foo28(numVal?: number = 2) {}
 export type * from "foo";
diff --git a/packages/babel-generator/test/fixtures/flow/type-annotations/output.js b/packages/babel-generator/test/fixtures/flow/type-annotations/output.js
index 433354505279..6465359f336d 100644
--- a/packages/babel-generator/test/fixtures/flow/type-annotations/output.js
+++ b/packages/babel-generator/test/fixtures/flow/type-annotations/output.js
@@ -1,237 +1,237 @@
-function foo(numVal: any) {}
+function foo1(numVal: any) {}
 
-function foo(numVal: number) {}
+function foo2(numVal: number) {}
 
-function foo(numVal: number, strVal: string) {}
+function foo3(numVal: number, strVal: string) {}
 
-function foo(numVal: number, untypedVal) {}
+function foo4(numVal: number, untypedVal) {}
 
-function foo(untypedVal, numVal: number) {}
+function foo5(untypedVal, numVal: number) {}
 
-function foo(nullableNum: ?number) {}
+function foo6(nullableNum: ?number) {}
 
-function foo(callback: () => void) {}
+function foo7(callback: () => void) {}
 
-function foo(callback: () => number) {}
+function foo8(callback: () => number) {}
 
-function foo(callback: (_: boolean) => number) {}
+function foo9(callback: (_: boolean) => number) {}
 
-function foo(callback: (_1: boolean, _2: string) => number) {}
+function foo10(callback: (_1: boolean, _2: string) => number) {}
 
-function foo(callback: (_1: boolean, ...foo: Array<number>) => number) {}
+function foo11(callback: (_1: boolean, ...foo: Array<number>) => number) {}
 
-function foo(): number {}
+function foo12(): number {}
 
-function foo(): () => void {}
+function foo13(): () => void {}
 
-function foo(): (_: boolean) => number {}
+function foo14(): (_: boolean) => number {}
 
-function foo(): (_?: boolean) => number {}
+function foo15(): (_?: boolean) => number {}
 
-function foo(): {} {}
+function foo16(): {} {}
 
-function foo<T>() {}
+function foo17<T>() {}
 
-function foo<T, S>() {}
+function foo18<T, S>() {}
 
-function foo<T: F>() {}
+function foo19<T: F>() {}
 
-a = function <T, S>() {};
+a1 = function <T, S>() {};
 
-a = {
+a2 = {
   set fooProp(value: number) {}
 
 };
-a = {
+a3 = {
   set fooProp(value: number): void {}
 
 };
-a = {
+a4 = {
   get fooProp(): number {}
 
 };
-a = {
+a5 = {
   id<T>(x: T): T {}
 
 };
-a = {
+a6 = {
   *id<T>(x: T): T {}
 
 };
-a = {
+a7 = {
   async id<T>(x: T): T {}
 
 };
-a = {
+a8 = {
   123<T>(x: T): T {}
 
 };
 
-class Foo {
+class Foo1 {
   set fooProp(value: number) {}
 
 }
 
-class Foo {
+class Foo2 {
   set fooProp(value: number): void {}
 
 }
 
-class Foo {
+class Foo3 {
   get fooProp(): number {}
 
 }
 
-var numVal: number;
-var numVal: empty;
-var numVal: mixed;
-var numVal: number = otherNumVal;
-var a: {
+var numVal1: number;
+var numVal2: empty;
+var numVal3: mixed;
+var numVal4: number = otherNumVal;
+var a1: {
   numVal: number
 };
-var a: {
+var a2: {
   numVal: number
 };
-var a: {
+var a3: {
   numVal: number,
   [indexer: string]: number,
 };
-var a: ?{
+var a4: ?{
   numVal: number
 };
-var a: {
+var a5: {
   numVal: number,
   strVal: string,
 };
-var a: {
+var a6: {
   subObj: {
     strVal: string
   }
 };
-var a: {
+var a7: {
   subObj: ?{
     strVal: string
   }
 };
-var a: {
+var a8: {
   param1: number,
   param2: string,
 };
-var a: {
+var a9: {
   param1: number,
   param2?: string,
 };
-var a: {
+var a10: {
   [a: number]: string,
   [b: number]: string,
 };
-var a: {
+var a11: {
   add(x: number, ...y: Array<string>): void
 };
-var a: {
+var a12: {
   subtract: (x: number, ...y: Array<string>) => void
 };
-var a: {
+var a13: {
   id<T>(x: T): T
 };
-var a: Array<number> = [1, 2, 3];
-a = class Foo<T> {};
-a = class Foo<T> extends Bar<T> {};
+var a14: Array<number> = [1, 2, 3];
+a13 = class Foo<T> {};
+a14 = class Foo<T> extends Bar<T> {};
 
-class Foo<T> {}
+class Foo4<T> {}
 
-class Foo<T> extends Bar<T> {}
+class Foo5<T> extends Bar<T> {}
 
-class Foo<T> extends mixin(Bar) {}
+class Foo6<T> extends mixin(Bar) {}
 
-class Foo<T> {
+class Foo7<T> {
   bar<U>(): number {
     return 42;
   }
 
 }
 
-class Foo {
+class Foo8 {
   "bar"<T>() {}
 
 }
 
-function foo(requiredParam, optParam?) {}
+function foo20(requiredParam, optParam?) {}
 
-class Foo {
+class Foo9 {
   prop1: string;
   prop2: number;
 }
 
-class Foo {
+class Foo10 {
   static prop1: string;
   prop2: number;
 }
 
-class Foo {
+class Foo11 {
   #prop1: string;
   prop2: number;
 }
 
-var x: number | string = 4;
+var x1: number | string = 4;
 
 class Array {
   concat(items: number | string) {}
 
 }
 
-var x: () => number | () => string = fn;
-var x: typeof Y = Y;
-var x: typeof Y | number = Y;
+var x2: () => number | (() => string) = fn;
+var x3: typeof Y = Y;
+var x4: typeof Y | number = Y;
 var {
-  x
+  x5
 }: {
-  x: string
+  x5: string
 } = {
-  x: "hello"
+  x5: "hello"
 };
 var {
-  x
+  x6
 }: {
-  x: string
+  x6: string
 } = {
-  x: "hello"
+  x6: "hello"
 };
-var [x]: Array<string> = ["hello"];
+var [x7]: Array<string> = ["hello"];
 
-function foo({
+function foo21({
   x
 }: {
   x: string
 }) {}
 
-function foo([x]: Array<string>) {}
+function foo22([x]: Array<string>) {}
 
-function foo(...rest: Array<number>) {}
+function foo23(...rest: Array<number>) {}
 
 (function (...rest: Array<number>) {});
 
 (...rest: Array<number>) => rest;
 
-var a: Map<string, Array<string>>;
-var a: Map<string, Array<string>>;
-var a: number[];
-var a: ?string[];
-var a: Promise<boolean>[];
-var a: (...rest: Array<number>) => number;
-var identity: <T>(x: T) => T;
-var identity: <T>(x: T, ...y: T[]) => T;
-import type foo from "bar";
-import type { foo, bar } from "baz";
-import type { foo as bar } from "baz";
+var a15: Map<string, Array<string>>;
+var a16: Map<string, Array<string>>;
+var a17: number[];
+var a18: ?string[];
+var a19: Promise<boolean>[];
+var a20: (...rest: Array<number>) => number;
+var identity1: <T>(x: T) => T;
+var identity2: <T>(x: T, ...y: T[]) => T;
+import type foo24 from "bar";
+import type { foo25, bar1 } from "baz";
+import type { foo as bar2 } from "baz";
 import type from "foo";
-import type, { foo } from "bar";
+import type2, { foo26 } from "bar";
 import typeof * as namespace from "bar";
-import { type Foo } from "bar";
-import { typeof Foo } from "bar";
-import { type Foo as Bar } from "bar";
-import { typeof Foo as Bar } from "bar";
-export type { foo };
+import { type Foo12 } from "bar";
+import { typeof Foo13 } from "bar";
+import { type Foo as Bar1 } from "bar";
+import { typeof Foo as Bar2 } from "bar";
+export type { foo1 };
 export type { bar } from "bar";
 export interface baz {
   p: number
@@ -239,58 +239,58 @@ export interface baz {
 export interface qux<T> {
   p: T
 }
-var a: ?Array<?string>;
-var a: {|
+var a21: ?Array<?string>;
+var a22: {|
   numVal: number
 |};
-var a: {|
+var a23: {|
   numVal: number
 |};
-var a: {|
+var a24: {|
   numVal: number,
   [indexer: string]: number,
 |};
-var a: ?{|
+var a25: ?{|
   numVal: number
 |};
-var a: {|
+var a26: {|
   numVal: number,
   strVal: string,
 |};
-var a: {|
+var a27: {|
   subObj: {
     strVal: string
   }
 |};
-var a: {|
+var a28: {|
   subObj: ?{
     strVal: string
   }
 |};
-var a: {|
+var a29: {|
   param1: number,
   param2: string,
 |};
-var a: {|
+var a30: {|
   param1: number,
   param2?: string,
 |};
-var a: {|
+var a31: {|
   [a: number]: string,
   [b: number]: string,
 |};
-var a: {|
+var a32: {|
   add(x: number, ...y: Array<string>): void
 |};
-var a: {|
+var a33: {|
   subtract: (x: number, ...y: Array<string>) => void
 |};
-var a: {|
+var a34: {|
   id<T>(x: T): T
 |};
 
-function foo(numVal: number = 2) {}
+function foo27(numVal: number = 2) {}
 
-function foo(numVal?: number = 2) {}
+function foo28(numVal?: number = 2) {}
 
 export type * from "foo";
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/flow/type-parameters/input.js b/packages/babel-generator/test/fixtures/flow/type-parameters/input.js
index a995d06499f4..5d0b94ca1569 100644
--- a/packages/babel-generator/test/fixtures/flow/type-parameters/input.js
+++ b/packages/babel-generator/test/fixtures/flow/type-parameters/input.js
@@ -1,21 +1,21 @@
-type A<T = string> = T;
-type A<T = *> = T;
-type A<T: ?string = string> = T;
-type A<S, T: ?string = string> = T;
-type A<S = number, T: ?string = string> = T;
-class A<T = string> {}
-class A<T: ?string = string> {}
-class A<S, T: ?string = string> {}
-class A<S = number, T: ?string = string> {}
-(class A<T = string> {});
-(class A<T: ?string = string> {});
-(class A<S, T: ?string = string> {});
-(class A<S = number, T: ?string = string> {});
-declare class A<T = string> {}
-declare class A<T: ?string = string> {}
-declare class A<S, T: ?string = string> {}
-declare class A<S = number, T: ?string = string> {}
-interface A<T = string> {}
-interface A<T: ?string = string> {}
-interface A<S, T: ?string = string> {}
-interface A<S = number, T: ?string = string> {}
+type A1<T = string> = T;
+type A2<T = *> = T;
+type A3<T: ?string = string> = T;
+type A4<S, T: ?string = string> = T;
+type A5<S = number, T: ?string = string> = T;
+class A6<T = string> {}
+class A7<T: ?string = string> {}
+class A8<S, T: ?string = string> {}
+class A9<S = number, T: ?string = string> {}
+(class A10<T = string> {});
+(class A11<T: ?string = string> {});
+(class A12<S, T: ?string = string> {});
+(class A13<S = number, T: ?string = string> {});
+declare class A14<T = string> {}
+declare class A15<T: ?string = string> {}
+declare class A16<S, T: ?string = string> {}
+declare class A17<S = number, T: ?string = string> {}
+interface A18<T = string> {}
+interface A19<T: ?string = string> {}
+interface A20<S, T: ?string = string> {}
+interface A21<S = number, T: ?string = string> {}
diff --git a/packages/babel-generator/test/fixtures/flow/type-parameters/output.js b/packages/babel-generator/test/fixtures/flow/type-parameters/output.js
index f4477884494d..768f82b1feaf 100644
--- a/packages/babel-generator/test/fixtures/flow/type-parameters/output.js
+++ b/packages/babel-generator/test/fixtures/flow/type-parameters/output.js
@@ -1,30 +1,30 @@
-type A<T = string> = T;
-type A<T = *> = T;
-type A<T: ?string = string> = T;
-type A<S, T: ?string = string> = T;
-type A<S = number, T: ?string = string> = T;
+type A1<T = string> = T;
+type A2<T = *> = T;
+type A3<T: ?string = string> = T;
+type A4<S, T: ?string = string> = T;
+type A5<S = number, T: ?string = string> = T;
 
-class A<T = string> {}
+class A6<T = string> {}
 
-class A<T: ?string = string> {}
+class A7<T: ?string = string> {}
 
-class A<S, T: ?string = string> {}
+class A8<S, T: ?string = string> {}
 
-class A<S = number, T: ?string = string> {}
+class A9<S = number, T: ?string = string> {}
 
-(class A<T = string> {});
+(class A10<T = string> {});
 
-(class A<T: ?string = string> {});
+(class A11<T: ?string = string> {});
 
-(class A<S, T: ?string = string> {});
+(class A12<S, T: ?string = string> {});
 
-(class A<S = number, T: ?string = string> {});
+(class A13<S = number, T: ?string = string> {});
 
-declare class A<T = string> {}
-declare class A<T: ?string = string> {}
-declare class A<S, T: ?string = string> {}
-declare class A<S = number, T: ?string = string> {}
-interface A<T = string> {}
-interface A<T: ?string = string> {}
-interface A<S, T: ?string = string> {}
-interface A<S = number, T: ?string = string> {}
\ No newline at end of file
+declare class A14<T = string> {}
+declare class A15<T: ?string = string> {}
+declare class A16<S, T: ?string = string> {}
+declare class A17<S = number, T: ?string = string> {}
+interface A18<T = string> {}
+interface A19<T: ?string = string> {}
+interface A20<S, T: ?string = string> {}
+interface A21<S = number, T: ?string = string> {}
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/input.js b/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/input.js
index b9325bbae180..a198e5160062 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/input.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/input.js
@@ -4,15 +4,15 @@ function t2({responseText}) {
 }
 function t3([a, b]) {
 }
-var [i, j, k] = array;
+var [i1, j1, k1] = array;
 var {
-  i,
-  j,
-  k
+  i2,
+  j2,
+  k2
 } = obj;
-let {i, j, k} = obj;
-const {i, j, k} = obj;
-var { value } = obj;
+let {i3, j3, k3} = obj;
+const {i4, j4, k4} = obj;
+var { value1 } = obj;
 var {
-  value
+  value2
 } = obj;
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/output.js b/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/output.js
index 8c09588f29a4..65da4d30e45d 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/output.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/destructuring-assignment/output.js
@@ -8,25 +8,25 @@ function t2({
 
 function t3([a, b]) {}
 
-var [i, j, k] = array;
+var [i1, j1, k1] = array;
 var {
-  i,
-  j,
-  k
+  i2,
+  j2,
+  k2
 } = obj;
 let {
-  i,
-  j,
-  k
+  i3,
+  j3,
+  k3
 } = obj;
 const {
-  i,
-  j,
-  k
+  i4,
+  j4,
+  k4
 } = obj;
 var {
-  value
+  value1
 } = obj;
 var {
-  value
+  value2
 } = obj;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/exports/input.js b/packages/babel-generator/test/fixtures/harmony-edgecase/exports/input.js
index ec680f05ac1d..540245d565b3 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/exports/input.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/exports/input.js
@@ -1,3 +1,4 @@
+var a, c;
 export * from "OK"
 export { name } from "OK"
 export { a as b, c as d } from "hello"
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/exports/output.js b/packages/babel-generator/test/fixtures/harmony-edgecase/exports/output.js
index 5482292b19a7..84c968fe12a3 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/exports/output.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/exports/output.js
@@ -1,3 +1,4 @@
+var a, c;
 export * from "OK";
 export { name } from "OK";
 export { a as b, c as d } from "hello";
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/input.js b/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/input.js
index 7fb048846d58..0b3e895ed0cc 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/input.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/input.js
@@ -1,5 +1,5 @@
-import foo from "foo";
-import * as foo from "foo";
+import foo1 from "foo";
+import * as foo2 from "foo";
 import ok, {
   foo as bar,
   test as testing,
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/output.js b/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/output.js
index 26bcdddc4545..0cc3e0472082 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/output.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/import-with-default/output.js
@@ -1,3 +1,3 @@
-import foo from "foo";
-import * as foo from "foo";
+import foo1 from "foo";
+import * as foo2 from "foo";
 import ok, { foo as bar, test as testing, logging } from "foo";
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/imports/input.js b/packages/babel-generator/test/fixtures/harmony-edgecase/imports/input.js
index 98bbc6bbcb68..db91fc8028d1 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/imports/input.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/imports/input.js
@@ -1,8 +1,8 @@
 import "foo";
 import {foo} from "foo";
-import {foo as bar} from "foo";
+import {foo as bar1} from "foo";
 import {
-  foo as bar,
+  foo as bar2,
   test as testing,
   logging
 } from "foo";
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/imports/output.js b/packages/babel-generator/test/fixtures/harmony-edgecase/imports/output.js
index 2406027fa302..651af1c0fe4a 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/imports/output.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/imports/output.js
@@ -1,4 +1,4 @@
 import "foo";
 import { foo } from "foo";
-import { foo as bar } from "foo";
-import { foo as bar, test as testing, logging } from "foo";
\ No newline at end of file
+import { foo as bar1 } from "foo";
+import { foo as bar2, test as testing, logging } from "foo";
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/input.js b/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/input.js
index c4cd936913e0..6e3396d15676 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/input.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/input.js
@@ -1,5 +1,5 @@
-var [a, b, ...rest] = array;
-const [a, b, ...rest] = array;
-function a([a, b, ...rest]) {
+var [a1, b1, ...rest1] = array;
+const [a2, b2, ...rest2] = array;
+function a([a1, b1, ...rest1]) {
 }
-([a, b, ...rest]) => { };
+([a1, b1, ...rest1]) => { };
diff --git a/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/output.js b/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/output.js
index d378ae924426..070fa55a1f3d 100644
--- a/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/output.js
+++ b/packages/babel-generator/test/fixtures/harmony-edgecase/spread-element/output.js
@@ -1,6 +1,6 @@
-var [a, b, ...rest] = array;
-const [a, b, ...rest] = array;
+var [a1, b1, ...rest1] = array;
+const [a2, b2, ...rest2] = array;
 
-function a([a, b, ...rest]) {}
+function a([a1, b1, ...rest1]) {}
 
-([a, b, ...rest]) => {};
\ No newline at end of file
+([a1, b1, ...rest1]) => {};
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/misc/placeholders/input.js b/packages/babel-generator/test/fixtures/misc/placeholders/input.js
new file mode 100644
index 000000000000..42eb25727b64
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/misc/placeholders/input.js
@@ -0,0 +1,8 @@
+var %%a%% = %%b%%
+
+%%c%%
+
+class %%d%% {}
+class A %%e%%
+
+function %%f%%(...%%g%%) %%h%%
diff --git a/packages/babel-generator/test/fixtures/misc/placeholders/options.json b/packages/babel-generator/test/fixtures/misc/placeholders/options.json
new file mode 100644
index 000000000000..92404e501295
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/misc/placeholders/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["placeholders"]
+}
diff --git a/packages/babel-generator/test/fixtures/misc/placeholders/output.js b/packages/babel-generator/test/fixtures/misc/placeholders/output.js
new file mode 100644
index 000000000000..82ad54ecc61e
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/misc/placeholders/output.js
@@ -0,0 +1,8 @@
+var %%a%% = %%b%%;
+%%c%%;
+
+class %%d%% {}
+
+class A %%e%%
+
+function %%f%%(...%%g%%) %%h%%
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/parentheses/class-extends/input.js b/packages/babel-generator/test/fixtures/parentheses/class-extends/input.js
index 308200e8d2e4..23e941a3b122 100644
--- a/packages/babel-generator/test/fixtures/parentheses/class-extends/input.js
+++ b/packages/babel-generator/test/fixtures/parentheses/class-extends/input.js
@@ -1,22 +1,22 @@
-class A extends (() => {}) {}
-class A extends (B = C) {}
-class A extends (B || C) {}
-class A extends (B + C) {}
-class A extends B() {}
-class A extends class {} {}
-class A extends (B ? C : D) {}
-class A extends (new B()) {}
-class A extends (B, C) {}
-class A extends ({}) {}
-class A extends B.C {}
-class A extends function() {} {}
-class A extends (void B) {}
-class A extends (++B) {}
+class A1 extends (() => {}) {}
+class A2 extends (B = C) {}
+class A3 extends (B || C) {}
+class A4 extends (B + C) {}
+class A5 extends B() {}
+class A6 extends class {} {}
+class A7 extends (B ? C : D) {}
+class A8 extends (new B()) {}
+class A9 extends (B, C) {}
+class A10 extends ({}) {}
+class A11 extends B.C {}
+class A12 extends function() {} {}
+class A13 extends (void B) {}
+class A14 extends (++B) {}
 
-async function f() {
-  class A extends (await C) {}
+async function f1() {
+  class A15 extends (await C) {}
 }
 
-function* f() {
-  class A extends (yield 1) {}
+function* f2() {
+  class A16 extends (yield 1) {}
 }
diff --git a/packages/babel-generator/test/fixtures/parentheses/class-extends/output.js b/packages/babel-generator/test/fixtures/parentheses/class-extends/output.js
index 4b67a09f7e4a..a898c15b5a13 100644
--- a/packages/babel-generator/test/fixtures/parentheses/class-extends/output.js
+++ b/packages/babel-generator/test/fixtures/parentheses/class-extends/output.js
@@ -1,35 +1,35 @@
-class A extends (() => {}) {}
+class A1 extends (() => {}) {}
 
-class A extends (B = C) {}
+class A2 extends (B = C) {}
 
-class A extends (B || C) {}
+class A3 extends (B || C) {}
 
-class A extends (B + C) {}
+class A4 extends (B + C) {}
 
-class A extends B() {}
+class A5 extends B() {}
 
-class A extends class {} {}
+class A6 extends class {} {}
 
-class A extends (B ? C : D) {}
+class A7 extends (B ? C : D) {}
 
-class A extends (new B()) {}
+class A8 extends (new B()) {}
 
-class A extends (B, C) {}
+class A9 extends (B, C) {}
 
-class A extends {} {}
+class A10 extends {} {}
 
-class A extends B.C {}
+class A11 extends B.C {}
 
-class A extends function () {} {}
+class A12 extends function () {} {}
 
-class A extends (void B) {}
+class A13 extends (void B) {}
 
-class A extends (++B) {}
+class A14 extends (++B) {}
 
-async function f() {
-  class A extends (await C) {}
+async function f1() {
+  class A15 extends (await C) {}
 }
 
-function* f() {
-  class A extends (yield 1) {}
+function* f2() {
+  class A16 extends (yield 1) {}
 }
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/parentheses/terminator-break/input.js b/packages/babel-generator/test/fixtures/parentheses/terminator-break/input.js
index ad3ad2eecf90..b7fe375717db 100644
--- a/packages/babel-generator/test/fixtures/parentheses/terminator-break/input.js
+++ b/packages/babel-generator/test/fixtures/parentheses/terminator-break/input.js
@@ -1,10 +1,10 @@
-function foo() {
+function foo1() {
   return ( // foobar
     "bar"
   );
 }
 
-function foo() {
+function foo2() {
   return (
     // foobar
     "bar"
diff --git a/packages/babel-generator/test/fixtures/parentheses/terminator-break/output.js b/packages/babel-generator/test/fixtures/parentheses/terminator-break/output.js
index 1267e861f3a4..7ec6459a0d85 100644
--- a/packages/babel-generator/test/fixtures/parentheses/terminator-break/output.js
+++ b/packages/babel-generator/test/fixtures/parentheses/terminator-break/output.js
@@ -1,10 +1,10 @@
-function foo() {
+function foo1() {
   return (// foobar
     "bar"
   );
 }
 
-function foo() {
+function foo2() {
   return (// foobar
     "bar"
   );
diff --git a/packages/babel-generator/test/fixtures/parentheses/yield-expression/input.js b/packages/babel-generator/test/fixtures/parentheses/yield-expression/input.js
index b000b972b537..2d6b7957f17c 100644
--- a/packages/babel-generator/test/fixtures/parentheses/yield-expression/input.js
+++ b/packages/babel-generator/test/fixtures/parentheses/yield-expression/input.js
@@ -10,3 +10,7 @@ function* asdf() {
 function* a(b) {
   (yield xhr({ url: "views/test.html" })).data;
 }
+
+(async function* () {
+  await (yield 1);
+});
diff --git a/packages/babel-generator/test/fixtures/parentheses/yield-expression/output.js b/packages/babel-generator/test/fixtures/parentheses/yield-expression/output.js
index 28340375a453..e7c3bcd100df 100644
--- a/packages/babel-generator/test/fixtures/parentheses/yield-expression/output.js
+++ b/packages/babel-generator/test/fixtures/parentheses/yield-expression/output.js
@@ -11,4 +11,8 @@ function* a(b) {
   (yield xhr({
     url: "views/test.html"
   })).data;
-}
\ No newline at end of file
+}
+
+(async function* () {
+  await (yield 1);
+});
diff --git a/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/input.js b/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/input.js
new file mode 100644
index 000000000000..29e9b90f83e0
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/input.js
@@ -0,0 +1,12 @@
+foo(?);
+foo(?, x);
+foo(x, ?);
+foo(?, x, ?);
+obj.foo(x, ?);
+obj.foo(?, x);
+obj.foo(?, x, ?);
+class foo {
+  constructor() {
+      baz(this, () => super.bar(?));
+  }
+}
diff --git a/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/options.json b/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/options.json
new file mode 100644
index 000000000000..eff064512269
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/options.json
@@ -0,0 +1 @@
+{ "plugins": ["partialApplication"] }
diff --git a/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/output.js b/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/output.js
new file mode 100644
index 000000000000..7cb1b16bd55e
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/ArgumentPlaceholder/output.js
@@ -0,0 +1,14 @@
+foo(?);
+foo(?, x);
+foo(x, ?);
+foo(?, x, ?);
+obj.foo(x, ?);
+obj.foo(?, x);
+obj.foo(?, x, ?);
+
+class foo {
+  constructor() {
+    baz(this, () => super.bar(?));
+  }
+
+}
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/input.js b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/input.js
index bec3598e321c..ae3f4b33c003 100644
--- a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/input.js
+++ b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/input.js
@@ -5,12 +5,31 @@ class Foo {
   get foo() {}
   set foo(bar) {}
 
+  async #foo() {}
+  #foo() {}
+  get #foo() {}
+  set #foo(bar) {}
+  * #foo() {}
+  async * #foo() {}
+  get #bar() {}
+  set #baz(taz) {}
+
   static async foo() {}
   static foo() {}
   static ["foo"]() {}
   static get foo() {}
   static set foo(bar) {}
   static static() {}
+  static * foo() {}
+  static async * foo() {}
+
+  static #foo() {}
+  static async #foo() {}
+  static ["foo"]() {}
+  static get #foo() {}
+  static set #foo(taz) {}
+  static * #foo() {}
+  static async * #foo() {}
 
   get
   () {}
@@ -52,4 +71,4 @@ class Foo {
   get
   static
   () {}
-}
+}
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/options.json b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/options.json
new file mode 100644
index 000000000000..894b1b617167
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/options.json
@@ -0,0 +1 @@
+{ "plugins": ["classPrivateMethods", "asyncGenerators"] }
diff --git a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/output.js b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/output.js
index 4676bff086d0..24f3e9229c84 100644
--- a/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/output.js
+++ b/packages/babel-generator/test/fixtures/types/ClassBody-MethodDefinition/output.js
@@ -9,6 +9,22 @@ class Foo {
 
   set foo(bar) {}
 
+  async #foo() {}
+
+  #foo() {}
+
+  get #foo() {}
+
+  set #foo(bar) {}
+
+  *#foo() {}
+
+  async *#foo() {}
+
+  get #bar() {}
+
+  set #baz(taz) {}
+
   static async foo() {}
 
   static foo() {}
@@ -21,6 +37,24 @@ class Foo {
 
   static static() {}
 
+  static *foo() {}
+
+  static async *foo() {}
+
+  static #foo() {}
+
+  static async #foo() {}
+
+  static ["foo"]() {}
+
+  static get #foo() {}
+
+  static set #foo(taz) {}
+
+  static *#foo() {}
+
+  static async *#foo() {}
+
   get() {}
 
   set() {}
diff --git a/packages/babel-generator/test/fixtures/types/ClassExpression/input.js b/packages/babel-generator/test/fixtures/types/ClassExpression/input.js
index 1931f1faeae2..195044c70d69 100644
--- a/packages/babel-generator/test/fixtures/types/ClassExpression/input.js
+++ b/packages/babel-generator/test/fixtures/types/ClassExpression/input.js
@@ -1,2 +1,2 @@
 class Foo {}
-class Foo extends Bar {}
+class Foo2 extends Bar {}
diff --git a/packages/babel-generator/test/fixtures/types/ClassExpression/output.js b/packages/babel-generator/test/fixtures/types/ClassExpression/output.js
index 5355e2a5ed56..500088a1f3f7 100644
--- a/packages/babel-generator/test/fixtures/types/ClassExpression/output.js
+++ b/packages/babel-generator/test/fixtures/types/ClassExpression/output.js
@@ -1,3 +1,3 @@
 class Foo {}
 
-class Foo extends Bar {}
\ No newline at end of file
+class Foo2 extends Bar {}
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/Decorator/input.js b/packages/babel-generator/test/fixtures/types/Decorator/input.js
index f1946c7635fa..198a50e9c7a6 100644
--- a/packages/babel-generator/test/fixtures/types/Decorator/input.js
+++ b/packages/babel-generator/test/fixtures/types/Decorator/input.js
@@ -31,14 +31,14 @@ class Foo {
 }
 
 @foo
-export default class Foo {
+export default class Foo2 {
   bar() {
     class Baz {}
   }
 }
 
 @foo
-export class Foo {
+export class Foo3 {
   bar() {
     class Baz {}
   }
diff --git a/packages/babel-generator/test/fixtures/types/Decorator/output.js b/packages/babel-generator/test/fixtures/types/Decorator/output.js
index 5c526f5f61f9..db5f62ff6b7c 100644
--- a/packages/babel-generator/test/fixtures/types/Decorator/output.js
+++ b/packages/babel-generator/test/fixtures/types/Decorator/output.js
@@ -33,14 +33,14 @@ class Foo {
 }
 
 export default @foo
-class Foo {
+class Foo2 {
   bar() {
     class Baz {}
   }
 
 }
 export @foo
-class Foo {
+class Foo3 {
   bar() {
     class Baz {}
   }
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier11/input.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier11/input.js
index f40ac5c3434e..701c971b8991 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier11/input.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier11/input.js
@@ -1 +1,2 @@
 export { foo };
+var foo;
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier11/output.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier11/output.js
index f604032cb6d6..520c0fb1dda1 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier11/output.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier11/output.js
@@ -1 +1,2 @@
-export { foo };
\ No newline at end of file
+export { foo };
+var foo;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier12/input.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier12/input.js
index 9dfa348be312..5e6c6606032a 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier12/input.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier12/input.js
@@ -1 +1,2 @@
 export { foo, bar };
+var foo, bar;
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier12/output.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier12/output.js
index 4cb44a4b2592..be6d973b815d 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier12/output.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier12/output.js
@@ -1 +1,2 @@
-export { foo, bar };
\ No newline at end of file
+export { foo, bar };
+var foo, bar;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier13/input.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier13/input.js
index e4cca384daec..dd1cfea6d77d 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier13/input.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier13/input.js
@@ -1 +1,2 @@
 export { foo as bar };
+var foo;
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier13/output.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier13/output.js
index 5d4569c099d2..d6e7ac50254e 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier13/output.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier13/output.js
@@ -1 +1,2 @@
-export { foo as bar };
\ No newline at end of file
+export { foo as bar };
+var foo;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier14/input.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier14/input.js
index 95daad9d9676..5e840fff920b 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier14/input.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier14/input.js
@@ -1 +1,2 @@
 export { foo as default };
+var foo;
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier14/output.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier14/output.js
index f96da82b3b2c..4a3a9fe44ea7 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier14/output.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier14/output.js
@@ -1 +1,2 @@
-export { foo as default };
\ No newline at end of file
+export { foo as default };
+var foo;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier15/input.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier15/input.js
index ebd14b2d969e..022457fd87a6 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier15/input.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier15/input.js
@@ -1 +1,2 @@
 export { foo as default, bar };
+var foo, bar;
diff --git a/packages/babel-generator/test/fixtures/types/ExportSpecifier15/output.js b/packages/babel-generator/test/fixtures/types/ExportSpecifier15/output.js
index 2ef73817d596..974c22ae14f2 100644
--- a/packages/babel-generator/test/fixtures/types/ExportSpecifier15/output.js
+++ b/packages/babel-generator/test/fixtures/types/ExportSpecifier15/output.js
@@ -1 +1,2 @@
-export { foo as default, bar };
\ No newline at end of file
+export { foo as default, bar };
+var foo, bar;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/input.js b/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/input.js
index 3b31e93eb772..c42d876ad7b2 100644
--- a/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/input.js
+++ b/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/input.js
@@ -1,23 +1,23 @@
-function foo(bar = "bar") {}
+function foo1(bar = "bar") {}
 
-function foo(bar = "bar", ...items) {}
+function foo2(bar = "bar", ...items) {}
 
-function foo(...items) {}
+function foo3(...items) {}
 
-function* foo() {}
+function* foo4() {}
 
-function foo() {}
+function foo5() {}
 
-async function foo() {}
+async function foo6() {}
 
-var foo = function* foo() {};
+var foo7 = function* foo7() {};
 
-var foo = function foo() {};
+var foo8 = function foo8() {};
 
-var foo = async function foo() {};
+var foo9 = async function foo9() {};
 
-var foo = function* () {};
+var foo10 = function* () {};
 
-var foo = function () {};
+var foo11 = function () {};
 
-var foo = async function () {};
+var foo12 = async function () {};
diff --git a/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/output.js b/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/output.js
index ef42e4b2fbb2..2c2841253255 100644
--- a/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/output.js
+++ b/packages/babel-generator/test/fixtures/types/FunctionDeclaration-FunctionExpression/output.js
@@ -1,23 +1,23 @@
-function foo(bar = "bar") {}
+function foo1(bar = "bar") {}
 
-function foo(bar = "bar", ...items) {}
+function foo2(bar = "bar", ...items) {}
 
-function foo(...items) {}
+function foo3(...items) {}
 
-function* foo() {}
+function* foo4() {}
 
-function foo() {}
+function foo5() {}
 
-async function foo() {}
+async function foo6() {}
 
-var foo = function* foo() {};
+var foo7 = function* foo7() {};
 
-var foo = function foo() {};
+var foo8 = function foo8() {};
 
-var foo = async function foo() {};
+var foo9 = async function foo9() {};
 
-var foo = function* () {};
+var foo10 = function* () {};
 
-var foo = function () {};
+var foo11 = function () {};
 
-var foo = async function () {};
\ No newline at end of file
+var foo12 = async function () {};
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/input.js b/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/input.js
index b7a4a4b9fdce..84e2db5be047 100644
--- a/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/input.js
+++ b/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/input.js
@@ -1,9 +1,9 @@
 import "foo";
-import foo from "foo";
-import { default as foo } from "foo";
-import * as foo from "foo";
-import foo, { baz as xyz } from "foo";
-import { bar } from "foo";
-import { bar, baz } from "foo";
-import { bar as baz } from "foo";
-import { bar as baz, xyz } from "foo";
+import foo1 from "foo";
+import { default as foo2 } from "foo";
+import * as foo3 from "foo";
+import foo4, { baz as xyz1 } from "foo";
+import { bar1 } from "foo";
+import { bar2, baz1 } from "foo";
+import { bar as baz2 } from "foo";
+import { bar as baz3, xyz2 } from "foo";
diff --git a/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/output.js b/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/output.js
index 7cd5b681f8f2..c460e5b96277 100644
--- a/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/output.js
+++ b/packages/babel-generator/test/fixtures/types/ImportDeclaration-ImportSpecifier-ImportNamespaceSpecifier/output.js
@@ -1,9 +1,9 @@
 import "foo";
-import foo from "foo";
-import { default as foo } from "foo";
-import * as foo from "foo";
-import foo, { baz as xyz } from "foo";
-import { bar } from "foo";
-import { bar, baz } from "foo";
-import { bar as baz } from "foo";
-import { bar as baz, xyz } from "foo";
\ No newline at end of file
+import foo1 from "foo";
+import { default as foo2 } from "foo";
+import * as foo3 from "foo";
+import foo4, { baz as xyz1 } from "foo";
+import { bar1 } from "foo";
+import { bar2, baz1 } from "foo";
+import { bar as baz2 } from "foo";
+import { bar as baz3, xyz2 } from "foo";
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/input.js b/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/input.js
index 1c60f768707d..6e71f9167264 100644
--- a/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/input.js
+++ b/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/input.js
@@ -14,3 +14,7 @@ foo?.["bar"]?.foo;
 0.?.toString();
 0.5?.toString();
 1.000?.toString();
+
+(a?.b).c;
+(a ? b : c)?.d;
+(a?.b)()
diff --git a/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/output.js b/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/output.js
index be34e83a5833..a99aa9039c18 100644
--- a/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/output.js
+++ b/packages/babel-generator/test/fixtures/types/Optional-MemberExpression/output.js
@@ -11,4 +11,7 @@ foo?.["bar"].foo;
 foo?.["bar"]?.foo;
 0.?.toString();
 0.5?.toString();
-1.000?.toString();
\ No newline at end of file
+1.000?.toString();
+(a?.b).c;
+(a ? b : c)?.d;
+(a?.b)();
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/Optional-TryStatement-CatchClause/options.json b/packages/babel-generator/test/fixtures/types/Optional-TryStatement-CatchClause/options.json
deleted file mode 100644
index f7793b0dd816..000000000000
--- a/packages/babel-generator/test/fixtures/types/Optional-TryStatement-CatchClause/options.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "plugins": ["optionalCatchBinding"] }
diff --git a/packages/babel-generator/test/fixtures/types/PipelineBareFunction/input.js b/packages/babel-generator/test/fixtures/types/PipelineBareFunction/input.js
new file mode 100644
index 000000000000..e5b2807245d0
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/PipelineBareFunction/input.js
@@ -0,0 +1 @@
+let result = "hello" |> doubleSay |> text.capitalize |> a.b.exclaim;
diff --git a/packages/babel-generator/test/fixtures/types/PipelineBareFunction/options.json b/packages/babel-generator/test/fixtures/types/PipelineBareFunction/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/PipelineBareFunction/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-generator/test/fixtures/types/PipelineBareFunction/output.js b/packages/babel-generator/test/fixtures/types/PipelineBareFunction/output.js
new file mode 100644
index 000000000000..e5b2807245d0
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/PipelineBareFunction/output.js
@@ -0,0 +1 @@
+let result = "hello" |> doubleSay |> text.capitalize |> a.b.exclaim;
diff --git a/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/input.js b/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/input.js
new file mode 100644
index 000000000000..4c8ffd3bf244
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/input.js
@@ -0,0 +1,8 @@
+value |> # + 1;
+value |> 1 + #;
+value |> do {
+  #;
+};
+value |> do {
+  if (yes) #;
+};
diff --git a/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/options.json b/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/output.js b/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/output.js
new file mode 100644
index 000000000000..4c8ffd3bf244
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/PipelineTopicExpression/output.js
@@ -0,0 +1,8 @@
+value |> # + 1;
+value |> 1 + #;
+value |> do {
+  #;
+};
+value |> do {
+  if (yes) #;
+};
diff --git a/packages/babel-generator/test/fixtures/types/RestProperty/options.json b/packages/babel-generator/test/fixtures/types/RestProperty/options.json
deleted file mode 100644
index 8a2a1d3bfa91..000000000000
--- a/packages/babel-generator/test/fixtures/types/RestProperty/options.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "plugins": ["objectRestSpread"] }
diff --git a/packages/babel-generator/test/fixtures/types/ReturnStatement/input.js b/packages/babel-generator/test/fixtures/types/ReturnStatement/input.js
index cadd08000823..793ca5c4bacb 100644
--- a/packages/babel-generator/test/fixtures/types/ReturnStatement/input.js
+++ b/packages/babel-generator/test/fixtures/types/ReturnStatement/input.js
@@ -1,4 +1,4 @@
-function foo() {
+function foo1() {
   return;
 }
 
@@ -6,10 +6,10 @@ function bar() {
   return "foo";
 }
 
-function foo() {
+function foo2() {
   return 1, "foo";
 }
 
 () => { return /a/; }
 
-function foo() { return /a/; }
+function foo3() { return /a/; }
diff --git a/packages/babel-generator/test/fixtures/types/ReturnStatement/output.js b/packages/babel-generator/test/fixtures/types/ReturnStatement/output.js
index e9aa8d34019a..5fb776fc769b 100644
--- a/packages/babel-generator/test/fixtures/types/ReturnStatement/output.js
+++ b/packages/babel-generator/test/fixtures/types/ReturnStatement/output.js
@@ -1,4 +1,4 @@
-function foo() {
+function foo1() {
   return;
 }
 
@@ -6,7 +6,7 @@ function bar() {
   return "foo";
 }
 
-function foo() {
+function foo2() {
   return 1, "foo";
 }
 
@@ -14,6 +14,6 @@ function foo() {
   return /a/;
 };
 
-function foo() {
+function foo3() {
   return /a/;
 }
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/UnaryExpression/options.json b/packages/babel-generator/test/fixtures/types/UnaryExpression/options.json
new file mode 100644
index 000000000000..a2e80d9ec294
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/UnaryExpression/options.json
@@ -0,0 +1,3 @@
+{
+  "strictMode": false
+}
diff --git a/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/input.js b/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/input.js
index ede42c53ec82..ae204a4df56d 100644
--- a/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/input.js
+++ b/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/input.js
@@ -1,13 +1,13 @@
-let foo;
-var foo;
+let foo1;
+var foo2;
 
-let foo = "foo";
-var foo = "bar";
-const foo = "foo";
+let foo3 = "foo";
+var foo4 = "bar";
+const foo5 = "foo";
 
-let foo, bar = "bar";
-var foo, bar = "bar";
+let foo6, bar1 = "bar";
+var foo7, bar2 = "bar";
 
-let foo = "foo", bar = "bar";
-var foo = "foo", bar = "bar";
-const foo = "foo", bar = "bar";
+let foo8 = "foo", bar3 = "bar";
+var foo9 = "foo", bar4 = "bar";
+const foo10 = "foo", bar5 = "bar";
diff --git a/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/output.js b/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/output.js
index c3e42e09131a..60453ccb0247 100644
--- a/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/output.js
+++ b/packages/babel-generator/test/fixtures/types/VariableDeclaration-VariableDeclarator/output.js
@@ -1,15 +1,15 @@
-let foo;
-var foo;
-let foo = "foo";
-var foo = "bar";
-const foo = "foo";
-let foo,
-    bar = "bar";
-var foo,
-    bar = "bar";
-let foo = "foo",
-    bar = "bar";
-var foo = "foo",
-    bar = "bar";
-const foo = "foo",
-      bar = "bar";
\ No newline at end of file
+let foo1;
+var foo2;
+let foo3 = "foo";
+var foo4 = "bar";
+const foo5 = "foo";
+let foo6,
+    bar1 = "bar";
+var foo7,
+    bar2 = "bar";
+let foo8 = "foo",
+    bar3 = "bar";
+var foo9 = "foo",
+    bar4 = "bar";
+const foo10 = "foo",
+      bar5 = "bar";
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/types/WithStatement/options.json b/packages/babel-generator/test/fixtures/types/WithStatement/options.json
new file mode 100644
index 000000000000..a2e80d9ec294
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/types/WithStatement/options.json
@@ -0,0 +1,3 @@
+{
+  "strictMode": false
+}
diff --git a/packages/babel-generator/test/fixtures/typescript/class-abstract/input.js b/packages/babel-generator/test/fixtures/typescript/class-abstract/input.js
index 8f41a8b71f2a..3cb560c5a3dc 100644
--- a/packages/babel-generator/test/fixtures/typescript/class-abstract/input.js
+++ b/packages/babel-generator/test/fixtures/typescript/class-abstract/input.js
@@ -1,7 +1,7 @@
-abstract class C {}
-declare abstract class C {}
-export abstract class C {}
+abstract class C1 {}
+declare abstract class C2 {}
+export abstract class C3 {}
 // `export abstract class { }` is not valid.
 export default abstract class { }
-export default abstract class C { }
+export default abstract class C4 { }
 // `abstract class` is not valid as an expression.
diff --git a/packages/babel-generator/test/fixtures/typescript/class-abstract/output.js b/packages/babel-generator/test/fixtures/typescript/class-abstract/output.js
index 860e03a34dd9..e621d56e2e37 100644
--- a/packages/babel-generator/test/fixtures/typescript/class-abstract/output.js
+++ b/packages/babel-generator/test/fixtures/typescript/class-abstract/output.js
@@ -1,8 +1,8 @@
-abstract class C {}
+abstract class C1 {}
 
-declare abstract class C {}
+declare abstract class C2 {}
 
-export abstract class C {} // `export abstract class { }` is not valid.
+export abstract class C3 {} // `export abstract class { }` is not valid.
 
 export default abstract class {}
-export default abstract class C {} // `abstract class` is not valid as an expression.
\ No newline at end of file
+export default abstract class C4 {} // `abstract class` is not valid as an expression.
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple-empty/input.js b/packages/babel-generator/test/fixtures/typescript/tuple-empty/input.js
new file mode 100644
index 000000000000..f7cd7b5a0e25
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple-empty/input.js
@@ -0,0 +1 @@
+let x: [];
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple-empty/output.js b/packages/babel-generator/test/fixtures/typescript/tuple-empty/output.js
new file mode 100644
index 000000000000..a602e2203789
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple-empty/output.js
@@ -0,0 +1 @@
+let x: [];
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple-optional/input.js b/packages/babel-generator/test/fixtures/typescript/tuple-optional/input.js
new file mode 100644
index 000000000000..3b8d21ba958c
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple-optional/input.js
@@ -0,0 +1 @@
+let x: [string, number?, (string | number)?]
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple-optional/output.js b/packages/babel-generator/test/fixtures/typescript/tuple-optional/output.js
new file mode 100644
index 000000000000..c32cf4f129a6
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple-optional/output.js
@@ -0,0 +1 @@
+let x: [string, number?, (string | number)?];
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple-rest/input.js b/packages/babel-generator/test/fixtures/typescript/tuple-rest/input.js
new file mode 100644
index 000000000000..d7719b2cb4e6
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple-rest/input.js
@@ -0,0 +1 @@
+let x: [string, ...number[]]
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple-rest/output.js b/packages/babel-generator/test/fixtures/typescript/tuple-rest/output.js
new file mode 100644
index 000000000000..52be881f835c
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple-rest/output.js
@@ -0,0 +1 @@
+let x: [string, ...number[]];
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple/input.js b/packages/babel-generator/test/fixtures/typescript/tuple/input.js
new file mode 100644
index 000000000000..53c8e72ec952
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple/input.js
@@ -0,0 +1 @@
+let x: [number, number, number];
diff --git a/packages/babel-generator/test/fixtures/typescript/tuple/output.js b/packages/babel-generator/test/fixtures/typescript/tuple/output.js
new file mode 100644
index 000000000000..07edd6a75272
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/tuple/output.js
@@ -0,0 +1 @@
+let x: [number, number, number];
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/types-import-type/input.js b/packages/babel-generator/test/fixtures/typescript/types-import-type/input.js
new file mode 100644
index 000000000000..848a461d3c57
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/types-import-type/input.js
@@ -0,0 +1,3 @@
+let x: typeof import('./x');
+let Y: import('./y').Y;
+let z: import("/z").foo.bar<string>;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/types-import-type/output.js b/packages/babel-generator/test/fixtures/typescript/types-import-type/output.js
new file mode 100644
index 000000000000..848a461d3c57
--- /dev/null
+++ b/packages/babel-generator/test/fixtures/typescript/types-import-type/output.js
@@ -0,0 +1,3 @@
+let x: typeof import('./x');
+let Y: import('./y').Y;
+let z: import("/z").foo.bar<string>;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/types-keywords/input.js b/packages/babel-generator/test/fixtures/typescript/types-keywords/input.js
index d2ddfb94bbc6..0fec8f608a1c 100644
--- a/packages/babel-generator/test/fixtures/typescript/types-keywords/input.js
+++ b/packages/babel-generator/test/fixtures/typescript/types-keywords/input.js
@@ -1,4 +1,5 @@
 let a: any;
+let un: unknown;
 let b: boolean;
 let ne: never;
 let nul: null;
diff --git a/packages/babel-generator/test/fixtures/typescript/types-keywords/output.js b/packages/babel-generator/test/fixtures/typescript/types-keywords/output.js
index 0c6820fbaf27..0fec8f608a1c 100644
--- a/packages/babel-generator/test/fixtures/typescript/types-keywords/output.js
+++ b/packages/babel-generator/test/fixtures/typescript/types-keywords/output.js
@@ -1,4 +1,5 @@
 let a: any;
+let un: unknown;
 let b: boolean;
 let ne: never;
 let nul: null;
@@ -7,4 +8,4 @@ let o: object;
 let st: string;
 let sy: symbol;
 let u: undefined;
-let v: void;
\ No newline at end of file
+let v: void;
diff --git a/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/input.js b/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/input.js
index d2cea8ee69cc..d047bcfa5908 100644
--- a/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/input.js
+++ b/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/input.js
@@ -1,2 +1,2 @@
 let x: true;
-let x: false;
+let x2: false;
diff --git a/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/output.js b/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/output.js
index 2a25bd9d18bf..dbec899ee6af 100644
--- a/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/output.js
+++ b/packages/babel-generator/test/fixtures/typescript/types-literal-boolean/output.js
@@ -1,2 +1,2 @@
 let x: true;
-let x: false;
\ No newline at end of file
+let x2: false;
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/types-mapped/input.js b/packages/babel-generator/test/fixtures/typescript/types-mapped/input.js
index 575af654a45f..6415810f0530 100644
--- a/packages/babel-generator/test/fixtures/typescript/types-mapped/input.js
+++ b/packages/babel-generator/test/fixtures/typescript/types-mapped/input.js
@@ -1,4 +1,4 @@
-let map: { [P in string]: number };
-let map: { readonly [P in string]?: number };
-let map: { +readonly [P in string]+?: number };
-let map: { -readonly [P in string]-?: number };
+let map1: { [P in string]: number };
+let map2: { readonly [P in string]?: number };
+let map3: { +readonly [P in string]+?: number };
+let map4: { -readonly [P in string]-?: number };
diff --git a/packages/babel-generator/test/fixtures/typescript/types-mapped/output.js b/packages/babel-generator/test/fixtures/typescript/types-mapped/output.js
index bb0a6786368f..208e77ca4019 100644
--- a/packages/babel-generator/test/fixtures/typescript/types-mapped/output.js
+++ b/packages/babel-generator/test/fixtures/typescript/types-mapped/output.js
@@ -1,4 +1,4 @@
-let map: { [P in string]: number };
-let map: { readonly [P in string]?: number };
-let map: { +readonly [P in string]+?: number };
-let map: { -readonly [P in string]-?: number };
\ No newline at end of file
+let map1: { [P in string]: number };
+let map2: { readonly [P in string]?: number };
+let map3: { +readonly [P in string]+?: number };
+let map4: { -readonly [P in string]-?: number };
\ No newline at end of file
diff --git a/packages/babel-generator/test/fixtures/typescript/types-union-intersection/output.js b/packages/babel-generator/test/fixtures/typescript/types-union-intersection/output.js
index 8f74eb81d7ac..24a187a151f4 100644
--- a/packages/babel-generator/test/fixtures/typescript/types-union-intersection/output.js
+++ b/packages/babel-generator/test/fixtures/typescript/types-union-intersection/output.js
@@ -1,4 +1,4 @@
 let union: number | null | undefined;
 let intersection: number & string;
-let precedence1: number | string & boolean;
-let precedence2: number & string | boolean;
\ No newline at end of file
+let precedence1: number | (string & boolean);
+let precedence2: (number & string) | boolean;
\ No newline at end of file
diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js
index f79b964d0a83..80bee85f9eaf 100644
--- a/packages/babel-generator/test/index.js
+++ b/packages/babel-generator/test/index.js
@@ -384,6 +384,82 @@ describe("programmatic generation", function() {
   [key: any]: number
 }`);
   });
+
+  describe("directives", function() {
+    it("preserves escapes", function() {
+      const directive = t.directive(
+        t.directiveLiteral(String.raw`us\x65 strict`),
+      );
+      const output = generate(directive).code;
+
+      expect(output).toBe(String.raw`"us\x65 strict";`);
+    });
+
+    it("preserves escapes in minified output", function() {
+      // https://github.com/babel/babel/issues/4767
+
+      const directive = t.directive(t.directiveLiteral(String.raw`foo\n\t\r`));
+      const output = generate(directive, { minified: true }).code;
+
+      expect(output).toBe(String.raw`"foo\n\t\r";`);
+    });
+
+    it("unescaped single quote", function() {
+      const directive = t.directive(t.directiveLiteral(String.raw`'\'\"`));
+      const output = generate(directive).code;
+
+      expect(output).toBe(String.raw`"'\'\"";`);
+    });
+
+    it("unescaped double quote", function() {
+      const directive = t.directive(t.directiveLiteral(String.raw`"\'\"`));
+      const output = generate(directive).code;
+
+      expect(output).toBe(String.raw`'"\'\"';`);
+    });
+
+    it("unescaped single and double quotes together throw", function() {
+      const directive = t.directive(t.directiveLiteral(String.raw`'"`));
+
+      expect(() => {
+        generate(directive);
+      }).toThrow();
+    });
+  });
+
+  describe("typescript generate parentheses if necessary", function() {
+    it("wraps around union for array", () => {
+      const typeStatement = t.TSArrayType(
+        t.TSUnionType([
+          t.TSIntersectionType([t.TSNumberKeyword(), t.TSBooleanKeyword()]),
+          t.TSNullKeyword(),
+        ]),
+      );
+      const output = generate(typeStatement).code;
+      expect(output).toBe("((number & boolean) | null)[]");
+    });
+    it("wraps around intersection for array", () => {
+      const typeStatement = t.TSArrayType(
+        t.TSIntersectionType([t.TSNumberKeyword(), t.TSBooleanKeyword()]),
+      );
+      const output = generate(typeStatement).code;
+      expect(output).toBe("(number & boolean)[]");
+    });
+    it("wraps around rest", () => {
+      const typeStatement = t.tsRestType(
+        t.TSIntersectionType([t.TSNumberKeyword(), t.TSBooleanKeyword()]),
+      );
+      const output = generate(typeStatement).code;
+      expect(output).toBe("...(number & boolean)");
+    });
+    it("wraps around optional type", () => {
+      const typeStatement = t.tsOptionalType(
+        t.TSIntersectionType([t.TSNumberKeyword(), t.TSBooleanKeyword()]),
+      );
+      const output = generate(typeStatement).code;
+      expect(output).toBe("(number & boolean)?");
+    });
+  });
 });
 
 describe("CodeGenerator", function() {
@@ -413,9 +489,10 @@ suites.forEach(function(testSuite) {
             const actualAst = parse(actualCode, {
               filename: actual.loc,
               plugins: task.options.plugins || [],
-              strictMode: false,
+              strictMode: task.options.strictMode === false ? false : true,
               sourceType: "module",
               sourceMaps: !!task.sourceMap,
+              ...task.options.parserOpts,
             });
             const options = {
               sourceFileName: path.relative(__dirname, actual.loc),
diff --git a/packages/babel-helper-builder-react-jsx/package.json b/packages/babel-helper-builder-react-jsx/package.json
index 8ef4b652d317..7b13e4b4753a 100644
--- a/packages/babel-helper-builder-react-jsx/package.json
+++ b/packages/babel-helper-builder-react-jsx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-builder-react-jsx",
-  "version": "7.0.0",
+  "version": "7.3.0",
   "description": "Helper function to build react jsx",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-builder-react-jsx",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "^7.0.0",
+    "@babel/types": "^7.3.0",
     "esutils": "^2.0.0"
   }
 }
diff --git a/packages/babel-helper-builder-react-jsx/src/index.js b/packages/babel-helper-builder-react-jsx/src/index.js
index 4f2473ae5062..3602ecb8496e 100644
--- a/packages/babel-helper-builder-react-jsx/src/index.js
+++ b/packages/babel-helper-builder-react-jsx/src/index.js
@@ -19,6 +19,13 @@ You can turn on the 'throwIfNamespace' flag to bypass this warning.`,
       );
     }
   };
+
+  visitor.JSXSpreadChild = function(path) {
+    throw path.buildCodeFrameError(
+      "Spread children are not supported in React.",
+    );
+  };
+
   visitor.JSXElement = {
     exit(path, file) {
       const callExpr = buildElementCall(path, file);
diff --git a/packages/babel-helper-call-delegate/package.json b/packages/babel-helper-call-delegate/package.json
index 37ebc6134f08..3e7fd81bcf40 100644
--- a/packages/babel-helper-call-delegate/package.json
+++ b/packages/babel-helper-call-delegate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-call-delegate",
-  "version": "7.1.0",
+  "version": "7.4.4",
   "description": "Helper function to call delegate",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-call-delegate",
   "license": "MIT",
@@ -9,8 +9,8 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-hoist-variables": "^7.0.0",
-    "@babel/traverse": "^7.1.0",
-    "@babel/types": "^7.0.0"
+    "@babel/helper-hoist-variables": "^7.4.4",
+    "@babel/traverse": "^7.4.4",
+    "@babel/types": "^7.4.4"
   }
 }
diff --git a/packages/babel-helper-call-delegate/src/index.js b/packages/babel-helper-call-delegate/src/index.js
index 8aee0276132c..d4bf041d0131 100644
--- a/packages/babel-helper-call-delegate/src/index.js
+++ b/packages/babel-helper-call-delegate/src/index.js
@@ -41,7 +41,7 @@ export default function(path: NodePath, scope = path.scope) {
 
   path.traverse(visitor, state);
 
-  if (state.foundArguments) {
+  if (state.foundArguments || state.foundThis) {
     callee = t.memberExpression(container, t.identifier("apply"));
     args = [];
 
diff --git a/packages/babel-helper-create-class-features-plugin/.npmignore b/packages/babel-helper-create-class-features-plugin/.npmignore
new file mode 100644
index 000000000000..f9806945836e
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-helper-create-class-features-plugin/README.md b/packages/babel-helper-create-class-features-plugin/README.md
new file mode 100644
index 000000000000..5ce5e8c6b570
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/README.md
@@ -0,0 +1,19 @@
+# @babel/helper-create-class-features-plugin
+
+> Compile class public and private fields, private methods and decorators to ES6
+
+See our website [@babel/helper-create-class-features-plugin](https://babeljs.io/docs/en/next/babel-helper-create-class-features-plugin.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/helper-create-class-features-plugin
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/helper-create-class-features-plugin --dev
+```
diff --git a/packages/babel-helper-create-class-features-plugin/package.json b/packages/babel-helper-create-class-features-plugin/package.json
new file mode 100644
index 000000000000..a5c46704a7db
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "@babel/helper-create-class-features-plugin",
+  "version": "7.5.5",
+  "author": "The Babel Team (https://babeljs.io/team)",
+  "license": "MIT",
+  "description": "Compile class public and private fields, private methods and decorators to ES6",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-create-class-features-plugin",
+  "main": "lib/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "babel",
+    "babel-plugin"
+  ],
+  "dependencies": {
+    "@babel/helper-function-name": "^7.1.0",
+    "@babel/helper-member-expression-to-functions": "^7.5.5",
+    "@babel/helper-optimise-call-expression": "^7.0.0",
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "@babel/helper-replace-supers": "^7.5.5",
+    "@babel/helper-split-export-declaration": "^7.4.4"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.5.5",
+    "@babel/helper-plugin-test-runner": "^7.0.0"
+  }
+}
diff --git a/packages/babel-helper-create-class-features-plugin/src/decorators.js b/packages/babel-helper-create-class-features-plugin/src/decorators.js
new file mode 100644
index 000000000000..74fc7d059523
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/src/decorators.js
@@ -0,0 +1,164 @@
+import { types as t, template } from "@babel/core";
+import ReplaceSupers from "@babel/helper-replace-supers";
+import nameFunction from "@babel/helper-function-name";
+
+export function hasOwnDecorators(node) {
+  return !!(node.decorators && node.decorators.length);
+}
+
+export function hasDecorators(node) {
+  return hasOwnDecorators(node) || node.body.body.some(hasOwnDecorators);
+}
+
+function prop(key, value) {
+  if (!value) return null;
+  return t.objectProperty(t.identifier(key), value);
+}
+
+function method(key, body) {
+  return t.objectMethod(
+    "method",
+    t.identifier(key),
+    [],
+    t.blockStatement(body),
+  );
+}
+
+function takeDecorators(node) {
+  let result;
+  if (node.decorators && node.decorators.length > 0) {
+    result = t.arrayExpression(
+      node.decorators.map(decorator => decorator.expression),
+    );
+  }
+  node.decorators = undefined;
+  return result;
+}
+
+function getKey(node) {
+  if (node.computed) {
+    return node.key;
+  } else if (t.isIdentifier(node.key)) {
+    return t.stringLiteral(node.key.name);
+  } else {
+    return t.stringLiteral(String(node.key.value));
+  }
+}
+
+// NOTE: This function can be easily bound as .bind(file, classRef, superRef)
+//       to make it easier to use it in a loop.
+function extractElementDescriptor(/* this: File, */ classRef, superRef, path) {
+  const { node, scope } = path;
+  const isMethod = path.isClassMethod();
+
+  if (path.isPrivate()) {
+    throw path.buildCodeFrameError(
+      `Private ${
+        isMethod ? "methods" : "fields"
+      } in decorated classes are not supported yet.`,
+    );
+  }
+
+  new ReplaceSupers(
+    {
+      methodPath: path,
+      methodNode: node,
+      objectRef: classRef,
+      isStatic: node.static,
+      superRef,
+      scope,
+      file: this,
+    },
+    true,
+  ).replace();
+
+  const properties = [
+    prop("kind", t.stringLiteral(isMethod ? node.kind : "field")),
+    prop("decorators", takeDecorators(node)),
+    prop("static", node.static && t.booleanLiteral(true)),
+    prop("key", getKey(node)),
+  ].filter(Boolean);
+
+  if (isMethod) {
+    const id = node.computed ? null : node.key;
+    t.toExpression(node);
+    properties.push(prop("value", nameFunction({ node, id, scope }) || node));
+  } else if (node.value) {
+    properties.push(
+      method("value", template.statements.ast`return ${node.value}`),
+    );
+  } else {
+    properties.push(prop("value", scope.buildUndefinedNode()));
+  }
+
+  path.remove();
+
+  return t.objectExpression(properties);
+}
+
+function addDecorateHelper(file) {
+  try {
+    return file.addHelper("decorate");
+  } catch (err) {
+    if (err.code === "BABEL_HELPER_UNKNOWN") {
+      err.message +=
+        "\n  '@babel/plugin-transform-decorators' in non-legacy mode" +
+        " requires '@babel/core' version ^7.0.2 and you appear to be using" +
+        " an older version.";
+    }
+    throw err;
+  }
+}
+
+export function buildDecoratedClass(ref, path, elements, file) {
+  const { node, scope } = path;
+  const initializeId = scope.generateUidIdentifier("initialize");
+  const isDeclaration = node.id && path.isDeclaration();
+  const isStrict = path.isInStrictMode();
+  const { superClass } = node;
+
+  node.type = "ClassDeclaration";
+  if (!node.id) node.id = t.cloneNode(ref);
+
+  let superId;
+  if (superClass) {
+    superId = scope.generateUidIdentifierBasedOnNode(node.superClass, "super");
+    node.superClass = superId;
+  }
+
+  const classDecorators = takeDecorators(node);
+  const definitions = t.arrayExpression(
+    elements.map(extractElementDescriptor.bind(file, node.id, superId)),
+  );
+
+  let replacement = template.expression.ast`
+    ${addDecorateHelper(file)}(
+      ${classDecorators || t.nullLiteral()},
+      function (${initializeId}, ${superClass ? superId : null}) {
+        ${node}
+        return { F: ${t.cloneNode(node.id)}, d: ${definitions} };
+      },
+      ${superClass}
+    )
+  `;
+  let classPathDesc = "arguments.1.body.body.0";
+
+  if (!isStrict) {
+    replacement.arguments[1].body.directives.push(
+      t.directive(t.directiveLiteral("use strict")),
+    );
+  }
+
+  if (isDeclaration) {
+    replacement = template.ast`let ${ref} = ${replacement}`;
+    classPathDesc = "declarations.0.init." + classPathDesc;
+  }
+
+  return {
+    instanceNodes: [template.statement.ast`${initializeId}(this)`],
+    wrapClass(path) {
+      path.replaceWith(replacement);
+      return path.get(classPathDesc);
+    },
+  };
+}
diff --git a/packages/babel-helper-create-class-features-plugin/src/features.js b/packages/babel-helper-create-class-features-plugin/src/features.js
new file mode 100644
index 000000000000..fffc0d0014e0
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/src/features.js
@@ -0,0 +1,93 @@
+import { hasOwnDecorators } from "./decorators";
+
+export const FEATURES = Object.freeze({
+  //classes: 1 << 0,
+  fields: 1 << 1,
+  privateMethods: 1 << 2,
+  decorators: 1 << 3,
+});
+
+// We can't use a symbol because this needs to always be the same, even if
+// this package isn't deduped by npm. e.g.
+//  - node_modules/
+//    - @babel/plugin-class-features
+//    - @babel/plugin-proposal-decorators
+//      - node_modules
+//        - @babel-plugin-class-features
+const featuresKey = "@babel/plugin-class-features/featuresKey";
+const looseKey = "@babel/plugin-class-features/looseKey";
+
+export function enableFeature(file, feature, loose) {
+  // We can't blindly enable the feature because, if it was already set,
+  // "loose" can't be changed, so that
+  //   @babel/plugin-class-properties { loose: true }
+  //   @babel/plugin-class-properties { loose: false }
+  // is transformed in loose mode.
+  // We only enabled the feature if it was previously disabled.
+  if (!hasFeature(file, feature)) {
+    file.set(featuresKey, file.get(featuresKey) | feature);
+    if (loose) file.set(looseKey, file.get(looseKey) | feature);
+  }
+}
+
+function hasFeature(file, feature) {
+  return !!(file.get(featuresKey) & feature);
+}
+
+export function isLoose(file, feature) {
+  return !!(file.get(looseKey) & feature);
+}
+
+export function verifyUsedFeatures(path, file) {
+  if (hasOwnDecorators(path.node)) {
+    if (!hasFeature(file, FEATURES.decorators)) {
+      throw path.buildCodeFrameError(
+        "Decorators are not enabled." +
+          "\nIf you are using " +
+          '["@babel/plugin-proposal-decorators", { "legacy": true }], ' +
+          'make sure it comes *before* "@babel/plugin-proposal-class-properties" ' +
+          "and enable loose mode, like so:\n" +
+          '\t["@babel/plugin-proposal-decorators", { "legacy": true }]\n' +
+          '\t["@babel/plugin-proposal-class-properties", { "loose": true }]',
+      );
+    }
+
+    if (path.isPrivate()) {
+      throw path.buildCodeFrameError(
+        `Private ${
+          path.isClassMethod() ? "methods" : "fields"
+        } in decorated classes are not supported yet.`,
+      );
+    }
+  }
+
+  // NOTE: We can't use path.isPrivateMethod() because it isn't supported in <7.2.0
+  if (path.isPrivate() && path.isMethod()) {
+    if (!hasFeature(file, FEATURES.privateMethods)) {
+      throw path.buildCodeFrameError("Class private methods are not enabled.");
+    }
+
+    if (path.node.static && path.node.kind !== "method") {
+      throw path.buildCodeFrameError(
+        "@babel/plugin-class-features doesn't support class static private accessors yet.",
+      );
+    }
+  }
+
+  if (
+    hasFeature(file, FEATURES.privateMethods) &&
+    hasFeature(file, FEATURES.fields) &&
+    isLoose(file, FEATURES.privateMethods) !== isLoose(file, FEATURES.fields)
+  ) {
+    throw path.buildCodeFrameError(
+      "'loose' mode configuration must be the same for both @babel/plugin-proposal-class-properties " +
+        "and @babel/plugin-proposal-private-methods",
+    );
+  }
+
+  if (path.isProperty()) {
+    if (!hasFeature(file, FEATURES.fields)) {
+      throw path.buildCodeFrameError("Class fields are not enabled.");
+    }
+  }
+}
diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.js b/packages/babel-helper-create-class-features-plugin/src/fields.js
new file mode 100644
index 000000000000..c6fb3da40ded
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/src/fields.js
@@ -0,0 +1,671 @@
+import { template, traverse, types as t } from "@babel/core";
+import ReplaceSupers, {
+  environmentVisitor,
+} from "@babel/helper-replace-supers";
+import memberExpressionToFunctions from "@babel/helper-member-expression-to-functions";
+import optimiseCall from "@babel/helper-optimise-call-expression";
+
+export function buildPrivateNamesMap(props) {
+  const privateNamesMap = new Map();
+  for (const prop of props) {
+    const isPrivate = prop.isPrivate();
+    const isMethod = !prop.isProperty();
+    const isInstance = !prop.node.static;
+    if (isPrivate) {
+      const { name } = prop.node.key.id;
+      const update = privateNamesMap.has(name)
+        ? privateNamesMap.get(name)
+        : {
+            id: prop.scope.generateUidIdentifier(name),
+            static: !isInstance,
+            method: isMethod,
+          };
+      if (prop.node.kind === "get") {
+        update.getId = prop.scope.generateUidIdentifier(`get_${name}`);
+      } else if (prop.node.kind === "set") {
+        update.setId = prop.scope.generateUidIdentifier(`set_${name}`);
+      } else if (prop.node.kind === "method") {
+        update.methodId = prop.scope.generateUidIdentifier(name);
+      }
+      privateNamesMap.set(name, update);
+    }
+  }
+  return privateNamesMap;
+}
+
+export function buildPrivateNamesNodes(privateNamesMap, loose, state) {
+  const initNodes = [];
+
+  for (const [name, value] of privateNamesMap) {
+    // In loose mode, both static and instance fields are transpiled using a
+    // secret non-enumerable property. Hence, we also need to generate that
+    // key (using the classPrivateFieldLooseKey helper).
+    // In spec mode, only instance fields need a "private name" initializer
+    // because static fields are directly assigned to a variable in the
+    // buildPrivateStaticFieldInitSpec function.
+    const { id, static: isStatic, method: isMethod, getId, setId } = value;
+    if (loose) {
+      initNodes.push(
+        template.statement.ast`
+          var ${id} = ${state.addHelper("classPrivateFieldLooseKey")}("${name}")
+        `,
+      );
+    } else if (isMethod && !isStatic) {
+      if (getId || setId) {
+        initNodes.push(template.statement.ast`var ${id} = new WeakMap();`);
+      } else {
+        initNodes.push(template.statement.ast`var ${id} = new WeakSet();`);
+      }
+    } else if (!isStatic) {
+      initNodes.push(template.statement.ast`var ${id} = new WeakMap();`);
+    }
+  }
+
+  return initNodes;
+}
+
+// Traverses the class scope, handling private name references. If an inner
+// class redeclares the same private name, it will hand off traversal to the
+// restricted visitor (which doesn't traverse the inner class's inner scope).
+const privateNameVisitor = {
+  PrivateName(path) {
+    const { privateNamesMap } = this;
+    const { node, parentPath } = path;
+
+    if (!parentPath.isMemberExpression({ property: node })) return;
+    if (!privateNamesMap.has(node.id.name)) return;
+
+    this.handle(parentPath);
+  },
+
+  Class(path) {
+    const { privateNamesMap } = this;
+    const body = path.get("body.body");
+
+    for (const prop of body) {
+      if (!prop.isPrivate()) {
+        continue;
+      }
+      if (!privateNamesMap.has(prop.node.key.id.name)) continue;
+
+      // This class redeclares the private name.
+      // So, we can only evaluate the things in the outer scope.
+      path.traverse(privateNameInnerVisitor, this);
+      path.skip();
+      break;
+    }
+  },
+};
+
+// Traverses the outer portion of a class, without touching the class's inner
+// scope, for private names.
+const privateNameInnerVisitor = traverse.visitors.merge([
+  {
+    PrivateName: privateNameVisitor.PrivateName,
+  },
+  environmentVisitor,
+]);
+
+const privateNameHandlerSpec = {
+  memoise(member, count) {
+    const { scope } = member;
+    const { object } = member.node;
+
+    const memo = scope.maybeGenerateMemoised(object);
+    if (!memo) {
+      return;
+    }
+
+    this.memoiser.set(object, memo, count);
+  },
+
+  receiver(member) {
+    const { object } = member.node;
+
+    if (this.memoiser.has(object)) {
+      return t.cloneNode(this.memoiser.get(object));
+    }
+
+    return t.cloneNode(object);
+  },
+
+  get(member) {
+    const { classRef, privateNamesMap, file } = this;
+    const { name } = member.node.property.id;
+    const {
+      id,
+      static: isStatic,
+      method: isMethod,
+      methodId,
+      getId,
+      setId,
+    } = privateNamesMap.get(name);
+
+    if (isStatic) {
+      const helperName = isMethod
+        ? "classStaticPrivateMethodGet"
+        : "classStaticPrivateFieldSpecGet";
+
+      return t.callExpression(file.addHelper(helperName), [
+        this.receiver(member),
+        t.cloneNode(classRef),
+        t.cloneNode(id),
+      ]);
+    }
+
+    if (isMethod) {
+      if (getId || setId) {
+        return t.callExpression(file.addHelper("classPrivateFieldGet"), [
+          this.receiver(member),
+          t.cloneNode(id),
+        ]);
+      }
+      return t.callExpression(file.addHelper("classPrivateMethodGet"), [
+        this.receiver(member),
+        t.cloneNode(id),
+        t.cloneNode(methodId),
+      ]);
+    }
+    return t.callExpression(file.addHelper("classPrivateFieldGet"), [
+      this.receiver(member),
+      t.cloneNode(id),
+    ]);
+  },
+
+  set(member, value) {
+    const { classRef, privateNamesMap, file } = this;
+    const { name } = member.node.property.id;
+    const {
+      id,
+      static: isStatic,
+      method: isMethod,
+      setId,
+    } = privateNamesMap.get(name);
+
+    if (isStatic) {
+      const helperName = isMethod
+        ? "classStaticPrivateMethodSet"
+        : "classStaticPrivateFieldSpecSet";
+
+      return t.callExpression(file.addHelper(helperName), [
+        this.receiver(member),
+        t.cloneNode(classRef),
+        t.cloneNode(id),
+        value,
+      ]);
+    }
+    if (isMethod) {
+      if (setId) {
+        return t.callExpression(file.addHelper("classPrivateFieldSet"), [
+          this.receiver(member),
+          t.cloneNode(id),
+          value,
+        ]);
+      }
+      return t.callExpression(file.addHelper("classPrivateMethodSet"), []);
+    }
+    return t.callExpression(file.addHelper("classPrivateFieldSet"), [
+      this.receiver(member),
+      t.cloneNode(id),
+      value,
+    ]);
+  },
+
+  destructureSet(member) {
+    const { privateNamesMap, file } = this;
+    const { name } = member.node.property.id;
+    const { id } = privateNamesMap.get(name);
+    return t.memberExpression(
+      t.callExpression(file.addHelper("classPrivateFieldDestructureSet"), [
+        this.receiver(member),
+        t.cloneNode(id),
+      ]),
+      t.identifier("value"),
+    );
+  },
+
+  call(member, args) {
+    // The first access (the get) should do the memo assignment.
+    this.memoise(member, 1);
+
+    return optimiseCall(this.get(member), this.receiver(member), args);
+  },
+};
+
+const privateNameHandlerLoose = {
+  handle(member) {
+    const { privateNamesMap, file } = this;
+    const { object } = member.node;
+    const { name } = member.node.property.id;
+
+    member.replaceWith(
+      template.expression`BASE(REF, PROP)[PROP]`({
+        BASE: file.addHelper("classPrivateFieldLooseBase"),
+        REF: object,
+        PROP: privateNamesMap.get(name).id,
+      }),
+    );
+  },
+};
+
+export function transformPrivateNamesUsage(
+  ref,
+  path,
+  privateNamesMap,
+  loose,
+  state,
+) {
+  const body = path.get("body");
+
+  if (loose) {
+    body.traverse(privateNameVisitor, {
+      privateNamesMap,
+      file: state,
+      ...privateNameHandlerLoose,
+    });
+  } else {
+    memberExpressionToFunctions(body, privateNameVisitor, {
+      privateNamesMap,
+      classRef: ref,
+      file: state,
+      ...privateNameHandlerSpec,
+    });
+  }
+}
+
+function buildPrivateFieldInitLoose(ref, prop, privateNamesMap) {
+  const { id } = privateNamesMap.get(prop.node.key.id.name);
+  const value = prop.node.value || prop.scope.buildUndefinedNode();
+
+  return template.statement.ast`
+    Object.defineProperty(${ref}, ${id}, {
+      // configurable is false by default
+      // enumerable is false by default
+      writable: true,
+      value: ${value}
+    });
+  `;
+}
+
+function buildPrivateInstanceFieldInitSpec(ref, prop, privateNamesMap) {
+  const { id } = privateNamesMap.get(prop.node.key.id.name);
+  const value = prop.node.value || prop.scope.buildUndefinedNode();
+
+  return template.statement.ast`${id}.set(${ref}, {
+    // configurable is always false for private elements
+    // enumerable is always false for private elements
+    writable: true,
+    value: ${value},
+  })`;
+}
+
+function buildPrivateStaticFieldInitSpec(prop, privateNamesMap) {
+  const { id } = privateNamesMap.get(prop.node.key.id.name);
+  const value = prop.node.value || prop.scope.buildUndefinedNode();
+
+  return template.statement.ast`
+    var ${id} = {
+      // configurable is false by default
+      // enumerable is false by default
+      writable: true,
+      value: ${value}
+    };
+  `;
+}
+
+function buildPrivateMethodInitLoose(ref, prop, privateNamesMap) {
+  const privateName = privateNamesMap.get(prop.node.key.id.name);
+  const { methodId, id, getId, setId, initAdded } = privateName;
+  if (initAdded) return;
+
+  if (methodId) {
+    return template.statement.ast`
+        Object.defineProperty(${ref}, ${id}, {
+          // configurable is false by default
+          // enumerable is false by default
+          // writable is false by default
+          value: ${methodId.name}
+        });
+      `;
+  }
+
+  if (getId || setId) {
+    privateNamesMap.set(prop.node.key.id.name, {
+      ...privateName,
+      initAdded: true,
+    });
+
+    if (getId && setId) {
+      return template.statement.ast`
+        Object.defineProperty(${ref}, ${id}, {
+          // configurable is false by default
+          // enumerable is false by default
+          // writable is false by default
+          get: ${getId.name},
+          set: ${setId.name}
+        });
+      `;
+    } else if (getId && !setId) {
+      return template.statement.ast`
+        Object.defineProperty(${ref}, ${id}, {
+          // configurable is false by default
+          // enumerable is false by default
+          // writable is false by default
+          get: ${getId.name}
+        });
+      `;
+    } else if (!getId && setId) {
+      return template.statement.ast`
+        Object.defineProperty(${ref}, ${id}, {
+          // configurable is false by default
+          // enumerable is false by default
+          // writable is false by default
+          set: ${setId.name}
+        });
+      `;
+    }
+  }
+}
+
+function buildPrivateInstanceMethodInitSpec(ref, prop, privateNamesMap) {
+  const privateName = privateNamesMap.get(prop.node.key.id.name);
+  const { id, getId, setId, initAdded } = privateName;
+  if (initAdded) return;
+
+  if (getId || setId) {
+    privateNamesMap.set(prop.node.key.id.name, {
+      ...privateName,
+      initAdded: true,
+    });
+
+    if (getId && setId) {
+      return template.statement.ast`
+        ${id}.set(${ref}, {
+          get: ${getId.name},
+          set: ${setId.name}
+        });
+      `;
+    } else if (getId && !setId) {
+      return template.statement.ast`
+        ${id}.set(${ref}, {
+          get: ${getId.name}
+        });
+      `;
+    } else if (!getId && setId) {
+      return template.statement.ast`
+        ${id}.set(${ref}, {
+          set: ${setId.name}
+        });
+      `;
+    }
+  }
+  return template.statement.ast`${id}.add(${ref})`;
+}
+
+function buildPublicFieldInitLoose(ref, prop) {
+  const { key, computed } = prop.node;
+  const value = prop.node.value || prop.scope.buildUndefinedNode();
+
+  return t.expressionStatement(
+    t.assignmentExpression(
+      "=",
+      t.memberExpression(ref, key, computed || t.isLiteral(key)),
+      value,
+    ),
+  );
+}
+
+function buildPublicFieldInitSpec(ref, prop, state) {
+  const { key, computed } = prop.node;
+  const value = prop.node.value || prop.scope.buildUndefinedNode();
+
+  return t.expressionStatement(
+    t.callExpression(state.addHelper("defineProperty"), [
+      ref,
+      computed || t.isLiteral(key) ? key : t.stringLiteral(key.name),
+      value,
+    ]),
+  );
+}
+
+function buildPrivateStaticMethodInitLoose(ref, prop, state, privateNamesMap) {
+  const { id, methodId } = privateNamesMap.get(prop.node.key.id.name);
+  return template.statement.ast`
+    Object.defineProperty(${ref}, ${id}, {
+      // configurable is false by default
+      // enumerable is false by default
+      // writable is false by default
+      value: ${methodId.name}
+    });
+  `;
+}
+
+function buildPrivateMethodDeclaration(prop, privateNamesMap, loose = false) {
+  const privateName = privateNamesMap.get(prop.node.key.id.name);
+  const {
+    id,
+    methodId,
+    getId,
+    setId,
+    getterDeclared,
+    setterDeclared,
+    static: isStatic,
+  } = privateName;
+  const { params, body, generator, async } = prop.node;
+  const methodValue = t.functionExpression(
+    methodId,
+    params,
+    body,
+    generator,
+    async,
+  );
+  const isGetter = getId && !getterDeclared && params.length === 0;
+  const isSetter = setId && !setterDeclared && params.length > 0;
+
+  if (isGetter) {
+    privateNamesMap.set(prop.node.key.id.name, {
+      ...privateName,
+      getterDeclared: true,
+    });
+    return t.variableDeclaration("var", [
+      t.variableDeclarator(getId, methodValue),
+    ]);
+  }
+  if (isSetter) {
+    privateNamesMap.set(prop.node.key.id.name, {
+      ...privateName,
+      setterDeclared: true,
+    });
+    return t.variableDeclaration("var", [
+      t.variableDeclarator(setId, methodValue),
+    ]);
+  }
+  if (isStatic && !loose) {
+    return t.variableDeclaration("var", [
+      t.variableDeclarator(
+        id,
+        t.functionExpression(id, params, body, generator, async),
+      ),
+    ]);
+  }
+
+  return t.variableDeclaration("var", [
+    t.variableDeclarator(methodId, methodValue),
+  ]);
+}
+
+const thisContextVisitor = traverse.visitors.merge([
+  {
+    ThisExpression(path, state) {
+      state.needsClassRef = true;
+      path.replaceWith(t.cloneNode(state.classRef));
+    },
+  },
+  environmentVisitor,
+]);
+
+function replaceThisContext(path, ref, superRef, file, loose) {
+  const state = { classRef: ref, needsClassRef: false };
+
+  const replacer = new ReplaceSupers({
+    methodPath: path,
+    isLoose: loose,
+    superRef,
+    file,
+    getObjectRef() {
+      state.needsClassRef = true;
+      return path.node.static
+        ? ref
+        : t.memberExpression(ref, t.identifier("prototype"));
+    },
+  });
+  replacer.replace();
+  if (path.isProperty()) {
+    path.traverse(thisContextVisitor, state);
+  }
+  return state.needsClassRef;
+}
+
+export function buildFieldsInitNodes(
+  ref,
+  superRef,
+  props,
+  privateNamesMap,
+  state,
+  loose,
+) {
+  const staticNodes = [];
+  const instanceNodes = [];
+  let needsClassRef = false;
+
+  for (const prop of props) {
+    const isStatic = prop.node.static;
+    const isInstance = !isStatic;
+    const isPrivate = prop.isPrivate();
+    const isPublic = !isPrivate;
+    const isField = prop.isProperty();
+    const isMethod = !isField;
+
+    if (isStatic || (isMethod && isPrivate)) {
+      const replaced = replaceThisContext(prop, ref, superRef, state, loose);
+      needsClassRef = needsClassRef || replaced;
+    }
+
+    switch (true) {
+      case isStatic && isPrivate && isField && loose:
+        needsClassRef = true;
+        staticNodes.push(
+          buildPrivateFieldInitLoose(t.cloneNode(ref), prop, privateNamesMap),
+        );
+        break;
+      case isStatic && isPrivate && isField && !loose:
+        needsClassRef = true;
+        staticNodes.push(
+          buildPrivateStaticFieldInitSpec(prop, privateNamesMap),
+        );
+        break;
+      case isStatic && isPublic && isField && loose:
+        needsClassRef = true;
+        staticNodes.push(buildPublicFieldInitLoose(t.cloneNode(ref), prop));
+        break;
+      case isStatic && isPublic && isField && !loose:
+        needsClassRef = true;
+        staticNodes.push(
+          buildPublicFieldInitSpec(t.cloneNode(ref), prop, state),
+        );
+        break;
+      case isInstance && isPrivate && isField && loose:
+        instanceNodes.push(
+          buildPrivateFieldInitLoose(t.thisExpression(), prop, privateNamesMap),
+        );
+        break;
+      case isInstance && isPrivate && isField && !loose:
+        instanceNodes.push(
+          buildPrivateInstanceFieldInitSpec(
+            t.thisExpression(),
+            prop,
+            privateNamesMap,
+          ),
+        );
+        break;
+      case isInstance && isPrivate && isMethod && loose:
+        instanceNodes.unshift(
+          buildPrivateMethodInitLoose(
+            t.thisExpression(),
+            prop,
+            privateNamesMap,
+          ),
+        );
+        staticNodes.push(
+          buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
+        );
+        break;
+      case isInstance && isPrivate && isMethod && !loose:
+        instanceNodes.unshift(
+          buildPrivateInstanceMethodInitSpec(
+            t.thisExpression(),
+            prop,
+            privateNamesMap,
+          ),
+        );
+        staticNodes.push(
+          buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
+        );
+        break;
+      case isStatic && isPrivate && isMethod && !loose:
+        needsClassRef = true;
+        staticNodes.push(
+          buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
+        );
+        break;
+      case isStatic && isPrivate && isMethod && loose:
+        needsClassRef = true;
+        staticNodes.push(
+          buildPrivateMethodDeclaration(prop, privateNamesMap, loose),
+        );
+        staticNodes.push(
+          buildPrivateStaticMethodInitLoose(
+            t.cloneNode(ref),
+            prop,
+            state,
+            privateNamesMap,
+          ),
+        );
+        break;
+      case isInstance && isPublic && isField && loose:
+        instanceNodes.push(buildPublicFieldInitLoose(t.thisExpression(), prop));
+        break;
+      case isInstance && isPublic && isField && !loose:
+        instanceNodes.push(
+          buildPublicFieldInitSpec(t.thisExpression(), prop, state),
+        );
+        break;
+      default:
+        throw new Error("Unreachable.");
+    }
+  }
+
+  return {
+    staticNodes,
+    instanceNodes: instanceNodes.filter(Boolean),
+    wrapClass(path) {
+      for (const prop of props) {
+        prop.remove();
+      }
+
+      if (!needsClassRef) return path;
+
+      if (path.isClassExpression()) {
+        path.scope.push({ id: ref });
+        path.replaceWith(
+          t.assignmentExpression("=", t.cloneNode(ref), path.node),
+        );
+      } else if (!path.node.id) {
+        // Anonymous class declaration
+        path.node.id = ref;
+      }
+
+      return path;
+    },
+  };
+}
diff --git a/packages/babel-helper-create-class-features-plugin/src/index.js b/packages/babel-helper-create-class-features-plugin/src/index.js
new file mode 100644
index 000000000000..1ed61a1839c0
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/src/index.js
@@ -0,0 +1,214 @@
+import nameFunction from "@babel/helper-function-name";
+import splitExportDeclaration from "@babel/helper-split-export-declaration";
+import {
+  buildPrivateNamesNodes,
+  buildPrivateNamesMap,
+  transformPrivateNamesUsage,
+  buildFieldsInitNodes,
+} from "./fields";
+import {
+  hasOwnDecorators,
+  buildDecoratedClass,
+  hasDecorators,
+} from "./decorators";
+import { injectInitialization, extractComputedKeys } from "./misc";
+import {
+  enableFeature,
+  verifyUsedFeatures,
+  FEATURES,
+  isLoose,
+} from "./features";
+
+import pkg from "../package.json";
+
+export { FEATURES, injectInitialization };
+
+// Note: Versions are represented as an integer. e.g. 7.1.5 is represented
+//       as 70000100005. This method is easier than using a semver-parsing
+//       package, but it breaks if we release x.y.z where x, y or z are
+//       greater than 99_999.
+const version = pkg.version.split(".").reduce((v, x) => v * 1e5 + +x, 0);
+const versionKey = "@babel/plugin-class-features/version";
+
+export function createClassFeaturePlugin({
+  name,
+  feature,
+  loose,
+  manipulateOptions,
+}) {
+  return {
+    name,
+    manipulateOptions,
+
+    pre() {
+      enableFeature(this.file, feature, loose);
+
+      if (!this.file.get(versionKey) || this.file.get(versionKey) < version) {
+        this.file.set(versionKey, version);
+      }
+    },
+
+    visitor: {
+      Class(path, state) {
+        if (this.file.get(versionKey) !== version) return;
+
+        verifyUsedFeatures(path, this.file);
+
+        const loose = isLoose(this.file, feature);
+
+        let constructor;
+        let isDecorated = hasOwnDecorators(path.node);
+        const props = [];
+        const elements = [];
+        const computedPaths = [];
+        const privateNames = new Set();
+        const body = path.get("body");
+
+        for (const path of body.get("body")) {
+          verifyUsedFeatures(path, this.file);
+
+          if (path.node.computed) {
+            computedPaths.push(path);
+          }
+
+          if (path.isPrivate()) {
+            const { name } = path.node.key.id;
+            const getName = `get ${name}`;
+            const setName = `set ${name}`;
+
+            if (path.node.kind === "get") {
+              if (
+                privateNames.has(getName) ||
+                (privateNames.has(name) && !privateNames.has(setName))
+              ) {
+                throw path.buildCodeFrameError("Duplicate private field");
+              }
+
+              privateNames.add(getName).add(name);
+            } else if (path.node.kind === "set") {
+              if (
+                privateNames.has(setName) ||
+                (privateNames.has(name) && !privateNames.has(getName))
+              ) {
+                throw path.buildCodeFrameError("Duplicate private field");
+              }
+
+              privateNames.add(setName).add(name);
+            } else {
+              if (
+                (privateNames.has(name) &&
+                  (!privateNames.has(getName) && !privateNames.has(setName))) ||
+                (privateNames.has(name) &&
+                  (privateNames.has(getName) || privateNames.has(setName)))
+              ) {
+                throw path.buildCodeFrameError("Duplicate private field");
+              }
+
+              privateNames.add(name);
+            }
+          }
+
+          if (path.isClassMethod({ kind: "constructor" })) {
+            constructor = path;
+          } else {
+            elements.push(path);
+            if (path.isProperty() || path.isPrivate()) {
+              props.push(path);
+            }
+          }
+
+          if (!isDecorated) isDecorated = hasOwnDecorators(path.node);
+        }
+
+        if (!props.length && !isDecorated) return;
+
+        let ref;
+
+        if (path.isClassExpression() || !path.node.id) {
+          nameFunction(path);
+          ref = path.scope.generateUidIdentifier("class");
+        } else {
+          ref = path.node.id;
+        }
+
+        // NODE: These three functions don't support decorators yet,
+        //       but verifyUsedFeatures throws if there are both
+        //       decorators and private fields.
+        const privateNamesMap = buildPrivateNamesMap(props);
+        const privateNamesNodes = buildPrivateNamesNodes(
+          privateNamesMap,
+          loose,
+          state,
+        );
+
+        transformPrivateNamesUsage(ref, path, privateNamesMap, loose, state);
+
+        let keysNodes, staticNodes, instanceNodes, wrapClass;
+
+        if (isDecorated) {
+          staticNodes = keysNodes = [];
+          ({ instanceNodes, wrapClass } = buildDecoratedClass(
+            ref,
+            path,
+            elements,
+            this.file,
+          ));
+        } else {
+          keysNodes = extractComputedKeys(ref, path, computedPaths, this.file);
+          ({ staticNodes, instanceNodes, wrapClass } = buildFieldsInitNodes(
+            ref,
+            path.node.superClass,
+            props,
+            privateNamesMap,
+            state,
+            loose,
+          ));
+        }
+
+        if (instanceNodes.length > 0) {
+          injectInitialization(
+            path,
+            constructor,
+            instanceNodes,
+            (referenceVisitor, state) => {
+              if (isDecorated) return;
+              for (const prop of props) {
+                if (prop.node.static) continue;
+                prop.traverse(referenceVisitor, state);
+              }
+            },
+          );
+        }
+
+        path = wrapClass(path);
+        path.insertBefore(keysNodes);
+        path.insertAfter([...privateNamesNodes, ...staticNodes]);
+      },
+
+      PrivateName(path) {
+        if (this.file.get(versionKey) !== version) return;
+
+        throw path.buildCodeFrameError(`Unknown PrivateName "${path}"`);
+      },
+
+      ExportDefaultDeclaration(path) {
+        if (this.file.get(versionKey) !== version) return;
+
+        const decl = path.get("declaration");
+
+        if (decl.isClassDeclaration() && hasDecorators(decl.node)) {
+          if (decl.node.id) {
+            // export default class Foo {}
+            //   -->
+            // class Foo {} export { Foo as default }
+            splitExportDeclaration(path);
+          } else {
+            // Annyms class declarations can be
+            // transformed as if they were expressions
+            decl.node.type = "ClassExpression";
+          }
+        }
+      },
+    },
+  };
+}
diff --git a/packages/babel-helper-create-class-features-plugin/src/misc.js b/packages/babel-helper-create-class-features-plugin/src/misc.js
new file mode 100644
index 000000000000..ff5178374a56
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/src/misc.js
@@ -0,0 +1,117 @@
+import { template, traverse, types as t } from "@babel/core";
+import { environmentVisitor } from "@babel/helper-replace-supers";
+
+const findBareSupers = traverse.visitors.merge([
+  {
+    Super(path) {
+      const { node, parentPath } = path;
+      if (parentPath.isCallExpression({ callee: node })) {
+        this.push(parentPath);
+      }
+    },
+  },
+  environmentVisitor,
+]);
+
+const referenceVisitor = {
+  "TSTypeAnnotation|TypeAnnotation"(path) {
+    path.skip();
+  },
+
+  ReferencedIdentifier(path) {
+    if (this.scope.hasOwnBinding(path.node.name)) {
+      this.scope.rename(path.node.name);
+      path.skip();
+    }
+  },
+};
+
+const classFieldDefinitionEvaluationTDZVisitor = traverse.visitors.merge([
+  {
+    ReferencedIdentifier(path) {
+      if (
+        this.classBinding &&
+        this.classBinding === path.scope.getBinding(path.node.name)
+      ) {
+        const classNameTDZError = this.file.addHelper("classNameTDZError");
+        const throwNode = t.callExpression(classNameTDZError, [
+          t.stringLiteral(path.node.name),
+        ]);
+
+        path.replaceWith(t.sequenceExpression([throwNode, path.node]));
+        path.skip();
+      }
+    },
+  },
+  environmentVisitor,
+]);
+
+export function injectInitialization(path, constructor, nodes, renamer) {
+  if (!nodes.length) return;
+
+  const isDerived = !!path.node.superClass;
+
+  if (!constructor) {
+    const newConstructor = t.classMethod(
+      "constructor",
+      t.identifier("constructor"),
+      [],
+      t.blockStatement([]),
+    );
+
+    if (isDerived) {
+      newConstructor.params = [t.restElement(t.identifier("args"))];
+      newConstructor.body.body.push(template.statement.ast`super(...args)`);
+    }
+
+    [constructor] = path.get("body").unshiftContainer("body", newConstructor);
+  }
+
+  if (renamer) {
+    renamer(referenceVisitor, { scope: constructor.scope });
+  }
+
+  if (isDerived) {
+    const bareSupers = [];
+    constructor.traverse(findBareSupers, bareSupers);
+    for (const bareSuper of bareSupers) {
+      bareSuper.insertAfter(nodes);
+    }
+  } else {
+    constructor.get("body").unshiftContainer("body", nodes);
+  }
+}
+
+export function extractComputedKeys(ref, path, computedPaths, file) {
+  const declarations = [];
+
+  for (const computedPath of computedPaths) {
+    computedPath.traverse(classFieldDefinitionEvaluationTDZVisitor, {
+      classBinding: path.node.id && path.scope.getBinding(path.node.id.name),
+      file,
+    });
+
+    const computedNode = computedPath.node;
+    // Make sure computed property names are only evaluated once (upon class definition)
+    // and in the right order in combination with static properties
+    if (!computedPath.get("key").isConstantExpression()) {
+      const ident = path.scope.generateUidIdentifierBasedOnNode(
+        computedNode.key,
+      );
+      // Declaring in the same block scope
+      // Ref: https://github.com/babel/babel/pull/10029/files#diff-fbbdd83e7a9c998721c1484529c2ce92
+      path.scope.push({
+        id: ident,
+        kind: "let",
+      });
+      declarations.push(
+        t.expressionStatement(
+          t.assignmentExpression("=", t.cloneNode(ident), computedNode.key),
+        ),
+      );
+      computedNode.key = t.cloneNode(ident);
+    }
+  }
+
+  return declarations;
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/input.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/input.js
new file mode 100644
index 000000000000..eb0eb350654f
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/input.js
@@ -0,0 +1,3 @@
+class A {
+  foo;
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/options.json b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/options.json
new file mode 100644
index 000000000000..60fe9fc3ffdf
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    ["proposal-class-properties", { "loose": true }, "name 1"],
+    ["proposal-class-properties", { "loose": false }, "name 2"]
+  ]
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/output.js
new file mode 100644
index 000000000000..063a057f52c0
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/loose-not-overwritten/output.js
@@ -0,0 +1,6 @@
+class A {
+  constructor() {
+    this.foo = void 0;
+  }
+
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/input.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/input.js
new file mode 100644
index 000000000000..970c1db08ec2
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/input.js
@@ -0,0 +1,7 @@
+const sym = Symbol();
+const sym1 = Symbol();
+
+class A {
+  [sym]: A.B;
+  [sym1]: Array<A>;
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/options.json b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/options.json
new file mode 100644
index 000000000000..ec128fdb330b
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/options.json
@@ -0,0 +1,4 @@
+{
+  "presets": ["flow"],
+  "plugins": ["proposal-class-properties"]
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/output.js
new file mode 100644
index 000000000000..fd32a2ea962d
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/output.js
@@ -0,0 +1,13 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const sym = Symbol();
+const sym1 = Symbol();
+
+class A {
+  constructor() {
+    _defineProperty(this, sym, void 0);
+
+    _defineProperty(this, sym1, void 0);
+  }
+
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/input.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/input.js
new file mode 100644
index 000000000000..ccab98482097
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/input.js
@@ -0,0 +1,5 @@
+const sym = Symbol();
+
+class A {
+  [sym]: A;
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/options.json b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/options.json
new file mode 100644
index 000000000000..ec128fdb330b
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/options.json
@@ -0,0 +1,4 @@
+{
+  "presets": ["flow"],
+  "plugins": ["proposal-class-properties"]
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/output.js
new file mode 100644
index 000000000000..bfd8df8eda20
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/output.js
@@ -0,0 +1,10 @@
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const sym = Symbol();
+
+class A {
+  constructor() {
+    _defineProperty(this, sym, void 0);
+  }
+
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/input.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/input.js
new file mode 100644
index 000000000000..40fba0a0a941
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/input.js
@@ -0,0 +1,5 @@
+class X {
+  #privateMethod() {
+    return 42;
+  }
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/options.json b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/options.json
new file mode 100644
index 000000000000..f85119d087cc
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    ["proposal-private-methods", { "loose": false }]
+  ]
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js
new file mode 100644
index 000000000000..2a500530b640
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js
@@ -0,0 +1,12 @@
+class X {
+  constructor() {
+    _privateMethod.add(this);
+  }
+
+}
+
+var _privateMethod = new WeakSet();
+
+var _privateMethod2 = function _privateMethod2() {
+  return 42;
+};
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/input.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/input.js
new file mode 100644
index 000000000000..40fba0a0a941
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/input.js
@@ -0,0 +1,5 @@
+class X {
+  #privateMethod() {
+    return 42;
+  }
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/options.json b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/options.json
new file mode 100644
index 000000000000..e0ee1124a93a
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    ["proposal-private-methods", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js
new file mode 100644
index 000000000000..a660b0038d59
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js
@@ -0,0 +1,18 @@
+var id = 0;
+
+function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
+
+class X {
+  constructor() {
+    Object.defineProperty(this, _privateMethod, {
+      value: _privateMethod2
+    });
+  }
+
+}
+
+var _privateMethod = _classPrivateFieldLooseKey("privateMethod");
+
+var _privateMethod2 = function _privateMethod2() {
+  return 42;
+};
diff --git a/packages/babel-helper-create-class-features-plugin/test/index.js b/packages/babel-helper-create-class-features-plugin/test/index.js
new file mode 100644
index 000000000000..1b534b8fc64a
--- /dev/null
+++ b/packages/babel-helper-create-class-features-plugin/test/index.js
@@ -0,0 +1,3 @@
+import runner from "@babel/helper-plugin-test-runner";
+
+runner(__dirname);
diff --git a/packages/babel-helper-define-map/package.json b/packages/babel-helper-define-map/package.json
index 366e4a0610b1..a51713a7f9f5 100644
--- a/packages/babel-helper-define-map/package.json
+++ b/packages/babel-helper-define-map/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-define-map",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Helper function to define a map",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-define-map",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/helper-function-name": "^7.1.0",
-    "@babel/types": "^7.0.0",
-    "lodash": "^4.17.10"
+    "@babel/types": "^7.5.5",
+    "lodash": "^4.17.13"
   }
 }
diff --git a/packages/babel-helper-define-map/src/index.js b/packages/babel-helper-define-map/src/index.js
index ff588c1ce380..da81b3a43bd7 100644
--- a/packages/babel-helper-define-map/src/index.js
+++ b/packages/babel-helper-define-map/src/index.js
@@ -98,7 +98,7 @@ export function push(
 }
 
 export function hasComputed(mutatorMap: Object): boolean {
-  for (const key in mutatorMap) {
+  for (const key of Object.keys(mutatorMap)) {
     if (mutatorMap[key]._computed) {
       return true;
     }
diff --git a/packages/babel-helper-fixtures/package.json b/packages/babel-helper-fixtures/package.json
index 2704f7328c66..809a91b81c73 100644
--- a/packages/babel-helper-fixtures/package.json
+++ b/packages/babel-helper-fixtures/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-fixtures",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Helper function to support fixtures",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-fixtures",
   "main": "lib/index.js",
   "dependencies": {
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.13",
     "semver": "^5.3.0",
     "try-resolve": "^1.0.0"
   }
diff --git a/packages/babel-helper-fixtures/src/index.js b/packages/babel-helper-fixtures/src/index.js
index 29a15433658e..7fc0cf21a3c7 100644
--- a/packages/babel-helper-fixtures/src/index.js
+++ b/packages/babel-helper-fixtures/src/index.js
@@ -70,7 +70,7 @@ function findFile(filepath: string, allowJSON: boolean) {
     throw new Error(`Found conflicting file matches: ${matches.join(", ")}`);
   }
 
-  return matches[0] || filepath + ".js";
+  return matches[0];
 }
 
 export default function get(entryLoc): Array<Suite> {
@@ -101,10 +101,26 @@ export default function get(entryLoc): Array<Suite> {
     }
 
     function push(taskName, taskDir) {
-      const actualLoc = findFile(taskDir + "/input");
-      const expectLoc = findFile(taskDir + "/output", true /* allowJSON */);
+      const taskDirStats = fs.statSync(taskDir);
+      let actualLoc = findFile(taskDir + "/input");
       let execLoc = findFile(taskDir + "/exec");
 
+      // If neither input nor exec is present it is not a real testcase
+      if (taskDirStats.isDirectory() && !actualLoc && !execLoc) {
+        if (fs.readdirSync(taskDir).length > 0) {
+          console.warn(`Skipped test folder with invalid layout: ${taskDir}`);
+        }
+        return;
+      } else if (!actualLoc) {
+        actualLoc = taskDir + "/input.js";
+      } else if (!execLoc) {
+        execLoc = taskDir + "/exec.js";
+      }
+
+      const expectLoc =
+        findFile(taskDir + "/output", true /* allowJSON */) ||
+        taskDir + "/output.js";
+
       const actualLocAlias =
         suiteName + "/" + taskName + "/" + path.basename(actualLoc);
       const expectLocAlias =
@@ -112,7 +128,7 @@ export default function get(entryLoc): Array<Suite> {
       let execLocAlias =
         suiteName + "/" + taskName + "/" + path.basename(actualLoc);
 
-      if (fs.statSync(taskDir).isFile()) {
+      if (taskDirStats.isFile()) {
         const ext = path.extname(taskDir);
         if (EXTENSIONS.indexOf(ext) === -1) return;
 
diff --git a/packages/babel-helper-hoist-variables/package.json b/packages/babel-helper-hoist-variables/package.json
index 74c6e29d6b7d..dad2e954ce2f 100644
--- a/packages/babel-helper-hoist-variables/package.json
+++ b/packages/babel-helper-hoist-variables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-hoist-variables",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Helper function to hoist variables",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-hoist-variables",
   "license": "MIT",
@@ -9,6 +9,6 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "^7.0.0"
+    "@babel/types": "^7.4.4"
   }
 }
diff --git a/packages/babel-helper-hoist-variables/src/index.js b/packages/babel-helper-hoist-variables/src/index.js
index 4f9c6d938bd7..6b8bb4cf3b03 100644
--- a/packages/babel-helper-hoist-variables/src/index.js
+++ b/packages/babel-helper-hoist-variables/src/index.js
@@ -28,7 +28,7 @@ const visitor = {
         );
       }
 
-      for (const name in declar.getBindingIdentifiers()) {
+      for (const name of Object.keys(declar.getBindingIdentifiers())) {
         state.emit(t.identifier(name), name, declar.node.init !== null);
       }
     }
diff --git a/packages/babel-helper-member-expression-to-functions/package.json b/packages/babel-helper-member-expression-to-functions/package.json
index 6783f48cc9d2..4e94f0cdefaf 100644
--- a/packages/babel-helper-member-expression-to-functions/package.json
+++ b/packages/babel-helper-member-expression-to-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-member-expression-to-functions",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Helper function to replace certain member expressions with function calls",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-member-expression-to-functions",
   "license": "MIT",
@@ -10,6 +10,6 @@
   "main": "lib/index.js",
   "author": "Justin Ridgewell <justin@ridgewell.name>",
   "dependencies": {
-    "@babel/types": "^7.0.0"
+    "@babel/types": "^7.5.5"
   }
 }
diff --git a/packages/babel-helper-member-expression-to-functions/src/index.js b/packages/babel-helper-member-expression-to-functions/src/index.js
index e44c3eb78496..88b8514c2cdf 100644
--- a/packages/babel-helper-member-expression-to-functions/src/index.js
+++ b/packages/babel-helper-member-expression-to-functions/src/index.js
@@ -100,6 +100,34 @@ const handle = {
       return;
     }
 
+    // { KEY: MEMBER } = OBJ -> { KEY: _destructureSet(MEMBER) } = OBJ
+    // { KEY: MEMBER = _VALUE } = OBJ -> { KEY: _destructureSet(MEMBER) = _VALUE } = OBJ
+    // {...MEMBER} -> {..._destructureSet(MEMBER)}
+    //
+    // [MEMBER] = ARR -> [_destructureSet(MEMBER)] = ARR
+    // [MEMBER = _VALUE] = ARR -> [_destructureSet(MEMBER) = _VALUE] = ARR
+    // [...MEMBER] -> [..._destructureSet(MEMBER)]
+    if (
+      // { KEY: MEMBER } = OBJ
+      (parentPath.isObjectProperty({ value: node }) &&
+        parentPath.parentPath.isObjectPattern()) ||
+      // { KEY: MEMBER = _VALUE } = OBJ
+      (parentPath.isAssignmentPattern({ left: node }) &&
+        parentPath.parentPath.isObjectProperty({ value: parent }) &&
+        parentPath.parentPath.parentPath.isObjectPattern()) ||
+      // [MEMBER] = ARR
+      parentPath.isArrayPattern() ||
+      // [MEMBER = _VALUE] = ARR
+      (parentPath.isAssignmentPattern({ left: node }) &&
+        parentPath.parentPath.isArrayPattern()) ||
+      // {...MEMBER}
+      // [...MEMBER]
+      parentPath.isRestElement()
+    ) {
+      member.replaceWith(this.destructureSet(member));
+      return;
+    }
+
     // MEMBER   ->   _get(MEMBER)
     member.replaceWith(this.get(member));
   },
diff --git a/packages/babel-helper-module-transforms/package.json b/packages/babel-helper-module-transforms/package.json
index 4df315528955..3e4d55182dcf 100644
--- a/packages/babel-helper-module-transforms/package.json
+++ b/packages/babel-helper-module-transforms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-module-transforms",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Babel helper functions for implementing ES6 module transformations",
   "author": "Logan Smyth <loganfsmyth@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -13,9 +13,9 @@
   "dependencies": {
     "@babel/helper-module-imports": "^7.0.0",
     "@babel/helper-simple-access": "^7.1.0",
-    "@babel/helper-split-export-declaration": "^7.0.0",
-    "@babel/template": "^7.1.0",
-    "@babel/types": "^7.0.0",
-    "lodash": "^4.17.10"
+    "@babel/helper-split-export-declaration": "^7.4.4",
+    "@babel/template": "^7.4.4",
+    "@babel/types": "^7.5.5",
+    "lodash": "^4.17.13"
   }
 }
diff --git a/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js b/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js
index 3f2f86dfdd5a..18fe439ce59e 100644
--- a/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js
+++ b/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js
@@ -8,6 +8,8 @@ export type ModuleMetadata = {
   // The name of the variable that will reference an object containing export names.
   exportNameListName: null | string,
 
+  hasExports: boolean,
+
   // Lookup from local binding to export information.
   local: Map<string, LocalExportMetadata>,
 
@@ -52,18 +54,7 @@ export type LocalExportMetadata = {
  * Check if the module has any exports that need handling.
  */
 export function hasExports(metadata: ModuleMetadata) {
-  const { local, source } = metadata;
-
-  return (
-    local.size > 0 ||
-    Array.from(source).some(([, meta]) => {
-      return (
-        meta.reexports.size > 0 ||
-        meta.reexportNamespace.size > 0 ||
-        !!meta.reexportAll
-      );
-    })
-  );
+  return metadata.hasExports;
 }
 
 /**
@@ -99,7 +90,10 @@ export default function normalizeModuleAndLoadMetadata(
 
   nameAnonymousExports(programPath);
 
-  const { local, source } = getModuleMetadata(programPath, { loose, lazy });
+  const { local, source, hasExports } = getModuleMetadata(programPath, {
+    loose,
+    lazy,
+  });
 
   removeModuleDeclarations(programPath);
 
@@ -127,6 +121,7 @@ export default function normalizeModuleAndLoadMetadata(
   return {
     exportName,
     exportNameListName: null,
+    hasExports,
     local,
     source,
   };
@@ -171,6 +166,7 @@ function getModuleMetadata(
     }
     return data;
   };
+  let hasExports = false;
   programPath.get("body").forEach(child => {
     if (child.isImportDeclaration()) {
       const data = getData(child.node.source);
@@ -219,6 +215,7 @@ function getModuleMetadata(
         }
       });
     } else if (child.isExportAllDeclaration()) {
+      hasExports = true;
       const data = getData(child.node.source);
       if (!data.loc) data.loc = child.node.loc;
 
@@ -226,6 +223,7 @@ function getModuleMetadata(
         loc: child.node.loc,
       };
     } else if (child.isExportNamedDeclaration() && child.node.source) {
+      hasExports = true;
       const data = getData(child.node.source);
       if (!data.loc) data.loc = child.node.loc;
 
@@ -242,6 +240,11 @@ function getModuleMetadata(
           throw exportName.buildCodeFrameError('Illegal export "__esModule".');
         }
       });
+    } else if (
+      child.isExportNamedDeclaration() ||
+      child.isExportDefaultDeclaration()
+    ) {
+      hasExports = true;
     }
   });
 
@@ -285,7 +288,7 @@ function getModuleMetadata(
         // dependency modules are loaded lazily.
         metadata.lazy = !/\./.test(source);
       } else if (Array.isArray(lazy)) {
-        metadata.lazy = lazy.indexOf(source);
+        metadata.lazy = lazy.indexOf(source) !== -1;
       } else if (typeof lazy === "function") {
         metadata.lazy = lazy(source);
       } else {
@@ -295,6 +298,7 @@ function getModuleMetadata(
   }
 
   return {
+    hasExports,
     local: localData,
     source: sourceData,
   };
diff --git a/packages/babel-helper-module-transforms/src/rewrite-this.js b/packages/babel-helper-module-transforms/src/rewrite-this.js
index 5d79687244f7..1c572c2d40e9 100644
--- a/packages/babel-helper-module-transforms/src/rewrite-this.js
+++ b/packages/babel-helper-module-transforms/src/rewrite-this.js
@@ -17,4 +17,7 @@ const rewriteThisVisitor = {
   ClassProperty(path) {
     path.skip();
   },
+  ClassPrivateProperty(path) {
+    path.skip();
+  },
 };
diff --git a/packages/babel-helper-regex/package.json b/packages/babel-helper-regex/package.json
index a7fa3c2b762c..0fdf8c0aee80 100644
--- a/packages/babel-helper-regex/package.json
+++ b/packages/babel-helper-regex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-regex",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Helper function to check for literal RegEx",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-regex",
   "license": "MIT",
@@ -9,6 +9,6 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "lodash": "^4.17.10"
+    "lodash": "^4.17.13"
   }
 }
diff --git a/packages/babel-helper-replace-supers/package.json b/packages/babel-helper-replace-supers/package.json
index 23fe71896e59..a6c6dbc76c2b 100644
--- a/packages/babel-helper-replace-supers/package.json
+++ b/packages/babel-helper-replace-supers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-replace-supers",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Helper function to replace supers",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-replace-supers",
   "license": "MIT",
@@ -9,9 +9,9 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-member-expression-to-functions": "^7.0.0",
+    "@babel/helper-member-expression-to-functions": "^7.5.5",
     "@babel/helper-optimise-call-expression": "^7.0.0",
-    "@babel/traverse": "^7.1.0",
-    "@babel/types": "^7.0.0"
+    "@babel/traverse": "^7.5.5",
+    "@babel/types": "^7.5.5"
   }
 }
diff --git a/packages/babel-helper-replace-supers/src/index.js b/packages/babel-helper-replace-supers/src/index.js
index d8da1f0409fd..3412d321caf2 100644
--- a/packages/babel-helper-replace-supers/src/index.js
+++ b/packages/babel-helper-replace-supers/src/index.js
@@ -15,11 +15,12 @@ import * as t from "@babel/types";
  *
  *   helpers.getPrototypeOf(CLASS.prototype)
  */
-function getPrototypeOfExpression(objectRef, isStatic, file) {
+function getPrototypeOfExpression(objectRef, isStatic, file, isPrivateMethod) {
   objectRef = t.cloneNode(objectRef);
-  const targetRef = isStatic
-    ? objectRef
-    : t.memberExpression(objectRef, t.identifier("prototype"));
+  const targetRef =
+    isStatic || isPrivateMethod
+      ? objectRef
+      : t.memberExpression(objectRef, t.identifier("prototype"));
 
   return t.callExpression(file.addHelper("getPrototypeOf"), [targetRef]);
 }
@@ -40,6 +41,9 @@ function skipAllButComputedKey(path) {
 }
 
 export const environmentVisitor = {
+  TypeAnnotation(path) {
+    path.skip();
+  },
   Function(path) {
     // Methods will be handled by the Method visit
     if (path.isMethod()) return;
@@ -48,13 +52,7 @@ export const environmentVisitor = {
     path.skip();
   },
 
-  Method(path) {
-    skipAllButComputedKey(path);
-  },
-
-  "ClassProperty|ClassPrivateProperty"(path) {
-    // If the property is computed, we need to visit everything.
-    if (path.node.static) return;
+  "Method|ClassProperty|ClassPrivateProperty"(path) {
     skipAllButComputedKey(path);
   },
 };
@@ -101,7 +99,12 @@ const specHandlers = {
 
   get(superMember) {
     return t.callExpression(this.file.addHelper("get"), [
-      getPrototypeOfExpression(this.getObjectRef(), this.isStatic, this.file),
+      getPrototypeOfExpression(
+        this.getObjectRef(),
+        this.isStatic,
+        this.file,
+        this.isPrivateMethod,
+      ),
       this.prop(superMember),
       t.thisExpression(),
     ]);
@@ -109,7 +112,12 @@ const specHandlers = {
 
   set(superMember, value) {
     return t.callExpression(this.file.addHelper("set"), [
-      getPrototypeOfExpression(this.getObjectRef(), this.isStatic, this.file),
+      getPrototypeOfExpression(
+        this.getObjectRef(),
+        this.isStatic,
+        this.file,
+        this.isPrivateMethod,
+      ),
       this.prop(superMember),
       value,
       t.thisExpression(),
@@ -117,6 +125,12 @@ const specHandlers = {
     ]);
   },
 
+  destructureSet(superMember) {
+    throw superMember.buildCodeFrameError(
+      `Destructuring to a super field is not supported yet.`,
+    );
+  },
+
   call(superMember, args) {
     return optimiseCall(this.get(superMember), t.thisExpression(), args);
   },
@@ -166,6 +180,13 @@ const looseHandlers = {
       value,
     );
   },
+
+  destructureSet(superMember) {
+    const { computed } = superMember.node;
+    const prop = this.prop(superMember);
+
+    return t.memberExpression(t.thisExpression(), prop, computed);
+  },
 };
 
 export default class ReplaceSupers {
@@ -173,8 +194,8 @@ export default class ReplaceSupers {
     const path = opts.methodPath;
 
     this.methodPath = path;
-    this.isStatic =
-      path.isClassMethod({ static: true }) || path.isObjectMethod();
+    this.isStatic = path.isObjectMethod() || path.node.static;
+    this.isPrivateMethod = path.isPrivate() && path.isMethod();
 
     this.file = opts.file;
     this.superRef = opts.superRef;
@@ -205,6 +226,7 @@ export default class ReplaceSupers {
     memberExpressionToFunctions(this.methodPath, visitor, {
       file: this.file,
       isStatic: this.isStatic,
+      isPrivateMethod: this.isPrivateMethod,
       getObjectRef: this.getObjectRef.bind(this),
       superRef: this.superRef,
       ...handler,
diff --git a/packages/babel-helper-split-export-declaration/package.json b/packages/babel-helper-split-export-declaration/package.json
index 5a449d06a82d..f8510565f9e9 100644
--- a/packages/babel-helper-split-export-declaration/package.json
+++ b/packages/babel-helper-split-export-declaration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-split-export-declaration",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-split-export-declaration",
   "license": "MIT",
@@ -9,6 +9,6 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/types": "^7.0.0"
+    "@babel/types": "^7.4.4"
   }
 }
diff --git a/packages/babel-helper-split-export-declaration/src/index.js b/packages/babel-helper-split-export-declaration/src/index.js
index ffbf52243a05..c591f8746396 100644
--- a/packages/babel-helper-split-export-declaration/src/index.js
+++ b/packages/babel-helper-split-export-declaration/src/index.js
@@ -49,10 +49,7 @@ export default function splitExportDeclaration(exportDeclaration) {
     exportDeclaration.replaceWith(updatedDeclaration);
 
     if (needBindingRegistration) {
-      scope.registerBinding(
-        isClassDeclaration ? "let" : "var",
-        exportDeclaration,
-      );
+      scope.registerDeclaration(exportDeclaration);
     }
 
     return exportDeclaration;
diff --git a/packages/babel-helper-transform-fixture-test-runner/package.json b/packages/babel-helper-transform-fixture-test-runner/package.json
index 2a2ee591d06f..f1e766baff50 100644
--- a/packages/babel-helper-transform-fixture-test-runner/package.json
+++ b/packages/babel-helper-transform-fixture-test-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-transform-fixture-test-runner",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Transform test runner for @babel/helper-fixtures module",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -11,13 +11,14 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-transform-fixture-test-runner",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/code-frame": "^7.0.0",
-    "@babel/core": "^7.1.0",
-    "@babel/helper-fixtures": "^7.0.0",
-    "@babel/polyfill": "^7.0.0",
-    "jest": "^22.4.2",
-    "jest-diff": "^22.4.0",
-    "lodash": "^4.17.10",
+    "@babel/code-frame": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/helper-fixtures": "^7.5.5",
+    "@babel/polyfill": "^7.4.4",
+    "babel-check-duplicated-nodes": "^1.0.0",
+    "jest": "^24.8.0",
+    "jest-diff": "^24.8.0",
+    "lodash": "^4.17.13",
     "resolve": "^1.3.2",
     "source-map": "^0.5.0"
   }
diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.js b/packages/babel-helper-transform-fixture-test-runner/src/index.js
index a16e19b1a68c..a83e8ff1c61b 100644
--- a/packages/babel-helper-transform-fixture-test-runner/src/index.js
+++ b/packages/babel-helper-transform-fixture-test-runner/src/index.js
@@ -15,6 +15,7 @@ import assert from "assert";
 import fs from "fs";
 import path from "path";
 import vm from "vm";
+import checkDuplicatedNodes from "babel-check-duplicated-nodes";
 
 import diff from "jest-diff";
 
@@ -129,51 +130,6 @@ function wrapPackagesArray(type, names, optionsDir) {
   });
 }
 
-function checkDuplicatedNodes(ast) {
-  const nodes = new WeakSet();
-  const parents = new WeakMap();
-
-  const setParent = (child, parent) => {
-    if (typeof child === "object" && child !== null) {
-      let p = parents.get(child);
-      if (!p) {
-        p = [];
-        parents.set(child, p);
-      }
-      p.unshift(parent);
-    }
-  };
-  const registerChildren = node => {
-    for (const key in node) {
-      if (Array.isArray(node[key])) {
-        node[key].forEach(child => setParent(child, node));
-      } else {
-        setParent(node[key], node);
-      }
-    }
-  };
-
-  const hidePrivateProperties = (key, val) => {
-    // Hides properties like _shadowedFunctionLiteral,
-    // which makes the AST circular
-    if (key[0] === "_") return "[Private]";
-    return val;
-  };
-
-  babel.types.traverseFast(ast, node => {
-    registerChildren(node);
-    if (nodes.has(node)) {
-      throw new Error(
-        "Do not reuse nodes. Use `t.cloneNode` to copy them.\n" +
-          JSON.stringify(node, hidePrivateProperties, 2) +
-          "\nParent:\n" +
-          JSON.stringify(parents.get(node), hidePrivateProperties, 2),
-      );
-    }
-    nodes.add(node);
-  });
-}
-
 function run(task) {
   const actual = task.actual;
   const expected = task.expect;
@@ -222,7 +178,7 @@ function run(task) {
   if (execCode) {
     const execOpts = getOpts(exec);
     result = babel.transform(execCode, execOpts);
-    checkDuplicatedNodes(result.ast);
+    checkDuplicatedNodes(babel, result.ast);
     execCode = result.code;
 
     try {
@@ -244,7 +200,7 @@ function run(task) {
       "<CWD>",
     );
 
-    checkDuplicatedNodes(result.ast);
+    checkDuplicatedNodes(babel, result.ast);
     if (
       !expected.code &&
       expectedCode &&
diff --git a/packages/babel-helper-wrap-function/package.json b/packages/babel-helper-wrap-function/package.json
index b563d6125aa3..d0a3396e76f5 100644
--- a/packages/babel-helper-wrap-function/package.json
+++ b/packages/babel-helper-wrap-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helper-wrap-function",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Helper to wrap functions inside a function call.",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-wrap-function",
   "license": "MIT",
@@ -12,6 +12,6 @@
     "@babel/helper-function-name": "^7.1.0",
     "@babel/template": "^7.1.0",
     "@babel/traverse": "^7.1.0",
-    "@babel/types": "^7.0.0"
+    "@babel/types": "^7.2.0"
   }
 }
diff --git a/packages/babel-helper-wrap-function/src/index.js b/packages/babel-helper-wrap-function/src/index.js
index c05d80fc4fed..d36e9d267700 100644
--- a/packages/babel-helper-wrap-function/src/index.js
+++ b/packages/babel-helper-wrap-function/src/index.js
@@ -3,7 +3,7 @@ import nameFunction from "@babel/helper-function-name";
 import template from "@babel/template";
 import * as t from "@babel/types";
 
-const buildExpressionWrapper = template.expression(`
+const buildAnonymousExpressionWrapper = template.expression(`
   (function () {
     var REF = FUNCTION;
     return function NAME(PARAMS) {
@@ -12,6 +12,16 @@ const buildExpressionWrapper = template.expression(`
   })()
 `);
 
+const buildNamedExpressionWrapper = template.expression(`
+  (function () {
+    var REF = FUNCTION;
+    function NAME(PARAMS) {
+      return REF.apply(this, arguments);
+    }
+    return NAME;
+  })()
+`);
+
 const buildDeclarationWrapper = template(`
   function NAME(PARAMS) { return REF.apply(this, arguments); }
   function REF() {
@@ -53,7 +63,9 @@ function plainFunction(path: NodePath, callId: Object) {
   const functionId = node.id;
   const wrapper = isDeclaration
     ? buildDeclarationWrapper
-    : buildExpressionWrapper;
+    : functionId
+    ? buildNamedExpressionWrapper
+    : buildAnonymousExpressionWrapper;
 
   if (path.isArrowFunctionExpression()) {
     path.arrowFunctionToExpression();
diff --git a/packages/babel-helpers/package.json b/packages/babel-helpers/package.json
index 172471ed321b..54db360349b1 100644
--- a/packages/babel-helpers/package.json
+++ b/packages/babel-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/helpers",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Collection of helper functions used by Babel transforms.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -11,9 +11,9 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helpers",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/template": "^7.1.0",
-    "@babel/traverse": "^7.1.0",
-    "@babel/types": "^7.0.0"
+    "@babel/template": "^7.4.4",
+    "@babel/traverse": "^7.5.5",
+    "@babel/types": "^7.5.5"
   },
   "devDependencies": {
     "@babel/helper-plugin-test-runner": "^7.0.0"
diff --git a/packages/babel-helpers/src/helpers.js b/packages/babel-helpers/src/helpers.js
index ca0491e99522..527b24c330ac 100644
--- a/packages/babel-helpers/src/helpers.js
+++ b/packages/babel-helpers/src/helpers.js
@@ -26,13 +26,14 @@ helpers.typeof = helper("7.0.0-beta.0")`
   }
 `;
 
+// "for" is a reserved keyword in ES3 so escaping it here for backward compatibility
 helpers.jsx = helper("7.0.0-beta.0")`
   var REACT_ELEMENT_TYPE;
 
   export default function _createRawReactElement(type, props, key, children) {
     if (!REACT_ELEMENT_TYPE) {
       REACT_ELEMENT_TYPE = (
-        typeof Symbol === "function" && Symbol.for && Symbol.for("react.element")
+        typeof Symbol === "function" && Symbol["for"] && Symbol["for"]("react.element")
       ) || 0xeac7;
     }
 
@@ -80,7 +81,7 @@ helpers.jsx = helper("7.0.0-beta.0")`
 helpers.asyncIterator = helper("7.0.0-beta.0")`
   export default function _asyncIterator(iterable) {
     var method
-    if (typeof Symbol === "function") {
+    if (typeof Symbol !== "undefined") {
       if (Symbol.asyncIterator) {
         method = iterable[Symbol.asyncIterator]
         if (method != null) return method.call(iterable);
@@ -384,6 +385,7 @@ helpers.extends = helper("7.0.0-beta.0")`
   }
 `;
 
+// This old helper can be removed in babel v8
 helpers.objectSpread = helper("7.0.0-beta.0")`
   import defineProperty from "defineProperty";
 
@@ -404,6 +406,48 @@ helpers.objectSpread = helper("7.0.0-beta.0")`
   }
 `;
 
+helpers.objectSpread2 = helper("7.5.0")`
+  import defineProperty from "defineProperty";
+
+  // This function is different to "Reflect.ownKeys". The enumerableOnly
+  // filters on symbol properties only. Returned string properties are always 
+  // enumerable. It is good to use in objectSpread.
+
+  function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+      var symbols = Object.getOwnPropertySymbols(object);
+      if (enumerableOnly) symbols = symbols.filter(function (sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+      keys.push.apply(keys, symbols);
+    }
+    return keys;
+  }
+
+  export default function _objectSpread2(target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = (arguments[i] != null) ? arguments[i] : {};
+      if (i % 2) {
+        ownKeys(source, true).forEach(function (key) {
+          defineProperty(target, key, source[key]);
+        });
+      } else if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+      } else {
+        ownKeys(source).forEach(function (key) {
+          Object.defineProperty(
+            target,
+            key,
+            Object.getOwnPropertyDescriptor(source, key)
+          );
+        });
+      }
+    }
+    return target;
+  }
+`;
+
 helpers.inherits = helper("7.0.0-beta.0")`
   import setPrototypeOf from "setPrototypeOf";
 
@@ -548,7 +592,7 @@ helpers.wrapNativeSuper = helper("7.0.0-beta.0")`
 helpers.instanceof = helper("7.0.0-beta.0")`
   export default function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-      return right[Symbol.hasInstance](left);
+      return !!right[Symbol.hasInstance](left);
     } else {
       return left instanceof right;
     }
@@ -676,7 +720,6 @@ helpers.superPropBase = helper("7.0.0-beta.0")`
 `;
 
 helpers.get = helper("7.0.0-beta.0")`
-  import getPrototypeOf from "getPrototypeOf";
   import superPropBase from "superPropBase";
 
   export default function _get(target, property, receiver) {
@@ -701,7 +744,6 @@ helpers.get = helper("7.0.0-beta.0")`
 `;
 
 helpers.set = helper("7.0.0-beta.0")`
-  import getPrototypeOf from "getPrototypeOf";
   import superPropBase from "superPropBase";
   import defineProperty from "defineProperty";
 
@@ -775,18 +817,6 @@ helpers.taggedTemplateLiteralLoose = helper("7.0.0-beta.0")`
   }
 `;
 
-helpers.temporalRef = helper("7.0.0-beta.0")`
-  import undef from "temporalUndefined";
-
-  export default function _temporalRef(val, name) {
-    if (val === undef) {
-      throw new ReferenceError(name + " is not defined - temporal dead zone");
-    } else {
-      return val;
-    }
-  }
-`;
-
 helpers.readOnlyError = helper("7.0.0-beta.0")`
   export default function _readOnlyError(name) {
     throw new Error("\\"" + name + "\\" is read-only");
@@ -800,7 +830,24 @@ helpers.classNameTDZError = helper("7.0.0-beta.0")`
 `;
 
 helpers.temporalUndefined = helper("7.0.0-beta.0")`
-  export default {};
+  // This function isn't mean to be called, but to be used as a reference.
+  // We can't use a normal object because it isn't hoisted.
+  export default function _temporalUndefined() {}
+`;
+
+helpers.tdz = helper("7.5.5")`
+  export default function _tdzError(name) {
+    throw new ReferenceError(name + " is not defined - temporal dead zone");
+  }
+`;
+
+helpers.temporalRef = helper("7.0.0-beta.0")`
+  import undef from "temporalUndefined";
+  import err from "tdz";
+
+  export default function _temporalRef(val, name) {
+    return val === undef ? err(name) : val;
+  }
 `;
 
 helpers.slicedToArray = helper("7.0.0-beta.0")`
@@ -935,13 +982,28 @@ helpers.skipFirstGeneratorNext = helper("7.0.0-beta.0")`
   }
 `;
 
-helpers.toPropertyKey = helper("7.0.0-beta.0")`
-  export default function _toPropertyKey(key) {
-    if (typeof key === "symbol") {
-      return key;
-    } else {
-      return String(key);
+helpers.toPrimitive = helper("7.1.5")`
+  export default function _toPrimitive(
+    input,
+    hint /*: "default" | "string" | "number" | void */
+  ) {
+    if (typeof input !== "object" || input === null) return input;
+    var prim = input[Symbol.toPrimitive];
+    if (prim !== undefined) {
+      var res = prim.call(input, hint || "default");
+      if (typeof res !== "object") return res;
+      throw new TypeError("@@toPrimitive must return a primitive value.");
     }
+    return (hint === "string" ? String : Number)(input);
+  }
+`;
+
+helpers.toPropertyKey = helper("7.1.5")`
+  import toPrimitive from "toPrimitive";
+
+  export default function _toPropertyKey(arg) {
+    var key = toPrimitive(arg, "string");
+    return typeof key === "symbol" ? key : String(key);
   }
 `;
 
@@ -983,7 +1045,7 @@ helpers.initializerDefineProperty = helper("7.0.0-beta.0")`
 helpers.applyDecoratedDescriptor = helper("7.0.0-beta.0")`
     export default function _applyDecoratedDescriptor(target, property, decorators, descriptor, context){
         var desc = {};
-        Object['ke' + 'ys'](descriptor).forEach(function(key){
+        Object.keys(descriptor).forEach(function(key){
             desc[key] = descriptor[key];
         });
         desc.enumerable = !!desc.enumerable;
@@ -1004,7 +1066,7 @@ helpers.applyDecoratedDescriptor = helper("7.0.0-beta.0")`
         if (desc.initializer === void 0){
             // This is a hack to avoid this being processed by 'transform-runtime'.
             // See issue #9.
-            Object['define' + 'Property'](target, property, desc);
+            Object.defineProperty(target, property, desc);
             desc = null;
         }
 
@@ -1030,27 +1092,65 @@ helpers.classPrivateFieldLooseBase = helper("7.0.0-beta.0")`
 
 helpers.classPrivateFieldGet = helper("7.0.0-beta.0")`
   export default function _classPrivateFieldGet(receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
+    var descriptor = privateMap.get(receiver);
+    if (!descriptor) {
       throw new TypeError("attempted to get private field on non-instance");
     }
-    return privateMap.get(receiver).value;
+    if (descriptor.get) {
+      return descriptor.get.call(receiver);
+    }
+    return descriptor.value;
   }
 `;
 
 helpers.classPrivateFieldSet = helper("7.0.0-beta.0")`
   export default function _classPrivateFieldSet(receiver, privateMap, value) {
+    var descriptor = privateMap.get(receiver);
+    if (!descriptor) {
+      throw new TypeError("attempted to set private field on non-instance");
+    }
+    if (descriptor.set) {
+      descriptor.set.call(receiver, value);
+    } else {
+      if (!descriptor.writable) {
+        // This should only throw in strict mode, but class bodies are
+        // always strict and private fields can only be used inside
+        // class bodies.
+        throw new TypeError("attempted to set read only private field");
+      }
+
+      descriptor.value = value;
+    }
+
+    return value;
+  }
+`;
+
+helpers.classPrivateFieldDestructureSet = helper("7.4.4")`
+  export default function _classPrivateFieldDestructureSet(receiver, privateMap) {
     if (!privateMap.has(receiver)) {
       throw new TypeError("attempted to set private field on non-instance");
     }
     var descriptor = privateMap.get(receiver);
-    if (!descriptor.writable) {
-      // This should only throw in strict mode, but class bodies are
-      // always strict and private fields can only be used inside
-      // class bodies.
-      throw new TypeError("attempted to set read only private field");
+    if (descriptor.set) {
+      if (!("__destrObj" in descriptor)) {
+        descriptor.__destrObj = {
+          set value(v) {
+            descriptor.set.call(receiver, v)
+          },
+        };
+      }
+      return descriptor.__destrObj;
+    } else {
+      if (!descriptor.writable) {
+        // This should only throw in strict mode, but class bodies are
+        // always strict and private fields can only be used inside
+        // class bodies.
+        throw new TypeError("attempted to set read only private field");
+      }
+
+      return descriptor;
     }
-    descriptor.value = value;
-    return value;
   }
 `;
 
@@ -1079,8 +1179,24 @@ helpers.classStaticPrivateFieldSpecSet = helper("7.0.2")`
   }
 `;
 
-helpers.decorate = helper("7.0.2")`
+helpers.classStaticPrivateMethodGet = helper("7.3.2")`
+  export default function _classStaticPrivateMethodGet(receiver, classConstructor, method) {
+    if (receiver !== classConstructor) {
+      throw new TypeError("Private static access of wrong provenance");
+    }
+    return method;
+  }
+`;
+
+helpers.classStaticPrivateMethodSet = helper("7.3.2")`
+  export default function _classStaticPrivateMethodSet() {
+    throw new TypeError("attempted to set read only static private field");
+  }
+`;
+
+helpers.decorate = helper("7.1.5")`
   import toArray from "toArray";
+  import toPropertyKey from "toPropertyKey";
 
   // These comments are stripped by @babel/template
   /*::
@@ -1196,29 +1312,438 @@ helpers.decorate = helper("7.0.2")`
 
   */
 
+  /*::
+
+  type Placements = {
+    static: Key[],
+    prototype: Key[],
+    own: Key[],
+  };
+
+  */
+
   // ClassDefinitionEvaluation (Steps 26-*)
   export default function _decorate(
     decorators /*: ClassDecorator[] */,
     factory /*: ClassFactory */,
     superClass /*: ?Class<*> */,
+    mixins /*: ?Array<Function> */,
   ) /*: Class<*> */ {
+    var api = _getDecoratorsApi();
+    if (mixins) {
+      for (var i = 0; i < mixins.length; i++) {
+        api = mixins[i](api);
+      }
+    }
+
     var r = factory(function initialize(O) {
-      _initializeInstanceElements(O, decorated.elements);
+      api.initializeInstanceElements(O, decorated.elements);
     }, superClass);
-    var decorated = _decorateClass(
+    var decorated = api.decorateClass(
       _coalesceClassElements(r.d.map(_createElementDescriptor)),
       decorators,
     );
 
-    _initializeClassElements(r.F, decorated.elements);
+    api.initializeClassElements(r.F, decorated.elements);
 
-    return _runClassFinishers(r.F, decorated.finishers);
+    return api.runClassFinishers(r.F, decorated.finishers);
+  }
+
+  function _getDecoratorsApi() {
+    _getDecoratorsApi = function() {
+      return api;
+    };
+
+    var api = {
+      elementsDefinitionOrder: [["method"], ["field"]],
+
+      // InitializeInstanceElements
+      initializeInstanceElements: function(
+        /*::<C>*/ O /*: C */,
+        elements /*: ElementDescriptor[] */,
+      ) {
+        ["method", "field"].forEach(function(kind) {
+          elements.forEach(function(element /*: ElementDescriptor */) {
+            if (element.kind === kind && element.placement === "own") {
+              this.defineClassElement(O, element);
+            }
+          }, this);
+        }, this);
+      },
+
+      // InitializeClassElements
+      initializeClassElements: function(
+        /*::<C>*/ F /*: Class<C> */,
+        elements /*: ElementDescriptor[] */,
+      ) {
+        var proto = F.prototype;
+
+        ["method", "field"].forEach(function(kind) {
+          elements.forEach(function(element /*: ElementDescriptor */) {
+            var placement = element.placement;
+            if (
+              element.kind === kind &&
+              (placement === "static" || placement === "prototype")
+            ) {
+              var receiver = placement === "static" ? F : proto;
+              this.defineClassElement(receiver, element);
+            }
+          }, this);
+        }, this);
+      },
+
+      // DefineClassElement
+      defineClassElement: function(
+        /*::<C>*/ receiver /*: C | Class<C> */,
+        element /*: ElementDescriptor */,
+      ) {
+        var descriptor /*: PropertyDescriptor */ = element.descriptor;
+        if (element.kind === "field") {
+          var initializer = element.initializer;
+          descriptor = {
+            enumerable: descriptor.enumerable,
+            writable: descriptor.writable,
+            configurable: descriptor.configurable,
+            value: initializer === void 0 ? void 0 : initializer.call(receiver),
+          };
+        }
+        Object.defineProperty(receiver, element.key, descriptor);
+      },
+
+      // DecorateClass
+      decorateClass: function(
+        elements /*: ElementDescriptor[] */,
+        decorators /*: ClassDecorator[] */,
+      ) /*: ElementsFinishers */ {
+        var newElements /*: ElementDescriptor[] */ = [];
+        var finishers /*: ClassFinisher[] */ = [];
+        var placements /*: Placements */ = {
+          static: [],
+          prototype: [],
+          own: [],
+        };
+
+        elements.forEach(function(element /*: ElementDescriptor */) {
+          this.addElementPlacement(element, placements);
+        }, this);
+
+        elements.forEach(function(element /*: ElementDescriptor */) {
+          if (!_hasDecorators(element)) return newElements.push(element);
+
+          var elementFinishersExtras /*: ElementFinishersExtras */ = this.decorateElement(
+            element,
+            placements,
+          );
+          newElements.push(elementFinishersExtras.element);
+          newElements.push.apply(newElements, elementFinishersExtras.extras);
+          finishers.push.apply(finishers, elementFinishersExtras.finishers);
+        }, this);
+
+        if (!decorators) {
+          return { elements: newElements, finishers: finishers };
+        }
+
+        var result /*: ElementsFinishers */ = this.decorateConstructor(
+          newElements,
+          decorators,
+        );
+        finishers.push.apply(finishers, result.finishers);
+        result.finishers = finishers;
+
+        return result;
+      },
+
+      // AddElementPlacement
+      addElementPlacement: function(
+        element /*: ElementDescriptor */,
+        placements /*: Placements */,
+        silent /*: boolean */,
+      ) {
+        var keys = placements[element.placement];
+        if (!silent && keys.indexOf(element.key) !== -1) {
+          throw new TypeError("Duplicated element (" + element.key + ")");
+        }
+        keys.push(element.key);
+      },
+
+      // DecorateElement
+      decorateElement: function(
+        element /*: ElementDescriptor */,
+        placements /*: Placements */,
+      ) /*: ElementFinishersExtras */ {
+        var extras /*: ElementDescriptor[] */ = [];
+        var finishers /*: ClassFinisher[] */ = [];
+
+        for (
+          var decorators = element.decorators, i = decorators.length - 1;
+          i >= 0;
+          i--
+        ) {
+          // (inlined) RemoveElementPlacement
+          var keys = placements[element.placement];
+          keys.splice(keys.indexOf(element.key), 1);
+
+          var elementObject /*: ElementObjectInput */ = this.fromElementDescriptor(
+            element,
+          );
+          var elementFinisherExtras /*: ElementFinisherExtras */ = this.toElementFinisherExtras(
+            (0, decorators[i])(elementObject) /*: ElementObjectOutput */ ||
+              elementObject,
+          );
+
+          element = elementFinisherExtras.element;
+          this.addElementPlacement(element, placements);
+
+          if (elementFinisherExtras.finisher) {
+            finishers.push(elementFinisherExtras.finisher);
+          }
+
+          var newExtras /*: ElementDescriptor[] | void */ =
+            elementFinisherExtras.extras;
+          if (newExtras) {
+            for (var j = 0; j < newExtras.length; j++) {
+              this.addElementPlacement(newExtras[j], placements);
+            }
+            extras.push.apply(extras, newExtras);
+          }
+        }
+
+        return { element: element, finishers: finishers, extras: extras };
+      },
+
+      // DecorateConstructor
+      decorateConstructor: function(
+        elements /*: ElementDescriptor[] */,
+        decorators /*: ClassDecorator[] */,
+      ) /*: ElementsFinishers */ {
+        var finishers /*: ClassFinisher[] */ = [];
+
+        for (var i = decorators.length - 1; i >= 0; i--) {
+          var obj /*: ClassObject */ = this.fromClassDescriptor(elements);
+          var elementsAndFinisher /*: ElementsFinisher */ = this.toClassDescriptor(
+            (0, decorators[i])(obj) /*: ClassObject */ || obj,
+          );
+
+          if (elementsAndFinisher.finisher !== undefined) {
+            finishers.push(elementsAndFinisher.finisher);
+          }
+
+          if (elementsAndFinisher.elements !== undefined) {
+            elements = elementsAndFinisher.elements;
+
+            for (var j = 0; j < elements.length - 1; j++) {
+              for (var k = j + 1; k < elements.length; k++) {
+                if (
+                  elements[j].key === elements[k].key &&
+                  elements[j].placement === elements[k].placement
+                ) {
+                  throw new TypeError(
+                    "Duplicated element (" + elements[j].key + ")",
+                  );
+                }
+              }
+            }
+          }
+        }
+
+        return { elements: elements, finishers: finishers };
+      },
+
+      // FromElementDescriptor
+      fromElementDescriptor: function(
+        element /*: ElementDescriptor */,
+      ) /*: ElementObject */ {
+        var obj /*: ElementObject */ = {
+          kind: element.kind,
+          key: element.key,
+          placement: element.placement,
+          descriptor: element.descriptor,
+        };
+
+        var desc = {
+          value: "Descriptor",
+          configurable: true,
+        };
+        Object.defineProperty(obj, Symbol.toStringTag, desc);
+
+        if (element.kind === "field") obj.initializer = element.initializer;
+
+        return obj;
+      },
+
+      // ToElementDescriptors
+      toElementDescriptors: function(
+        elementObjects /*: ElementObject[] */,
+      ) /*: ElementDescriptor[] */ {
+        if (elementObjects === undefined) return;
+        return toArray(elementObjects).map(function(elementObject) {
+          var element = this.toElementDescriptor(elementObject);
+          this.disallowProperty(elementObject, "finisher", "An element descriptor");
+          this.disallowProperty(elementObject, "extras", "An element descriptor");
+          return element;
+        }, this);
+      },
+
+      // ToElementDescriptor
+      toElementDescriptor: function(
+        elementObject /*: ElementObject */,
+      ) /*: ElementDescriptor */ {
+        var kind = String(elementObject.kind);
+        if (kind !== "method" && kind !== "field") {
+          throw new TypeError(
+            'An element descriptor\\'s .kind property must be either "method" or' +
+              ' "field", but a decorator created an element descriptor with' +
+              ' .kind "' +
+              kind +
+              '"',
+          );
+        }
+
+        var key = toPropertyKey(elementObject.key);
+
+        var placement = String(elementObject.placement);
+        if (
+          placement !== "static" &&
+          placement !== "prototype" &&
+          placement !== "own"
+        ) {
+          throw new TypeError(
+            'An element descriptor\\'s .placement property must be one of "static",' +
+              ' "prototype" or "own", but a decorator created an element descriptor' +
+              ' with .placement "' +
+              placement +
+              '"',
+          );
+        }
+
+        var descriptor /*: PropertyDescriptor */ = elementObject.descriptor;
+
+        this.disallowProperty(elementObject, "elements", "An element descriptor");
+
+        var element /*: ElementDescriptor */ = {
+          kind: kind,
+          key: key,
+          placement: placement,
+          descriptor: Object.assign({}, descriptor),
+        };
+
+        if (kind !== "field") {
+          this.disallowProperty(elementObject, "initializer", "A method descriptor");
+        } else {
+          this.disallowProperty(
+            descriptor,
+            "get",
+            "The property descriptor of a field descriptor",
+          );
+          this.disallowProperty(
+            descriptor,
+            "set",
+            "The property descriptor of a field descriptor",
+          );
+          this.disallowProperty(
+            descriptor,
+            "value",
+            "The property descriptor of a field descriptor",
+          );
+
+          element.initializer = elementObject.initializer;
+        }
+
+        return element;
+      },
+
+      toElementFinisherExtras: function(
+        elementObject /*: ElementObject */,
+      ) /*: ElementFinisherExtras */ {
+        var element /*: ElementDescriptor */ = this.toElementDescriptor(
+          elementObject,
+        );
+        var finisher /*: ClassFinisher */ = _optionalCallableProperty(
+          elementObject,
+          "finisher",
+        );
+        var extras /*: ElementDescriptors[] */ = this.toElementDescriptors(
+          elementObject.extras,
+        );
+
+        return { element: element, finisher: finisher, extras: extras };
+      },
+
+      // FromClassDescriptor
+      fromClassDescriptor: function(
+        elements /*: ElementDescriptor[] */,
+      ) /*: ClassObject */ {
+        var obj = {
+          kind: "class",
+          elements: elements.map(this.fromElementDescriptor, this),
+        };
+
+        var desc = { value: "Descriptor", configurable: true };
+        Object.defineProperty(obj, Symbol.toStringTag, desc);
+
+        return obj;
+      },
+
+      // ToClassDescriptor
+      toClassDescriptor: function(
+        obj /*: ClassObject */,
+      ) /*: ElementsFinisher */ {
+        var kind = String(obj.kind);
+        if (kind !== "class") {
+          throw new TypeError(
+            'A class descriptor\\'s .kind property must be "class", but a decorator' +
+              ' created a class descriptor with .kind "' +
+              kind +
+              '"',
+          );
+        }
+
+        this.disallowProperty(obj, "key", "A class descriptor");
+        this.disallowProperty(obj, "placement", "A class descriptor");
+        this.disallowProperty(obj, "descriptor", "A class descriptor");
+        this.disallowProperty(obj, "initializer", "A class descriptor");
+        this.disallowProperty(obj, "extras", "A class descriptor");
+
+        var finisher = _optionalCallableProperty(obj, "finisher");
+        var elements = this.toElementDescriptors(obj.elements);
+
+        return { elements: elements, finisher: finisher };
+      },
+
+      // RunClassFinishers
+      runClassFinishers: function(
+        constructor /*: Class<*> */,
+        finishers /*: ClassFinisher[] */,
+      ) /*: Class<*> */ {
+        for (var i = 0; i < finishers.length; i++) {
+          var newConstructor /*: ?Class<*> */ = (0, finishers[i])(constructor);
+          if (newConstructor !== undefined) {
+            // NOTE: This should check if IsConstructor(newConstructor) is false.
+            if (typeof newConstructor !== "function") {
+              throw new TypeError("Finishers must return a constructor.");
+            }
+            constructor = newConstructor;
+          }
+        }
+        return constructor;
+      },
+
+      disallowProperty: function(obj, name, objectType) {
+        if (obj[name] !== undefined) {
+          throw new TypeError(objectType + " can't have a ." + name + " property.");
+        }
+      }
+    };
+
+    return api;
   }
 
   // ClassElementEvaluation
   function _createElementDescriptor(
     def /*: ElementDefinition */,
   ) /*: ElementDescriptor */ {
+    var key = toPropertyKey(def.key);
+
     var descriptor /*: PropertyDescriptor */;
     if (def.kind === "method") {
       descriptor = {
@@ -1232,17 +1757,17 @@ helpers.decorate = helper("7.0.2")`
     } else if (def.kind === "set") {
       descriptor = { set: def.value, configurable: true, enumerable: false };
     } else if (def.kind === "field") {
-      descriptor = { configurable: true, writable: true, enumerable: false };
+      descriptor = { configurable: true, writable: true, enumerable: true };
     }
 
     var element /*: ElementDescriptor */ = {
       kind: def.kind === "field" ? "field" : "method",
-      key: def.key,
+      key: key,
       placement: def.static
         ? "static"
         : def.kind === "field"
-          ? "own"
-          : "prototype",
+        ? "own"
+        : "prototype",
       descriptor: descriptor,
     };
     if (def.decorators) element.decorators = def.decorators;
@@ -1269,7 +1794,9 @@ helpers.decorate = helper("7.0.2")`
   ) /*: ElementDescriptor[] */ {
     var newElements /*: ElementDescriptor[] */ = [];
 
-    var isSameElement = function(other /*: ElementDescriptor */) /*: boolean */ {
+    var isSameElement = function(
+      other /*: ElementDescriptor */,
+    ) /*: boolean */ {
       return (
         other.kind === "method" &&
         other.key === element.key &&
@@ -1328,392 +1855,102 @@ helpers.decorate = helper("7.0.2")`
     );
   }
 
-  // InitializeClassElements
-  function _initializeClassElements /*::<C>*/(
-    F /*: Class<C> */,
-    elements /*: ElementDescriptor[] */,
-  ) {
-    var proto = F.prototype;
-
-    ["method", "field"].forEach(function(kind) {
-      elements.forEach(function(element /*: ElementDescriptor */) {
-        var placement = element.placement;
-        if (
-          element.kind === kind &&
-          (placement === "static" || placement === "prototype")
-        ) {
-          var receiver = placement === "static" ? F : proto;
-          _defineClassElement(receiver, element);
-        }
-      });
-    });
-  }
-
-  // InitializeInstanceElements
-  function _initializeInstanceElements /*::<C>*/(
-    O /*: C */,
-    elements /*: ElementDescriptor[] */,
-  ) {
-    ["method", "field"].forEach(function(kind) {
-      elements.forEach(function(element /*: ElementDescriptor */) {
-        if (element.kind === kind && element.placement === "own") {
-          _defineClassElement(O, element);
-        }
-      });
-    });
-  }
-
-  // DefineClassElement
-  function _defineClassElement /*::<C>*/(
-    receiver /*: C | Class<C> */,
-    element /*: ElementDescriptor */,
-  ) {
-    var descriptor /*: PropertyDescriptor */ = element.descriptor;
-    if (element.kind === "field") {
-      var initializer = element.initializer;
-      descriptor = {
-        enumerable: descriptor.enumerable,
-        writable: descriptor.writable,
-        configurable: descriptor.configurable,
-        value: initializer === void 0 ? void 0 : initializer.call(receiver),
-      };
+  function _optionalCallableProperty /*::<T>*/(
+    obj /*: T */,
+    name /*: $Keys<T> */,
+  ) /*: ?Function */ {
+    var value = obj[name];
+    if (value !== undefined && typeof value !== "function") {
+      throw new TypeError("Expected '" + name + "' to be a function");
     }
-    Object.defineProperty(receiver, element.key, descriptor);
+    return value;
   }
 
-  /*::
-
-  type Placements = {
-    static: Key[],
-    prototype: Key[],
-    own: Key[],
-  };
-
-  */
-
-  // DecorateClass
-  function _decorateClass(
-    elements /*: ElementDescriptor[] */,
-    decorators /*: ClassDecorator[] */,
-  ) /*: ElementsFinishers */ {
-    var newElements /*: ElementDescriptor[] */ = [];
-    var finishers /*: ClassFinisher[] */ = [];
-    var placements /*: Placements */ = { static: [], prototype: [], own: [] };
-
-    elements.forEach(function(element /*: ElementDescriptor */) {
-      _addElementPlacement(element, placements);
-    });
-
-    elements.forEach(function(element /*: ElementDescriptor */) {
-      if (!_hasDecorators(element)) return newElements.push(element);
-
-      var elementFinishersExtras /*: ElementFinishersExtras */ = _decorateElement(
-        element,
-        placements,
-      );
-      newElements.push(elementFinishersExtras.element);
-      newElements.push.apply(newElements, elementFinishersExtras.extras);
-      finishers.push.apply(finishers, elementFinishersExtras.finishers);
-    });
+`;
 
-    if (!decorators) {
-      return { elements: newElements, finishers: finishers };
+helpers.classPrivateMethodGet = helper("7.1.6")`
+  export default function _classPrivateMethodGet(receiver, privateSet, fn) {
+    if (!privateSet.has(receiver)) {
+      throw new TypeError("attempted to get private field on non-instance");
     }
-
-    var result /*: ElementsFinishers */ = _decorateConstructor(
-      newElements,
-      decorators,
-    );
-    finishers.push.apply(finishers, result.finishers);
-    result.finishers = finishers;
-
-    return result;
+    return fn;
   }
+`;
 
-  // AddElementPlacement
-  function _addElementPlacement(
-    element /*: ElementDescriptor */,
-    placements /*: Placements */,
-    silent /*: boolean */,
-  ) {
-    var keys = placements[element.placement];
-    if (!silent && keys.indexOf(element.key) !== -1) {
-      throw new TypeError("Duplicated element (" + element.key + ")");
-    }
-    keys.push(element.key);
+helpers.classPrivateMethodSet = helper("7.1.6")`
+  export default function _classPrivateMethodSet() {
+    throw new TypeError("attempted to reassign private method");
   }
+`;
 
-  // DecorateElement
-  function _decorateElement(
-    element /*: ElementDescriptor */,
-    placements /*: Placements */,
-  ) /*: ElementFinishersExtras */ {
-    var extras /*: ElementDescriptor[] */ = [];
-    var finishers /*: ClassFinisher[] */ = [];
-
-    for (
-      var decorators = element.decorators, i = decorators.length - 1;
-      i >= 0;
-      i--
-    ) {
-      // (inlined) RemoveElementPlacement
-      var keys = placements[element.placement];
-      keys.splice(keys.indexOf(element.key), 1);
-
-      var elementObject /*: ElementObjectInput */ = _fromElementDescriptor(
-        element,
-      );
-      var elementFinisherExtras /*: ElementFinisherExtras */ = _toElementFinisherExtras(
-        (0, decorators[i])(elementObject) /*: ElementObjectOutput */ ||
-          elementObject,
-      );
+helpers.wrapRegExp = helper("7.2.6")`
+  import wrapNativeSuper from "wrapNativeSuper";
+  import getPrototypeOf from "getPrototypeOf";
+  import possibleConstructorReturn from "possibleConstructorReturn";
+  import inherits from "inherits";
 
-      element = elementFinisherExtras.element;
-      _addElementPlacement(element, placements);
+  export default function _wrapRegExp(re, groups) {
+    _wrapRegExp = function(re, groups) {
+      return new BabelRegExp(re, groups);
+    };
 
-      if (elementFinisherExtras.finisher) {
-        finishers.push(elementFinisherExtras.finisher);
-      }
+    var _RegExp = wrapNativeSuper(RegExp);
+    var _super = RegExp.prototype;
+    var _groups = new WeakMap();
 
-      var newExtras /*: ElementDescriptor[] | void */ =
-        elementFinisherExtras.extras;
-      if (newExtras) {
-        for (var j = 0; j < newExtras.length; j++) {
-          _addElementPlacement(newExtras[j], placements);
-        }
-        extras.push.apply(extras, newExtras);
-      }
+    function BabelRegExp(re, groups) {
+      var _this = _RegExp.call(this, re);
+      _groups.set(_this, groups);
+      return _this;
     }
+    inherits(BabelRegExp, _RegExp);
 
-    return { element: element, finishers: finishers, extras: extras };
-  }
-
-  // DecorateConstructor
-  function _decorateConstructor(
-    elements /*: ElementDescriptor[] */,
-    decorators /*: ClassDecorator[] */,
-  ) /*: ElementsFinishers */ {
-    var finishers /*: ClassFinisher[] */ = [];
-
-    for (var i = decorators.length - 1; i >= 0; i--) {
-      var obj /*: ClassObject */ = _fromClassDescriptor(elements);
-      var elementsAndFinisher /*: ElementsFinisher */ = _toClassDescriptor(
-        (0, decorators[i])(obj) /*: ClassObject */ || obj,
-      );
-
-      if (elementsAndFinisher.finisher !== undefined) {
-        finishers.push(elementsAndFinisher.finisher);
-      }
-
-      if (elementsAndFinisher.elements !== undefined) {
-        elements = elementsAndFinisher.elements;
-
-        for (var j = 0; j < elements.length - 1; j++) {
-          for (var k = j + 1; k < elements.length; k++) {
-            if (
-              elements[j].key === elements[k].key &&
-              elements[j].placement === elements[k].placement
-            ) {
-              throw new TypeError("Duplicated element (" + elements[j].key + ")");
+    BabelRegExp.prototype.exec = function(str) {
+      var result = _super.exec.call(this, str);
+      if (result) result.groups = buildGroups(result, this);
+      return result;
+    };
+    BabelRegExp.prototype[Symbol.replace] = function(str, substitution) {
+      if (typeof substitution === "string") {
+        var groups = _groups.get(this);
+        return _super[Symbol.replace].call(
+          this,
+          str,
+          substitution.replace(/\\$<([^>]+)>/g, function(_, name) {
+            return "$" + groups[name];
+          })
+        );
+      } else if (typeof substitution === "function") {
+        var _this = this;
+        return _super[Symbol.replace].call(
+          this,
+          str,
+          function() {
+            var args = [];
+            args.push.apply(args, arguments);
+            if (typeof args[args.length - 1] !== "object") {
+              // Modern engines already pass result.groups as the last arg.
+              args.push(buildGroups(args, _this));
             }
+            return substitution.apply(this, args);
           }
-        }
+        );
+      } else {
+        return _super[Symbol.replace].call(this, str, substitution);
       }
     }
 
-    return { elements: elements, finishers: finishers };
-  }
-
-  // FromElementDescriptor
-  function _fromElementDescriptor(
-    element /*: ElementDescriptor */,
-  ) /*: ElementObject */ {
-    var obj /*: ElementObject */ = {
-      kind: element.kind,
-      key: element.key,
-      placement: element.placement,
-      descriptor: element.descriptor,
-    };
-
-    var desc = {
-      value: "Descriptor",
-      configurable: true,
-    };
-    Object.defineProperty(obj, Symbol.toStringTag, desc);
-
-    if (element.kind === "field") obj.initializer = element.initializer;
+    function buildGroups(result, re) {
+      // NOTE: This function should return undefined if there are no groups,
+      // but in that case Babel doesn't add the wrapper anyway.
 
-    return obj;
-  }
-
-  // ToElementDescriptors
-  function _toElementDescriptors(
-    elementObjects /*: ElementObject[] */,
-  ) /*: ElementDescriptor[] */ {
-    if (elementObjects === undefined) return;
-    return toArray(elementObjects).map(function(elementObject) {
-      var element = _toElementDescriptor(elementObject);
-      _disallowProperty(elementObject, "finisher", "An element descriptor");
-      _disallowProperty(elementObject, "extras", "An element descriptor");
-      return element;
-    });
-  }
-
-  // ToElementDescriptor
-  function _toElementDescriptor(
-    elementObject /*: ElementObject */,
-  ) /*: ElementDescriptor */ {
-    var kind = String(elementObject.kind);
-    if (kind !== "method" && kind !== "field") {
-      throw new TypeError(
-        'An element descriptor\\'s .kind property must be either "method" or' +
-          ' "field", but a decorator created an element descriptor with' +
-          ' .kind "' +
-          kind +
-          '"',
-      );
+      var g = _groups.get(re);
+      return Object.keys(g).reduce(function(groups, name) {
+        groups[name] = result[g[name]];
+        return groups;
+      }, Object.create(null));
     }
 
-    var key = elementObject.key;
-    if (typeof key !== "string" && typeof key !== "symbol") key = String(key);
-
-    var placement = String(elementObject.placement);
-    if (
-      placement !== "static" &&
-      placement !== "prototype" &&
-      placement !== "own"
-    ) {
-      throw new TypeError(
-        'An element descriptor\\'s .placement property must be one of "static",' +
-          ' "prototype" or "own", but a decorator created an element descriptor' +
-          ' with .placement "' +
-          placement +
-          '"',
-      );
-    }
-
-    var descriptor /*: PropertyDescriptor */ = elementObject.descriptor;
-
-    _disallowProperty(elementObject, "elements", "An element descriptor");
-
-    var element /*: ElementDescriptor */ = {
-      kind: kind,
-      key: key,
-      placement: placement,
-      descriptor: Object.assign({}, descriptor),
-    };
-
-    if (kind !== "field") {
-      _disallowProperty(elementObject, "initializer", "A method descriptor");
-    } else {
-      _disallowProperty(
-        descriptor,
-        "get",
-        "The property descriptor of a field descriptor",
-      );
-      _disallowProperty(
-        descriptor,
-        "set",
-        "The property descriptor of a field descriptor",
-      );
-      _disallowProperty(
-        descriptor,
-        "value",
-        "The property descriptor of a field descriptor",
-      );
-
-      element.initializer = elementObject.initializer;
-    }
-
-    return element;
-  }
-
-  function _toElementFinisherExtras(
-    elementObject /*: ElementObject */,
-  ) /*: ElementFinisherExtras */ {
-    var element /*: ElementDescriptor */ = _toElementDescriptor(elementObject);
-    var finisher /*: ClassFinisher */ = _optionalCallableProperty(
-      elementObject,
-      "finisher",
-    );
-    var extras /*: ElementDescriptors[] */ = _toElementDescriptors(
-      elementObject.extras,
-    );
-
-    return { element: element, finisher: finisher, extras: extras };
-  }
-
-  // FromClassDescriptor
-  function _fromClassDescriptor(
-    elements /*: ElementDescriptor[] */,
-  ) /*: ClassObject */ {
-    var obj = {
-      kind: "class",
-      elements: elements.map(_fromElementDescriptor),
-    };
-
-    var desc = { value: "Descriptor", configurable: true };
-    Object.defineProperty(obj, Symbol.toStringTag, desc);
-
-    return obj;
-  }
-
-  // ToClassDescriptor
-  function _toClassDescriptor(obj /*: ClassObject */) /*: ElementsFinisher */ {
-    var kind = String(obj.kind);
-    if (kind !== "class") {
-      throw new TypeError(
-        'A class descriptor\\'s .kind property must be "class", but a decorator' +
-          ' created a class descriptor with .kind "' +
-          kind +
-          '"',
-      );
-    }
-
-    _disallowProperty(obj, "key", "A class descriptor");
-    _disallowProperty(obj, "placement", "A class descriptor");
-    _disallowProperty(obj, "descriptor", "A class descriptor");
-    _disallowProperty(obj, "initializer", "A class descriptor");
-    _disallowProperty(obj, "extras", "A class descriptor");
-
-    var finisher = _optionalCallableProperty(obj, "finisher");
-    var elements = _toElementDescriptors(obj.elements);
-
-    return { elements: elements, finisher: finisher };
+    return _wrapRegExp.apply(this, arguments);
   }
-
-  function _disallowProperty(obj, name, objectType) {
-    if (obj[name] !== undefined) {
-      throw new TypeError(objectType + " can't have a ." + name + " property.");
-    }
-  }
-
-  function _optionalCallableProperty /*::<T>*/(
-    obj /*: T */,
-    name /*: $Keys<T> */,
-  ) /*: ?Function */ {
-    var value = obj[name];
-    if (value !== undefined && typeof value !== "function") {
-      throw new TypeError("Expected '" + name + "' to be a function");
-    }
-    return value;
-  }
-
-  // RunClassFinishers
-  function _runClassFinishers(
-    constructor /*: Class<*> */,
-    finishers /*: ClassFinisher[] */,
-  ) /*: Class<*> */ {
-    for (var i = 0; i < finishers.length; i++) {
-      var newConstructor /*: ?Class<*> */ = (0, finishers[i])(constructor);
-      if (newConstructor !== undefined) {
-        // NOTE: This should check if IsConstructor(newConstructor) is false.
-        if (typeof newConstructor !== "function") {
-          throw new TypeError("Finishers must return a constructor.");
-        }
-        constructor = newConstructor;
-      }
-    }
-    return constructor;
-  }
-  `;
+`;
diff --git a/packages/babel-helpers/src/index.js b/packages/babel-helpers/src/index.js
index 86465941a063..9dc87ce58916 100644
--- a/packages/babel-helpers/src/index.js
+++ b/packages/babel-helpers/src/index.js
@@ -280,6 +280,10 @@ export function getDependencies(name: string): $ReadOnlyArray<string> {
   return Array.from(loadHelper(name).dependencies.values());
 }
 
+export function ensure(name: string) {
+  loadHelper(name);
+}
+
 export const list = Object.keys(helpers)
   .map(name => name.replace(/^_/, ""))
   .filter(name => name !== "__esModule");
diff --git a/packages/babel-highlight/package.json b/packages/babel-highlight/package.json
index 0312b1aeae93..66fcb3c2db0f 100644
--- a/packages/babel-highlight/package.json
+++ b/packages/babel-highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/highlight",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Syntax highlight JavaScript strings for output in terminals.",
   "author": "suchipi <me@suchipi.com>",
   "homepage": "https://babeljs.io/",
diff --git a/packages/babel-highlight/test/index.js b/packages/babel-highlight/test/index.js
index 2aeab67a9b3a..a33f79fd5041 100644
--- a/packages/babel-highlight/test/index.js
+++ b/packages/babel-highlight/test/index.js
@@ -94,8 +94,8 @@ describe("@babel/highlight", function() {
       });
     });
 
-    describe("when colors are supported", function() {
-      stubColorSupport(true);
+    describe("when colors are not supported", function() {
+      stubColorSupport(false);
 
       describe("when forceColor is not passed", function() {
         it("returns a Chalk instance", function() {
diff --git a/packages/babel-node/package.json b/packages/babel-node/package.json
index 8ec75844217b..d613965164c4 100644
--- a/packages/babel-node/package.json
+++ b/packages/babel-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/node",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Babel command line",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -20,19 +20,20 @@
   ],
   "dependencies": {
     "@babel/polyfill": "^7.0.0",
-    "@babel/register": "^7.0.0",
+    "@babel/register": "^7.5.5",
     "commander": "^2.8.1",
-    "fs-readdir-recursive": "^1.0.0",
-    "lodash": "^4.17.10",
-    "output-file-sync": "^2.0.0",
+    "lodash": "^4.17.13",
+    "node-environment-flags": "^1.0.5",
     "v8flags": "^3.1.1"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/helper-fixtures": "^7.0.0"
+    "@babel/core": "^7.5.5",
+    "@babel/helper-fixtures": "^7.5.5",
+    "fs-readdir-recursive": "^1.0.0",
+    "output-file-sync": "^2.0.0"
   },
   "bin": {
     "babel-node": "./bin/babel-node.js"
diff --git a/packages/babel-node/src/_babel-node.js b/packages/babel-node/src/_babel-node.js
index 42ebf774d184..ff908a56e6d2 100644
--- a/packages/babel-node/src/_babel-node.js
+++ b/packages/babel-node/src/_babel-node.js
@@ -52,6 +52,11 @@ program.option(
   "The name of the 'env' to use when loading configs and plugins. " +
     "Defaults to the value of BABEL_ENV, or else NODE_ENV, or else 'development'.",
 );
+program.option(
+  "--root-mode [mode]",
+  "The project-root resolution mode. " +
+    "One of 'root' (the default), 'upward', or 'upward-optional'.",
+);
 program.option("-w, --plugins [string]", "", collect);
 program.option("-b, --presets [string]", "", collect);
 
@@ -59,7 +64,7 @@ program.version(pkg.version);
 program.usage("[options] [ -e script | script.js ] [arguments]");
 program.parse(process.argv);
 
-register({
+const babelOptions = {
   caller: {
     name: "@babel/node",
   },
@@ -70,12 +75,21 @@ register({
   presets: program.presets,
   configFile: program.configFile,
   envName: program.envName,
+  rootMode: program.rootMode,
 
   // Commander will default the "--no-" arguments to true, but we want to
   // leave them undefined so that @babel/core can handle the
   // default-assignment logic on its own.
   babelrc: program.babelrc === true ? undefined : program.babelrc,
-});
+};
+
+for (const key of Object.keys(babelOptions)) {
+  if (babelOptions[key] === undefined) {
+    delete babelOptions[key];
+  }
+}
+
+register(babelOptions);
 
 const replPlugin = ({ types: t }) => ({
   visitor: {
diff --git a/packages/babel-node/src/babel-node.js b/packages/babel-node/src/babel-node.js
index 5c29c3d4dbce..d143e4f756b4 100755
--- a/packages/babel-node/src/babel-node.js
+++ b/packages/babel-node/src/babel-node.js
@@ -6,6 +6,10 @@
 import getV8Flags from "v8flags";
 import path from "path";
 
+// TODO: When support for node < 10.10 will be dropped, this package
+// can be replaced with process.allowedNodeEnvironmentFlags
+import allowedNodeEnvironmentFlags from "node-environment-flags";
+
 let args = [path.join(__dirname, "_babel-node")];
 
 let babelArgs = process.argv.slice(2);
@@ -24,7 +28,9 @@ if (argSeparator > -1) {
  * that only the flag is returned.
  */
 function getNormalizedV8Flag(arg) {
-  const matches = arg.match(/--(.+)/);
+  // v8 uses the "no" prefix to negate boolean flags (e.g. --nolazy),
+  // but they are not listed by v8flags
+  const matches = arg.match(/--(?:no)?(.+)/);
 
   if (matches) {
     return `--${matches[1].replace(/-/g, "_")}`;
@@ -33,51 +39,30 @@ function getNormalizedV8Flag(arg) {
   return arg;
 }
 
+// These are aliases for node options defined by babel-node.
+const aliases = new Map([["-d", "--debug"], ["-gc", "--expose-gc"]]);
+
 getV8Flags(function(err, v8Flags) {
-  babelArgs.forEach(function(arg, index) {
+  for (let i = 0; i < babelArgs.length; i++) {
+    const arg = babelArgs[i];
     const flag = arg.split("=")[0];
 
-    switch (flag) {
-      case "-d":
-        args.unshift("--debug");
-        break;
-
-      case "debug":
-      case "--debug":
-      case "--debug-brk":
-      case "--inspect":
-      case "--inspect-brk":
-      case "--experimental-modules":
-        args.unshift(arg);
-        break;
-
-      case "-r":
-      case "--require":
-        args.push(flag);
-        args.push(babelArgs[index + 1]);
-        delete babelArgs[index + 1];
-        break;
-
-      case "-gc":
-        args.unshift("--expose-gc");
-        break;
-
-      case "--nolazy":
-        args.unshift(flag);
-        break;
-
-      default:
-        if (
-          v8Flags.indexOf(getNormalizedV8Flag(flag)) >= 0 ||
-          arg.indexOf("--trace") === 0
-        ) {
-          args.unshift(arg);
-        } else {
-          args.push(arg);
-        }
-        break;
+    if (flag === "-r" || flag === "--require") {
+      args.push(flag);
+      args.push(babelArgs[++i]);
+    } else if (aliases.has(flag)) {
+      args.unshift(aliases.get(flag));
+    } else if (
+      flag === "debug" || // node debug foo.js
+      flag === "inspect" ||
+      v8Flags.indexOf(getNormalizedV8Flag(flag)) >= 0 ||
+      allowedNodeEnvironmentFlags.has(flag)
+    ) {
+      args.unshift(arg);
+    } else {
+      args.push(arg);
     }
-  });
+  }
 
   // append arguments passed after --
   if (argSeparator > -1) {
@@ -88,7 +73,12 @@ getV8Flags(function(err, v8Flags) {
     const kexec = require("kexec");
     kexec(process.argv[0], args);
   } catch (err) {
-    if (err.code !== "MODULE_NOT_FOUND") throw err;
+    if (
+      err.code !== "MODULE_NOT_FOUND" &&
+      err.code !== "UNDECLARED_DEPENDENCY"
+    ) {
+      throw err;
+    }
 
     const child_process = require("child_process");
     const proc = child_process.spawn(process.argv[0], args, {
diff --git a/packages/babel-node/test/fixtures/babel-node/node_--inspect/options.json b/packages/babel-node/test/fixtures/babel-node/node_--inspect/options.json
new file mode 100644
index 000000000000..68134a010bd7
--- /dev/null
+++ b/packages/babel-node/test/fixtures/babel-node/node_--inspect/options.json
@@ -0,0 +1,6 @@
+{
+  "args": ["--inspect", "--eval", "console.log('foo');"],
+  "stderr": "Debugger listening on",
+  "stderrContains": true,
+  "stdout": "foo"
+}
diff --git a/packages/babel-node/test/fixtures/babel-node/node_--no-lazy/options.json b/packages/babel-node/test/fixtures/babel-node/node_--no-lazy/options.json
new file mode 100644
index 000000000000..e993aa117b2b
--- /dev/null
+++ b/packages/babel-node/test/fixtures/babel-node/node_--no-lazy/options.json
@@ -0,0 +1,4 @@
+{
+  "args": ["--nolazy", "--eval", "console.log('foo')"],
+  "stdout": "foo"
+}
diff --git a/packages/babel-node/test/fixtures/babel-node/node_-gc_alias_--expose-gc/options.json b/packages/babel-node/test/fixtures/babel-node/node_-gc_alias_--expose-gc/options.json
new file mode 100644
index 000000000000..1496c8ff8e20
--- /dev/null
+++ b/packages/babel-node/test/fixtures/babel-node/node_-gc_alias_--expose-gc/options.json
@@ -0,0 +1,4 @@
+{
+  "args": ["-gc", "--eval", "console.log(typeof global.gc)"],
+  "stdout": "function"
+}
diff --git a/packages/babel-parser/CHANGELOG.md b/packages/babel-parser/CHANGELOG.md
index cc96c3f7d128..6ddd17fb8800 100644
--- a/packages/babel-parser/CHANGELOG.md
+++ b/packages/babel-parser/CHANGELOG.md
@@ -178,7 +178,7 @@ The returned AST will only consist of the expression. The options are the same a
 
 Add startLine option ([#346](https://github.com/babel/babylon/pull/346)) (Raphael Mu)
 
-A new option was added to babylon allowing to change the intial linenumber for the first line which is usually `1`.
+A new option was added to babylon allowing to change the initial linenumber for the first line which is usually `1`.
 Changing this for example to `100` will make line `1` of the input source to be marked as line `100`, line `2` as `101`, line `3` as `102`, ...
 
 Function predicate declaration ([#103](https://github.com/babel/babylon/pull/103)) (Panagiotis Vekris)
@@ -224,7 +224,7 @@ import { a as debugger } from "foo";
 
 Do not allow overwritting of primitive types ([#314](https://github.com/babel/babylon/pull/314)) (Daniel Tschinder)
 
-In flow it is now forbidden to overwrite the primitve types `"any"`, `"mixed"`, `"empty"`, `"bool"`, `"boolean"`, `"number"`, `"string"`, `"void"` and `"null"` with your own type declaration.
+In flow it is now forbidden to overwrite the primitive types `"any"`, `"mixed"`, `"empty"`, `"bool"`, `"boolean"`, `"number"`, `"string"`, `"void"` and `"null"` with your own type declaration.
 
 Disallow import type { type a } from … ([#305](https://github.com/babel/babylon/pull/305)) (Daniel Tschinder)
 
@@ -628,7 +628,7 @@ Annotate more errors with expected token ([#172](https://github.com/babel/babylo
 
 Remove kcheck ([#173](https://github.com/babel/babylon/pull/173)))  (Daniel Tschinder)
 
-Also run flow, linting, babel tests on seperate instances (add back node 0.10)
+Also run flow, linting, babel tests on separate instances (add back node 0.10)
 
 ## v6.11.6 (2016-10-12)
 
diff --git a/packages/babel-parser/README.md b/packages/babel-parser/README.md
index 9e140cc08185..65092a05347e 100644
--- a/packages/babel-parser/README.md
+++ b/packages/babel-parser/README.md
@@ -2,7 +2,7 @@
 
 > A JavaScript parser
 
-See our website [@babel/parser](https://babeljs.io/docs/en/next/babel-parser.html) for more information or the [issues](https://github.com/babel/babel/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%22pkg%3A%20babylon%22+is%3Aopen) associated with this package.
+See our website [@babel/parser](https://babeljs.io/docs/en/next/babel-parser.html) for more information or the [issues](https://github.com/babel/babel/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%22pkg%3A+parser+%28babylon%29%22+is%3Aopen) associated with this package.
 
 ## Install
 
diff --git a/packages/babel-parser/ast/spec.md b/packages/babel-parser/ast/spec.md
index e8b5120b135d..d1b1a51ca733 100644
--- a/packages/babel-parser/ast/spec.md
+++ b/packages/babel-parser/ast/spec.md
@@ -72,12 +72,14 @@ These are the core @babel/parser (babylon) AST node types.
     - [LogicalExpression](#logicalexpression)
       - [LogicalOperator](#logicaloperator)
     - [SpreadElement](#spreadelement)
+    - [ArgumentPlaceholder](#argumentplaceholder)
     - [MemberExpression](#memberexpression)
     - [BindExpression](#bindexpression)
   - [ConditionalExpression](#conditionalexpression)
   - [CallExpression](#callexpression)
   - [NewExpression](#newexpression)
   - [SequenceExpression](#sequenceexpression)
+  - [ParenthesizedExpression](#parenthesizedexpression)
   - [DoExpression](#doexpression)
 - [Template Literals](#template-literals)
   - [TemplateLiteral](#templateliteral)
@@ -862,6 +864,14 @@ interface SpreadElement <: Node {
 }
 ```
 
+### ArgumentPlaceholder
+
+```js
+interface ArgumentPlaceholder <: Node {
+    type: "ArgumentPlaceholder";
+}
+```
+
 ### MemberExpression
 
 ```js
@@ -888,6 +898,54 @@ interface BindExpression <: Expression {
 
 If `object` is `null`, then `callee` should be a `MemberExpression`.
 
+### Pipeline
+
+These nodes are used by the Smart Pipeline to determine the type of the expression in a Pipeline Operator Expression. The F# Pipeline uses simple `BinaryExpression`s.
+
+#### PipelineBody
+
+```js
+interface PipelineBody <: NodeBase {
+    type: "PipelineBody";
+}
+```
+
+#### PipelineBareFunctionBody
+
+```js
+interface PipelineBody <: NodeBase {
+    type: "PipelineBareFunctionBody";
+    callee: Expression;
+}
+```
+
+#### PipelineBareConstructorBody
+
+```js
+interface PipelineBareConstructorBody <: NodeBase {
+    type: "PipelineBareConstructorBody";
+    callee: Expression;
+}
+```
+
+#### PipelineBareAwaitedFunctionBody
+
+```js
+interface PipelineBareConstructorBody <: NodeBase {
+    type: "PipelineTopicBody";
+    expression: Expression;
+}
+```
+
+#### PipelineTopicBody
+
+```js
+interface PipelineBareConstructorBody <: NodeBase {
+    type: "PipelineBareAwaitedFunctionBody";
+    callee: Expression;
+}
+```
+
 ## ConditionalExpression
 
 ```js
@@ -936,6 +994,17 @@ interface SequenceExpression <: Expression {
 
 A sequence expression, i.e., a comma-separated sequence of expressions.
 
+## ParenthesizedExpression
+
+```js
+interface ParenthesizedExpression <: Expression {
+    type "ParenthesizedExpression";
+    expression: Expression;
+}
+```
+
+An expression wrapped by parentheses.
+
 ## DoExpression
 
 ```js
@@ -1149,6 +1218,7 @@ A specifier in an import or export declaration.
 ```js
 interface ImportDeclaration <: ModuleDeclaration {
   type: "ImportDeclaration";
+  importKind: null | "type" | "typeof" | "value";
   specifiers: [ ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier ];
   source: Literal;
 }
@@ -1156,6 +1226,8 @@ interface ImportDeclaration <: ModuleDeclaration {
 
 An import declaration, e.g., `import foo from "mod";`.
 
+> importKind is only set when `flow` plugin enabled in babel-parser
+
 ### ImportSpecifier
 
 ```js
diff --git a/packages/babel-parser/package.json b/packages/babel-parser/package.json
index 2f0652c1f24e..5fa40c1ff68c 100644
--- a/packages/babel-parser/package.json
+++ b/packages/babel-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/parser",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "A JavaScript parser",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -28,9 +28,10 @@
     "node": ">=6.0.0"
   },
   "devDependencies": {
-    "@babel/helper-fixtures": "^7.0.0",
-    "charcodes": "0.1.0",
-    "unicode-11.0.0": "^0.7.7"
+    "@babel/code-frame": "^7.5.5",
+    "@babel/helper-fixtures": "^7.5.5",
+    "charcodes": "^0.2.0",
+    "unicode-12.0.0": "^0.7.9"
   },
   "bin": {
     "parser": "./bin/babel-parser.js"
diff --git a/packages/babel-parser/scripts/generate-identifier-regex.js b/packages/babel-parser/scripts/generate-identifier-regex.js
index c0c53de64e35..21e249ad4f28 100644
--- a/packages/babel-parser/scripts/generate-identifier-regex.js
+++ b/packages/babel-parser/scripts/generate-identifier-regex.js
@@ -1,7 +1,8 @@
 "use strict";
 
-// Which Unicode version should be used?
-const version = "11.0.0";
+// Always use the latest available version of Unicode!
+// https://tc39.github.io/ecma262/#sec-conformance
+const version = "12.0.0";
 
 const start = require("unicode-" +
   version +
@@ -60,11 +61,15 @@ function generate(chars) {
 const startData = generate(start);
 const contData = generate(cont);
 
+console.log("/* prettier-ignore */");
 console.log('let nonASCIIidentifierStartChars = "' + startData.nonASCII + '";');
+console.log("/* prettier-ignore */");
 console.log('let nonASCIIidentifierChars = "' + contData.nonASCII + '";');
+console.log("/* prettier-ignore */");
 console.log(
   "const astralIdentifierStartCodes = " + JSON.stringify(startData.astral) + ";"
 );
+console.log("/* prettier-ignore */");
 console.log(
   "const astralIdentifierCodes = " + JSON.stringify(contData.astral) + ";"
 );
diff --git a/packages/babel-parser/src/options.js b/packages/babel-parser/src/options.js
index 3bab7c04a287..8b030847f970 100755
--- a/packages/babel-parser/src/options.js
+++ b/packages/babel-parser/src/options.js
@@ -15,10 +15,12 @@ export type Options = {
   allowReturnOutsideFunction: boolean,
   allowImportExportEverywhere: boolean,
   allowSuperOutsideMethod: boolean,
+  allowUndeclaredExports: boolean,
   plugins: PluginList,
   strictMode: ?boolean,
   ranges: boolean,
   tokens: boolean,
+  createParenthesizedExpressions: boolean,
 };
 
 export const defaultOptions: Options = {
@@ -40,6 +42,8 @@ export const defaultOptions: Options = {
   allowImportExportEverywhere: false,
   // TODO
   allowSuperOutsideMethod: false,
+  // When enabled, export statements can reference undeclared variables.
+  allowUndeclaredExports: false,
   // An array of plugins to enable
   plugins: [],
   // TODO
@@ -55,13 +59,16 @@ export const defaultOptions: Options = {
   ranges: false,
   // Adds all parsed tokens to a `tokens` property on the `File` node
   tokens: false,
+  // Whether to create ParenthesizedExpression AST nodes (if false
+  // the parser sets extra.parenthesized on the expression nodes instead).
+  createParenthesizedExpressions: false,
 };
 
 // Interpret and default an options object
 
 export function getOptions(opts: ?Options): Options {
   const options: any = {};
-  for (const key in defaultOptions) {
+  for (const key of Object.keys(defaultOptions)) {
     options[key] = opts && opts[key] != null ? opts[key] : defaultOptions[key];
   }
   return options;
diff --git a/packages/babel-parser/src/parser/base.js b/packages/babel-parser/src/parser/base.js
index 7c84857752fb..1e451794158c 100644
--- a/packages/babel-parser/src/parser/base.js
+++ b/packages/babel-parser/src/parser/base.js
@@ -1,36 +1,32 @@
 // @flow
 
 import type { Options } from "../options";
-import { reservedWords } from "../util/identifier";
-
 import type State from "../tokenizer/state";
 import type { PluginsMap } from "./index";
+import type ScopeHandler from "../util/scope";
 
 export default class BaseParser {
   // Properties set by constructor in index.js
   options: Options;
   inModule: boolean;
+  scope: ScopeHandler<*>;
   plugins: PluginsMap;
   filename: ?string;
   sawUnambiguousESM: boolean = false;
 
   // Initialized by Tokenizer
   state: State;
+  // input and length are not in state as they are constant and we do
+  // not want to ever copy them, which happens if state gets cloned
   input: string;
-
-  isReservedWord(word: string): boolean {
-    if (word === "await") {
-      return this.inModule;
-    } else {
-      return reservedWords[6](word);
-    }
-  }
+  length: number;
 
   hasPlugin(name: string): boolean {
-    return Object.hasOwnProperty.call(this.plugins, name);
+    return this.plugins.has(name);
   }
 
   getPluginOption(plugin: string, name: string) {
-    if (this.hasPlugin(plugin)) return this.plugins[plugin][name];
+    // $FlowIssue
+    if (this.hasPlugin(plugin)) return this.plugins.get(plugin)[name];
   }
 }
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
index 48dd82d67347..9b48c7129e2f 100644
--- a/packages/babel-parser/src/parser/expression.js
+++ b/packages/babel-parser/src/parser/expression.js
@@ -21,12 +21,37 @@
 import { types as tt, type TokenType } from "../tokenizer/types";
 import * as N from "../types";
 import LValParser from "./lval";
-import { reservedWords } from "../util/identifier";
+import {
+  isKeyword,
+  isReservedWord,
+  isStrictReservedWord,
+  isStrictBindReservedWord,
+} from "../util/identifier";
 import type { Pos, Position } from "../util/location";
+import * as charCodes from "charcodes";
+import {
+  BIND_OUTSIDE,
+  BIND_VAR,
+  functionFlags,
+  SCOPE_ARROW,
+  SCOPE_CLASS,
+  SCOPE_DIRECT_SUPER,
+  SCOPE_SUPER,
+  SCOPE_PROGRAM,
+} from "../util/scopeflags";
+
+const unwrapParenthesizedExpression = node => {
+  return node.type === "ParenthesizedExpression"
+    ? unwrapParenthesizedExpression(node.expression)
+    : node;
+};
 
 export default class ExpressionParser extends LValParser {
   // Forward-declaration: defined in statement.js
-  +parseBlock: (allowDirectives?: boolean) => N.BlockStatement;
+  +parseBlock: (
+    allowDirectives?: boolean,
+    createNewLexicalScope?: boolean,
+  ) => N.BlockStatement;
   +parseClass: (
     node: N.Class,
     isStatement: boolean,
@@ -35,10 +60,9 @@ export default class ExpressionParser extends LValParser {
   +parseDecorators: (allowExport?: boolean) => void;
   +parseFunction: <T: N.NormalFunction>(
     node: T,
-    isStatement: boolean,
+    statement?: number,
     allowExpressionBody?: boolean,
     isAsync?: boolean,
-    optionalId?: boolean,
   ) => T;
   +parseFunctionParams: (node: N.Function, allowModifiers?: boolean) => void;
   +takeDecorators: (node: N.HasDecorators) => void;
@@ -49,10 +73,18 @@ export default class ExpressionParser extends LValParser {
   // strict mode, init properties are also not allowed to be repeated.
 
   checkPropClash(
-    prop: N.ObjectMember,
+    prop: N.ObjectMember | N.SpreadElement,
     propHash: { [key: string]: boolean },
   ): void {
-    if (prop.computed || prop.kind) return;
+    if (
+      prop.type === "SpreadElement" ||
+      prop.computed ||
+      prop.kind ||
+      // $FlowIgnore
+      prop.shorthand
+    ) {
+      return;
+    }
 
     const key = prop.key;
     // It is either an Identifier or a String/NumericLiteral
@@ -68,6 +100,7 @@ export default class ExpressionParser extends LValParser {
 
   // Convenience method to parse an Expression only
   getExpression(): N.Expression {
+    this.scope.enter(SCOPE_PROGRAM);
     this.nextToken();
     const expr = this.parseExpression();
     if (!this.match(tt.eof)) {
@@ -121,14 +154,23 @@ export default class ExpressionParser extends LValParser {
   ): N.Expression {
     const startPos = this.state.start;
     const startLoc = this.state.startLoc;
-    if (this.match(tt._yield) && this.state.inGenerator) {
-      let left = this.parseYield();
-      if (afterLeftParse) {
-        left = afterLeftParse.call(this, left, startPos, startLoc);
+    if (this.isContextual("yield")) {
+      if (this.scope.inGenerator) {
+        let left = this.parseYield(noIn);
+        if (afterLeftParse) {
+          left = afterLeftParse.call(this, left, startPos, startLoc);
+        }
+        return left;
+      } else {
+        // The tokenizer will assume an expression is allowed after
+        // `yield`, but this isn't that kind of yield
+        this.state.exprAllowed = false;
       }
-      return left;
     }
 
+    const oldCommaAfterSpreadAt = this.state.commaAfterSpreadAt;
+    this.state.commaAfterSpreadAt = -1;
+
     let failOnShorthandAssign;
     if (refShorthandDefaultPos) {
       failOnShorthandAssign = false;
@@ -137,7 +179,7 @@ export default class ExpressionParser extends LValParser {
       failOnShorthandAssign = true;
     }
 
-    if (this.match(tt.parenL) || this.match(tt.name) || this.match(tt._yield)) {
+    if (this.match(tt.parenL) || this.match(tt.name)) {
       this.state.potentialArrowAt = this.state.start;
     }
 
@@ -168,21 +210,29 @@ export default class ExpressionParser extends LValParser {
 
       this.checkLVal(left, undefined, undefined, "assignment expression");
 
-      if (left.extra && left.extra.parenthesized) {
-        let errorMsg;
-        if (left.type === "ObjectPattern") {
-          errorMsg = "`({a}) = 0` use `({a} = 0)`";
-        } else if (left.type === "ArrayPattern") {
-          errorMsg = "`([a]) = 0` use `([a] = 0)`";
-        }
-        if (errorMsg) {
-          this.raise(
-            left.start,
-            `You're trying to assign to a parenthesized expression, eg. instead of ${errorMsg}`,
-          );
-        }
+      const maybePattern = unwrapParenthesizedExpression(left);
+
+      let patternErrorMsg;
+      if (maybePattern.type === "ObjectPattern") {
+        patternErrorMsg = "`({a}) = 0` use `({a} = 0)`";
+      } else if (maybePattern.type === "ArrayPattern") {
+        patternErrorMsg = "`([a]) = 0` use `([a] = 0)`";
       }
 
+      if (
+        patternErrorMsg &&
+        ((left.extra && left.extra.parenthesized) ||
+          left.type === "ParenthesizedExpression")
+      ) {
+        this.raise(
+          maybePattern.start,
+          `You're trying to assign to a parenthesized expression, eg. instead of ${patternErrorMsg}`,
+        );
+      }
+
+      if (patternErrorMsg) this.checkCommaAfterRestFromSpread();
+      this.state.commaAfterSpreadAt = oldCommaAfterSpreadAt;
+
       this.next();
       node.right = this.parseMaybeAssign(noIn);
       return this.finishNode(node, "AssignmentExpression");
@@ -190,6 +240,8 @@ export default class ExpressionParser extends LValParser {
       this.unexpected(refShorthandDefaultPos.start);
     }
 
+    this.state.commaAfterSpreadAt = oldCommaAfterSpreadAt;
+
     return left;
   }
 
@@ -279,15 +331,18 @@ export default class ExpressionParser extends LValParser {
     const prec = this.state.type.binop;
     if (prec != null && (!noIn || !this.match(tt._in))) {
       if (prec > minPrec) {
-        const node = this.startNodeAt(leftStartPos, leftStartLoc);
         const operator = this.state.value;
+        if (operator === "|>" && this.state.inFSharpPipelineDirectBody) {
+          return left;
+        }
+        const node = this.startNodeAt(leftStartPos, leftStartLoc);
         node.left = left;
         node.operator = operator;
-
         if (
           operator === "**" &&
           left.type === "UnaryExpression" &&
-          !(left.extra && left.extra.parenthesized)
+          (this.options.createParenthesizedExpressions ||
+            !(left.extra && left.extra.parenthesized))
         ) {
           this.raise(
             left.argument.start,
@@ -296,22 +351,25 @@ export default class ExpressionParser extends LValParser {
         }
 
         const op = this.state.type;
-        if (op === tt.nullishCoalescing) {
-          this.expectPlugin("nullishCoalescingOperator");
-        } else if (op === tt.pipeline) {
+
+        if (op === tt.pipeline) {
           this.expectPlugin("pipelineOperator");
+          this.state.inPipeline = true;
+          this.checkPipelineAtInfixOperator(left, leftStartPos);
+        } else if (op === tt.nullishCoalescing) {
+          this.expectPlugin("nullishCoalescingOperator");
         }
 
         this.next();
 
-        const startPos = this.state.start;
-        const startLoc = this.state.startLoc;
-
-        if (op === tt.pipeline) {
+        if (
+          op === tt.pipeline &&
+          this.getPluginOption("pipelineOperator", "proposal") === "minimal"
+        ) {
           if (
             this.match(tt.name) &&
             this.state.value === "await" &&
-            this.state.inAsync
+            this.scope.inAsync
           ) {
             throw this.raise(
               this.state.start,
@@ -320,22 +378,17 @@ export default class ExpressionParser extends LValParser {
           }
         }
 
-        node.right = this.parseExprOp(
-          this.parseMaybeUnary(),
-          startPos,
-          startLoc,
-          op.rightAssociative ? prec - 1 : prec,
-          noIn,
-        );
+        node.right = this.parseExprOpRightExpr(op, prec, noIn);
 
         this.finishNode(
           node,
           op === tt.logicalOR ||
-          op === tt.logicalAND ||
-          op === tt.nullishCoalescing
+            op === tt.logicalAND ||
+            op === tt.nullishCoalescing
             ? "LogicalExpression"
             : "BinaryExpression",
         );
+
         return this.parseExprOp(
           node,
           leftStartPos,
@@ -348,10 +401,69 @@ export default class ExpressionParser extends LValParser {
     return left;
   }
 
+  // Helper function for `parseExprOp`. Parse the right-hand side of binary-
+  // operator expressions, then apply any operator-specific functions.
+
+  parseExprOpRightExpr(
+    op: TokenType,
+    prec: number,
+    noIn: ?boolean,
+  ): N.Expression {
+    const startPos = this.state.start;
+    const startLoc = this.state.startLoc;
+    switch (op) {
+      case tt.pipeline:
+        switch (this.getPluginOption("pipelineOperator", "proposal")) {
+          case "smart":
+            return this.withTopicPermittingContext(() => {
+              return this.parseSmartPipelineBody(
+                this.parseExprOpBaseRightExpr(op, prec, noIn),
+                startPos,
+                startLoc,
+              );
+            });
+          case "fsharp":
+            return this.withSoloAwaitPermittingContext(() => {
+              return this.parseFSharpPipelineBody(prec, noIn);
+            });
+        }
+      // falls through
+
+      default:
+        return this.parseExprOpBaseRightExpr(op, prec, noIn);
+    }
+  }
+
+  // Helper function for `parseExprOpRightExpr`. Parse the right-hand side of
+  // binary-operator expressions without applying any operator-specific functions.
+
+  parseExprOpBaseRightExpr(
+    op: TokenType,
+    prec: number,
+    noIn: ?boolean,
+  ): N.Expression {
+    const startPos = this.state.start;
+    const startLoc = this.state.startLoc;
+
+    return this.parseExprOp(
+      this.parseMaybeUnary(),
+      startPos,
+      startLoc,
+      op.rightAssociative ? prec - 1 : prec,
+      noIn,
+    );
+  }
+
   // Parse unary operators, both prefix and postfix.
 
   parseMaybeUnary(refShorthandDefaultPos: ?Pos): N.Expression {
-    if (this.state.type.prefix) {
+    if (
+      this.isContextual("await") &&
+      (this.scope.inAsync ||
+        (!this.scope.inFunction && this.options.allowAwaitOutsideFunction))
+    ) {
+      return this.parseAwait();
+    } else if (this.state.type.prefix) {
       const node = this.startNode();
       const update = this.match(tt.incDec);
       node.operator = this.state.value;
@@ -433,12 +545,21 @@ export default class ExpressionParser extends LValParser {
     startLoc: Position,
     noCalls?: ?boolean,
   ): N.Expression {
+    const maybeAsyncArrow = this.atPossibleAsync(base);
+
     const state = {
       optionalChainMember: false,
       stop: false,
     };
     do {
-      base = this.parseSubscript(base, startPos, startLoc, noCalls, state);
+      base = this.parseSubscript(
+        base,
+        startPos,
+        startLoc,
+        noCalls,
+        state,
+        maybeAsyncArrow,
+      );
     } while (!state.stop);
     return base;
   }
@@ -453,6 +574,7 @@ export default class ExpressionParser extends LValParser {
     startLoc: Position,
     noCalls: ?boolean,
     state: N.ParseSubscriptState,
+    maybeAsyncArrow: boolean,
   ): N.Expression {
     if (!noCalls && this.eat(tt.doubleColon)) {
       const node = this.startNodeAt(startPos, startLoc);
@@ -468,7 +590,7 @@ export default class ExpressionParser extends LValParser {
     } else if (this.match(tt.questionDot)) {
       this.expectPlugin("optionalChaining");
       state.optionalChainMember = true;
-      if (noCalls && this.lookahead().type == tt.parenL) {
+      if (noCalls && this.lookahead().type === tt.parenL) {
         state.stop = true;
         return base;
       }
@@ -484,13 +606,8 @@ export default class ExpressionParser extends LValParser {
         this.expect(tt.bracketR);
         return this.finishNode(node, "OptionalMemberExpression");
       } else if (this.eat(tt.parenL)) {
-        const possibleAsync = this.atPossibleAsync(base);
-
         node.callee = base;
-        node.arguments = this.parseCallExpressionArguments(
-          tt.parenR,
-          possibleAsync,
-        );
+        node.arguments = this.parseCallExpressionArguments(tt.parenR, false);
         node.optional = true;
         return this.finishNode(node, "OptionalCallExpression");
       } else {
@@ -522,21 +639,26 @@ export default class ExpressionParser extends LValParser {
       }
       return this.finishNode(node, "MemberExpression");
     } else if (!noCalls && this.match(tt.parenL)) {
-      const possibleAsync = this.atPossibleAsync(base);
+      const oldMaybeInArrowParameters = this.state.maybeInArrowParameters;
+      const oldYieldPos = this.state.yieldPos;
+      const oldAwaitPos = this.state.awaitPos;
+      this.state.maybeInArrowParameters = true;
+      this.state.yieldPos = 0;
+      this.state.awaitPos = 0;
+
       this.next();
 
-      const node = this.startNodeAt(startPos, startLoc);
+      let node = this.startNodeAt(startPos, startLoc);
       node.callee = base;
 
-      // TODO: Clean up/merge this into `this.state` or a class like acorn's
-      // `DestructuringErrors` alongside refShorthandDefaultPos and
-      // refNeedsArrowPos.
-      const refTrailingCommaPos: Pos = { start: -1 };
+      const oldCommaAfterSpreadAt = this.state.commaAfterSpreadAt;
+      this.state.commaAfterSpreadAt = -1;
 
       node.arguments = this.parseCallExpressionArguments(
         tt.parenR,
-        possibleAsync,
-        refTrailingCommaPos,
+        maybeAsyncArrow,
+        base.type === "Import",
+        base.type !== "Super",
       );
       if (!state.optionalChainMember) {
         this.finishCallExpression(node);
@@ -544,23 +666,30 @@ export default class ExpressionParser extends LValParser {
         this.finishOptionalCallExpression(node);
       }
 
-      if (possibleAsync && this.shouldParseAsyncArrow()) {
+      if (maybeAsyncArrow && this.shouldParseAsyncArrow()) {
         state.stop = true;
 
-        if (refTrailingCommaPos.start > -1) {
-          this.raise(
-            refTrailingCommaPos.start,
-            "A trailing comma is not permitted after the rest element",
-          );
-        }
+        this.checkCommaAfterRestFromSpread();
 
-        return this.parseAsyncArrowFromCallExpression(
+        node = this.parseAsyncArrowFromCallExpression(
           this.startNodeAt(startPos, startLoc),
           node,
         );
+        this.checkYieldAwaitInDefaultParams();
+        this.state.yieldPos = oldYieldPos;
+        this.state.awaitPos = oldAwaitPos;
       } else {
-        this.toReferencedList(node.arguments);
+        this.toReferencedListDeep(node.arguments);
+
+        // We keep the old value if it isn't null, for cases like
+        //   (x = async(yield)) => {}
+        this.state.yieldPos = oldYieldPos || this.state.yieldPos;
+        this.state.awaitPos = oldAwaitPos || this.state.awaitPos;
       }
+
+      this.state.maybeInArrowParameters = oldMaybeInArrowParameters;
+      this.state.commaAfterSpreadAt = oldCommaAfterSpreadAt;
+
       return node;
     } else if (this.match(tt.backQuote)) {
       return this.parseTaggedTemplateExpression(
@@ -600,11 +729,11 @@ export default class ExpressionParser extends LValParser {
 
   atPossibleAsync(base: N.Expression): boolean {
     return (
-      !this.state.containsEsc &&
-      this.state.potentialArrowAt === base.start &&
       base.type === "Identifier" &&
       base.name === "async" &&
-      !this.canInsertSemicolon()
+      this.state.lastTokEnd === base.end &&
+      !this.canInsertSemicolon() &&
+      this.input.slice(base.start, base.end) === "async"
     );
   }
 
@@ -639,18 +768,29 @@ export default class ExpressionParser extends LValParser {
   parseCallExpressionArguments(
     close: TokenType,
     possibleAsyncArrow: boolean,
-    refTrailingCommaPos?: Pos,
+    dynamicImport?: boolean,
+    allowPlaceholder?: boolean,
   ): $ReadOnlyArray<?N.Expression> {
     const elts = [];
     let innerParenStart;
     let first = true;
+    const oldInFSharpPipelineDirectBody = this.state.inFSharpPipelineDirectBody;
+    this.state.inFSharpPipelineDirectBody = false;
 
     while (!this.eat(close)) {
       if (first) {
         first = false;
       } else {
         this.expect(tt.comma);
-        if (this.eat(close)) break;
+        if (this.eat(close)) {
+          if (dynamicImport) {
+            this.raise(
+              this.state.lastTokStart,
+              "Trailing comma is disallowed inside import(...) arguments",
+            );
+          }
+          break;
+        }
       }
 
       // we need to make sure that if this is an async arrow functions,
@@ -664,7 +804,7 @@ export default class ExpressionParser extends LValParser {
           false,
           possibleAsyncArrow ? { start: 0 } : undefined,
           possibleAsyncArrow ? { start: 0 } : undefined,
-          possibleAsyncArrow ? refTrailingCommaPos : undefined,
+          allowPlaceholder,
         ),
       );
     }
@@ -674,22 +814,21 @@ export default class ExpressionParser extends LValParser {
       this.unexpected();
     }
 
+    this.state.inFSharpPipelineDirectBody = oldInFSharpPipelineDirectBody;
+
     return elts;
   }
 
   shouldParseAsyncArrow(): boolean {
-    return this.match(tt.arrow);
+    return this.match(tt.arrow) && !this.canInsertSemicolon();
   }
 
   parseAsyncArrowFromCallExpression(
     node: N.ArrowFunctionExpression,
     call: N.CallExpression,
   ): N.ArrowFunctionExpression {
-    const oldYield = this.state.yieldInPossibleArrowParameters;
-    this.state.yieldInPossibleArrowParameters = null;
     this.expect(tt.arrow);
     this.parseArrowExpression(node, call.arguments, true);
-    this.state.yieldInPossibleArrowParameters = oldYield;
     return node;
   }
 
@@ -707,16 +846,16 @@ export default class ExpressionParser extends LValParser {
   // or `{}`.
 
   parseExprAtom(refShorthandDefaultPos?: ?Pos): N.Expression {
+    // If a division operator appears in an expression position, the
+    // tokenizer got confused, and we force it to read a regexp instead.
+    if (this.state.type === tt.slash) this.readRegexp();
+
     const canBeArrow = this.state.potentialArrowAt === this.state.start;
     let node;
 
     switch (this.state.type) {
       case tt._super:
-        if (
-          !this.state.inMethod &&
-          !this.state.inClassProperty &&
-          !this.options.allowSuperOutsideMethod
-        ) {
+        if (!this.scope.allowSuper && !this.options.allowSuperOutsideMethod) {
           this.raise(
             this.state.start,
             "super is only allowed in object methods and classes",
@@ -725,91 +864,77 @@ export default class ExpressionParser extends LValParser {
 
         node = this.startNode();
         this.next();
-        if (
-          !this.match(tt.parenL) &&
-          !this.match(tt.bracketL) &&
-          !this.match(tt.dot)
-        ) {
-          this.unexpected();
-        }
         if (
           this.match(tt.parenL) &&
-          this.state.inMethod !== "constructor" &&
+          !this.scope.allowDirectSuper &&
           !this.options.allowSuperOutsideMethod
         ) {
           this.raise(
             node.start,
-            "super() is only valid inside a class constructor. " +
-              "Make sure the method name is spelled exactly as 'constructor'.",
+            "super() is only valid inside a class constructor of a subclass. " +
+              "Maybe a typo in the method name ('constructor') or not extending another class?",
           );
         }
-        return this.finishNode(node, "Super");
 
-      case tt._import:
-        if (this.lookahead().type === tt.dot) {
-          return this.parseImportMetaProperty();
+        if (
+          !this.match(tt.parenL) &&
+          !this.match(tt.bracketL) &&
+          !this.match(tt.dot)
+        ) {
+          this.unexpected();
         }
 
-        this.expectPlugin("dynamicImport");
+        return this.finishNode(node, "Super");
 
+      case tt._import:
         node = this.startNode();
         this.next();
+
+        if (this.match(tt.dot)) {
+          return this.parseImportMetaProperty(node);
+        }
+
+        this.expectPlugin("dynamicImport", node.start);
+
         if (!this.match(tt.parenL)) {
           this.unexpected(null, tt.parenL);
         }
         return this.finishNode(node, "Import");
-
       case tt._this:
         node = this.startNode();
         this.next();
         return this.finishNode(node, "ThisExpression");
 
-      case tt._yield:
-        if (this.state.inGenerator) this.unexpected();
-
       case tt.name: {
         node = this.startNode();
-        const allowAwait =
-          this.state.value === "await" &&
-          (this.state.inAsync ||
-            (!this.state.inFunction && this.options.allowAwaitOutsideFunction));
-
         const containsEsc = this.state.containsEsc;
-        const allowYield = this.shouldAllowYieldIdentifier();
-        const id = this.parseIdentifier(allowAwait || allowYield);
+        const id = this.parseIdentifier();
 
-        if (id.name === "await") {
-          if (
-            this.state.inAsync ||
-            this.inModule ||
-            (!this.state.inFunction && this.options.allowAwaitOutsideFunction)
-          ) {
-            return this.parseAwait(node);
-          }
-        } else if (
+        if (
           !containsEsc &&
           id.name === "async" &&
           this.match(tt._function) &&
           !this.canInsertSemicolon()
         ) {
           this.next();
-          return this.parseFunction(node, false, false, true);
-        } else if (canBeArrow && id.name === "async" && this.match(tt.name)) {
-          const oldYield = this.state.yieldInPossibleArrowParameters;
-          this.state.yieldInPossibleArrowParameters = null;
+          return this.parseFunction(node, undefined, true);
+        } else if (
+          canBeArrow &&
+          !containsEsc &&
+          id.name === "async" &&
+          this.match(tt.name) &&
+          !this.canInsertSemicolon()
+        ) {
           const params = [this.parseIdentifier()];
           this.expect(tt.arrow);
-          // let foo = bar => {};
+          // let foo = async bar => {};
           this.parseArrowExpression(node, params, true);
-          this.state.yieldInPossibleArrowParameters = oldYield;
           return node;
         }
 
-        if (canBeArrow && !this.canInsertSemicolon() && this.eat(tt.arrow)) {
-          const oldYield = this.state.yieldInPossibleArrowParameters;
-          this.state.yieldInPossibleArrowParameters = null;
-          this.parseArrowExpression(node, [id]);
-          this.state.yieldInPossibleArrowParameters = oldYield;
+        if (canBeArrow && this.match(tt.arrow) && !this.canInsertSemicolon()) {
+          this.next();
+          this.parseArrowExpression(node, [id], false);
           return node;
         }
 
@@ -820,12 +945,9 @@ export default class ExpressionParser extends LValParser {
         this.expectPlugin("doExpressions");
         const node = this.startNode();
         this.next();
-        const oldInFunction = this.state.inFunction;
         const oldLabels = this.state.labels;
         this.state.labels = [];
-        this.state.inFunction = false;
-        node.body = this.parseBlock(false);
-        this.state.inFunction = oldInFunction;
+        node.body = this.parseBlock();
         this.state.labels = oldLabels;
         return this.finishNode(node, "DoExpression");
       }
@@ -859,7 +981,10 @@ export default class ExpressionParser extends LValParser {
       case tt.parenL:
         return this.parseParenAndDistinguishExpression(canBeArrow);
 
-      case tt.bracketL:
+      case tt.bracketL: {
+        const oldInFSharpPipelineDirectBody = this.state
+          .inFSharpPipelineDirectBody;
+        this.state.inFSharpPipelineDirectBody = false;
         node = this.startNode();
         this.next();
         node.elements = this.parseExprList(
@@ -867,12 +992,25 @@ export default class ExpressionParser extends LValParser {
           true,
           refShorthandDefaultPos,
         );
-        this.toReferencedList(node.elements);
+        if (!this.state.maybeInArrowParameters) {
+          // This could be an array pattern:
+          //   ([a: string, b: string]) => {}
+          // In this case, we don't have to call toReferencedList. We will
+          // call it, if needed, when we are sure that it is a parenthesized
+          // expression by calling toReferencedListDeep.
+          this.toReferencedList(node.elements);
+        }
+        this.state.inFSharpPipelineDirectBody = oldInFSharpPipelineDirectBody;
         return this.finishNode(node, "ArrayExpression");
-
-      case tt.braceL:
-        return this.parseObj(false, refShorthandDefaultPos);
-
+      }
+      case tt.braceL: {
+        const oldInFSharpPipelineDirectBody = this.state
+          .inFSharpPipelineDirectBody;
+        this.state.inFSharpPipelineDirectBody = false;
+        const ret = this.parseObj(false, refShorthandDefaultPos);
+        this.state.inFSharpPipelineDirectBody = oldInFSharpPipelineDirectBody;
+        return ret;
+      }
       case tt._function:
         return this.parseFunctionExpression();
 
@@ -905,6 +1043,32 @@ export default class ExpressionParser extends LValParser {
         }
       }
 
+      case tt.hash: {
+        if (this.state.inPipeline) {
+          node = this.startNode();
+
+          if (
+            this.getPluginOption("pipelineOperator", "proposal") !== "smart"
+          ) {
+            this.raise(
+              node.start,
+              "Primary Topic Reference found but pipelineOperator not passed 'smart' for 'proposal' option.",
+            );
+          }
+
+          this.next();
+          if (this.primaryTopicReferenceIsAllowedInCurrentTopicContext()) {
+            this.registerTopicReference();
+            return this.finishNode(node, "PipelinePrimaryTopicReference");
+          } else {
+            throw this.raise(
+              node.start,
+              `Topic reference was used in a lexical context without topic binding`,
+            );
+          }
+        }
+      }
+
       default:
         throw this.unexpected();
     }
@@ -924,6 +1088,7 @@ export default class ExpressionParser extends LValParser {
       this.expectOnePlugin(["classPrivateProperties", "classPrivateMethods"]);
       const node = this.startNode();
       this.next();
+      this.assertNoSpace("Unexpected space between # and identifier");
       node.id = this.parseIdentifier(true);
       return this.finishNode(node, "PrivateName");
     } else {
@@ -933,11 +1098,20 @@ export default class ExpressionParser extends LValParser {
 
   parseFunctionExpression(): N.FunctionExpression | N.MetaProperty {
     const node = this.startNode();
-    const meta = this.parseIdentifier(true);
-    if (this.state.inGenerator && this.eat(tt.dot)) {
+
+    // We do not do parseIdentifier here because when parseFunctionExpression
+    // is called we already know that the current token is a "name" with the value "function"
+    // This will improve perf a tiny little bit as we do not do validation but more importantly
+    // here is that parseIdentifier will remove an item from the expression stack
+    // if "function" or "class" is parsed as identifier (in objects e.g.), which should not happen here.
+    let meta = this.startNode();
+    this.next();
+    meta = this.createIdentifier(meta, "function");
+
+    if (this.scope.inGenerator && this.eat(tt.dot)) {
       return this.parseMetaProperty(node, meta, "sent");
     }
-    return this.parseFunction(node, false);
+    return this.parseFunction(node);
   }
 
   parseMetaProperty(
@@ -972,20 +1146,17 @@ export default class ExpressionParser extends LValParser {
     return this.finishNode(node, "MetaProperty");
   }
 
-  parseImportMetaProperty(): N.MetaProperty {
-    const node = this.startNode();
-    const id = this.parseIdentifier(true);
+  parseImportMetaProperty(node: N.MetaProperty): N.MetaProperty {
+    const id = this.createIdentifier(this.startNodeAtNode(node), "import");
     this.expect(tt.dot);
 
-    if (id.name === "import") {
-      if (this.isContextual("meta")) {
-        this.expectPlugin("importMeta");
-      } else if (!this.hasPlugin("importMeta")) {
-        this.raise(
-          id.start,
-          `Dynamic imports require a parameter: import('a.js')`,
-        );
-      }
+    if (this.isContextual("meta")) {
+      this.expectPlugin("importMeta");
+    } else if (!this.hasPlugin("importMeta")) {
+      this.raise(
+        id.start,
+        `Dynamic imports require a parameter: import('a.js')`,
+      );
     }
 
     if (!this.inModule) {
@@ -1017,13 +1188,6 @@ export default class ExpressionParser extends LValParser {
     return this.finishNode(node, type);
   }
 
-  parseParenExpression(): N.Expression {
-    this.expect(tt.parenL);
-    const val = this.parseExpression();
-    this.expect(tt.parenR);
-    return val;
-  }
-
   parseParenAndDistinguishExpression(canBeArrow: boolean): N.Expression {
     const startPos = this.state.start;
     const startLoc = this.state.startLoc;
@@ -1032,9 +1196,13 @@ export default class ExpressionParser extends LValParser {
     this.expect(tt.parenL);
 
     const oldMaybeInArrowParameters = this.state.maybeInArrowParameters;
-    const oldYield = this.state.yieldInPossibleArrowParameters;
+    const oldYieldPos = this.state.yieldPos;
+    const oldAwaitPos = this.state.awaitPos;
+    const oldInFSharpPipelineDirectBody = this.state.inFSharpPipelineDirectBody;
     this.state.maybeInArrowParameters = true;
-    this.state.yieldInPossibleArrowParameters = null;
+    this.state.yieldPos = 0;
+    this.state.awaitPos = 0;
+    this.state.inFSharpPipelineDirectBody = false;
 
     const innerStartPos = this.state.start;
     const innerStartLoc = this.state.startLoc;
@@ -1062,18 +1230,13 @@ export default class ExpressionParser extends LValParser {
         spreadStart = this.state.start;
         exprList.push(
           this.parseParenItem(
-            this.parseRest(),
+            this.parseRestBinding(),
             spreadNodeStartPos,
             spreadNodeStartLoc,
           ),
         );
 
-        if (this.match(tt.comma) && this.lookahead().type === tt.parenR) {
-          this.raise(
-            this.state.start,
-            "A trailing comma is not permitted after the rest element",
-          );
-        }
+        this.checkCommaAfterRest();
 
         break;
       } else {
@@ -1093,6 +1256,7 @@ export default class ExpressionParser extends LValParser {
     this.expect(tt.parenR);
 
     this.state.maybeInArrowParameters = oldMaybeInArrowParameters;
+    this.state.inFSharpPipelineDirectBody = oldInFSharpPipelineDirectBody;
 
     let arrowNode = this.startNodeAt(startPos, startLoc);
     if (
@@ -1100,18 +1264,23 @@ export default class ExpressionParser extends LValParser {
       this.shouldParseArrow() &&
       (arrowNode = this.parseArrow(arrowNode))
     ) {
+      this.checkYieldAwaitInDefaultParams();
+      this.state.yieldPos = oldYieldPos;
+      this.state.awaitPos = oldAwaitPos;
       for (const param of exprList) {
         if (param.extra && param.extra.parenthesized) {
           this.unexpected(param.extra.parenStart);
         }
       }
 
-      this.parseArrowExpression(arrowNode, exprList);
-      this.state.yieldInPossibleArrowParameters = oldYield;
+      this.parseArrowExpression(arrowNode, exprList, false);
       return arrowNode;
     }
 
-    this.state.yieldInPossibleArrowParameters = oldYield;
+    // We keep the old value if it isn't null, for cases like
+    //   (x = (yield)) => {}
+    this.state.yieldPos = oldYieldPos || this.state.yieldPos;
+    this.state.awaitPos = oldAwaitPos || this.state.awaitPos;
 
     if (!exprList.length) {
       this.unexpected(this.state.lastTokStart);
@@ -1123,19 +1292,25 @@ export default class ExpressionParser extends LValParser {
     }
     if (refNeedsArrowPos.start) this.unexpected(refNeedsArrowPos.start);
 
+    this.toReferencedListDeep(exprList, /* isParenthesizedExpr */ true);
     if (exprList.length > 1) {
       val = this.startNodeAt(innerStartPos, innerStartLoc);
       val.expressions = exprList;
-      this.toReferencedList(val.expressions);
       this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc);
     } else {
       val = exprList[0];
     }
 
-    this.addExtra(val, "parenthesized", true);
-    this.addExtra(val, "parenStart", startPos);
+    if (!this.options.createParenthesizedExpressions) {
+      this.addExtra(val, "parenthesized", true);
+      this.addExtra(val, "parenStart", startPos);
+      return val;
+    }
 
-    return val;
+    const parenExpression = this.startNodeAt(startPos, startLoc);
+    parenExpression.expression = val;
+    this.finishNode(parenExpression, "ParenthesizedExpression");
+    return parenExpression;
   }
 
   shouldParseArrow(): boolean {
@@ -1169,7 +1344,7 @@ export default class ExpressionParser extends LValParser {
     if (this.eat(tt.dot)) {
       const metaProp = this.parseMetaProperty(node, meta, "target");
 
-      if (!this.state.inFunction && !this.state.inClassProperty) {
+      if (!this.scope.inNonArrowFunction && !this.state.inClassProperty) {
         let error = "new.target can only be used in functions";
 
         if (this.hasPlugin("classProperties")) {
@@ -1183,7 +1358,10 @@ export default class ExpressionParser extends LValParser {
     }
 
     node.callee = this.parseNoCallExpr();
-    if (
+
+    if (node.callee.type === "Import") {
+      this.raise(node.callee.start, "Cannot use new with import(...)");
+    } else if (
       node.callee.type === "OptionalMemberExpression" ||
       node.callee.type === "OptionalCallExpression"
     ) {
@@ -1191,13 +1369,13 @@ export default class ExpressionParser extends LValParser {
         this.state.lastTokEnd,
         "constructors in/after an Optional Chain are not allowed",
       );
-    }
-    if (this.eat(tt.questionDot)) {
+    } else if (this.eat(tt.questionDot)) {
       this.raise(
         this.state.start,
         "constructors in/after an Optional Chain are not allowed",
       );
     }
+
     this.parseNewArguments(node);
     return this.finishNode(node, "NewExpression");
   }
@@ -1261,7 +1439,6 @@ export default class ExpressionParser extends LValParser {
     isPattern: boolean,
     refShorthandDefaultPos?: ?Pos,
   ): T {
-    let decorators = [];
     const propHash: any = Object.create(null);
     let first = true;
     const node = this.startNode();
@@ -1269,8 +1446,6 @@ export default class ExpressionParser extends LValParser {
     node.properties = [];
     this.next();
 
-    let firstRestLocation = null;
-
     while (!this.eat(tt.braceR)) {
       if (first) {
         first = false;
@@ -1279,140 +1454,117 @@ export default class ExpressionParser extends LValParser {
         if (this.eat(tt.braceR)) break;
       }
 
-      if (this.match(tt.at)) {
-        if (this.hasPlugin("decorators")) {
-          this.raise(
-            this.state.start,
-            "Stage 2 decorators disallow object literal property decorators",
-          );
-        } else {
-          // we needn't check if decorators (stage 0) plugin is enabled since it's checked by
-          // the call to this.parseDecorator
-          while (this.match(tt.at)) {
-            decorators.push(this.parseDecorator());
-          }
-        }
-      }
+      const prop = this.parseObjectMember(isPattern, refShorthandDefaultPos);
+      // $FlowIgnore RestElement will never be returned if !isPattern
+      if (!isPattern) this.checkPropClash(prop, propHash);
 
-      let prop = this.startNode(),
-        isGenerator = false,
-        isAsync = false,
-        startPos,
-        startLoc;
-      if (decorators.length) {
-        prop.decorators = decorators;
-        decorators = [];
+      // $FlowIgnore
+      if (prop.shorthand) {
+        this.addExtra(prop, "shorthand", true);
       }
 
-      if (this.match(tt.ellipsis)) {
-        this.expectPlugin("objectRestSpread");
-        prop = this.parseSpread(isPattern ? { start: 0 } : undefined);
-        if (isPattern) {
-          this.toAssignable(prop, true, "object pattern");
-        }
-        node.properties.push(prop);
-        if (isPattern) {
-          const position = this.state.start;
-          if (firstRestLocation !== null) {
-            this.unexpected(
-              firstRestLocation,
-              "Cannot have multiple rest elements when destructuring",
-            );
-          } else if (this.eat(tt.braceR)) {
-            break;
-          } else if (
-            this.match(tt.comma) &&
-            this.lookahead().type === tt.braceR
-          ) {
-            this.unexpected(
-              position,
-              "A trailing comma is not permitted after the rest element",
-            );
-          } else {
-            firstRestLocation = position;
-            continue;
-          }
-        } else {
-          continue;
-        }
-      }
+      node.properties.push(prop);
+    }
 
-      prop.method = false;
+    return this.finishNode(
+      node,
+      isPattern ? "ObjectPattern" : "ObjectExpression",
+    );
+  }
 
-      if (isPattern || refShorthandDefaultPos) {
-        startPos = this.state.start;
-        startLoc = this.state.startLoc;
-      }
+  isAsyncProp(prop: N.ObjectProperty): boolean {
+    return (
+      !prop.computed &&
+      prop.key.type === "Identifier" &&
+      prop.key.name === "async" &&
+      (this.match(tt.name) ||
+        this.match(tt.num) ||
+        this.match(tt.string) ||
+        this.match(tt.bracketL) ||
+        this.state.type.keyword ||
+        this.match(tt.star)) &&
+      !this.hasPrecedingLineBreak()
+    );
+  }
 
-      if (!isPattern) {
-        isGenerator = this.eat(tt.star);
+  parseObjectMember(
+    isPattern: boolean,
+    refShorthandDefaultPos: ?Pos,
+  ): N.ObjectMember | N.SpreadElement | N.RestElement {
+    let decorators = [];
+    if (this.match(tt.at)) {
+      if (this.hasPlugin("decorators")) {
+        this.raise(
+          this.state.start,
+          "Stage 2 decorators disallow object literal property decorators",
+        );
+      } else {
+        // we needn't check if decorators (stage 0) plugin is enabled since it's checked by
+        // the call to this.parseDecorator
+        while (this.match(tt.at)) {
+          decorators.push(this.parseDecorator());
+        }
       }
+    }
 
-      const containsEsc = this.state.containsEsc;
-
-      if (!isPattern && this.isContextual("async")) {
-        if (isGenerator) this.unexpected();
+    const prop = this.startNode();
+    let isGenerator = false;
+    let isAsync = false;
+    let startPos;
+    let startLoc;
 
-        const asyncId = this.parseIdentifier();
-        if (
-          this.match(tt.colon) ||
-          this.match(tt.parenL) ||
-          this.match(tt.braceR) ||
-          this.match(tt.eq) ||
-          this.match(tt.comma)
-        ) {
-          prop.key = asyncId;
-          prop.computed = false;
-        } else {
-          isAsync = true;
-          if (this.match(tt.star)) {
-            this.expectPlugin("asyncGenerators");
-            this.next();
-            isGenerator = true;
-          }
-          this.parsePropertyName(prop);
-        }
-      } else {
-        this.parsePropertyName(prop);
+    if (this.match(tt.ellipsis)) {
+      if (decorators.length) this.unexpected();
+      if (isPattern) {
+        this.next();
+        // Don't use parseRestBinding() as we only allow Identifier here.
+        prop.argument = this.parseIdentifier();
+        this.checkCommaAfterRest();
+        return this.finishNode(prop, "RestElement");
       }
 
-      this.parseObjPropValue(
-        prop,
-        startPos,
-        startLoc,
-        isGenerator,
-        isAsync,
-        isPattern,
-        refShorthandDefaultPos,
-        containsEsc,
-      );
-      this.checkPropClash(prop, propHash);
+      return this.parseSpread();
+    }
 
-      if (prop.shorthand) {
-        this.addExtra(prop, "shorthand", true);
-      }
+    if (decorators.length) {
+      prop.decorators = decorators;
+      decorators = [];
+    }
 
-      node.properties.push(prop);
+    prop.method = false;
+
+    if (isPattern || refShorthandDefaultPos) {
+      startPos = this.state.start;
+      startLoc = this.state.startLoc;
     }
 
-    if (firstRestLocation !== null) {
-      this.unexpected(
-        firstRestLocation,
-        "The rest element has to be the last element when destructuring",
-      );
+    if (!isPattern) {
+      isGenerator = this.eat(tt.star);
     }
 
-    if (decorators.length) {
-      this.raise(
-        this.state.start,
-        "You have trailing decorators with no property",
-      );
+    const containsEsc = this.state.containsEsc;
+    this.parsePropertyName(prop);
+
+    if (!isPattern && !containsEsc && !isGenerator && this.isAsyncProp(prop)) {
+      isAsync = true;
+      isGenerator = this.eat(tt.star);
+      this.parsePropertyName(prop);
+    } else {
+      isAsync = false;
     }
 
-    return this.finishNode(
-      node,
-      isPattern ? "ObjectPattern" : "ObjectExpression",
+    this.parseObjPropValue(
+      prop,
+      startPos,
+      startLoc,
+      isGenerator,
+      isAsync,
+      isPattern,
+      refShorthandDefaultPos,
+      containsEsc,
     );
+
+    return prop;
   }
 
   isGetterOrSetterMethod(prop: N.ObjectMethod, isPattern: boolean): boolean {
@@ -1429,10 +1581,16 @@ export default class ExpressionParser extends LValParser {
     );
   }
 
+  getGetterSetterExpectedParamCount(
+    method: N.ObjectMethod | N.ClassMethod,
+  ): number {
+    return method.kind === "get" ? 0 : 1;
+  }
+
   // get methods aren't allowed to have any parameters
   // set methods must have exactly 1 parameter which is not a rest parameter
   checkGetterSetterParams(method: N.ObjectMethod | N.ClassMethod): void {
-    const paramCount = method.kind === "get" ? 0 : 1;
+    const paramCount = this.getGetterSetterExpectedParamCount(method);
     const start = method.start;
     if (method.params.length !== paramCount) {
       if (method.kind === "get") {
@@ -1442,7 +1600,10 @@ export default class ExpressionParser extends LValParser {
       }
     }
 
-    if (method.kind === "set" && method.params[0].type === "RestElement") {
+    if (
+      method.kind === "set" &&
+      method.params[method.params.length - 1].type === "RestElement"
+    ) {
       this.raise(
         start,
         "setter function argument must not be a rest parameter",
@@ -1466,6 +1627,7 @@ export default class ExpressionParser extends LValParser {
         isGenerator,
         isAsync,
         /* isConstructor */ false,
+        false,
         "ObjectMethod",
       );
     }
@@ -1479,6 +1641,7 @@ export default class ExpressionParser extends LValParser {
         /* isGenerator */ false,
         /* isAsync */ false,
         /* isConstructor */ false,
+        false,
         "ObjectMethod",
       );
       this.checkGetterSetterParams(prop);
@@ -1604,24 +1767,31 @@ export default class ExpressionParser extends LValParser {
     isGenerator: boolean,
     isAsync: boolean,
     isConstructor: boolean,
+    allowDirectSuper: boolean,
     type: string,
+    inClassScope: boolean = false,
   ): T {
-    const oldInFunc = this.state.inFunction;
-    const oldInMethod = this.state.inMethod;
-    const oldInGenerator = this.state.inGenerator;
-    this.state.inFunction = true;
-    this.state.inMethod = node.kind || true;
-    this.state.inGenerator = isGenerator;
+    const oldYieldPos = this.state.yieldPos;
+    const oldAwaitPos = this.state.awaitPos;
+    this.state.yieldPos = 0;
+    this.state.awaitPos = 0;
 
     this.initFunction(node, isAsync);
     node.generator = !!isGenerator;
     const allowModifiers = isConstructor; // For TypeScript parameter properties
+    this.scope.enter(
+      functionFlags(isAsync, node.generator) |
+        SCOPE_SUPER |
+        (inClassScope ? SCOPE_CLASS : 0) |
+        (allowDirectSuper ? SCOPE_DIRECT_SUPER : 0),
+    );
     this.parseFunctionParams((node: any), allowModifiers);
-    this.parseFunctionBodyAndFinish(node, type);
+    this.checkYieldAwaitInDefaultParams();
+    this.parseFunctionBodyAndFinish(node, type, true);
+    this.scope.exit();
 
-    this.state.inFunction = oldInFunc;
-    this.state.inMethod = oldInMethod;
-    this.state.inGenerator = oldInGenerator;
+    this.state.yieldPos = oldYieldPos;
+    this.state.awaitPos = oldAwaitPos;
 
     return node;
   }
@@ -1631,32 +1801,26 @@ export default class ExpressionParser extends LValParser {
   // assignable list.
   parseArrowExpression(
     node: N.ArrowFunctionExpression,
-    params?: ?(N.Expression[]),
-    isAsync?: boolean,
+    params: ?(N.Expression[]),
+    isAsync: boolean,
   ): N.ArrowFunctionExpression {
-    // if we got there, it's no more "yield in possible arrow parameters";
-    // it's just "yield in arrow parameters"
-    if (this.state.yieldInPossibleArrowParameters) {
-      this.raise(
-        this.state.yieldInPossibleArrowParameters.start,
-        "yield is not allowed in the parameters of an arrow function" +
-          " inside a generator",
-      );
-    }
-
-    const oldInFunc = this.state.inFunction;
-    this.state.inFunction = true;
+    this.scope.enter(functionFlags(isAsync, false) | SCOPE_ARROW);
     this.initFunction(node, isAsync);
-    if (params) this.setArrowFunctionParameters(node, params);
 
-    const oldInGenerator = this.state.inGenerator;
     const oldMaybeInArrowParameters = this.state.maybeInArrowParameters;
-    this.state.inGenerator = false;
+    const oldYieldPos = this.state.yieldPos;
+    const oldAwaitPos = this.state.awaitPos;
     this.state.maybeInArrowParameters = false;
+    this.state.yieldPos = 0;
+    this.state.awaitPos = 0;
+
+    if (params) this.setArrowFunctionParameters(node, params);
     this.parseFunctionBody(node, true);
-    this.state.inGenerator = oldInGenerator;
-    this.state.inFunction = oldInFunc;
+
+    this.scope.exit();
     this.state.maybeInArrowParameters = oldMaybeInArrowParameters;
+    this.state.yieldPos = oldYieldPos;
+    this.state.awaitPos = oldAwaitPos;
 
     return this.finishNode(node, "ArrowFunctionExpression");
   }
@@ -1689,71 +1853,100 @@ export default class ExpressionParser extends LValParser {
   parseFunctionBodyAndFinish(
     node: N.BodilessFunctionOrMethodBase,
     type: string,
-    allowExpressionBody?: boolean,
+    isMethod?: boolean = false,
   ): void {
     // $FlowIgnore (node is not bodiless if we get here)
-    this.parseFunctionBody(node, allowExpressionBody);
+    this.parseFunctionBody(node, false, isMethod);
     this.finishNode(node, type);
   }
 
   // Parse function body and check parameters.
-  parseFunctionBody(node: N.Function, allowExpression: ?boolean): void {
+  parseFunctionBody(
+    node: N.Function,
+    allowExpression: ?boolean,
+    isMethod?: boolean = false,
+  ): void {
     const isExpression = allowExpression && !this.match(tt.braceL);
+    const oldStrict = this.state.strict;
+    let useStrict = false;
 
     const oldInParameters = this.state.inParameters;
-    const oldInAsync = this.state.inAsync;
     this.state.inParameters = false;
-    this.state.inAsync = node.async;
 
     if (isExpression) {
       node.body = this.parseMaybeAssign();
+      this.checkParams(node, false, allowExpression);
     } else {
-      // Start a new scope with regard to labels and the `inGenerator`
+      const nonSimple = !this.isSimpleParamList(node.params);
+      if (!oldStrict || nonSimple) {
+        useStrict = this.strictDirective(this.state.end);
+        // If this is a strict mode function, verify that argument names
+        // are not repeated, and it does not try to bind the words `eval`
+        // or `arguments`.
+        if (useStrict && nonSimple) {
+          // This logic is here to align the error location with the estree plugin
+          const errorPos =
+            // $FlowIgnore
+            (node.kind === "method" || node.kind === "constructor") &&
+            // $FlowIgnore
+            !!node.key
+              ? node.key.end
+              : node.start;
+          this.raise(
+            errorPos,
+            "Illegal 'use strict' directive in function with non-simple parameter list",
+          );
+        }
+      }
+      // Start a new scope with regard to labels
       // flag (restore them to their old value afterwards).
-      const oldInGen = this.state.inGenerator;
-      const oldInFunc = this.state.inFunction;
       const oldLabels = this.state.labels;
-      this.state.inGenerator = node.generator;
-      this.state.inFunction = true;
       this.state.labels = [];
-      node.body = this.parseBlock(true);
-      this.state.inFunction = oldInFunc;
-      this.state.inGenerator = oldInGen;
+      if (useStrict) this.state.strict = true;
+      // Add the params to varDeclaredNames to ensure that an error is thrown
+      // if a let/const declaration in the function clashes with one of the params.
+      this.checkParams(
+        node,
+        !oldStrict && !useStrict && !allowExpression && !isMethod && !nonSimple,
+        allowExpression,
+      );
+      node.body = this.parseBlock(true, false);
       this.state.labels = oldLabels;
     }
-    this.state.inAsync = oldInAsync;
 
-    this.checkFunctionNameAndParams(node, allowExpression);
     this.state.inParameters = oldInParameters;
+    // Ensure the function name isn't a forbidden identifier in strict mode, e.g. 'eval'
+    if (this.state.strict && node.id) {
+      this.checkLVal(node.id, BIND_OUTSIDE, undefined, "function name");
+    }
+    this.state.strict = oldStrict;
+  }
+
+  isSimpleParamList(
+    params: $ReadOnlyArray<N.Pattern | N.TSParameterProperty>,
+  ): boolean {
+    for (let i = 0, len = params.length; i < len; i++) {
+      if (params[i].type !== "Identifier") return false;
+    }
+    return true;
   }
 
-  checkFunctionNameAndParams(
+  checkParams(
     node: N.Function,
+    allowDuplicates: boolean,
+    // eslint-disable-next-line no-unused-vars
     isArrowFunction: ?boolean,
   ): void {
-    // If this is a strict mode function, verify that argument names
-    // are not repeated, and it does not try to bind the words `eval`
-    // or `arguments`.
-    const isStrict = this.isStrictBody(node);
-    // Also check for arrow functions
-    const checkLVal = this.state.strict || isStrict || isArrowFunction;
-
-    const oldStrict = this.state.strict;
-    if (isStrict) this.state.strict = isStrict;
-
-    if (checkLVal) {
-      const nameHash: any = Object.create(null);
-      if (node.id) {
-        this.checkLVal(node.id, true, undefined, "function name");
-      }
-      for (const param of node.params) {
-        if (isStrict && param.type !== "Identifier") {
-          this.raise(param.start, "Non-simple parameter in strict mode");
-        }
-        this.checkLVal(param, true, nameHash, "function parameter list");
-      }
+    // $FlowIssue
+    const nameHash: {} = Object.create(null);
+    for (let i = 0; i < node.params.length; i++) {
+      this.checkLVal(
+        node.params[i],
+        BIND_VAR,
+        allowDuplicates ? null : nameHash,
+        "function paramter list",
+      );
     }
-    this.state.strict = oldStrict;
   }
 
   // Parses a comma-separated list of expressions, and returns them as
@@ -1787,7 +1980,7 @@ export default class ExpressionParser extends LValParser {
     allowEmpty: ?boolean,
     refShorthandDefaultPos: ?Pos,
     refNeedsArrowPos: ?Pos,
-    refTrailingCommaPos?: Pos,
+    allowPlaceholder: ?boolean,
   ): ?N.Expression {
     let elt;
     if (allowEmpty && this.match(tt.comma)) {
@@ -1800,10 +1993,14 @@ export default class ExpressionParser extends LValParser {
         spreadNodeStartPos,
         spreadNodeStartLoc,
       );
-
-      if (refTrailingCommaPos && this.match(tt.comma)) {
-        refTrailingCommaPos.start = this.state.start;
+    } else if (this.match(tt.question)) {
+      this.expectPlugin("partialApplication");
+      if (!allowPlaceholder) {
+        this.raise(this.state.start, "Unexpected argument placeholder");
       }
+      const node = this.startNode();
+      this.next();
+      elt = this.finishNode(node, "ArgumentPlaceholder");
     } else {
       elt = this.parseMaybeAssign(
         false,
@@ -1822,36 +2019,52 @@ export default class ExpressionParser extends LValParser {
   parseIdentifier(liberal?: boolean): N.Identifier {
     const node = this.startNode();
     const name = this.parseIdentifierName(node.start, liberal);
+
+    return this.createIdentifier(node, name);
+  }
+
+  createIdentifier(node: N.Identifier, name: string): N.Identifier {
     node.name = name;
     node.loc.identifierName = name;
+
     return this.finishNode(node, "Identifier");
   }
 
   parseIdentifierName(pos: number, liberal?: boolean): string {
-    if (!liberal) {
-      this.checkReservedWord(
-        this.state.value,
-        this.state.start,
-        !!this.state.type.keyword,
-        false,
-      );
-    }
-
     let name: string;
 
     if (this.match(tt.name)) {
       name = this.state.value;
     } else if (this.state.type.keyword) {
       name = this.state.type.keyword;
+
+      // `class` and `function` keywords push new context into this.context.
+      // But there is no chance to pop the context if the keyword is consumed
+      // as an identifier such as a property name.
+      // If the previous token is a dot, this does not apply because the
+      // context-managing code already ignored the keyword
+      if (
+        (name === "class" || name === "function") &&
+        (this.state.lastTokEnd !== this.state.lastTokStart + 1 ||
+          this.input.charCodeAt(this.state.lastTokStart) !== charCodes.dot)
+      ) {
+        this.state.context.pop();
+      }
     } else {
       throw this.unexpected();
     }
 
-    if (!liberal && name === "await" && this.state.inAsync) {
-      this.raise(pos, "invalid use of await inside of an async function");
+    if (!liberal) {
+      this.checkReservedWord(
+        name,
+        this.state.start,
+        !!this.state.type.keyword,
+        false,
+      );
     }
 
     this.next();
+
     return name;
   }
 
@@ -1861,18 +2074,17 @@ export default class ExpressionParser extends LValParser {
     checkKeywords: boolean,
     isBinding: boolean,
   ): void {
-    if (
-      this.state.strict &&
-      (reservedWords.strict(word) ||
-        (isBinding && reservedWords.strictBind(word)))
-    ) {
-      this.raise(startLoc, word + " is a reserved word in strict mode");
+    if (this.scope.inGenerator && word === "yield") {
+      this.raise(
+        startLoc,
+        "Can not use 'yield' as identifier inside a generator",
+      );
     }
 
-    if (this.state.inGenerator && word === "yield") {
+    if (this.scope.inAsync && word === "await") {
       this.raise(
         startLoc,
-        "yield is a reserved word inside generator functions",
+        "Can not use 'await' as identifier inside an async function",
       );
     }
 
@@ -1882,21 +2094,42 @@ export default class ExpressionParser extends LValParser {
         "'arguments' is not allowed in class field initializer",
       );
     }
+    if (checkKeywords && isKeyword(word)) {
+      this.raise(startLoc, `Unexpected keyword '${word}'`);
+    }
+
+    const reservedTest = !this.state.strict
+      ? isReservedWord
+      : isBinding
+      ? isStrictBindReservedWord
+      : isStrictReservedWord;
 
-    if (this.isReservedWord(word) || (checkKeywords && this.isKeyword(word))) {
-      this.raise(startLoc, word + " is a reserved word");
+    if (reservedTest(word, this.inModule)) {
+      if (!this.scope.inAsync && word === "await") {
+        this.raise(
+          startLoc,
+          "Can not use keyword 'await' outside an async function",
+        );
+      }
+      this.raise(startLoc, `Unexpected reserved word '${word}'`);
     }
   }
 
   // Parses await expression inside async function.
 
-  parseAwait(node: N.AwaitExpression): N.AwaitExpression {
-    // istanbul ignore next: this condition is checked at the call site so won't be hit here
-    if (
-      !this.state.inAsync &&
-      (this.state.inFunction || !this.options.allowAwaitOutsideFunction)
-    ) {
-      this.unexpected();
+  parseAwait(): N.AwaitExpression {
+    if (!this.state.awaitPos) {
+      this.state.awaitPos = this.state.start;
+    }
+    const node = this.startNode();
+
+    this.next();
+
+    if (this.state.inParameters) {
+      this.raise(
+        node.start,
+        "await is not allowed in async function parameters",
+      );
     }
     if (this.match(tt.star)) {
       this.raise(
@@ -1904,39 +2137,245 @@ export default class ExpressionParser extends LValParser {
         "await* has been removed from the async functions proposal. Use Promise.all() instead.",
       );
     }
-    node.argument = this.parseMaybeUnary();
+
+    if (!this.state.soloAwait) {
+      node.argument = this.parseMaybeUnary();
+    }
     return this.finishNode(node, "AwaitExpression");
   }
 
   // Parses yield expression inside generator.
 
-  parseYield(): N.YieldExpression {
+  parseYield(noIn?: ?boolean): N.YieldExpression {
+    if (!this.state.yieldPos) {
+      this.state.yieldPos = this.state.start;
+    }
     const node = this.startNode();
 
     if (this.state.inParameters) {
       this.raise(node.start, "yield is not allowed in generator parameters");
     }
-    if (
-      this.state.maybeInArrowParameters &&
-      // We only set yieldInPossibleArrowParameters if we haven't already
-      // found a possible invalid YieldExpression.
-      !this.state.yieldInPossibleArrowParameters
-    ) {
-      this.state.yieldInPossibleArrowParameters = node;
-    }
 
     this.next();
     if (
       this.match(tt.semi) ||
-      this.canInsertSemicolon() ||
-      (!this.match(tt.star) && !this.state.type.startsExpr)
+      (!this.match(tt.star) && !this.state.type.startsExpr) ||
+      this.canInsertSemicolon()
     ) {
       node.delegate = false;
       node.argument = null;
     } else {
       node.delegate = this.eat(tt.star);
-      node.argument = this.parseMaybeAssign();
+      node.argument = this.parseMaybeAssign(noIn);
     }
     return this.finishNode(node, "YieldExpression");
   }
+
+  // Validates a pipeline (for any of the pipeline Babylon plugins) at the point
+  // of the infix operator `|>`.
+
+  checkPipelineAtInfixOperator(left: N.Expression, leftStartPos: number) {
+    if (this.getPluginOption("pipelineOperator", "proposal") === "smart") {
+      if (left.type === "SequenceExpression") {
+        // Ensure that the pipeline head is not a comma-delimited
+        // sequence expression.
+        throw this.raise(
+          leftStartPos,
+          `Pipeline head should not be a comma-separated sequence expression`,
+        );
+      }
+    }
+  }
+
+  parseSmartPipelineBody(
+    childExpression: N.Expression,
+    startPos: number,
+    startLoc: Position,
+  ): N.PipelineBody {
+    const pipelineStyle = this.checkSmartPipelineBodyStyle(childExpression);
+
+    this.checkSmartPipelineBodyEarlyErrors(
+      childExpression,
+      pipelineStyle,
+      startPos,
+    );
+
+    return this.parseSmartPipelineBodyInStyle(
+      childExpression,
+      pipelineStyle,
+      startPos,
+      startLoc,
+    );
+  }
+
+  checkSmartPipelineBodyEarlyErrors(
+    childExpression: N.Expression,
+    pipelineStyle: N.PipelineStyle,
+    startPos: number,
+  ): void {
+    if (this.match(tt.arrow)) {
+      // If the following token is invalidly `=>`, then throw a human-friendly error
+      // instead of something like 'Unexpected token, expected ";"'.
+      throw this.raise(
+        this.state.start,
+        `Unexpected arrow "=>" after pipeline body; arrow function in pipeline body must be parenthesized`,
+      );
+    } else if (
+      pipelineStyle === "PipelineTopicExpression" &&
+      childExpression.type === "SequenceExpression"
+    ) {
+      throw this.raise(
+        startPos,
+        `Pipeline body may not be a comma-separated sequence expression`,
+      );
+    }
+  }
+
+  parseSmartPipelineBodyInStyle(
+    childExpression: N.Expression,
+    pipelineStyle: N.PipelineStyle,
+    startPos: number,
+    startLoc: Position,
+  ): N.PipelineBody {
+    const bodyNode = this.startNodeAt(startPos, startLoc);
+    switch (pipelineStyle) {
+      case "PipelineBareFunction":
+        bodyNode.callee = childExpression;
+        break;
+      case "PipelineBareConstructor":
+        bodyNode.callee = childExpression.callee;
+        break;
+      case "PipelineBareAwaitedFunction":
+        bodyNode.callee = childExpression.argument;
+        break;
+      case "PipelineTopicExpression":
+        if (!this.topicReferenceWasUsedInCurrentTopicContext()) {
+          throw this.raise(
+            startPos,
+            `Pipeline is in topic style but does not use topic reference`,
+          );
+        }
+        bodyNode.expression = childExpression;
+        break;
+      default:
+        throw this.raise(startPos, `Unknown pipeline style ${pipelineStyle}`);
+    }
+    return this.finishNode(bodyNode, pipelineStyle);
+  }
+
+  checkSmartPipelineBodyStyle(expression: N.Expression): N.PipelineStyle {
+    switch (expression.type) {
+      default:
+        return this.isSimpleReference(expression)
+          ? "PipelineBareFunction"
+          : "PipelineTopicExpression";
+    }
+  }
+
+  isSimpleReference(expression: N.Expression): boolean {
+    switch (expression.type) {
+      case "MemberExpression":
+        return (
+          !expression.computed && this.isSimpleReference(expression.object)
+        );
+      case "Identifier":
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  // Enable topic references from outer contexts within smart pipeline bodies.
+  // The function modifies the parser's topic-context state to enable or disable
+  // the use of topic references with the smartPipelines plugin. They then run a
+  // callback, then they reset the parser to the old topic-context state that it
+  // had before the function was called.
+
+  withTopicPermittingContext<T>(callback: () => T): T {
+    const outerContextTopicState = this.state.topicContext;
+    this.state.topicContext = {
+      // Enable the use of the primary topic reference.
+      maxNumOfResolvableTopics: 1,
+      // Hide the use of any topic references from outer contexts.
+      maxTopicIndex: null,
+    };
+
+    try {
+      return callback();
+    } finally {
+      this.state.topicContext = outerContextTopicState;
+    }
+  }
+
+  // Disable topic references from outer contexts within syntax constructs
+  // such as the bodies of iteration statements.
+  // The function modifies the parser's topic-context state to enable or disable
+  // the use of topic references with the smartPipelines plugin. They then run a
+  // callback, then they reset the parser to the old topic-context state that it
+  // had before the function was called.
+
+  withTopicForbiddingContext<T>(callback: () => T): T {
+    const outerContextTopicState = this.state.topicContext;
+    this.state.topicContext = {
+      // Disable the use of the primary topic reference.
+      maxNumOfResolvableTopics: 0,
+      // Hide the use of any topic references from outer contexts.
+      maxTopicIndex: null,
+    };
+
+    try {
+      return callback();
+    } finally {
+      this.state.topicContext = outerContextTopicState;
+    }
+  }
+
+  withSoloAwaitPermittingContext<T>(callback: () => T): T {
+    const outerContextSoloAwaitState = this.state.soloAwait;
+    this.state.soloAwait = true;
+
+    try {
+      return callback();
+    } finally {
+      this.state.soloAwait = outerContextSoloAwaitState;
+    }
+  }
+
+  // Register the use of a primary topic reference (`#`) within the current
+  // topic context.
+  registerTopicReference(): void {
+    this.state.topicContext.maxTopicIndex = 0;
+  }
+
+  primaryTopicReferenceIsAllowedInCurrentTopicContext(): boolean {
+    return this.state.topicContext.maxNumOfResolvableTopics >= 1;
+  }
+
+  topicReferenceWasUsedInCurrentTopicContext(): boolean {
+    return (
+      this.state.topicContext.maxTopicIndex != null &&
+      this.state.topicContext.maxTopicIndex >= 0
+    );
+  }
+
+  parseFSharpPipelineBody(prec: number, noIn: ?boolean): N.Expression {
+    const startPos = this.state.start;
+    const startLoc = this.state.startLoc;
+
+    this.state.potentialArrowAt = this.state.start;
+    const oldInFSharpPipelineDirectBody = this.state.inFSharpPipelineDirectBody;
+    this.state.inFSharpPipelineDirectBody = true;
+
+    const ret = this.parseExprOp(
+      this.parseMaybeUnary(),
+      startPos,
+      startLoc,
+      prec,
+      noIn,
+    );
+
+    this.state.inFSharpPipelineDirectBody = oldInFSharpPipelineDirectBody;
+
+    return ret;
+  }
 }
diff --git a/packages/babel-parser/src/parser/index.js b/packages/babel-parser/src/parser/index.js
index 6d6d9cfd8b7b..9e75bf6044d3 100644
--- a/packages/babel-parser/src/parser/index.js
+++ b/packages/babel-parser/src/parser/index.js
@@ -5,10 +5,10 @@ import type { File, JSXOpeningElement } from "../types";
 import type { PluginList } from "../plugin-utils";
 import { getOptions } from "../options";
 import StatementParser from "./statement";
+import { SCOPE_PROGRAM } from "../util/scopeflags";
+import ScopeHandler from "../util/scope";
 
-export type PluginsMap = {
-  [key: string]: { [option: string]: any },
-};
+export type PluginsMap = Map<string, { [string]: any }>;
 
 export default class Parser extends StatementParser {
   // Forward-declaration so typescript plugin can override jsx plugin
@@ -20,14 +20,22 @@ export default class Parser extends StatementParser {
     options = getOptions(options);
     super(options, input);
 
+    const ScopeHandler = this.getScopeHandler();
+
     this.options = options;
     this.inModule = this.options.sourceType === "module";
-    this.input = input;
+    this.scope = new ScopeHandler(this.raise.bind(this), this.inModule);
     this.plugins = pluginsMap(this.options.plugins);
     this.filename = options.sourceFilename;
   }
 
+  // This can be overwritten, for example, by the TypeScript plugin.
+  getScopeHandler(): Class<ScopeHandler<*>> {
+    return ScopeHandler;
+  }
+
   parse(): File {
+    this.scope.enter(SCOPE_PROGRAM);
     const file = this.startNode();
     const program = this.startNode();
     this.nextToken();
@@ -36,10 +44,10 @@ export default class Parser extends StatementParser {
 }
 
 function pluginsMap(plugins: PluginList): PluginsMap {
-  const pluginMap: PluginsMap = (Object.create(null): Object);
+  const pluginMap: PluginsMap = new Map();
   for (const plugin of plugins) {
-    const [name, options = {}] = Array.isArray(plugin) ? plugin : [plugin, {}];
-    if (!pluginMap[name]) pluginMap[name] = options || {};
+    const [name, options] = Array.isArray(plugin) ? plugin : [plugin, {}];
+    if (!pluginMap.has(name)) pluginMap.set(name, options || {});
   }
   return pluginMap;
 }
diff --git a/packages/babel-parser/src/parser/location.js b/packages/babel-parser/src/parser/location.js
index 79db584a4995..1839f359ae4c 100644
--- a/packages/babel-parser/src/parser/location.js
+++ b/packages/babel-parser/src/parser/location.js
@@ -10,6 +10,17 @@ import CommentsParser from "./comments";
 // message.
 
 export default class LocationParser extends CommentsParser {
+  getLocationForPosition(pos: number): Position {
+    let loc;
+    if (pos === this.state.start) loc = this.state.startLoc;
+    else if (pos === this.state.lastTokStart) loc = this.state.lastTokStartLoc;
+    else if (pos === this.state.end) loc = this.state.endLoc;
+    else if (pos === this.state.lastTokEnd) loc = this.state.lastTokEndLoc;
+    else loc = getLineInfo(this.input, pos);
+
+    return loc;
+  }
+
   raise(
     pos: number,
     message: string,
@@ -21,7 +32,8 @@ export default class LocationParser extends CommentsParser {
       code?: string,
     } = {},
   ): empty {
-    const loc = getLineInfo(this.input, pos);
+    const loc = this.getLocationForPosition(pos);
+
     message += ` (${loc.line}:${loc.column})`;
     // $FlowIgnore
     const err: SyntaxError & { pos: number, loc: Position } = new SyntaxError(
diff --git a/packages/babel-parser/src/parser/lval.js b/packages/babel-parser/src/parser/lval.js
index 46234dade3a9..b4281ab2ffb7 100644
--- a/packages/babel-parser/src/parser/lval.js
+++ b/packages/babel-parser/src/parser/lval.js
@@ -14,16 +14,12 @@ import type {
   SpreadElement,
 } from "../types";
 import type { Pos, Position } from "../util/location";
+import { isStrictBindReservedWord } from "../util/identifier";
 import { NodeUtils } from "./node";
+import { type BindingTypes, BIND_NONE, BIND_LEXICAL } from "../util/scopeflags";
 
 export default class LValParser extends NodeUtils {
   // Forward-declaration: defined in expression.js
-  +checkReservedWord: (
-    word: string,
-    startLoc: number,
-    checkKeywords: boolean,
-    isBinding: boolean,
-  ) => void;
   +parseIdentifier: (liberal?: boolean) => Identifier;
   +parseMaybeAssign: (
     noIn?: ?boolean,
@@ -56,9 +52,13 @@ export default class LValParser extends NodeUtils {
 
         case "ObjectExpression":
           node.type = "ObjectPattern";
-          for (let index = 0; index < node.properties.length; index++) {
-            const prop = node.properties[index];
-            const isLast = index === node.properties.length - 1;
+          for (
+            let i = 0, length = node.properties.length, last = length - 1;
+            i < length;
+            i++
+          ) {
+            const prop = node.properties[i];
+            const isLast = i === last;
             this.toAssignableObjectExpressionProp(prop, isBinding, isLast);
           }
           break;
@@ -93,6 +93,14 @@ export default class LValParser extends NodeUtils {
           }
           break;
 
+        case "ParenthesizedExpression":
+          node.expression = this.toAssignable(
+            node.expression,
+            isBinding,
+            contextDescription,
+          );
+          break;
+
         case "MemberExpression":
           if (!isBinding) break;
 
@@ -122,10 +130,7 @@ export default class LValParser extends NodeUtils {
 
       this.raise(prop.key.start, error);
     } else if (prop.type === "SpreadElement" && !isLast) {
-      this.raise(
-        prop.start,
-        "The rest element has to be the last element when destructuring",
-      );
+      this.raiseRestNotLast(prop.start);
     } else {
       this.toAssignable(prop, isBinding, "object destructuring pattern");
     }
@@ -148,12 +153,10 @@ export default class LValParser extends NodeUtils {
         const arg = last.argument;
         this.toAssignable(arg, isBinding, contextDescription);
         if (
-          [
-            "Identifier",
-            "MemberExpression",
-            "ArrayPattern",
-            "ObjectPattern",
-          ].indexOf(arg.type) === -1
+          arg.type !== "Identifier" &&
+          arg.type !== "MemberExpression" &&
+          arg.type !== "ArrayPattern" &&
+          arg.type !== "ObjectPattern"
         ) {
           this.unexpected(arg.start);
         }
@@ -162,13 +165,12 @@ export default class LValParser extends NodeUtils {
     }
     for (let i = 0; i < end; i++) {
       const elt = exprList[i];
-      if (elt && elt.type === "SpreadElement") {
-        this.raise(
-          elt.start,
-          "The rest element has to be the last element when destructuring",
-        );
+      if (elt) {
+        this.toAssignable(elt, isBinding, contextDescription);
+        if (elt.type === "RestElement") {
+          this.raiseRestNotLast(elt.start);
+        }
       }
-      if (elt) this.toAssignable(elt, isBinding, contextDescription);
     }
     return exprList;
   }
@@ -177,16 +179,32 @@ export default class LValParser extends NodeUtils {
 
   toReferencedList(
     exprList: $ReadOnlyArray<?Expression>,
+    isParenthesizedExpr?: boolean, // eslint-disable-line no-unused-vars
   ): $ReadOnlyArray<?Expression> {
     return exprList;
   }
 
+  toReferencedListDeep(
+    exprList: $ReadOnlyArray<?Expression>,
+    isParenthesizedExpr?: boolean,
+  ): $ReadOnlyArray<?Expression> {
+    this.toReferencedList(exprList, isParenthesizedExpr);
+
+    for (const expr of exprList) {
+      if (expr && expr.type === "ArrayExpression") {
+        this.toReferencedListDeep(expr.elements);
+      }
+    }
+
+    return exprList;
+  }
+
   // Parses spread element.
 
-  parseSpread<T: RestElement | SpreadElement>(
+  parseSpread(
     refShorthandDefaultPos: ?Pos,
     refNeedsArrowPos?: ?Pos,
-  ): T {
+  ): SpreadElement {
     const node = this.startNode();
     this.next();
     node.argument = this.parseMaybeAssign(
@@ -195,33 +213,24 @@ export default class LValParser extends NodeUtils {
       undefined,
       refNeedsArrowPos,
     );
+
+    if (this.state.commaAfterSpreadAt === -1 && this.match(tt.comma)) {
+      this.state.commaAfterSpreadAt = this.state.start;
+    }
+
     return this.finishNode(node, "SpreadElement");
   }
 
-  parseRest(): RestElement {
+  parseRestBinding(): RestElement {
     const node = this.startNode();
     this.next();
     node.argument = this.parseBindingAtom();
     return this.finishNode(node, "RestElement");
   }
 
-  shouldAllowYieldIdentifier(): boolean {
-    return (
-      this.match(tt._yield) && !this.state.strict && !this.state.inGenerator
-    );
-  }
-
-  parseBindingIdentifier(): Identifier {
-    return this.parseIdentifier(this.shouldAllowYieldIdentifier());
-  }
-
   // Parses lvalue (assignable) atom.
   parseBindingAtom(): Pattern {
     switch (this.state.type) {
-      case tt._yield:
-      case tt.name:
-        return this.parseBindingIdentifier();
-
       case tt.bracketL: {
         const node = this.startNode();
         this.next();
@@ -231,10 +240,9 @@ export default class LValParser extends NodeUtils {
 
       case tt.braceL:
         return this.parseObj(true);
-
-      default:
-        throw this.unexpected();
     }
+
+    return this.parseIdentifier();
   }
 
   parseBindingList(
@@ -256,7 +264,8 @@ export default class LValParser extends NodeUtils {
       } else if (this.eat(close)) {
         break;
       } else if (this.match(tt.ellipsis)) {
-        elts.push(this.parseAssignableListItemTypes(this.parseRest()));
+        elts.push(this.parseAssignableListItemTypes(this.parseRestBinding()));
+        this.checkCommaAfterRest();
         this.expect(close);
         break;
       } else {
@@ -316,13 +325,23 @@ export default class LValParser extends NodeUtils {
 
   checkLVal(
     expr: Expression,
-    isBinding: ?boolean,
+    bindingType: BindingTypes = BIND_NONE,
     checkClashes: ?{ [key: string]: boolean },
     contextDescription: string,
   ): void {
     switch (expr.type) {
       case "Identifier":
-        this.checkReservedWord(expr.name, expr.start, false, true);
+        if (
+          this.state.strict &&
+          isStrictBindReservedWord(expr.name, this.inModule)
+        ) {
+          this.raise(
+            expr.start,
+            `${bindingType === BIND_NONE ? "Assigning to" : "Binding"} '${
+              expr.name
+            }' in strict mode`,
+          );
+        }
 
         if (checkClashes) {
           // we need to prefix this with an underscore for the cases where we have a key of
@@ -339,15 +358,26 @@ export default class LValParser extends NodeUtils {
           const key = `_${expr.name}`;
 
           if (checkClashes[key]) {
-            this.raise(expr.start, "Argument name clash in strict mode");
+            this.raise(expr.start, "Argument name clash");
           } else {
             checkClashes[key] = true;
           }
         }
+        if (bindingType === BIND_LEXICAL && expr.name === "let") {
+          this.raise(
+            expr.start,
+            "'let' is not allowed to be used as a name in 'let' or 'const' declarations.",
+          );
+        }
+        if (!(bindingType & BIND_NONE)) {
+          this.scope.declareName(expr.name, bindingType, expr.start);
+        }
         break;
 
       case "MemberExpression":
-        if (isBinding) this.raise(expr.start, "Binding member expression");
+        if (bindingType !== BIND_NONE) {
+          this.raise(expr.start, "Binding member expression");
+        }
         break;
 
       case "ObjectPattern":
@@ -355,7 +385,7 @@ export default class LValParser extends NodeUtils {
           if (prop.type === "ObjectProperty") prop = prop.value;
           this.checkLVal(
             prop,
-            isBinding,
+            bindingType,
             checkClashes,
             "object destructuring pattern",
           );
@@ -367,7 +397,7 @@ export default class LValParser extends NodeUtils {
           if (elem) {
             this.checkLVal(
               elem,
-              isBinding,
+              bindingType,
               checkClashes,
               "array destructuring pattern",
             );
@@ -378,21 +408,35 @@ export default class LValParser extends NodeUtils {
       case "AssignmentPattern":
         this.checkLVal(
           expr.left,
-          isBinding,
+          bindingType,
           checkClashes,
           "assignment pattern",
         );
         break;
 
       case "RestElement":
-        this.checkLVal(expr.argument, isBinding, checkClashes, "rest element");
+        this.checkLVal(
+          expr.argument,
+          bindingType,
+          checkClashes,
+          "rest element",
+        );
+        break;
+
+      case "ParenthesizedExpression":
+        this.checkLVal(
+          expr.expression,
+          bindingType,
+          checkClashes,
+          "parenthesized expression",
+        );
         break;
 
       default: {
         const message =
-          (isBinding
-            ? /* istanbul ignore next */ "Binding invalid"
-            : "Invalid") +
+          (bindingType === BIND_NONE
+            ? "Invalid"
+            : /* istanbul ignore next */ "Binding invalid") +
           " left-hand side" +
           (contextDescription
             ? " in " + contextDescription
@@ -403,12 +447,27 @@ export default class LValParser extends NodeUtils {
   }
 
   checkToRestConversion(node: SpreadElement): void {
-    const validArgumentTypes = ["Identifier", "MemberExpression"];
+    if (
+      node.argument.type !== "Identifier" &&
+      node.argument.type !== "MemberExpression"
+    ) {
+      this.raise(node.argument.start, "Invalid rest operator's argument");
+    }
+  }
+
+  checkCommaAfterRest(): void {
+    if (this.match(tt.comma)) {
+      this.raiseRestNotLast(this.state.start);
+    }
+  }
 
-    if (validArgumentTypes.indexOf(node.argument.type) !== -1) {
-      return;
+  checkCommaAfterRestFromSpread(): void {
+    if (this.state.commaAfterSpreadAt > -1) {
+      this.raiseRestNotLast(this.state.commaAfterSpreadAt);
     }
+  }
 
-    this.raise(node.argument.start, "Invalid rest operator's argument");
+  raiseRestNotLast(pos: number) {
+    this.raise(pos, `Rest element must be last element`);
   }
 }
diff --git a/packages/babel-parser/src/parser/node.js b/packages/babel-parser/src/parser/node.js
index 73223eea85d6..b3d322310122 100644
--- a/packages/babel-parser/src/parser/node.js
+++ b/packages/babel-parser/src/parser/node.js
@@ -7,8 +7,6 @@ import type { Comment, Node as NodeType, NodeBase } from "../types";
 
 // Start an AST node, attaching a start offset.
 
-const commentKeys = ["leadingComments", "trailingComments", "innerComments"];
-
 class Node implements NodeBase {
   constructor(parser: Parser, pos: number, loc: Position) {
     this.type = "";
@@ -31,16 +29,22 @@ class Node implements NodeBase {
 
   __clone(): this {
     // $FlowIgnore
-    const node2: any = new Node();
-    Object.keys(this).forEach(key => {
+    const newNode: any = new Node();
+    const keys = Object.keys(this);
+    for (let i = 0, length = keys.length; i < length; i++) {
+      const key = keys[i];
       // Do not clone comments that are already attached to the node
-      if (commentKeys.indexOf(key) < 0) {
+      if (
+        key !== "leadingComments" &&
+        key !== "trailingComments" &&
+        key !== "innerComments"
+      ) {
         // $FlowIgnore
-        node2[key] = this[key];
+        newNode[key] = this[key];
       }
-    });
+    }
 
-    return node2;
+    return newNode;
   }
 }
 
@@ -79,6 +83,12 @@ export class NodeUtils extends UtilParser {
     pos: number,
     loc: Position,
   ): T {
+    if (process.env.NODE_ENV !== "production" && node.end > 0) {
+      throw new Error(
+        "Do not call finishNode*() twice on the same node." +
+          " Instead use resetEndLocation() or change type directly.",
+      );
+    }
     node.type = type;
     node.end = pos;
     node.loc.end = loc;
@@ -87,12 +97,26 @@ export class NodeUtils extends UtilParser {
     return node;
   }
 
+  resetStartLocation(node: NodeBase, start: number, startLoc: Position): void {
+    node.start = start;
+    node.loc.start = startLoc;
+    if (this.options.ranges) node.range[0] = start;
+  }
+
+  resetEndLocation(
+    node: NodeBase,
+    end?: number = this.state.lastTokEnd,
+    endLoc?: Position = this.state.lastTokEndLoc,
+  ): void {
+    node.end = end;
+    node.loc.end = endLoc;
+    if (this.options.ranges) node.range[1] = end;
+  }
+
   /**
    * Reset the start location of node to the start location of locationNode
    */
   resetStartLocationFromNode(node: NodeBase, locationNode: NodeBase): void {
-    node.start = locationNode.start;
-    node.loc.start = locationNode.loc.start;
-    if (this.options.ranges) node.range[0] = locationNode.range[0];
+    this.resetStartLocation(node, locationNode.start, locationNode.loc.start);
   }
 }
diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
index 9e890d2ef644..b677bfd0c9e2 100644
--- a/packages/babel-parser/src/parser/statement.js
+++ b/packages/babel-parser/src/parser/statement.js
@@ -3,16 +3,33 @@
 import * as N from "../types";
 import { types as tt, type TokenType } from "../tokenizer/types";
 import ExpressionParser from "./expression";
-import { isIdentifierChar } from "../util/identifier";
+import {
+  isIdentifierChar,
+  isIdentifierStart,
+  keywordRelationalOperator,
+} from "../util/identifier";
 import { lineBreak, skipWhiteSpace } from "../util/whitespace";
-
-// Reused empty array added for node fields that are always empty.
-
-const empty = [];
+import * as charCodes from "charcodes";
+import {
+  BIND_CLASS,
+  BIND_LEXICAL,
+  BIND_VAR,
+  BIND_FUNCTION,
+  functionFlags,
+  SCOPE_CLASS,
+  SCOPE_OTHER,
+  SCOPE_SIMPLE_CATCH,
+  SCOPE_SUPER,
+} from "../util/scopeflags";
 
 const loopLabel = { kind: "loop" },
   switchLabel = { kind: "switch" };
 
+const FUNC_NO_FLAGS = 0b000,
+  FUNC_STATEMENT = 0b001,
+  FUNC_HANGING_STATEMENT = 0b010,
+  FUNC_NULLABLE_ID = 0b100;
+
 export default class StatementParser extends ExpressionParser {
   // ### Statement parsing
 
@@ -28,6 +45,18 @@ export default class StatementParser extends ExpressionParser {
 
     this.parseBlockBody(program, true, true, tt.eof);
 
+    if (
+      this.inModule &&
+      !this.options.allowUndeclaredExports &&
+      this.scope.undefinedExports.size > 0
+    ) {
+      for (const [name] of Array.from(this.scope.undefinedExports)) {
+        const pos = this.scope.undefinedExports.get(name);
+        // $FlowIssue
+        this.raise(pos, `Export '${name}' is not defined`);
+      }
+    }
+
     file.program = this.finishNode(program, "Program");
     file.comments = this.state.comments;
 
@@ -71,6 +100,35 @@ export default class StatementParser extends ExpressionParser {
     return this.finishNode(node, "InterpreterDirective");
   }
 
+  isLet(context: ?string): boolean {
+    if (!this.isContextual("let")) {
+      return false;
+    }
+    skipWhiteSpace.lastIndex = this.state.pos;
+    const skip = skipWhiteSpace.exec(this.input);
+    // $FlowIgnore
+    const next = this.state.pos + skip[0].length;
+    const nextCh = this.input.charCodeAt(next);
+    // For ambiguous cases, determine if a LexicalDeclaration (or only a
+    // Statement) is allowed here. If context is not empty then only a Statement
+    // is allowed. However, `let [` is an explicit negative lookahead for
+    // ExpressionStatement, so special-case it first.
+    if (nextCh === charCodes.leftSquareBracket) return true;
+    if (context) return false;
+
+    if (nextCh === charCodes.leftCurlyBrace) return true;
+
+    if (isIdentifierStart(nextCh)) {
+      let pos = next + 1;
+      while (isIdentifierChar(this.input.charCodeAt(pos))) {
+        ++pos;
+      }
+      const ident = this.input.slice(next, pos);
+      if (!keywordRelationalOperator.test(ident)) return true;
+    }
+    return false;
+  }
+
   // Parse a single statement.
   //
   // If expecting a statement and finding a slash operator, parse a
@@ -78,16 +136,22 @@ export default class StatementParser extends ExpressionParser {
   // `if (foo) /blah/.exec(foo)`, where looking at the previous token
   // does not help.
 
-  parseStatement(declaration: boolean, topLevel?: boolean): N.Statement {
+  parseStatement(context: ?string, topLevel?: boolean): N.Statement {
     if (this.match(tt.at)) {
       this.parseDecorators(true);
     }
-    return this.parseStatementContent(declaration, topLevel);
+    return this.parseStatementContent(context, topLevel);
   }
 
-  parseStatementContent(declaration: boolean, topLevel: ?boolean): N.Statement {
-    const starttype = this.state.type;
+  parseStatementContent(context: ?string, topLevel: ?boolean): N.Statement {
+    let starttype = this.state.type;
     const node = this.startNode();
+    let kind;
+
+    if (this.isLet(context)) {
+      starttype = tt._var;
+      kind = "let";
+    }
 
     // Most types of statements are recognized by the keyword they
     // start with. Many are trivial to parse, some require a bit of
@@ -106,11 +170,24 @@ export default class StatementParser extends ExpressionParser {
         return this.parseForStatement(node);
       case tt._function:
         if (this.lookahead().type === tt.dot) break;
-        if (!declaration) this.unexpected();
-        return this.parseFunctionStatement(node);
+        if (context) {
+          if (this.state.strict) {
+            this.raise(
+              this.state.start,
+              "In strict mode code, functions can only be declared at top level or inside a block",
+            );
+          } else if (context !== "if" && context !== "label") {
+            this.raise(
+              this.state.start,
+              "In non-strict mode code, functions can only be declared at top level, " +
+                "inside a block, or as the body of an if statement",
+            );
+          }
+        }
+        return this.parseFunctionStatement(node, false, !context);
 
       case tt._class:
-        if (!declaration) this.unexpected();
+        if (context) this.unexpected();
         return this.parseClass(node, true);
 
       case tt._if:
@@ -124,12 +201,16 @@ export default class StatementParser extends ExpressionParser {
       case tt._try:
         return this.parseTryStatement(node);
 
-      case tt._let:
       case tt._const:
-        if (!declaration) this.unexpected(); // NOTE: falls through to _var
-
       case tt._var:
-        return this.parseVarStatement(node, starttype);
+        kind = kind || this.state.value;
+        if (context && kind !== "var") {
+          this.unexpected(
+            this.state.start,
+            "Lexical declaration cannot appear in a single-statement context",
+          );
+        }
+        return this.parseVarStatement(node, kind);
 
       case tt._while:
         return this.parseWhileStatement(node);
@@ -156,7 +237,7 @@ export default class StatementParser extends ExpressionParser {
         this.next();
 
         let result;
-        if (starttype == tt._import) {
+        if (starttype === tt._import) {
           result = this.parseImport(node);
 
           if (
@@ -183,18 +264,19 @@ export default class StatementParser extends ExpressionParser {
 
         return result;
       }
-      case tt.name:
-        if (this.isContextual("async")) {
-          // peek ahead and see if next token is a function
-          const state = this.state.clone();
-          this.next();
-          if (this.match(tt._function) && !this.canInsertSemicolon()) {
-            this.expect(tt._function);
-            return this.parseFunction(node, true, false, true);
-          } else {
-            this.state = state;
+
+      default: {
+        if (this.isAsyncFunction()) {
+          if (context) {
+            this.unexpected(
+              null,
+              "Async functions can only be declared at the top level or inside a block",
+            );
           }
+          this.next();
+          return this.parseFunctionStatement(node, true, !context);
         }
+      }
     }
 
     // If the statement does not start with a statement keyword or a
@@ -210,7 +292,7 @@ export default class StatementParser extends ExpressionParser {
       expr.type === "Identifier" &&
       this.eat(tt.colon)
     ) {
-      return this.parseLabeledStatement(node, maybeName, expr);
+      return this.parseLabeledStatement(node, maybeName, expr, context);
     } else {
       return this.parseExpressionStatement(node, expr);
     }
@@ -305,22 +387,26 @@ export default class StatementParser extends ExpressionParser {
         }
       }
 
-      if (this.eat(tt.parenL)) {
-        const node = this.startNodeAt(startPos, startLoc);
-        node.callee = expr;
-        node.arguments = this.parseCallExpressionArguments(tt.parenR, false);
-        this.toReferencedList(node.arguments);
-        expr = this.finishNode(node, "CallExpression");
-      }
-
-      node.expression = expr;
+      node.expression = this.parseMaybeDecoratorArguments(expr);
       this.state.decoratorStack.pop();
     } else {
-      node.expression = this.parseMaybeAssign();
+      node.expression = this.parseExprSubscripts();
     }
     return this.finishNode(node, "Decorator");
   }
 
+  parseMaybeDecoratorArguments(expr: N.Expression): N.Expression {
+    if (this.eat(tt.parenL)) {
+      const node = this.startNodeAtNode(expr);
+      node.callee = expr;
+      node.arguments = this.parseCallExpressionArguments(tt.parenR, false);
+      this.toReferencedList(node.arguments);
+      return this.finishNode(node, "CallExpression");
+    }
+
+    return expr;
+  }
+
   parseBreakContinueStatement(
     node: N.BreakStatement | N.ContinueStatement,
     keyword: string,
@@ -330,15 +416,24 @@ export default class StatementParser extends ExpressionParser {
 
     if (this.isLineTerminator()) {
       node.label = null;
-    } else if (!this.match(tt.name)) {
-      this.unexpected();
     } else {
       node.label = this.parseIdentifier();
       this.semicolon();
     }
 
-    // Verify that there is an actual destination to break or
-    // continue to.
+    this.verifyBreakContinue(node, keyword);
+
+    return this.finishNode(
+      node,
+      isBreak ? "BreakStatement" : "ContinueStatement",
+    );
+  }
+
+  verifyBreakContinue(
+    node: N.BreakStatement | N.ContinueStatement,
+    keyword: string,
+  ) {
+    const isBreak = keyword === "break";
     let i;
     for (i = 0; i < this.state.labels.length; ++i) {
       const lab = this.state.labels[i];
@@ -350,10 +445,6 @@ export default class StatementParser extends ExpressionParser {
     if (i === this.state.labels.length) {
       this.raise(node.start, "Unsyntactic " + keyword);
     }
-    return this.finishNode(
-      node,
-      isBreak ? "BreakStatement" : "ContinueStatement",
-    );
   }
 
   parseDebuggerStatement(node: N.DebuggerStatement): N.DebuggerStatement {
@@ -362,13 +453,30 @@ export default class StatementParser extends ExpressionParser {
     return this.finishNode(node, "DebuggerStatement");
   }
 
+  parseHeaderExpression(): N.Expression {
+    this.expect(tt.parenL);
+    const val = this.parseExpression();
+    this.expect(tt.parenR);
+    return val;
+  }
+
   parseDoStatement(node: N.DoWhileStatement): N.DoWhileStatement {
     this.next();
     this.state.labels.push(loopLabel);
-    node.body = this.parseStatement(false);
+
+    node.body =
+      // For the smartPipelines plugin: Disable topic references from outer
+      // contexts within the loop body. They are permitted in test expressions,
+      // outside of the loop body.
+      this.withTopicForbiddingContext(() =>
+        // Parse the loop body's body.
+        this.parseStatement("do"),
+      );
+
     this.state.labels.pop();
+
     this.expect(tt._while);
-    node.test = this.parseParenExpression();
+    node.test = this.parseHeaderExpression();
     this.eat(tt.semi);
     return this.finishNode(node, "DoWhileStatement");
   }
@@ -385,46 +493,40 @@ export default class StatementParser extends ExpressionParser {
     this.next();
     this.state.labels.push(loopLabel);
 
-    let forAwait = false;
-    if (this.state.inAsync && this.isContextual("await")) {
-      this.expectPlugin("asyncGenerators");
-      forAwait = true;
-      this.next();
+    let awaitAt = -1;
+    if (
+      (this.scope.inAsync ||
+        (!this.scope.inFunction && this.options.allowAwaitOutsideFunction)) &&
+      this.eatContextual("await")
+    ) {
+      awaitAt = this.state.lastTokStart;
     }
+    this.scope.enter(SCOPE_OTHER);
     this.expect(tt.parenL);
 
     if (this.match(tt.semi)) {
-      if (forAwait) {
-        this.unexpected();
+      if (awaitAt > -1) {
+        this.unexpected(awaitAt);
       }
       return this.parseFor(node, null);
     }
 
-    if (this.match(tt._var) || this.match(tt._let) || this.match(tt._const)) {
+    const isLet = this.isLet();
+    if (this.match(tt._var) || this.match(tt._const) || isLet) {
       const init = this.startNode();
-      const varKind = this.state.type;
+      const kind = isLet ? "let" : this.state.value;
       this.next();
-      this.parseVar(init, true, varKind);
+      this.parseVar(init, true, kind);
       this.finishNode(init, "VariableDeclaration");
 
-      if (this.match(tt._in) || this.isContextual("of")) {
-        if (init.declarations.length === 1) {
-          const declaration = init.declarations[0];
-          const isForInInitializer =
-            varKind === tt._var &&
-            declaration.init &&
-            declaration.id.type != "ObjectPattern" &&
-            declaration.id.type != "ArrayPattern" &&
-            !this.isContextual("of");
-          if (this.state.strict && isForInInitializer) {
-            this.raise(this.state.start, "for-in initializer in strict mode");
-          } else if (isForInInitializer || !declaration.init) {
-            return this.parseForIn(node, init, forAwait);
-          }
-        }
+      if (
+        (this.match(tt._in) || this.isContextual("of")) &&
+        init.declarations.length === 1
+      ) {
+        return this.parseForIn(node, init, awaitAt);
       }
-      if (forAwait) {
-        this.unexpected();
+      if (awaitAt > -1) {
+        this.unexpected(awaitAt);
       }
       return this.parseFor(node, init);
     }
@@ -437,31 +539,39 @@ export default class StatementParser extends ExpressionParser {
         : "for-in statement";
       this.toAssignable(init, undefined, description);
       this.checkLVal(init, undefined, undefined, description);
-      return this.parseForIn(node, init, forAwait);
+      return this.parseForIn(node, init, awaitAt);
     } else if (refShorthandDefaultPos.start) {
       this.unexpected(refShorthandDefaultPos.start);
     }
-    if (forAwait) {
-      this.unexpected();
+    if (awaitAt > -1) {
+      this.unexpected(awaitAt);
     }
     return this.parseFor(node, init);
   }
 
-  parseFunctionStatement(node: N.FunctionDeclaration): N.FunctionDeclaration {
+  parseFunctionStatement(
+    node: N.FunctionDeclaration,
+    isAsync?: boolean,
+    declarationPosition?: boolean,
+  ): N.FunctionDeclaration {
     this.next();
-    return this.parseFunction(node, true);
+    return this.parseFunction(
+      node,
+      FUNC_STATEMENT | (declarationPosition ? 0 : FUNC_HANGING_STATEMENT),
+      isAsync,
+    );
   }
 
   parseIfStatement(node: N.IfStatement): N.IfStatement {
     this.next();
-    node.test = this.parseParenExpression();
-    node.consequent = this.parseStatement(false);
-    node.alternate = this.eat(tt._else) ? this.parseStatement(false) : null;
+    node.test = this.parseHeaderExpression();
+    node.consequent = this.parseStatement("if");
+    node.alternate = this.eat(tt._else) ? this.parseStatement("if") : null;
     return this.finishNode(node, "IfStatement");
   }
 
   parseReturnStatement(node: N.ReturnStatement): N.ReturnStatement {
-    if (!this.state.inFunction && !this.options.allowReturnOutsideFunction) {
+    if (!this.scope.inFunction && !this.options.allowReturnOutsideFunction) {
       this.raise(this.state.start, "'return' outside of function");
     }
 
@@ -483,10 +593,11 @@ export default class StatementParser extends ExpressionParser {
 
   parseSwitchStatement(node: N.SwitchStatement): N.SwitchStatement {
     this.next();
-    node.discriminant = this.parseParenExpression();
+    node.discriminant = this.parseHeaderExpression();
     const cases = (node.cases = []);
     this.expect(tt.braceL);
     this.state.labels.push(switchLabel);
+    this.scope.enter(SCOPE_OTHER);
 
     // Statements under must be grouped (by label) in SwitchCase
     // nodes. `cur` is used to keep the node that we are currently
@@ -512,12 +623,13 @@ export default class StatementParser extends ExpressionParser {
         this.expect(tt.colon);
       } else {
         if (cur) {
-          cur.consequent.push(this.parseStatement(true));
+          cur.consequent.push(this.parseStatement(null));
         } else {
           this.unexpected();
         }
       }
     }
+    this.scope.exit();
     if (cur) this.finishNode(cur, "SwitchCase");
     this.next(); // Closing brace
     this.state.labels.pop();
@@ -548,18 +660,29 @@ export default class StatementParser extends ExpressionParser {
       if (this.match(tt.parenL)) {
         this.expect(tt.parenL);
         clause.param = this.parseBindingAtom();
-        const clashes: any = Object.create(null);
-        this.checkLVal(clause.param, true, clashes, "catch clause");
+        const simple = clause.param.type === "Identifier";
+        this.scope.enter(simple ? SCOPE_SIMPLE_CATCH : 0);
+        this.checkLVal(clause.param, BIND_LEXICAL, null, "catch clause");
         this.expect(tt.parenR);
       } else {
-        this.expectPlugin("optionalCatchBinding");
         clause.param = null;
+        this.scope.enter(SCOPE_OTHER);
       }
-      clause.body = this.parseBlock();
+
+      clause.body =
+        // For the smartPipelines plugin: Disable topic references from outer
+        // contexts within the function body. They are permitted in function
+        // default-parameter expressions, which are part of the outer context,
+        // outside of the function body.
+        this.withTopicForbiddingContext(() =>
+          // Parse the catch clause's body.
+          this.parseBlock(false, false),
+        );
+      this.scope.exit();
+
       node.handler = this.finishNode(clause, "CatchClause");
     }
 
-    node.guardedHandlers = empty;
     node.finalizer = this.eat(tt._finally) ? this.parseBlock() : null;
 
     if (!node.handler && !node.finalizer) {
@@ -571,7 +694,7 @@ export default class StatementParser extends ExpressionParser {
 
   parseVarStatement(
     node: N.VariableDeclaration,
-    kind: TokenType,
+    kind: "var" | "let" | "const",
   ): N.VariableDeclaration {
     this.next();
     this.parseVar(node, false, kind);
@@ -581,10 +704,20 @@ export default class StatementParser extends ExpressionParser {
 
   parseWhileStatement(node: N.WhileStatement): N.WhileStatement {
     this.next();
-    node.test = this.parseParenExpression();
+    node.test = this.parseHeaderExpression();
     this.state.labels.push(loopLabel);
-    node.body = this.parseStatement(false);
+
+    node.body =
+      // For the smartPipelines plugin:
+      // Disable topic references from outer contexts within the loop body.
+      // They are permitted in test expressions, outside of the loop body.
+      this.withTopicForbiddingContext(() =>
+        // Parse loop body.
+        this.parseStatement("while"),
+      );
+
     this.state.labels.pop();
+
     return this.finishNode(node, "WhileStatement");
   }
 
@@ -593,8 +726,18 @@ export default class StatementParser extends ExpressionParser {
       this.raise(this.state.start, "'with' in strict mode");
     }
     this.next();
-    node.object = this.parseParenExpression();
-    node.body = this.parseStatement(false);
+    node.object = this.parseHeaderExpression();
+
+    node.body =
+      // For the smartPipelines plugin:
+      // Disable topic references from outer contexts within the function body.
+      // They are permitted in function default-parameter expressions, which are
+      // part of the outer context, outside of the function body.
+      this.withTopicForbiddingContext(() =>
+        // Parse the statement body.
+        this.parseStatement("with"),
+      );
+
     return this.finishNode(node, "WithStatement");
   }
 
@@ -607,6 +750,7 @@ export default class StatementParser extends ExpressionParser {
     node: N.LabeledStatement,
     maybeName: string,
     expr: N.Identifier,
+    context: ?string,
   ): N.LabeledStatement {
     for (const label of this.state.labels) {
       if (label.name === maybeName) {
@@ -617,8 +761,8 @@ export default class StatementParser extends ExpressionParser {
     const kind = this.state.type.isLoop
       ? "loop"
       : this.match(tt._switch)
-        ? "switch"
-        : null;
+      ? "switch"
+      : null;
     for (let i = this.state.labels.length - 1; i >= 0; i--) {
       const label = this.state.labels[i];
       if (label.statementStart === node.start) {
@@ -634,16 +778,13 @@ export default class StatementParser extends ExpressionParser {
       kind: kind,
       statementStart: this.state.start,
     });
-    node.body = this.parseStatement(true);
-
-    if (
-      node.body.type == "ClassDeclaration" ||
-      (node.body.type == "VariableDeclaration" && node.body.kind !== "var") ||
-      (node.body.type == "FunctionDeclaration" &&
-        (this.state.strict || node.body.generator || node.body.async))
-    ) {
-      this.raise(node.body.start, "Invalid labeled declaration");
-    }
+    node.body = this.parseStatement(
+      context
+        ? context.indexOf("label") === -1
+          ? context + "label"
+          : context
+        : "label",
+    );
 
     this.state.labels.pop();
     node.label = expr;
@@ -653,7 +794,7 @@ export default class StatementParser extends ExpressionParser {
   parseExpressionStatement(
     node: N.ExpressionStatement,
     expr: N.Expression,
-  ): N.ExpressionStatement {
+  ): N.Statement {
     node.expression = expr;
     this.semicolon();
     return this.finishNode(node, "ExpressionStatement");
@@ -663,10 +804,19 @@ export default class StatementParser extends ExpressionParser {
   // strict"` declarations when `allowStrict` is true (used for
   // function bodies).
 
-  parseBlock(allowDirectives?: boolean): N.BlockStatement {
+  parseBlock(
+    allowDirectives?: boolean = false,
+    createNewLexicalScope?: boolean = true,
+  ): N.BlockStatement {
     const node = this.startNode();
     this.expect(tt.braceL);
+    if (createNewLexicalScope) {
+      this.scope.enter(SCOPE_OTHER);
+    }
     this.parseBlockBody(node, allowDirectives, false, tt.braceR);
+    if (createNewLexicalScope) {
+      this.scope.exit();
+    }
     return this.finishNode(node, "BlockStatement");
   }
 
@@ -710,7 +860,7 @@ export default class StatementParser extends ExpressionParser {
         octalPosition = this.state.octalPosition;
       }
 
-      const stmt = this.parseStatement(true, topLevel);
+      const stmt = this.parseStatement(null, topLevel);
 
       if (directives && !parsedNonDirective && this.isValidDirective(stmt)) {
         const directive = this.stmtToDirective(stmt);
@@ -751,8 +901,19 @@ export default class StatementParser extends ExpressionParser {
     this.expect(tt.semi);
     node.update = this.match(tt.parenR) ? null : this.parseExpression();
     this.expect(tt.parenR);
-    node.body = this.parseStatement(false);
+
+    node.body =
+      // For the smartPipelines plugin: Disable topic references from outer
+      // contexts within the loop body. They are permitted in test expressions,
+      // outside of the loop body.
+      this.withTopicForbiddingContext(() =>
+        // Parse the loop body.
+        this.parseStatement("for"),
+      );
+
+    this.scope.exit();
     this.state.labels.pop();
+
     return this.finishNode(node, "ForStatement");
   }
 
@@ -761,24 +922,53 @@ export default class StatementParser extends ExpressionParser {
 
   parseForIn(
     node: N.ForInOf,
-    init: N.VariableDeclaration,
-    forAwait: boolean,
+    init: N.VariableDeclaration | N.AssignmentPattern,
+    awaitAt: number,
   ): N.ForInOf {
-    const type = this.match(tt._in) ? "ForInStatement" : "ForOfStatement";
-    if (forAwait) {
-      this.eatContextual("of");
+    const isForIn = this.match(tt._in);
+    this.next();
+
+    if (isForIn) {
+      if (awaitAt > -1) this.unexpected(awaitAt);
     } else {
-      this.next();
+      node.await = awaitAt > -1;
     }
-    if (type === "ForOfStatement") {
-      node.await = !!forAwait;
+
+    if (
+      init.type === "VariableDeclaration" &&
+      init.declarations[0].init != null &&
+      (!isForIn ||
+        this.state.strict ||
+        init.kind !== "var" ||
+        init.declarations[0].id.type !== "Identifier")
+    ) {
+      this.raise(
+        init.start,
+        `${
+          isForIn ? "for-in" : "for-of"
+        } loop variable declaration may not have an initializer`,
+      );
+    } else if (init.type === "AssignmentPattern") {
+      this.raise(init.start, "Invalid left-hand side in for-loop");
     }
+
     node.left = init;
-    node.right = this.parseExpression();
+    node.right = isForIn ? this.parseExpression() : this.parseMaybeAssign();
     this.expect(tt.parenR);
-    node.body = this.parseStatement(false);
+
+    node.body =
+      // For the smartPipelines plugin:
+      // Disable topic references from outer contexts within the loop body.
+      // They are permitted in test expressions, outside of the loop body.
+      this.withTopicForbiddingContext(() =>
+        // Parse loop body.
+        this.parseStatement("for"),
+      );
+
+    this.scope.exit();
     this.state.labels.pop();
-    return this.finishNode(node, type);
+
+    return this.finishNode(node, isForIn ? "ForInStatement" : "ForOfStatement");
   }
 
   // Parse a list of variable declarations.
@@ -786,24 +976,24 @@ export default class StatementParser extends ExpressionParser {
   parseVar(
     node: N.VariableDeclaration,
     isFor: boolean,
-    kind: TokenType,
+    kind: "var" | "let" | "const",
   ): N.VariableDeclaration {
     const declarations = (node.declarations = []);
-    // $FlowFixMe
-    node.kind = kind.keyword;
+    const isTypescript = this.hasPlugin("typescript");
+    node.kind = kind;
     for (;;) {
       const decl = this.startNode();
-      this.parseVarHead(decl);
+      this.parseVarId(decl, kind);
       if (this.eat(tt.eq)) {
         decl.init = this.parseMaybeAssign(isFor);
       } else {
         if (
-          kind === tt._const &&
+          kind === "const" &&
           !(this.match(tt._in) || this.isContextual("of"))
         ) {
           // `const` with no initializer is allowed in TypeScript.
           // It could be a declaration like `const x: number;`.
-          if (!this.hasPlugin("typescript")) {
+          if (!isTypescript) {
             this.unexpected();
           }
         } else if (
@@ -823,9 +1013,14 @@ export default class StatementParser extends ExpressionParser {
     return node;
   }
 
-  parseVarHead(decl: N.VariableDeclarator): void {
+  parseVarId(decl: N.VariableDeclarator, kind: "var" | "let" | "const"): void {
     decl.id = this.parseBindingAtom();
-    this.checkLVal(decl.id, true, undefined, "variable declaration");
+    this.checkLVal(
+      decl.id,
+      kind === "var" ? BIND_VAR : BIND_LEXICAL,
+      undefined,
+      "variable declaration",
+    );
   }
 
   // Parse a function declaration or literal (depending on the
@@ -833,67 +1028,72 @@ export default class StatementParser extends ExpressionParser {
 
   parseFunction<T: N.NormalFunction>(
     node: T,
-    isStatement: boolean,
-    allowExpressionBody?: boolean,
-    isAsync?: boolean,
-    optionalId?: boolean,
+    statement?: number = FUNC_NO_FLAGS,
+    isAsync?: boolean = false,
   ): T {
-    const oldInFunc = this.state.inFunction;
-    const oldInMethod = this.state.inMethod;
-    const oldInGenerator = this.state.inGenerator;
-    const oldInClassProperty = this.state.inClassProperty;
-    this.state.inFunction = true;
-    this.state.inMethod = false;
-    this.state.inClassProperty = false;
+    const isStatement = statement & FUNC_STATEMENT;
+    const isHangingStatement = statement & FUNC_HANGING_STATEMENT;
+    const requireId = !!isStatement && !(statement & FUNC_NULLABLE_ID);
 
     this.initFunction(node, isAsync);
 
-    if (this.match(tt.star)) {
-      if (node.async) {
-        this.expectPlugin("asyncGenerators");
-      }
-      node.generator = true;
-      this.next();
+    if (this.match(tt.star) && isHangingStatement) {
+      this.unexpected(
+        this.state.start,
+        "Generators can only be declared at the top level or inside a block",
+      );
     }
+    node.generator = this.eat(tt.star);
 
-    if (
-      isStatement &&
-      !optionalId &&
-      !this.match(tt.name) &&
-      !this.match(tt._yield)
-    ) {
-      this.unexpected();
+    if (isStatement) {
+      node.id = this.parseFunctionId(requireId);
     }
 
-    // When parsing function expression, the binding identifier is parsed
-    // according to the rules inside the function.
-    // e.g. (function* yield() {}) is invalid because "yield" is disallowed in
-    // generators.
-    // This isn't the case with function declarations: function* yield() {} is
-    // valid because yield is parsed as if it was outside the generator.
-    // Therefore, this.state.inGenerator is set before or after parsing the
-    // function id according to the "isStatement" parameter.
-    if (!isStatement) this.state.inGenerator = node.generator;
-    if (this.match(tt.name) || this.match(tt._yield)) {
-      node.id = this.parseBindingIdentifier();
+    const oldInClassProperty = this.state.inClassProperty;
+    const oldYieldPos = this.state.yieldPos;
+    const oldAwaitPos = this.state.awaitPos;
+    this.state.inClassProperty = false;
+    this.state.yieldPos = 0;
+    this.state.awaitPos = 0;
+    this.scope.enter(functionFlags(node.async, node.generator));
+
+    if (!isStatement) {
+      node.id = this.parseFunctionId();
     }
-    if (isStatement) this.state.inGenerator = node.generator;
 
     this.parseFunctionParams(node);
-    this.parseFunctionBodyAndFinish(
-      node,
-      isStatement ? "FunctionDeclaration" : "FunctionExpression",
-      allowExpressionBody,
-    );
 
-    this.state.inFunction = oldInFunc;
-    this.state.inMethod = oldInMethod;
-    this.state.inGenerator = oldInGenerator;
+    // For the smartPipelines plugin: Disable topic references from outer
+    // contexts within the function body. They are permitted in test
+    // expressions, outside of the function body.
+    this.withTopicForbiddingContext(() => {
+      // Parse the function body.
+      this.parseFunctionBodyAndFinish(
+        node,
+        isStatement ? "FunctionDeclaration" : "FunctionExpression",
+      );
+    });
+
+    this.scope.exit();
+
+    if (isStatement && !isHangingStatement) {
+      // We need to validate this _after_ parsing the function body
+      // because of TypeScript body-less function declarations,
+      // which shouldn't be added to the scope.
+      this.checkFunctionStatementId(node);
+    }
+
     this.state.inClassProperty = oldInClassProperty;
+    this.state.yieldPos = oldYieldPos;
+    this.state.awaitPos = oldAwaitPos;
 
     return node;
   }
 
+  parseFunctionId(requireId?: boolean): ?N.Identifier {
+    return requireId || this.match(tt.name) ? this.parseIdentifier() : null;
+  }
+
   parseFunctionParams(node: N.Function, allowModifiers?: boolean): void {
     const oldInParameters = this.state.inParameters;
     this.state.inParameters = true;
@@ -906,6 +1106,26 @@ export default class StatementParser extends ExpressionParser {
     );
 
     this.state.inParameters = oldInParameters;
+    this.checkYieldAwaitInDefaultParams();
+  }
+
+  checkFunctionStatementId(node: N.Function): void {
+    if (!node.id) return;
+
+    // If it is a regular function declaration in sloppy mode, then it is
+    // subject to Annex B semantics (BIND_FUNCTION). Otherwise, the binding
+    // mode depends on properties of the current scope (see
+    // treatFunctionsAsVar).
+    this.checkLVal(
+      node.id,
+      this.state.strict || node.generator || node.async
+        ? this.scope.treatFunctionsAsVar
+          ? BIND_VAR
+          : BIND_LEXICAL
+        : BIND_FUNCTION,
+      null,
+      "function name",
+    );
   }
 
   // Parse a class declaration or literal (depending on the
@@ -918,9 +1138,17 @@ export default class StatementParser extends ExpressionParser {
   ): T {
     this.next();
     this.takeDecorators(node);
+
+    // A class definition is always strict mode code.
+    const oldStrict = this.state.strict;
+    this.state.strict = true;
+
     this.parseClassId(node, isStatement, optionalId);
     this.parseClassSuper(node);
-    this.parseClassBody(node);
+    node.body = this.parseClassBody(!!node.superClass);
+
+    this.state.strict = oldStrict;
+
     return this.finishNode(
       node,
       isStatement ? "ClassDeclaration" : "ClassExpression",
@@ -944,58 +1172,59 @@ export default class StatementParser extends ExpressionParser {
     );
   }
 
-  parseClassBody(node: N.Class): void {
-    // class bodies are implicitly strict
-    const oldStrict = this.state.strict;
-    this.state.strict = true;
+  parseClassBody(constructorAllowsSuper: boolean): N.ClassBody {
     this.state.classLevel++;
 
     const state = { hadConstructor: false };
     let decorators: N.Decorator[] = [];
     const classBody: N.ClassBody = this.startNode();
-
     classBody.body = [];
 
     this.expect(tt.braceL);
 
-    while (!this.eat(tt.braceR)) {
-      if (this.eat(tt.semi)) {
-        if (decorators.length > 0) {
-          this.raise(
-            this.state.lastTokEnd,
-            "Decorators must not be followed by a semicolon",
-          );
+    // For the smartPipelines plugin: Disable topic references from outer
+    // contexts within the class body. They are permitted in test expressions,
+    // outside of the class body.
+    this.withTopicForbiddingContext(() => {
+      while (!this.eat(tt.braceR)) {
+        if (this.eat(tt.semi)) {
+          if (decorators.length > 0) {
+            this.raise(
+              this.state.lastTokEnd,
+              "Decorators must not be followed by a semicolon",
+            );
+          }
+          continue;
         }
-        continue;
-      }
 
-      if (this.match(tt.at)) {
-        decorators.push(this.parseDecorator());
-        continue;
-      }
+        if (this.match(tt.at)) {
+          decorators.push(this.parseDecorator());
+          continue;
+        }
 
-      const member = this.startNode();
+        const member = this.startNode();
 
-      // steal the decorators if there are any
-      if (decorators.length) {
-        member.decorators = decorators;
-        this.resetStartLocationFromNode(member, decorators[0]);
-        decorators = [];
-      }
+        // steal the decorators if there are any
+        if (decorators.length) {
+          member.decorators = decorators;
+          this.resetStartLocationFromNode(member, decorators[0]);
+          decorators = [];
+        }
 
-      this.parseClassMember(classBody, member, state);
+        this.parseClassMember(classBody, member, state, constructorAllowsSuper);
 
-      if (
-        member.kind === "constructor" &&
-        member.decorators &&
-        member.decorators.length > 0
-      ) {
-        this.raise(
-          member.start,
-          "Decorators can't be used with a constructor. Did you mean '@dec class { ... }'?",
-        );
+        if (
+          member.kind === "constructor" &&
+          member.decorators &&
+          member.decorators.length > 0
+        ) {
+          this.raise(
+            member.start,
+            "Decorators can't be used with a constructor. Did you mean '@dec class { ... }'?",
+          );
+        }
       }
-    }
+    });
 
     if (decorators.length) {
       this.raise(
@@ -1004,16 +1233,16 @@ export default class StatementParser extends ExpressionParser {
       );
     }
 
-    node.body = this.finishNode(classBody, "ClassBody");
-
     this.state.classLevel--;
-    this.state.strict = oldStrict;
+
+    return this.finishNode(classBody, "ClassBody");
   }
 
   parseClassMember(
     classBody: N.ClassBody,
     member: N.ClassMember,
     state: { hadConstructor: boolean },
+    constructorAllowsSuper: boolean,
   ): void {
     let isStatic = false;
     const containsEsc = this.state.containsEsc;
@@ -1035,6 +1264,7 @@ export default class StatementParser extends ExpressionParser {
           false,
           false,
           /* isConstructor */ false,
+          false,
         );
         return;
       } else if (this.isClassProperty()) {
@@ -1054,7 +1284,13 @@ export default class StatementParser extends ExpressionParser {
       isStatic = true;
     }
 
-    this.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
+    this.parseClassMemberWithIsStatic(
+      classBody,
+      member,
+      state,
+      isStatic,
+      constructorAllowsSuper,
+    );
   }
 
   parseClassMemberWithIsStatic(
@@ -1062,6 +1298,7 @@ export default class StatementParser extends ExpressionParser {
     member: N.ClassMember,
     state: { hadConstructor: boolean },
     isStatic: boolean,
+    constructorAllowsSuper: boolean,
   ) {
     const publicMethod: $FlowSubtype<N.ClassMethod> = member;
     const privateMethod: $FlowSubtype<N.ClassPrivateMethod> = member;
@@ -1094,11 +1331,13 @@ export default class StatementParser extends ExpressionParser {
         true,
         false,
         /* isConstructor */ false,
+        false,
       );
 
       return;
     }
 
+    const containsEsc = this.state.containsEsc;
     const key = this.parseClassPropertyName(member);
     const isPrivate = key.type === "PrivateName";
     // Check the key is not a computed expression or string literal.
@@ -1116,7 +1355,7 @@ export default class StatementParser extends ExpressionParser {
 
       // a normal method
       const isConstructor = this.isNonstaticConstructor(publicMethod);
-
+      let allowsDirectSuper = false;
       if (isConstructor) {
         publicMethod.kind = "constructor";
 
@@ -1132,6 +1371,7 @@ export default class StatementParser extends ExpressionParser {
           this.raise(key.start, "Duplicate constructor in the same class");
         }
         state.hadConstructor = true;
+        allowsDirectSuper = constructorAllowsSuper;
       }
 
       this.pushClassMethod(
@@ -1140,6 +1380,7 @@ export default class StatementParser extends ExpressionParser {
         false,
         false,
         isConstructor,
+        allowsDirectSuper,
       );
     } else if (this.isClassProperty()) {
       if (isPrivate) {
@@ -1147,13 +1388,14 @@ export default class StatementParser extends ExpressionParser {
       } else {
         this.pushClassProperty(classBody, publicProp);
       }
-    } else if (isSimple && key.name === "async" && !this.isLineTerminator()) {
+    } else if (
+      isSimple &&
+      key.name === "async" &&
+      !containsEsc &&
+      !this.isLineTerminator()
+    ) {
       // an async method
-      const isGenerator = this.match(tt.star);
-      if (isGenerator) {
-        this.expectPlugin("asyncGenerators");
-        this.next();
-      }
+      const isGenerator = this.eat(tt.star);
 
       method.kind = "method";
       // The so-called parsed name would have been "async": get the real name.
@@ -1181,12 +1423,14 @@ export default class StatementParser extends ExpressionParser {
           isGenerator,
           true,
           /* isConstructor */ false,
+          false,
         );
       }
     } else if (
       isSimple &&
       (key.name === "get" || key.name === "set") &&
-      !(this.isLineTerminator() && this.match(tt.star))
+      !containsEsc &&
+      !(this.match(tt.star) && this.isLineTerminator())
     ) {
       // `get\n*` is an uninitialized property named 'get' followed by a generator.
       // a getter or setter
@@ -1210,6 +1454,7 @@ export default class StatementParser extends ExpressionParser {
           false,
           false,
           /* isConstructor */ false,
+          false,
         );
       }
 
@@ -1276,6 +1521,7 @@ export default class StatementParser extends ExpressionParser {
     isGenerator: boolean,
     isAsync: boolean,
     isConstructor: boolean,
+    allowsDirectSuper: boolean,
   ): void {
     classBody.body.push(
       this.parseMethod(
@@ -1283,7 +1529,9 @@ export default class StatementParser extends ExpressionParser {
         isGenerator,
         isAsync,
         isConstructor,
+        allowsDirectSuper,
         "ClassMethod",
+        true,
       ),
     );
   }
@@ -1301,7 +1549,9 @@ export default class StatementParser extends ExpressionParser {
         isGenerator,
         isAsync,
         /* isConstructor */ false,
+        false,
         "ClassPrivateMethod",
+        true,
       ),
     );
   }
@@ -1320,13 +1570,16 @@ export default class StatementParser extends ExpressionParser {
   parseClassPrivateProperty(
     node: N.ClassPrivateProperty,
   ): N.ClassPrivateProperty {
-    const oldInMethod = this.state.inMethod;
-    this.state.inMethod = false;
     this.state.inClassProperty = true;
+
+    this.scope.enter(SCOPE_CLASS | SCOPE_SUPER);
+
     node.value = this.eat(tt.eq) ? this.parseMaybeAssign() : null;
     this.semicolon();
     this.state.inClassProperty = false;
-    this.state.inMethod = oldInMethod;
+
+    this.scope.exit();
+
     return this.finishNode(node, "ClassPrivateProperty");
   }
 
@@ -1335,10 +1588,10 @@ export default class StatementParser extends ExpressionParser {
       this.expectPlugin("classProperties");
     }
 
-    const oldInMethod = this.state.inMethod;
-    this.state.inMethod = false;
     this.state.inClassProperty = true;
 
+    this.scope.enter(SCOPE_CLASS | SCOPE_SUPER);
+
     if (this.match(tt.eq)) {
       this.expectPlugin("classProperties");
       this.next();
@@ -1348,7 +1601,8 @@ export default class StatementParser extends ExpressionParser {
     }
     this.semicolon();
     this.state.inClassProperty = false;
-    this.state.inMethod = oldInMethod;
+
+    this.scope.exit();
 
     return this.finishNode(node, "ClassProperty");
   }
@@ -1360,6 +1614,9 @@ export default class StatementParser extends ExpressionParser {
   ): void {
     if (this.match(tt.name)) {
       node.id = this.parseIdentifier();
+      if (isStatement) {
+        this.checkLVal(node.id, BIND_CLASS, undefined, "class name");
+      }
     } else {
       if (optionalId || !isStatement) {
         node.id = null;
@@ -1375,35 +1632,109 @@ export default class StatementParser extends ExpressionParser {
 
   // Parses module export declaration.
 
-  // TODO: better type. Node is an N.AnyExport.
-  parseExport(node: N.Node): N.Node {
-    // export * from '...'
-    if (this.shouldParseExportStar()) {
-      this.parseExportStar(node);
-      if (node.type === "ExportAllDeclaration") return node;
-    } else if (this.isExportDefaultSpecifier()) {
-      this.expectPlugin("exportDefaultFrom");
-      const specifier = this.startNode();
-      specifier.exported = this.parseIdentifier(true);
-      const specifiers = [this.finishNode(specifier, "ExportDefaultSpecifier")];
-      node.specifiers = specifiers;
-      if (this.match(tt.comma) && this.lookahead().type === tt.star) {
-        this.expect(tt.comma);
-        const specifier = this.startNode();
-        this.expect(tt.star);
-        this.expectContextual("as");
-        specifier.exported = this.parseIdentifier();
-        specifiers.push(this.finishNode(specifier, "ExportNamespaceSpecifier"));
-      } else {
-        this.parseExportSpecifiersMaybe(node);
-      }
+  parseExport(node: N.Node): N.AnyExport {
+    const hasDefault = this.maybeParseExportDefaultSpecifier(node);
+    const parseAfterDefault = !hasDefault || this.eat(tt.comma);
+    const hasStar = parseAfterDefault && this.eatExportStar(node);
+    const hasNamespace =
+      hasStar && this.maybeParseExportNamespaceSpecifier(node);
+    const parseAfterNamespace =
+      parseAfterDefault && (!hasNamespace || this.eat(tt.comma));
+    const isFromRequired = hasDefault || hasStar;
+
+    if (hasStar && !hasNamespace) {
+      if (hasDefault) this.unexpected();
       this.parseExportFrom(node, true);
-    } else if (this.eat(tt._default)) {
+
+      return this.finishNode(node, "ExportAllDeclaration");
+    }
+
+    const hasSpecifiers = this.maybeParseExportNamedSpecifiers(node);
+
+    if (
+      (hasDefault && parseAfterDefault && !hasStar && !hasSpecifiers) ||
+      (hasNamespace && parseAfterNamespace && !hasSpecifiers)
+    ) {
+      throw this.unexpected(null, tt.braceL);
+    }
+
+    let hasDeclaration;
+    if (isFromRequired || hasSpecifiers) {
+      hasDeclaration = false;
+      this.parseExportFrom(node, isFromRequired);
+    } else {
+      hasDeclaration = this.maybeParseExportDeclaration(node);
+    }
+
+    if (isFromRequired || hasSpecifiers || hasDeclaration) {
+      this.checkExport(node, true, false, !!node.source);
+      return this.finishNode(node, "ExportNamedDeclaration");
+    }
+
+    if (this.eat(tt._default)) {
       // export default ...
       node.declaration = this.parseExportDefaultExpression();
       this.checkExport(node, true, true);
+
       return this.finishNode(node, "ExportDefaultDeclaration");
-    } else if (this.shouldParseExportDeclaration()) {
+    }
+
+    throw this.unexpected(null, tt.braceL);
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  eatExportStar(node: N.Node): boolean {
+    return this.eat(tt.star);
+  }
+
+  maybeParseExportDefaultSpecifier(node: N.Node): boolean {
+    if (this.isExportDefaultSpecifier()) {
+      // export defaultObj ...
+      this.expectPlugin("exportDefaultFrom");
+      const specifier = this.startNode();
+      specifier.exported = this.parseIdentifier(true);
+      node.specifiers = [this.finishNode(specifier, "ExportDefaultSpecifier")];
+      return true;
+    }
+    return false;
+  }
+
+  maybeParseExportNamespaceSpecifier(node: N.Node): boolean {
+    if (this.isContextual("as")) {
+      if (!node.specifiers) node.specifiers = [];
+      this.expectPlugin("exportNamespaceFrom");
+
+      const specifier = this.startNodeAt(
+        this.state.lastTokStart,
+        this.state.lastTokStartLoc,
+      );
+
+      this.next();
+
+      specifier.exported = this.parseIdentifier(true);
+      node.specifiers.push(
+        this.finishNode(specifier, "ExportNamespaceSpecifier"),
+      );
+      return true;
+    }
+    return false;
+  }
+
+  maybeParseExportNamedSpecifiers(node: N.Node): boolean {
+    if (this.match(tt.braceL)) {
+      if (!node.specifiers) node.specifiers = [];
+      node.specifiers.push(...this.parseExportSpecifiers());
+
+      node.source = null;
+      node.declaration = null;
+
+      return true;
+    }
+    return false;
+  }
+
+  maybeParseExportDeclaration(node: N.Node): boolean {
+    if (this.shouldParseExportDeclaration()) {
       if (this.isContextual("async")) {
         const next = this.lookahead();
 
@@ -1416,32 +1747,29 @@ export default class StatementParser extends ExpressionParser {
       node.specifiers = [];
       node.source = null;
       node.declaration = this.parseExportDeclaration(node);
-    } else {
-      // export { x, y as z } [from '...']
-      node.declaration = null;
-      node.specifiers = this.parseExportSpecifiers();
-      this.parseExportFrom(node);
+
+      return true;
     }
-    this.checkExport(node, true);
-    return this.finishNode(node, "ExportNamedDeclaration");
+    return false;
   }
 
-  isAsyncFunction() {
+  isAsyncFunction(): boolean {
     if (!this.isContextual("async")) return false;
 
-    const { input, pos } = this.state;
+    const { pos } = this.state;
 
     skipWhiteSpace.lastIndex = pos;
-    const skip = skipWhiteSpace.exec(input);
+    const skip = skipWhiteSpace.exec(this.input);
 
     if (!skip || !skip.length) return false;
 
     const next = pos + skip[0].length;
 
     return (
-      !lineBreak.test(input.slice(pos, next)) &&
-      input.slice(next, next + 8) === "function" &&
-      (next + 8 === input.length || !isIdentifierChar(input.charAt(next + 8)))
+      !lineBreak.test(this.input.slice(pos, next)) &&
+      this.input.slice(next, next + 8) === "function" &&
+      (next + 8 === this.length ||
+        !isIdentifierChar(this.input.charCodeAt(next + 8)))
     );
   }
 
@@ -1450,13 +1778,17 @@ export default class StatementParser extends ExpressionParser {
 
     const isAsync = this.isAsyncFunction();
 
-    if (this.eat(tt._function) || isAsync) {
+    if (this.match(tt._function) || isAsync) {
+      this.next();
       if (isAsync) {
-        this.eatContextual("async");
-        this.expect(tt._function);
+        this.next();
       }
 
-      return this.parseFunction(expr, true, false, isAsync, true);
+      return this.parseFunction(
+        expr,
+        FUNC_STATEMENT | FUNC_NULLABLE_ID,
+        isAsync,
+      );
     } else if (this.match(tt._class)) {
       return this.parseClass(expr, true, true);
     } else if (this.match(tt.at)) {
@@ -1473,11 +1805,7 @@ export default class StatementParser extends ExpressionParser {
       }
       this.parseDecorators(false);
       return this.parseClass(expr, true, true);
-    } else if (
-      this.match(tt._let) ||
-      this.match(tt._const) ||
-      this.match(tt._var)
-    ) {
+    } else if (this.match(tt._const) || this.match(tt._var) || this.isLet()) {
       return this.raise(
         this.state.start,
         "Only expressions, functions or classes are allowed as the `default` export.",
@@ -1491,12 +1819,12 @@ export default class StatementParser extends ExpressionParser {
 
   // eslint-disable-next-line no-unused-vars
   parseExportDeclaration(node: N.ExportNamedDeclaration): ?N.Declaration {
-    return this.parseStatement(true);
+    return this.parseStatement(null);
   }
 
   isExportDefaultSpecifier(): boolean {
     if (this.match(tt.name)) {
-      return this.state.value !== "async";
+      return this.state.value !== "async" && this.state.value !== "let";
     }
 
     if (!this.match(tt._default)) {
@@ -1510,17 +1838,9 @@ export default class StatementParser extends ExpressionParser {
     );
   }
 
-  parseExportSpecifiersMaybe(node: N.ExportNamedDeclaration): void {
-    if (this.eat(tt.comma)) {
-      node.specifiers = node.specifiers.concat(this.parseExportSpecifiers());
-    }
-  }
-
   parseExportFrom(node: N.ExportNamedDeclaration, expect?: boolean): void {
     if (this.eatContextual("from")) {
-      node.source = this.match(tt.string)
-        ? this.parseExprAtom()
-        : this.unexpected();
+      node.source = this.parseImportSource();
       this.checkExport(node);
     } else {
       if (expect) {
@@ -1533,39 +1853,6 @@ export default class StatementParser extends ExpressionParser {
     this.semicolon();
   }
 
-  shouldParseExportStar(): boolean {
-    return this.match(tt.star);
-  }
-
-  parseExportStar(node: N.ExportNamedDeclaration): void {
-    this.expect(tt.star);
-
-    if (this.isContextual("as")) {
-      this.parseExportNamespace(node);
-    } else {
-      this.parseExportFrom(node, true);
-      this.finishNode(node, "ExportAllDeclaration");
-    }
-  }
-
-  parseExportNamespace(node: N.ExportNamedDeclaration): void {
-    this.expectPlugin("exportNamespaceFrom");
-
-    const specifier = this.startNodeAt(
-      this.state.lastTokStart,
-      this.state.lastTokStartLoc,
-    );
-
-    this.next();
-
-    specifier.exported = this.parseIdentifier(true);
-
-    node.specifiers = [this.finishNode(specifier, "ExportNamespaceSpecifier")];
-
-    this.parseExportSpecifiersMaybe(node);
-    this.parseExportFrom(node, true);
-  }
-
   shouldParseExportDeclaration(): boolean {
     if (this.match(tt.at)) {
       this.expectOnePlugin(["decorators", "decorators-legacy"]);
@@ -1586,17 +1873,18 @@ export default class StatementParser extends ExpressionParser {
     return (
       this.state.type.keyword === "var" ||
       this.state.type.keyword === "const" ||
-      this.state.type.keyword === "let" ||
       this.state.type.keyword === "function" ||
       this.state.type.keyword === "class" ||
+      this.isLet() ||
       this.isAsyncFunction()
     );
   }
 
   checkExport(
     node: N.ExportNamedDeclaration,
-    checkNames: ?boolean,
+    checkNames?: boolean,
     isDefault?: boolean,
+    isFrom?: boolean,
   ): void {
     if (checkNames) {
       // Check for duplicate exports
@@ -1607,6 +1895,19 @@ export default class StatementParser extends ExpressionParser {
         // Named exports
         for (const specifier of node.specifiers) {
           this.checkDuplicateExports(specifier, specifier.exported.name);
+          // $FlowIgnore
+          if (!isFrom && specifier.local) {
+            // check for keywords used as local names
+            this.checkReservedWord(
+              specifier.local.name,
+              specifier.local.start,
+              true,
+              false,
+            );
+            // check if export is defined
+            // $FlowIgnore
+            this.scope.checkLocalExport(specifier.local);
+          }
         }
       } else if (node.declaration) {
         // Exported declarations
@@ -1645,7 +1946,9 @@ export default class StatementParser extends ExpressionParser {
   }
 
   checkDeclaration(node: N.Pattern | N.ObjectProperty): void {
-    if (node.type === "ObjectPattern") {
+    if (node.type === "Identifier") {
+      this.checkDuplicateExports(node, node.name);
+    } else if (node.type === "ObjectPattern") {
       for (const prop of node.properties) {
         this.checkDeclaration(prop);
       }
@@ -1659,39 +1962,35 @@ export default class StatementParser extends ExpressionParser {
       this.checkDeclaration(node.value);
     } else if (node.type === "RestElement") {
       this.checkDeclaration(node.argument);
-    } else if (node.type === "Identifier") {
-      this.checkDuplicateExports(node, node.name);
+    } else if (node.type === "AssignmentPattern") {
+      this.checkDeclaration(node.left);
     }
   }
 
   checkDuplicateExports(
-    node: N.Identifier | N.ExportNamedDeclaration | N.ExportSpecifier,
+    node:
+      | N.Identifier
+      | N.ExportNamedDeclaration
+      | N.ExportSpecifier
+      | N.ExportDefaultSpecifier,
     name: string,
   ): void {
     if (this.state.exportedIdentifiers.indexOf(name) > -1) {
-      this.raiseDuplicateExportError(node, name);
+      throw this.raise(
+        node.start,
+        name === "default"
+          ? "Only one default export allowed per module."
+          : `\`${name}\` has already been exported. Exported identifiers must be unique.`,
+      );
     }
     this.state.exportedIdentifiers.push(name);
   }
 
-  raiseDuplicateExportError(
-    node: N.Identifier | N.ExportNamedDeclaration | N.ExportSpecifier,
-    name: string,
-  ): empty {
-    throw this.raise(
-      node.start,
-      name === "default"
-        ? "Only one default export allowed per module."
-        : `\`${name}\` has already been exported. Exported identifiers must be unique.`,
-    );
-  }
-
   // Parses a comma-separated list of module exports.
 
   parseExportSpecifiers(): Array<N.ExportSpecifier> {
     const nodes = [];
     let first = true;
-    let needsFrom;
 
     // export { x, y as z } [from '...']
     this.expect(tt.braceL);
@@ -1704,44 +2003,39 @@ export default class StatementParser extends ExpressionParser {
         if (this.eat(tt.braceR)) break;
       }
 
-      const isDefault = this.match(tt._default);
-      if (isDefault && !needsFrom) needsFrom = true;
-
       const node = this.startNode();
-      node.local = this.parseIdentifier(isDefault);
+      node.local = this.parseIdentifier(true);
       node.exported = this.eatContextual("as")
         ? this.parseIdentifier(true)
         : node.local.__clone();
       nodes.push(this.finishNode(node, "ExportSpecifier"));
     }
 
-    // https://github.com/ember-cli/ember-cli/pull/3739
-    if (needsFrom && !this.isContextual("from")) {
-      this.unexpected();
-    }
-
     return nodes;
   }
 
   // Parses import declaration.
 
-  parseImport(node: N.Node): N.ImportDeclaration | N.TsImportEqualsDeclaration {
+  parseImport(node: N.Node): N.AnyImport {
     // import '...'
-    if (this.match(tt.string)) {
-      node.specifiers = [];
-      node.source = this.parseExprAtom();
-    } else {
-      node.specifiers = [];
-      this.parseImportSpecifiers(node);
+    node.specifiers = [];
+    if (!this.match(tt.string)) {
+      const hasDefault = this.maybeParseDefaultImportSpecifier(node);
+      const parseNext = !hasDefault || this.eat(tt.comma);
+      const hasStar = parseNext && this.maybeParseStarImportSpecifier(node);
+      if (parseNext && !hasStar) this.parseNamedImportSpecifiers(node);
       this.expectContextual("from");
-      node.source = this.match(tt.string)
-        ? this.parseExprAtom()
-        : this.unexpected();
     }
+    node.source = this.parseImportSource();
     this.semicolon();
     return this.finishNode(node, "ImportDeclaration");
   }
 
+  parseImportSource(): N.StringLiteral {
+    if (!this.match(tt.string)) this.unexpected();
+    return this.parseExprAtom();
+  }
+
   // eslint-disable-next-line no-unused-vars
   shouldParseDefaultImport(node: N.ImportDeclaration): boolean {
     return this.match(tt.name);
@@ -1754,13 +2048,16 @@ export default class StatementParser extends ExpressionParser {
     contextDescription: string,
   ): void {
     specifier.local = this.parseIdentifier();
-    this.checkLVal(specifier.local, true, undefined, contextDescription);
+    this.checkLVal(
+      specifier.local,
+      BIND_LEXICAL,
+      undefined,
+      contextDescription,
+    );
     node.specifiers.push(this.finishNode(specifier, type));
   }
 
-  // Parses a comma-separated list of module imports.
-  parseImportSpecifiers(node: N.ImportDeclaration): void {
-    let first = true;
+  maybeParseDefaultImportSpecifier(node: N.ImportDeclaration): boolean {
     if (this.shouldParseDefaultImport(node)) {
       // import defaultObj, { x, y as z } from '...'
       this.parseImportSpecifierLocal(
@@ -1769,10 +2066,12 @@ export default class StatementParser extends ExpressionParser {
         "ImportDefaultSpecifier",
         "default import specifier",
       );
-
-      if (!this.eat(tt.comma)) return;
+      return true;
     }
+    return false;
+  }
 
+  maybeParseStarImportSpecifier(node: N.ImportDeclaration): boolean {
     if (this.match(tt.star)) {
       const specifier = this.startNode();
       this.next();
@@ -1784,10 +2083,13 @@ export default class StatementParser extends ExpressionParser {
         "ImportNamespaceSpecifier",
         "import namespace specifier",
       );
-
-      return;
+      return true;
     }
+    return false;
+  }
 
+  parseNamedImportSpecifiers(node: N.ImportDeclaration) {
+    let first = true;
     this.expect(tt.braceL);
     while (!this.eat(tt.braceR)) {
       if (first) {
@@ -1824,7 +2126,12 @@ export default class StatementParser extends ExpressionParser {
       );
       specifier.local = specifier.imported.__clone();
     }
-    this.checkLVal(specifier.local, true, undefined, "import specifier");
+    this.checkLVal(
+      specifier.local,
+      BIND_LEXICAL,
+      undefined,
+      "import specifier",
+    );
     node.specifiers.push(this.finishNode(specifier, "ImportSpecifier"));
   }
 }
diff --git a/packages/babel-parser/src/parser/util.js b/packages/babel-parser/src/parser/util.js
index d889982f8376..bd6139a2480a 100644
--- a/packages/babel-parser/src/parser/util.js
+++ b/packages/babel-parser/src/parser/util.js
@@ -3,7 +3,9 @@
 import { types as tt, type TokenType } from "../tokenizer/types";
 import Tokenizer from "../tokenizer";
 import type { Node } from "../types";
-import { lineBreak } from "../util/whitespace";
+import { lineBreak, skipWhiteSpace } from "../util/whitespace";
+
+const literal = /^('|")((?:\\?.)*?)\1/;
 
 // ## Parser utilities
 
@@ -25,7 +27,7 @@ export default class UtilParser extends Tokenizer {
 
   isLookaheadRelational(op: "<" | ">"): boolean {
     const l = this.lookahead();
-    return l.type == tt.relational && l.value == op;
+    return l.type === tt.relational && l.value === op;
   }
 
   // TODO
@@ -111,6 +113,13 @@ export default class UtilParser extends Tokenizer {
     this.eat(type) || this.unexpected(pos, type);
   }
 
+  // Throws if the current token and the prev one are separated by a space.
+  assertNoSpace(message: string = "Unexpected space."): void {
+    if (this.state.start > this.state.lastTokEnd) {
+      this.raise(this.state.lastTokEnd, message);
+    }
+  }
+
   // Raise an unexpected token error. Can take the expected token type
   // instead of a message string.
 
@@ -147,4 +156,45 @@ export default class UtilParser extends Tokenizer {
       );
     }
   }
+
+  checkYieldAwaitInDefaultParams() {
+    if (
+      this.state.yieldPos &&
+      (!this.state.awaitPos || this.state.yieldPos < this.state.awaitPos)
+    ) {
+      this.raise(
+        this.state.yieldPos,
+        "Yield cannot be used as name inside a generator function",
+      );
+    }
+    if (this.state.awaitPos) {
+      this.raise(
+        this.state.awaitPos,
+        "Await cannot be used as name inside an async function",
+      );
+    }
+  }
+
+  strictDirective(start: number): boolean {
+    for (;;) {
+      // Try to find string literal.
+      skipWhiteSpace.lastIndex = start;
+      // $FlowIgnore
+      start += skipWhiteSpace.exec(this.input)[0].length;
+      const match = literal.exec(this.input.slice(start));
+      if (!match) break;
+      if (match[2] === "use strict") return true;
+      start += match[0].length;
+
+      // Skip semicolon, if any.
+      skipWhiteSpace.lastIndex = start;
+      // $FlowIgnore
+      start += skipWhiteSpace.exec(this.input)[0].length;
+      if (this.input[start] === ";") {
+        start++;
+      }
+    }
+
+    return false;
+  }
 }
diff --git a/packages/babel-parser/src/plugin-utils.js b/packages/babel-parser/src/plugin-utils.js
index e378b0afda9f..c1cb6a6b7e92 100644
--- a/packages/babel-parser/src/plugin-utils.js
+++ b/packages/babel-parser/src/plugin-utils.js
@@ -38,7 +38,7 @@ export function getPluginOption(
   return null;
 }
 
-const PIPELINE_PROPOSALS = ["minimal"];
+const PIPELINE_PROPOSALS = ["minimal", "smart", "fsharp"];
 
 export function validatePlugins(plugins: PluginList) {
   if (hasPlugin(plugins, "decorators")) {
@@ -77,7 +77,7 @@ export function validatePlugins(plugins: PluginList) {
   ) {
     throw new Error(
       "'pipelineOperator' requires 'proposal' option whose value should be one of: " +
-        PIPELINE_PROPOSALS.join(", "),
+        PIPELINE_PROPOSALS.map(p => `'${p}'`).join(", "),
     );
   }
 }
@@ -88,12 +88,17 @@ import estree from "./plugins/estree";
 import flow from "./plugins/flow";
 import jsx from "./plugins/jsx";
 import typescript from "./plugins/typescript";
+import placeholders from "./plugins/placeholders";
 
-// NOTE: estree must load first; flow and typescript must load last.
-export const mixinPluginNames = ["estree", "jsx", "flow", "typescript"];
+// NOTE: order is important. estree must come first; placeholders must come last.
 export const mixinPlugins: { [name: string]: MixinPlugin } = {
   estree,
   jsx,
   flow,
   typescript,
+  placeholders,
 };
+
+export const mixinPluginNames: $ReadOnlyArray<string> = Object.keys(
+  mixinPlugins,
+);
diff --git a/packages/babel-parser/src/plugins/estree.js b/packages/babel-parser/src/plugins/estree.js
index 3da593f7d9f3..a407b8ac84ca 100644
--- a/packages/babel-parser/src/plugins/estree.js
+++ b/packages/babel-parser/src/plugins/estree.js
@@ -4,6 +4,7 @@ import { types as tt, TokenType } from "../tokenizer/types";
 import type Parser from "../parser";
 import * as N from "../types";
 import type { Pos, Position } from "../util/location";
+import { type BindingTypes, BIND_NONE } from "../util/scopeflags";
 
 function isSimpleProperty(node: N.Node): boolean {
   return (
@@ -104,7 +105,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     checkLVal(
       expr: N.Expression,
-      isBinding: ?boolean,
+      bindingType: BindingTypes = BIND_NONE,
       checkClashes: ?{ [key: string]: boolean },
       contextDescription: string,
     ): void {
@@ -113,28 +114,36 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           expr.properties.forEach(prop => {
             this.checkLVal(
               prop.type === "Property" ? prop.value : prop,
-              isBinding,
+              bindingType,
               checkClashes,
               "object destructuring pattern",
             );
           });
           break;
         default:
-          super.checkLVal(expr, isBinding, checkClashes, contextDescription);
+          super.checkLVal(expr, bindingType, checkClashes, contextDescription);
       }
     }
 
     checkPropClash(
-      prop: N.ObjectMember,
+      prop: N.ObjectMember | N.SpreadElement,
       propHash: { [key: string]: boolean },
     ): void {
-      if (prop.computed || !isSimpleProperty(prop)) return;
+      if (
+        prop.type === "SpreadElement" ||
+        prop.computed ||
+        prop.method ||
+        // $FlowIgnore
+        prop.shorthand
+      ) {
+        return;
+      }
 
       const key = prop.key;
       // It is either an Identifier or a String/NumericLiteral
       const name = key.type === "Identifier" ? key.name : String(key.value);
 
-      if (name === "__proto__") {
+      if (name === "__proto__" && prop.kind === "init") {
         if (propHash.proto) {
           this.raise(key.start, "Redefinition of __proto__ property");
         }
@@ -203,13 +212,16 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       isGenerator: boolean,
       isAsync: boolean,
       isConstructor: boolean,
+      allowsDirectSuper: boolean,
     ): void {
       this.parseMethod(
         method,
         isGenerator,
         isAsync,
         isConstructor,
-        "MethodDefinition",
+        allowsDirectSuper,
+        "ClassMethod",
+        true,
       );
       if (method.typeParameters) {
         // $FlowIgnore
@@ -255,8 +267,12 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return node;
     }
 
-    parseFunctionBody(node: N.Function, allowExpression: ?boolean): void {
-      super.parseFunctionBody(node, allowExpression);
+    parseFunctionBody(
+      node: N.Function,
+      allowExpression: ?boolean,
+      isMethod?: boolean = false,
+    ): void {
+      super.parseFunctionBody(node, allowExpression, isMethod);
       node.expression = node.body.type !== "BlockStatement";
     }
 
@@ -265,7 +281,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       isGenerator: boolean,
       isAsync: boolean,
       isConstructor: boolean,
+      allowDirectSuper: boolean,
       type: string,
+      inClassScope: boolean = false,
     ): T {
       let funcNode = this.startNode();
       funcNode.kind = node.kind; // provide kind, so super method correctly sets state
@@ -274,12 +292,16 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         isGenerator,
         isAsync,
         isConstructor,
-        "FunctionExpression",
+        allowDirectSuper,
+        type,
+        inClassScope,
       );
+      funcNode.type = "FunctionExpression";
       delete funcNode.kind;
       // $FlowIgnore
       node.value = funcNode;
 
+      type = type === "ClassMethod" ? "MethodDefinition" : type;
       return this.finishNode(node, type);
     }
 
@@ -300,7 +322,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       if (node) {
         node.type = "Property";
-        if (node.kind === "method") node.kind = "init";
+        if (((node: any): N.ClassMethod).kind === "method") node.kind = "init";
         node.shorthand = false;
       }
 
diff --git a/packages/babel-parser/src/plugins/flow.js b/packages/babel-parser/src/plugins/flow.js
index 4f574776dc07..024a21baa5ab 100644
--- a/packages/babel-parser/src/plugins/flow.js
+++ b/packages/babel-parser/src/plugins/flow.js
@@ -6,10 +6,19 @@ import * as N from "../types";
 import type { Options } from "../options";
 import type { Pos, Position } from "../util/location";
 import type State from "../tokenizer/state";
+import { types as tc } from "../tokenizer/context";
 import * as charCodes from "charcodes";
 import { isIteratorStart } from "../util/identifier";
-
-const primitiveTypes = [
+import {
+  functionFlags,
+  type BindingTypes,
+  BIND_NONE,
+  BIND_LEXICAL,
+  SCOPE_ARROW,
+  SCOPE_OTHER,
+} from "../util/scopeflags";
+
+const reservedTypes = [
   "any",
   "bool",
   "boolean",
@@ -23,6 +32,9 @@ const primitiveTypes = [
   "true",
   "typeof",
   "void",
+  "interface",
+  "extends",
+  "_",
 ];
 
 function isEsModuleType(bodyElement: N.Node): boolean {
@@ -83,12 +95,25 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return this.getPluginOption("flow", "all") || this.flowPragma === "flow";
     }
 
+    finishToken(type: TokenType, val: any): void {
+      if (
+        type !== tt.string &&
+        type !== tt.semi &&
+        type !== tt.interpreterDirective
+      ) {
+        if (this.flowPragma === undefined) {
+          this.flowPragma = null;
+        }
+      }
+      return super.finishToken(type, val);
+    }
+
     addComment(comment: N.Comment): void {
       if (this.flowPragma === undefined) {
         // Try to parse a flow pragma.
         const matches = FLOW_PRAGMA_REGEX.exec(comment.value);
         if (!matches) {
-          this.flowPragma = null;
+          // do nothing
         } else if (matches[1] === "flow") {
           this.flowPragma = "flow";
         } else if (matches[1] === "noflow") {
@@ -197,8 +222,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       id.typeAnnotation = this.finishNode(typeContainer, "TypeAnnotation");
 
-      this.finishNode(id, id.type);
-
+      this.resetEndLocation(id);
       this.semicolon();
 
       return this.finishNode(node, "DeclareFunction");
@@ -214,13 +238,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         return this.flowParseDeclareFunction(node);
       } else if (this.match(tt._var)) {
         return this.flowParseDeclareVariable(node);
-      } else if (this.isContextual("module")) {
-        if (this.lookahead().type === tt.dot) {
+      } else if (this.eatContextual("module")) {
+        if (this.match(tt.dot)) {
           return this.flowParseDeclareModuleExports(node);
         } else {
           if (insideModule) {
             this.unexpected(
-              null,
+              this.state.lastTokStart,
               "`declare module` cannot be used inside another `declare module`",
             );
           }
@@ -251,7 +275,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     flowParseDeclareModule(node: N.FlowDeclareModule): N.FlowDeclareModule {
-      this.next();
+      this.scope.enter(SCOPE_OTHER);
 
       if (this.match(tt.string)) {
         node.id = this.parseExprAtom();
@@ -266,14 +290,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         let bodyNode = this.startNode();
 
         if (this.match(tt._import)) {
-          const lookahead = this.lookahead();
-          if (lookahead.value !== "type" && lookahead.value !== "typeof") {
+          this.next();
+          if (!this.isContextual("type") && !this.match(tt._typeof)) {
             this.unexpected(
-              null,
+              this.state.lastTokStart,
               "Imports within a `declare module` body must always be `import type` or `import typeof`",
             );
           }
-          this.next();
           this.parseImport(bodyNode);
         } else {
           this.expectContextual(
@@ -286,6 +309,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
         body.push(bodyNode);
       }
+
+      this.scope.exit();
+
       this.expect(tt.braceR);
 
       this.finishNode(bodyNode, "BlockStatement");
@@ -340,7 +366,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       } else {
         if (
           this.match(tt._const) ||
-          this.match(tt._let) ||
+          this.isLet() ||
           ((this.isContextual("type") || this.isContextual("interface")) &&
             !insideModule)
         ) {
@@ -392,8 +418,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     flowParseDeclareModuleExports(
       node: N.FlowDeclareModuleExports,
     ): N.FlowDeclareModuleExports {
-      this.expectContextual("module");
-      this.expect(tt.dot);
+      this.next();
       this.expectContextual("exports");
       node.typeAnnotation = this.flowParseTypeAnnotation();
       this.semicolon();
@@ -406,7 +431,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     ): N.FlowDeclareTypeAlias {
       this.next();
       this.flowParseTypeAlias(node);
-      return this.finishNode(node, "DeclareTypeAlias");
+      // Don't do finishNode as we don't want to process comments twice
+      node.type = "DeclareTypeAlias";
+      return node;
     }
 
     flowParseDeclareOpaqueType(
@@ -414,7 +441,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     ): N.FlowDeclareOpaqueType {
       this.next();
       this.flowParseOpaqueType(node, true);
-      return this.finishNode(node, "DeclareOpaqueType");
+      // Don't do finishNode as we don't want to process comments twice
+      node.type = "DeclareOpaqueType";
+      return node;
     }
 
     flowParseDeclareInterface(
@@ -463,7 +492,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         } while (this.eat(tt.comma));
       }
 
-      node.body = this.flowParseObjectType(isClass, false, false, isClass);
+      node.body = this.flowParseObjectType({
+        allowStatic: isClass,
+        allowExact: false,
+        allowSpread: false,
+        allowProto: isClass,
+        allowInexact: false,
+      });
     }
 
     flowParseInterfaceExtends(): N.FlowInterfaceExtends {
@@ -484,9 +519,18 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return this.finishNode(node, "InterfaceDeclaration");
     }
 
+    checkNotUnderscore(word: string) {
+      if (word === "_") {
+        throw this.unexpected(
+          null,
+          "`_` is only allowed as a type argument to call or new",
+        );
+      }
+    }
+
     checkReservedType(word: string, startLoc: number) {
-      if (primitiveTypes.indexOf(word) > -1) {
-        this.raise(startLoc, `Cannot overwrite primitive type ${word}`);
+      if (reservedTypes.indexOf(word) > -1) {
+        this.raise(startLoc, `Cannot overwrite reserved type ${word}`);
       }
     }
 
@@ -499,6 +543,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     flowParseTypeAlias(node: N.FlowTypeAlias): N.FlowTypeAlias {
       node.id = this.flowParseRestrictedIdentifier();
+      this.scope.declareName(node.id.name, BIND_LEXICAL, node.id.start);
 
       if (this.isRelational("<")) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
@@ -518,6 +563,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     ): N.FlowOpaqueType {
       this.expectContextual("type");
       node.id = this.flowParseRestrictedIdentifier(/*liberal*/ true);
+      this.scope.declareName(node.id.name, BIND_LEXICAL, node.id.start);
 
       if (this.isRelational("<")) {
         node.typeParameters = this.flowParseTypeParameterDeclaration();
@@ -542,16 +588,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     // Type annotations
 
-    flowParseTypeParameter(
-      allowDefault?: boolean = true,
-      requireDefault?: boolean = false,
-    ): N.TypeParameter {
-      if (!allowDefault && requireDefault) {
-        throw new Error(
-          "Cannot disallow a default value (`allowDefault`) while also requiring it (`requireDefault`).",
-        );
-      }
-
+    flowParseTypeParameter(requireDefault?: boolean = false): N.TypeParameter {
       const nodeStart = this.state.start;
 
       const node = this.startNode();
@@ -564,12 +601,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       node.bound = ident.typeAnnotation;
 
       if (this.match(tt.eq)) {
-        if (allowDefault) {
-          this.eat(tt.eq);
-          node.default = this.flowParseType();
-        } else {
-          this.unexpected();
-        }
+        this.eat(tt.eq);
+        node.default = this.flowParseType();
       } else {
         if (requireDefault) {
           this.unexpected(
@@ -583,9 +616,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return this.finishNode(node, "TypeParameter");
     }
 
-    flowParseTypeParameterDeclaration(
-      allowDefault?: boolean = true,
-    ): N.TypeParameterDeclaration {
+    flowParseTypeParameterDeclaration(): N.TypeParameterDeclaration {
       const oldInType = this.state.inType;
       const node = this.startNode();
       node.params = [];
@@ -602,10 +633,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let defaultRequired = false;
 
       do {
-        const typeParameter = this.flowParseTypeParameter(
-          allowDefault,
-          defaultRequired,
-        );
+        const typeParameter = this.flowParseTypeParameter(defaultRequired);
 
         node.params.push(typeParameter);
 
@@ -632,12 +660,36 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       this.state.inType = true;
 
       this.expectRelational("<");
+      const oldNoAnonFunctionType = this.state.noAnonFunctionType;
+      this.state.noAnonFunctionType = false;
       while (!this.isRelational(">")) {
         node.params.push(this.flowParseType());
         if (!this.isRelational(">")) {
           this.expect(tt.comma);
         }
       }
+      this.state.noAnonFunctionType = oldNoAnonFunctionType;
+      this.expectRelational(">");
+
+      this.state.inType = oldInType;
+
+      return this.finishNode(node, "TypeParameterInstantiation");
+    }
+
+    flowParseTypeParameterInstantiationCallOrNew(): N.TypeParameterInstantiation {
+      const node = this.startNode();
+      const oldInType = this.state.inType;
+      node.params = [];
+
+      this.state.inType = true;
+
+      this.expectRelational("<");
+      while (!this.isRelational(">")) {
+        node.params.push(this.flowParseTypeOrImplicitInstantiation());
+        if (!this.isRelational(">")) {
+          this.expect(tt.comma);
+        }
+      }
       this.expectRelational(">");
 
       this.state.inType = oldInType;
@@ -656,7 +708,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         } while (this.eat(tt.comma));
       }
 
-      node.body = this.flowParseObjectType(false, false, false, false);
+      node.body = this.flowParseObjectType({
+        allowStatic: false,
+        allowExact: false,
+        allowSpread: false,
+        allowProto: false,
+        allowInexact: false,
+      });
 
       return this.finishNode(node, "InterfaceTypeAnnotation");
     }
@@ -722,9 +780,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       node.typeParameters = null;
 
       if (this.isRelational("<")) {
-        node.typeParameters = this.flowParseTypeParameterDeclaration(
-          /* allowDefault */ false,
-        );
+        node.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
       this.expect(tt.parenL);
@@ -754,12 +810,19 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return this.finishNode(node, "ObjectTypeCallProperty");
     }
 
-    flowParseObjectType(
+    flowParseObjectType({
+      allowStatic,
+      allowExact,
+      allowSpread,
+      allowProto,
+      allowInexact,
+    }: {
       allowStatic: boolean,
       allowExact: boolean,
       allowSpread: boolean,
       allowProto: boolean,
-    ): N.FlowObjectTypeAnnotation {
+      allowInexact: boolean,
+    }): N.FlowObjectTypeAnnotation {
       const oldInType = this.state.inType;
       this.state.inType = true;
 
@@ -772,6 +835,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       let endDelim;
       let exact;
+      let inexact = false;
       if (allowExact && this.match(tt.braceBarL)) {
         this.expect(tt.braceBarL);
         endDelim = tt.braceBarR;
@@ -852,16 +916,21 @@ export default (superClass: Class<Parser>): Class<Parser> =>
             }
           }
 
-          nodeStart.properties.push(
-            this.flowParseObjectTypeProperty(
-              node,
-              isStatic,
-              protoStart,
-              variance,
-              kind,
-              allowSpread,
-            ),
+          const propOrInexact = this.flowParseObjectTypeProperty(
+            node,
+            isStatic,
+            protoStart,
+            variance,
+            kind,
+            allowSpread,
+            allowInexact,
           );
+
+          if (propOrInexact === null) {
+            inexact = true;
+          } else {
+            nodeStart.properties.push(propOrInexact);
+          }
         }
 
         this.flowObjectTypeSemicolon();
@@ -869,6 +938,15 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       this.expect(endDelim);
 
+      /* The inexact flag should only be added on ObjectTypeAnnotations that
+       * are not the body of an interface, declare interface, or declare class.
+       * Since spreads are only allowed in objec types, checking that is
+       * sufficient here.
+       */
+      if (allowSpread) {
+        nodeStart.inexact = inexact;
+      }
+
       const out = this.finishNode(nodeStart, "ObjectTypeAnnotation");
 
       this.state.inType = oldInType;
@@ -883,7 +961,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       variance: ?N.FlowVariance,
       kind: string,
       allowSpread: boolean,
-    ): N.FlowObjectTypeProperty | N.FlowObjectTypeSpreadProperty {
+      allowInexact: boolean,
+    ): (N.FlowObjectTypeProperty | N.FlowObjectTypeSpreadProperty) | null {
       if (this.match(tt.ellipsis)) {
         if (!allowSpread) {
           this.unexpected(
@@ -901,8 +980,30 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           );
         }
         this.expect(tt.ellipsis);
-        node.argument = this.flowParseType();
+        const isInexactToken = this.eat(tt.comma) || this.eat(tt.semi);
+
+        if (this.match(tt.braceR)) {
+          if (allowInexact) return null;
+          this.unexpected(
+            null,
+            "Explicit inexact syntax is only allowed inside inexact objects",
+          );
+        }
+
+        if (this.match(tt.braceBarR)) {
+          this.unexpected(
+            null,
+            "Explicit inexact syntax cannot appear inside an explicit exact object type",
+          );
+        }
 
+        if (isInexactToken) {
+          this.unexpected(
+            null,
+            "Explicit inexact syntax must appear at the end of an inexact object",
+          );
+        }
+        node.argument = this.flowParseType();
         return this.finishNode(node, "ObjectTypeSpreadProperty");
       } else {
         node.key = this.flowParseObjectPropertyKey();
@@ -1030,7 +1131,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       node.types = [];
       this.expect(tt.bracketL);
       // We allow trailing commas
-      while (this.state.pos < this.input.length && !this.match(tt.bracketR)) {
+      while (this.state.pos < this.length && !this.match(tt.bracketR)) {
         node.types.push(this.flowParseType());
         if (this.match(tt.bracketR)) break;
         this.expect(tt.comma);
@@ -1096,9 +1197,6 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         case "any":
           return this.finishNode(node, "AnyTypeAnnotation");
 
-        case "void":
-          return this.finishNode(node, "VoidTypeAnnotation");
-
         case "bool":
         case "boolean":
           return this.finishNode(node, "BooleanTypeAnnotation");
@@ -1116,6 +1214,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           return this.finishNode(node, "StringTypeAnnotation");
 
         default:
+          this.checkNotUnderscore(id.name);
           return this.flowParseGenericType(startPos, startLoc, id);
       }
     }
@@ -1146,19 +1245,32 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           );
 
         case tt.braceL:
-          return this.flowParseObjectType(false, false, true, false);
+          return this.flowParseObjectType({
+            allowStatic: false,
+            allowExact: false,
+            allowSpread: true,
+            allowProto: false,
+            allowInexact: true,
+          });
 
         case tt.braceBarL:
-          return this.flowParseObjectType(false, true, true, false);
+          return this.flowParseObjectType({
+            allowStatic: false,
+            allowExact: true,
+            allowSpread: true,
+            allowProto: false,
+            allowInexact: false,
+          });
 
         case tt.bracketL:
-          return this.flowParseTupleType();
+          this.state.noAnonFunctionType = false;
+          type = this.flowParseTupleType();
+          this.state.noAnonFunctionType = oldNoAnonFunctionType;
+          return type;
 
         case tt.relational:
           if (this.state.value === "<") {
-            node.typeParameters = this.flowParseTypeParameterDeclaration(
-              /* allowDefault */ false,
-            );
+            node.typeParameters = this.flowParseTypeParameterDeclaration();
             this.expect(tt.parenL);
             tmp = this.flowParseFunctionTypeParams();
             node.params = tmp.params;
@@ -1243,15 +1355,27 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         case tt.plusMin:
           if (this.state.value === "-") {
             this.next();
-            if (!this.match(tt.num)) {
-              this.unexpected(null, `Unexpected token, expected "number"`);
+            if (this.match(tt.num)) {
+              return this.parseLiteral(
+                -this.state.value,
+                "NumberLiteralTypeAnnotation",
+                node.start,
+                node.loc.start,
+              );
             }
 
-            return this.parseLiteral(
-              -this.state.value,
-              "NumberLiteralTypeAnnotation",
-              node.start,
-              node.loc.start,
+            if (this.match(tt.bigint)) {
+              return this.parseLiteral(
+                -this.state.value,
+                "BigIntLiteralTypeAnnotation",
+                node.start,
+                node.loc.start,
+              );
+            }
+
+            this.unexpected(
+              null,
+              `Unexpected token, expected "number" or "bigint"`,
             );
           }
 
@@ -1262,6 +1386,16 @@ export default (superClass: Class<Parser>): Class<Parser> =>
             "NumberLiteralTypeAnnotation",
           );
 
+        case tt.bigint:
+          return this.parseLiteral(
+            this.state.value,
+            "BigIntLiteralTypeAnnotation",
+          );
+
+        case tt._void:
+          this.next();
+          return this.finishNode(node, "VoidTypeAnnotation");
+
         case tt._null:
           this.next();
           return this.finishNode(node, "NullLiteralTypeAnnotation");
@@ -1277,6 +1411,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         default:
           if (this.state.type.keyword === "typeof") {
             return this.flowParseTypeofType();
+          } else if (this.state.type.keyword) {
+            const label = this.state.type.label;
+            this.next();
+            return super.createIdentifier(node, label);
           }
       }
 
@@ -1287,7 +1425,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       const startPos = this.state.start,
         startLoc = this.state.startLoc;
       let type = this.flowParsePrimaryType();
-      while (!this.canInsertSemicolon() && this.match(tt.bracketL)) {
+      while (this.match(tt.bracketL) && !this.canInsertSemicolon()) {
         const node = this.startNodeAt(startPos, startLoc);
         node.elementType = type;
         this.expect(tt.bracketL);
@@ -1359,6 +1497,17 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       return type;
     }
 
+    flowParseTypeOrImplicitInstantiation(): N.FlowTypeAnnotation {
+      if (this.state.type === tt.name && this.state.value === "_") {
+        const startPos = this.state.start;
+        const startLoc = this.state.startLoc;
+        const node = this.parseIdentifier();
+        return this.flowParseGenericType(startPos, startLoc, node);
+      } else {
+        return this.flowParseType();
+      }
+    }
+
     flowParseTypeAnnotation(): N.FlowTypeAnnotation {
       const node = this.startNode();
       node.typeAnnotation = this.flowParseTypeInitialiser();
@@ -1373,7 +1522,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         : this.flowParseRestrictedIdentifier();
       if (this.match(tt.colon)) {
         ident.typeAnnotation = this.flowParseTypeAnnotation();
-        this.finishNode(ident, ident.type);
+        this.resetEndLocation(ident);
       }
       return ident;
     }
@@ -1381,12 +1530,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     typeCastToParameter(node: N.Node): N.Node {
       node.expression.typeAnnotation = node.typeAnnotation;
 
-      return this.finishNodeAt(
+      this.resetEndLocation(
         node.expression,
-        node.expression.type,
         node.typeAnnotation.end,
         node.typeAnnotation.loc.end,
       );
+
+      return node.expression;
     }
 
     flowParseVariance(): ?N.FlowVariance {
@@ -1408,23 +1558,26 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     // Overrides
     // ==================================
 
-    parseFunctionBody(node: N.Function, allowExpressionBody: ?boolean): void {
+    parseFunctionBody(
+      node: N.Function,
+      allowExpressionBody: ?boolean,
+      isMethod?: boolean = false,
+    ): void {
       if (allowExpressionBody) {
         return this.forwardNoArrowParamsConversionAt(node, () =>
-          super.parseFunctionBody(node, true),
+          super.parseFunctionBody(node, true, isMethod),
         );
       }
 
-      return super.parseFunctionBody(node, false);
+      return super.parseFunctionBody(node, false, isMethod);
     }
 
     parseFunctionBodyAndFinish(
       node: N.BodilessFunctionOrMethodBase,
       type: string,
-      allowExpressionBody?: boolean,
+      isMethod?: boolean = false,
     ): void {
-      // For arrow functions, `parseArrow` handles the return type itself.
-      if (!allowExpressionBody && this.match(tt.colon)) {
+      if (this.match(tt.colon)) {
         const typeNode = this.startNode();
 
         [
@@ -1439,11 +1592,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
           : null;
       }
 
-      super.parseFunctionBodyAndFinish(node, type, allowExpressionBody);
+      super.parseFunctionBodyAndFinish(node, type, isMethod);
     }
 
     // interfaces
-    parseStatement(declaration: boolean, topLevel?: boolean): N.Statement {
+    parseStatement(context: ?string, topLevel?: boolean): N.Statement {
       // strict mode handling of `interface` since it's a reserved word
       if (
         this.state.strict &&
@@ -1454,7 +1607,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         this.next();
         return this.flowParseInterface(node);
       } else {
-        const stmt = super.parseStatement(declaration, topLevel);
+        const stmt = super.parseStatement(context, topLevel);
         // We will parse a flow pragma in any comment before the first statement.
         if (this.flowPragma === undefined && !this.isValidDirective(stmt)) {
           this.flowPragma = null;
@@ -1508,7 +1661,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         this.match(tt.name) &&
         (this.state.value === "type" ||
           this.state.value === "interface" ||
-          this.state.value == "opaque")
+          this.state.value === "opaque")
       ) {
         return false;
       }
@@ -1637,8 +1790,11 @@ export default (superClass: Class<Parser>): Class<Parser> =>
               true,
               "arrow function parameters",
             );
+            // Enter scope, as checkParams defines bindings
+            this.scope.enter(functionFlags(false, false) | SCOPE_ARROW);
             // Use super's method to force the parameters to be checked
-            super.checkFunctionNameAndParams(node, true);
+            super.checkParams(node, false, true);
+            this.scope.exit();
           } else {
             arrows.push(node);
           }
@@ -1695,6 +1851,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       node = super.parseParenItem(node, startPos, startLoc);
       if (this.eat(tt.question)) {
         node.optional = true;
+        // Include questionmark in location of node
+        // Don't use this.finishNode() as otherwise we might process comments twice and
+        // include already consumed parens
+        this.resetEndLocation(node);
       }
 
       if (this.match(tt.colon)) {
@@ -1724,15 +1884,15 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       super.assertModuleNodeAllowed(node);
     }
 
-    parseExport(node: N.ExportNamedDeclaration): N.ExportNamedDeclaration {
-      node = super.parseExport(node);
+    parseExport(node: N.Node): N.AnyExport {
+      const decl = super.parseExport(node);
       if (
-        node.type === "ExportNamedDeclaration" ||
-        node.type === "ExportAllDeclaration"
+        decl.type === "ExportNamedDeclaration" ||
+        decl.type === "ExportAllDeclaration"
       ) {
-        node.exportKind = node.exportKind || "value";
+        decl.exportKind = decl.exportKind || "value";
       }
-      return node;
+      return decl;
     }
 
     parseExportDeclaration(node: N.ExportNamedDeclaration): ?N.Declaration {
@@ -1768,27 +1928,26 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
     }
 
-    shouldParseExportStar(): boolean {
-      return (
-        super.shouldParseExportStar() ||
-        (this.isContextual("type") && this.lookahead().type === tt.star)
-      );
-    }
+    eatExportStar(node: N.Node): boolean {
+      if (super.eatExportStar(...arguments)) return true;
 
-    parseExportStar(node: N.ExportNamedDeclaration): void {
-      if (this.eatContextual("type")) {
+      if (this.isContextual("type") && this.lookahead().type === tt.star) {
         node.exportKind = "type";
+        this.next();
+        this.next();
+        return true;
       }
 
-      return super.parseExportStar(node);
+      return false;
     }
 
-    parseExportNamespace(node: N.ExportNamedDeclaration) {
-      if (node.exportKind === "type") {
-        this.unexpected();
+    maybeParseExportNamespaceSpecifier(node: N.Node): boolean {
+      const pos = this.state.start;
+      const hasNamespace = super.maybeParseExportNamespaceSpecifier(node);
+      if (hasNamespace && node.exportKind === "type") {
+        this.unexpected(pos);
       }
-
-      return super.parseExportNamespace(node);
+      return hasNamespace;
     }
 
     parseClassId(node: N.Class, isStatement: boolean, optionalId: ?boolean) {
@@ -1798,20 +1957,12 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
     }
 
-    // don't consider `void` to be a keyword as then it'll use the void token type
-    // and set startExpr
-    isKeyword(name: string): boolean {
-      if (this.state.inType && name === "void") {
-        return false;
-      } else {
-        return super.isKeyword(name);
-      }
-    }
-
     // ensure that inside flow types, we bypass the jsx parser plugin
-    readToken(code: number): void {
+    getTokenFromCode(code: number): void {
       const next = this.input.charCodeAt(this.state.pos + 1);
-      if (
+      if (code === charCodes.leftCurlyBrace && next === charCodes.verticalBar) {
+        return this.finishOp(tt.braceBarL, 2);
+      } else if (
         this.state.inType &&
         (code === charCodes.greaterThan || code === charCodes.lessThan)
       ) {
@@ -1820,7 +1971,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         this.state.isIterator = true;
         return super.readWord();
       } else {
-        return super.readToken(code);
+        return super.getTokenFromCode(code);
       }
     }
 
@@ -1859,50 +2010,36 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     // type casts that we've found that are illegal in this context
     toReferencedList(
       exprList: $ReadOnlyArray<?N.Expression>,
+      isParenthesizedExpr?: boolean,
     ): $ReadOnlyArray<?N.Expression> {
       for (let i = 0; i < exprList.length; i++) {
         const expr = exprList[i];
-        if (expr && expr._exprListItem && expr.type === "TypeCastExpression") {
-          this.raise(expr.start, "Unexpected type cast");
+        if (
+          expr &&
+          expr.type === "TypeCastExpression" &&
+          (!expr.extra || !expr.extra.parenthesized) &&
+          (exprList.length > 1 || !isParenthesizedExpr)
+        ) {
+          this.raise(
+            expr.typeAnnotation.start,
+            "The type cast expression is expected to be wrapped with parenthesis",
+          );
         }
       }
 
       return exprList;
     }
 
-    // parse an item inside a expression list eg. `(NODE, NODE)` where NODE represents
-    // the position where this function is called
-    parseExprListItem(
-      allowEmpty: ?boolean,
-      refShorthandDefaultPos: ?Pos,
-      refNeedsArrowPos: ?Pos,
-    ): ?N.Expression {
-      const container = this.startNode();
-      const node = super.parseExprListItem(
-        allowEmpty,
-        refShorthandDefaultPos,
-        refNeedsArrowPos,
-      );
-      if (this.match(tt.colon)) {
-        container._exprListItem = true;
-        container.expression = node;
-        container.typeAnnotation = this.flowParseTypeAnnotation();
-        return this.finishNode(container, "TypeCastExpression");
-      } else {
-        return node;
-      }
-    }
-
     checkLVal(
       expr: N.Expression,
-      isBinding: ?boolean,
+      bindingType: BindingTypes = BIND_NONE,
       checkClashes: ?{ [key: string]: boolean },
       contextDescription: string,
     ): void {
       if (expr.type !== "TypeCastExpression") {
         return super.checkLVal(
           expr,
-          isBinding,
+          bindingType,
           checkClashes,
           contextDescription,
         );
@@ -1947,15 +2084,14 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       isGenerator: boolean,
       isAsync: boolean,
       isConstructor: boolean,
+      allowsDirectSuper: boolean,
     ): void {
       if ((method: $FlowFixMe).variance) {
         this.unexpected((method: $FlowFixMe).variance.start);
       }
       delete (method: $FlowFixMe).variance;
       if (this.isRelational("<")) {
-        method.typeParameters = this.flowParseTypeParameterDeclaration(
-          /* allowDefault */ false,
-        );
+        method.typeParameters = this.flowParseTypeParameterDeclaration();
       }
 
       super.pushClassMethod(
@@ -1964,6 +2100,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         isGenerator,
         isAsync,
         isConstructor,
+        allowsDirectSuper,
       );
     }
 
@@ -2036,9 +2173,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
       // method shorthand
       if (this.isRelational("<")) {
-        typeParameters = this.flowParseTypeParameterDeclaration(
-          /* allowDefault */ false,
-        );
+        typeParameters = this.flowParseTypeParameterDeclaration();
         if (!this.match(tt.parenL)) this.unexpected();
       }
 
@@ -2073,7 +2208,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       if (this.match(tt.colon)) {
         param.typeAnnotation = this.flowParseTypeAnnotation();
       }
-      this.finishNode(param, param.type);
+      this.resetEndLocation(param);
       return param;
     }
 
@@ -2117,12 +2252,17 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         ? this.flowParseRestrictedIdentifier(true)
         : this.parseIdentifier();
 
-      this.checkLVal(specifier.local, true, undefined, contextDescription);
+      this.checkLVal(
+        specifier.local,
+        BIND_LEXICAL,
+        undefined,
+        contextDescription,
+      );
       node.specifiers.push(this.finishNode(specifier, type));
     }
 
     // parse typeof and type imports
-    parseImportSpecifiers(node: N.ImportDeclaration): void {
+    maybeParseDefaultImportSpecifier(node: N.ImportDeclaration): boolean {
       node.importKind = "value";
 
       let kind = null;
@@ -2149,7 +2289,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         }
       }
 
-      super.parseImportSpecifiers(node);
+      return super.maybeParseDefaultImportSpecifier(node);
     }
 
     // parse import-type/typeof shorthand
@@ -2227,28 +2367,34 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         );
       }
 
-      this.checkLVal(specifier.local, true, undefined, "import specifier");
+      this.checkLVal(
+        specifier.local,
+        BIND_LEXICAL,
+        undefined,
+        "import specifier",
+      );
       node.specifiers.push(this.finishNode(specifier, "ImportSpecifier"));
     }
 
     // parse function type parameters - function foo<T>() {}
-    parseFunctionParams(node: N.Function): void {
+    parseFunctionParams(node: N.Function, allowModifiers?: boolean): void {
       // $FlowFixMe
       const kind = node.kind;
       if (kind !== "get" && kind !== "set" && this.isRelational("<")) {
-        node.typeParameters = this.flowParseTypeParameterDeclaration(
-          /* allowDefault */ false,
-        );
+        node.typeParameters = this.flowParseTypeParameterDeclaration();
       }
-      super.parseFunctionParams(node);
+      super.parseFunctionParams(node, allowModifiers);
     }
 
     // parse flow type annotations on variable declarator heads - let foo: string = bar
-    parseVarHead(decl: N.VariableDeclarator): void {
-      super.parseVarHead(decl);
+    parseVarId(
+      decl: N.VariableDeclarator,
+      kind: "var" | "let" | "const",
+    ): void {
+      super.parseVarId(decl, kind);
       if (this.match(tt.colon)) {
         decl.id.typeAnnotation = this.flowParseTypeAnnotation();
-        this.finishNode(decl.id, decl.id.type);
+        this.resetEndLocation(decl.id); // set end position to end of type
       }
     }
 
@@ -2289,7 +2435,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       refNeedsArrowPos?: ?Pos,
     ): N.Expression {
       let jsxError = null;
-      if (tt.jsxTagStart && this.match(tt.jsxTagStart)) {
+      if (
+        this.hasPlugin("jsx") &&
+        (this.match(tt.jsxTagStart) || this.isRelational("<"))
+      ) {
         const state = this.state.clone();
         try {
           return super.parseMaybeAssign(
@@ -2305,7 +2454,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
             // Remove `tc.j_expr` and `tc.j_oTag` from context added
             // by parsing `jsxTagStart` to stop the JSX plugin from
             // messing with the tokens
-            this.state.context.length -= 2;
+            const cLength = this.state.context.length;
+            if (this.state.context[cLength - 1] === tc.j_oTag) {
+              this.state.context.length -= 2;
+            }
 
             jsxError = err;
           } else {
@@ -2410,8 +2562,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
     }
 
-    checkFunctionNameAndParams(
+    checkParams(
       node: N.Function,
+      allowDuplicates: boolean,
       isArrowFunction: ?boolean,
     ): void {
       if (
@@ -2421,7 +2574,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         return;
       }
 
-      return super.checkFunctionNameAndParams(node, isArrowFunction);
+      return super.checkParams(node, allowDuplicates, isArrowFunction);
     }
 
     parseParenAndDistinguishExpression(canBeArrow: boolean): N.Expression {
@@ -2481,6 +2634,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       startLoc: Position,
       noCalls: ?boolean,
       subscriptState: N.ParseSubscriptState,
+      maybeAsyncArrow: boolean,
     ): N.Expression {
       if (this.match(tt.questionDot) && this.isLookaheadRelational("<")) {
         this.expectPlugin("optionalChaining");
@@ -2510,7 +2664,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         node.callee = base;
         const state = this.state.clone();
         try {
-          node.typeArguments = this.flowParseTypeParameterInstantiation();
+          node.typeArguments = this.flowParseTypeParameterInstantiationCallOrNew();
           this.expect(tt.parenL);
           node.arguments = this.parseCallExpressionArguments(tt.parenR, false);
           if (subscriptState.optionalChainMember) {
@@ -2533,6 +2687,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         startLoc,
         noCalls,
         subscriptState,
+        maybeAsyncArrow,
       );
     }
 
@@ -2541,7 +2696,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       if (this.shouldParseTypes() && this.isRelational("<")) {
         const state = this.state.clone();
         try {
-          targs = this.flowParseTypeParameterInstantiation();
+          targs = this.flowParseTypeParameterInstantiationCallOrNew();
         } catch (e) {
           if (e instanceof SyntaxError) {
             this.state = state;
@@ -2585,21 +2740,44 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       super.readToken_mult_modulo(code);
     }
 
-    skipBlockComment(): void {
+    readToken_pipe_amp(code: number): void {
+      const next = this.input.charCodeAt(this.state.pos + 1);
       if (
-        this.hasPlugin("flow") &&
-        this.hasPlugin("flowComments") &&
-        this.skipFlowComment()
+        code === charCodes.verticalBar &&
+        next === charCodes.rightCurlyBrace
       ) {
+        // '|}'
+        this.finishOp(tt.braceBarR, 2);
+        return;
+      }
+
+      super.readToken_pipe_amp(code);
+    }
+
+    parseTopLevel(file: N.File, program: N.Program): N.File {
+      const fileNode = super.parseTopLevel(file, program);
+      if (this.state.hasFlowComment) {
+        this.unexpected(null, "Unterminated flow-comment");
+      }
+      return fileNode;
+    }
+
+    skipBlockComment(): void {
+      if (this.hasPlugin("flowComments") && this.skipFlowComment()) {
+        if (this.state.hasFlowComment) {
+          this.unexpected(
+            null,
+            "Cannot have a flow comment inside another flow comment",
+          );
+        }
         this.hasFlowCommentCompletion();
         this.state.pos += this.skipFlowComment();
         this.state.hasFlowComment = true;
         return;
       }
 
-      let end;
-      if (this.hasPlugin("flow") && this.state.hasFlowComment) {
-        end = this.input.indexOf("*-/", (this.state.pos += 2));
+      if (this.state.hasFlowComment) {
+        const end = this.input.indexOf("*-/", (this.state.pos += 2));
         if (end === -1) this.raise(this.state.pos - 2, "Unterminated comment");
         this.state.pos = end + 3;
         return;
@@ -2609,17 +2787,32 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     skipFlowComment(): number | boolean {
-      const ch2 = this.input.charCodeAt(this.state.pos + 2);
-      const ch3 = this.input.charCodeAt(this.state.pos + 3);
+      const { pos } = this.state;
+      let shiftToFirstNonWhiteSpace = 2;
+      while (
+        [charCodes.space, charCodes.tab].includes(
+          this.input.charCodeAt(pos + shiftToFirstNonWhiteSpace),
+        )
+      ) {
+        shiftToFirstNonWhiteSpace++;
+      }
+
+      const ch2 = this.input.charCodeAt(shiftToFirstNonWhiteSpace + pos);
+      const ch3 = this.input.charCodeAt(shiftToFirstNonWhiteSpace + pos + 1);
 
       if (ch2 === charCodes.colon && ch3 === charCodes.colon) {
-        return 4; // check for /*::
+        return shiftToFirstNonWhiteSpace + 2; // check for /*::
       }
-      if (this.input.slice(this.state.pos + 2, 14) === "flow-include") {
-        return 14; // check for /*flow-include
+      if (
+        this.input.slice(
+          shiftToFirstNonWhiteSpace + pos,
+          shiftToFirstNonWhiteSpace + pos + 12,
+        ) === "flow-include"
+      ) {
+        return shiftToFirstNonWhiteSpace + 12; // check for /*flow-include
       }
       if (ch2 === charCodes.colon && ch3 !== charCodes.colon) {
-        return 2; // check for /*:, advance only 2 steps
+        return shiftToFirstNonWhiteSpace; // check for /*:, advance up to :
       }
       return false;
     }
diff --git a/packages/babel-parser/src/plugins/jsx/index.js b/packages/babel-parser/src/plugins/jsx/index.js
index 0d32ea98d11f..5d3c2ec2ece1 100644
--- a/packages/babel-parser/src/plugins/jsx/index.js
+++ b/packages/babel-parser/src/plugins/jsx/index.js
@@ -14,6 +14,8 @@ import { isNewLine } from "../../util/whitespace";
 const HEX_NUMBER = /^[\da-fA-F]+$/;
 const DECIMAL_NUMBER = /^\d+$/;
 
+// Be aware that this file is always executed and not only when the plugin is enabled.
+// Therefore this contexts and tokens do always exist.
 tc.j_oTag = new TokContext("<tag", false);
 tc.j_cTag = new TokContext("</tag", false);
 tc.j_expr = new TokContext("<tag>...</tag>", true, true);
@@ -79,7 +81,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let out = "";
       let chunkStart = this.state.pos;
       for (;;) {
-        if (this.state.pos >= this.input.length) {
+        if (this.state.pos >= this.length) {
           this.raise(this.state.start, "Unterminated JSX contents");
         }
 
@@ -93,7 +95,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
                 ++this.state.pos;
                 return this.finishToken(tt.jsxTagStart);
               }
-              return this.getTokenFromCode(ch);
+              return super.getTokenFromCode(ch);
             }
             out += this.input.slice(chunkStart, this.state.pos);
             return this.finishToken(tt.jsxText, out);
@@ -139,7 +141,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let out = "";
       let chunkStart = ++this.state.pos;
       for (;;) {
-        if (this.state.pos >= this.input.length) {
+        if (this.state.pos >= this.length) {
           this.raise(this.state.start, "Unterminated string constant");
         }
 
@@ -168,7 +170,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let ch = this.input[this.state.pos];
 
       const startPos = ++this.state.pos;
-      while (this.state.pos < this.input.length && count++ < 10) {
+      while (this.state.pos < this.length && count++ < 10) {
         ch = this.input[this.state.pos++];
         if (ch === ";") {
           if (str[0] === "#") {
@@ -267,7 +269,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       let node;
       switch (this.state.type) {
         case tt.braceL:
-          node = this.jsxParseExpressionContainer();
+          node = this.startNode();
+          this.next();
+          node = this.jsxParseExpressionContainer(node);
           if (node.expression.type === "JSXEmptyExpression") {
             throw this.raise(
               node.start,
@@ -308,10 +312,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     // Parse JSX spread child
 
-    jsxParseSpreadChild(): N.JSXSpreadChild {
-      const node = this.startNode();
-      this.expect(tt.braceL);
-      this.expect(tt.ellipsis);
+    jsxParseSpreadChild(node: N.JSXSpreadChild): N.JSXSpreadChild {
+      this.next(); // ellipsis
       node.expression = this.parseExpression();
       this.expect(tt.braceR);
 
@@ -320,9 +322,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     // Parses JSX expression enclosed into curly brackets.
 
-    jsxParseExpressionContainer(): N.JSXExpressionContainer {
-      const node = this.startNode();
-      this.next();
+    jsxParseExpressionContainer(
+      node: N.JSXExpressionContainer,
+    ): N.JSXExpressionContainer {
       if (this.match(tt.braceR)) {
         node.expression = this.jsxParseEmptyExpression();
       } else {
@@ -421,15 +423,17 @@ export default (superClass: Class<Parser>): Class<Parser> =>
               children.push(this.parseExprAtom());
               break;
 
-            case tt.braceL:
-              if (this.lookahead().type === tt.ellipsis) {
-                children.push(this.jsxParseSpreadChild());
+            case tt.braceL: {
+              const node = this.startNode();
+              this.next();
+              if (this.match(tt.ellipsis)) {
+                children.push(this.jsxParseSpreadChild(node));
               } else {
-                children.push(this.jsxParseExpressionContainer());
+                children.push(this.jsxParseExpressionContainer(node));
               }
 
               break;
-
+            }
             // istanbul ignore next - should never happen
             default:
               throw this.unexpected();
@@ -506,13 +510,21 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         return this.parseLiteral(this.state.value, "JSXText");
       } else if (this.match(tt.jsxTagStart)) {
         return this.jsxParseElement();
+      } else if (
+        this.isRelational("<") &&
+        this.input.charCodeAt(this.state.pos) !== charCodes.exclamationMark
+      ) {
+        // In case we encounter an lt token here it will always be the start of
+        // jsx as the lt sign is not allowed in places that expect an expression
+        this.finishToken(tt.jsxTagStart);
+        return this.jsxParseElement();
       } else {
         return super.parseExprAtom(refShortHandDefaultPos);
       }
     }
 
-    readToken(code: number): void {
-      if (this.state.inPropertyName) return super.readToken(code);
+    getTokenFromCode(code: number): void {
+      if (this.state.inPropertyName) return super.getTokenFromCode(code);
 
       const context = this.curContext();
 
@@ -538,12 +550,16 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         }
       }
 
-      if (code === charCodes.lessThan && this.state.exprAllowed) {
+      if (
+        code === charCodes.lessThan &&
+        this.state.exprAllowed &&
+        this.input.charCodeAt(this.state.pos + 1) !== charCodes.exclamationMark
+      ) {
         ++this.state.pos;
         return this.finishToken(tt.jsxTagStart);
       }
 
-      return super.readToken(code);
+      return super.getTokenFromCode(code);
     }
 
     updateContext(prevType: TokenType): void {
diff --git a/packages/babel-parser/src/plugins/placeholders.js b/packages/babel-parser/src/plugins/placeholders.js
new file mode 100644
index 000000000000..aafe2d235d53
--- /dev/null
+++ b/packages/babel-parser/src/plugins/placeholders.js
@@ -0,0 +1,316 @@
+// @flow
+
+import * as charCodes from "charcodes";
+
+import { types as tt, TokenType } from "../tokenizer/types";
+import type Parser from "../parser";
+import * as N from "../types";
+
+tt.placeholder = new TokenType("%%", { startsExpr: true });
+
+export type PlaceholderTypes =
+  | "Identifier"
+  | "StringLiteral"
+  | "Expression"
+  | "Statement"
+  | "Declaration"
+  | "BlockStatement"
+  | "ClassBody"
+  | "Pattern";
+
+// $PropertyType doesn't support enums. Use a fake "switch" (GetPlaceholderNode)
+//type MaybePlaceholder<T: PlaceholderTypes> = $PropertyType<N, T> | N.Placeholder<T>;
+
+type _Switch<Value, Cases, Index> = $Call<
+  (
+    $ElementType<$ElementType<Cases, Index>, 0>,
+  ) => $ElementType<$ElementType<Cases, Index>, 1>,
+  Value,
+>;
+type $Switch<Value, Cases> = _Switch<Value, Cases, *>;
+
+type NodeOf<T: PlaceholderTypes> = $Switch<
+  T,
+  [
+    ["Identifier", N.Identifier],
+    ["StringLiteral", N.StringLiteral],
+    ["Expression", N.Expression],
+    ["Statement", N.Statement],
+    ["Declaration", N.Declaration],
+    ["BlockStatement", N.BlockStatement],
+    ["ClassBody", N.ClassBody],
+    ["Pattern", N.Pattern],
+  ],
+>;
+
+// Placeholder<T> breaks everything, because its type is incompatible with
+// the substituted nodes.
+type MaybePlaceholder<T: PlaceholderTypes> = NodeOf<T>; // | Placeholder<T>
+
+export default (superClass: Class<Parser>): Class<Parser> =>
+  class extends superClass {
+    parsePlaceholder<T: PlaceholderTypes>(
+      expectedNode: T,
+    ): /*?N.Placeholder<T>*/ ?MaybePlaceholder<T> {
+      if (this.match(tt.placeholder)) {
+        const node = this.startNode();
+        this.next();
+        this.assertNoSpace("Unexpected space in placeholder.");
+
+        // We can't use this.parseIdentifier because
+        // we don't want nested placeholders.
+        node.name = super.parseIdentifier(/* liberal */ true);
+
+        this.assertNoSpace("Unexpected space in placeholder.");
+        this.expect(tt.placeholder);
+        return this.finishPlaceholder(node, expectedNode);
+      }
+    }
+
+    finishPlaceholder<T: PlaceholderTypes>(
+      node: N.Node,
+      expectedNode: T,
+    ): /*N.Placeholder<T>*/ MaybePlaceholder<T> {
+      const isFinished = !!(node.expectedNode && node.type === "Placeholder");
+      node.expectedNode = expectedNode;
+
+      return isFinished ? node : this.finishNode(node, "Placeholder");
+    }
+
+    /* ============================================================ *
+     * tokenizer/index.js                                           *
+     * ============================================================ */
+
+    getTokenFromCode(code: number) {
+      if (
+        code === charCodes.percentSign &&
+        this.input.charCodeAt(this.state.pos + 1) === charCodes.percentSign
+      ) {
+        return this.finishOp(tt.placeholder, 2);
+      }
+
+      return super.getTokenFromCode(...arguments);
+    }
+
+    /* ============================================================ *
+     * parser/expression.js                                         *
+     * ============================================================ */
+
+    parseExprAtom(): MaybePlaceholder<"Expression"> {
+      return (
+        this.parsePlaceholder("Expression") || super.parseExprAtom(...arguments)
+      );
+    }
+
+    parseIdentifier(): MaybePlaceholder<"Identifier"> {
+      // NOTE: This function only handles identifiers outside of
+      // expressions and binding patterns, since they are already
+      // handled by the parseExprAtom and parseBindingAtom functions.
+      // This is needed, for example, to parse "class %%NAME%% {}".
+      return (
+        this.parsePlaceholder("Identifier") ||
+        super.parseIdentifier(...arguments)
+      );
+    }
+
+    checkReservedWord(word: string): void {
+      // Sometimes we call #checkReservedWord(node.name), expecting
+      // that node is an Identifier. If it is a Placeholder, name
+      // will be undefined.
+      if (word !== undefined) super.checkReservedWord(...arguments);
+    }
+
+    /* ============================================================ *
+     * parser/lval.js                                               *
+     * ============================================================ */
+
+    parseBindingAtom(): MaybePlaceholder<"Pattern"> {
+      return (
+        this.parsePlaceholder("Pattern") || super.parseBindingAtom(...arguments)
+      );
+    }
+
+    checkLVal(expr: N.Expression): void {
+      if (expr.type !== "Placeholder") super.checkLVal(...arguments);
+    }
+
+    toAssignable(node: N.Node): N.Node {
+      if (
+        node &&
+        node.type === "Placeholder" &&
+        node.expectedNode === "Expression"
+      ) {
+        node.expectedNode = "Pattern";
+        return node;
+      }
+      return super.toAssignable(...arguments);
+    }
+
+    /* ============================================================ *
+     * parser/statement.js                                          *
+     * ============================================================ */
+
+    verifyBreakContinue(node: N.BreakStatement | N.ContinueStatement) {
+      if (node.label && node.label.type === "Placeholder") return;
+      super.verifyBreakContinue(...arguments);
+    }
+
+    parseExpressionStatement(
+      node: MaybePlaceholder<"Statement">,
+      expr: N.Expression,
+    ): MaybePlaceholder<"Statement"> {
+      if (
+        expr.type !== "Placeholder" ||
+        (expr.extra && expr.extra.parenthesized)
+      ) {
+        return super.parseExpressionStatement(...arguments);
+      }
+
+      if (this.match(tt.colon)) {
+        const stmt: N.LabeledStatement = node;
+        stmt.label = this.finishPlaceholder(expr, "Identifier");
+        this.next();
+        stmt.body = this.parseStatement("label");
+        return this.finishNode(stmt, "LabeledStatement");
+      }
+
+      this.semicolon();
+
+      node.name = expr.name;
+      return this.finishPlaceholder(node, "Statement");
+    }
+
+    parseBlock(): MaybePlaceholder<"BlockStatement"> {
+      return (
+        this.parsePlaceholder("BlockStatement") ||
+        super.parseBlock(...arguments)
+      );
+    }
+
+    parseFunctionId(): ?MaybePlaceholder<"Identifier"> {
+      return (
+        this.parsePlaceholder("Identifier") ||
+        super.parseFunctionId(...arguments)
+      );
+    }
+
+    parseClass<T: N.Class>(
+      node: T,
+      isStatement: /* T === ClassDeclaration */ boolean,
+      optionalId?: boolean,
+    ): T {
+      const type = isStatement ? "ClassDeclaration" : "ClassExpression";
+
+      this.next();
+      this.takeDecorators(node);
+
+      const placeholder = this.parsePlaceholder("Identifier");
+      if (placeholder) {
+        if (
+          this.match(tt._extends) ||
+          this.match(tt.placeholder) ||
+          this.match(tt.braceL)
+        ) {
+          node.id = placeholder;
+        } else if (optionalId || !isStatement) {
+          node.id = null;
+          node.body = this.finishPlaceholder(placeholder, "ClassBody");
+          return this.finishNode(node, type);
+        } else {
+          this.unexpected(null, "A class name is required");
+        }
+      } else {
+        this.parseClassId(node, isStatement, optionalId);
+      }
+
+      this.parseClassSuper(node);
+      node.body =
+        this.parsePlaceholder("ClassBody") ||
+        this.parseClassBody(!!node.superClass);
+      return this.finishNode(node, type);
+    }
+
+    parseExport(node: N.Node): N.Node {
+      const placeholder = this.parsePlaceholder("Identifier");
+      if (!placeholder) return super.parseExport(...arguments);
+
+      if (!this.isContextual("from") && !this.match(tt.comma)) {
+        // export %%DECL%%;
+        node.specifiers = [];
+        node.source = null;
+        node.declaration = this.finishPlaceholder(placeholder, "Declaration");
+        return this.finishNode(node, "ExportNamedDeclaration");
+      }
+
+      // export %%NAME%% from "foo";
+      this.expectPlugin("exportDefaultFrom");
+      const specifier = this.startNode();
+      specifier.exported = placeholder;
+      node.specifiers = [this.finishNode(specifier, "ExportDefaultSpecifier")];
+
+      return super.parseExport(node);
+    }
+
+    maybeParseExportDefaultSpecifier(node: N.Node): boolean {
+      if (node.specifiers && node.specifiers.length > 0) {
+        // "export %%NAME%%" has already been parsed by #parseExport.
+        return true;
+      }
+      return super.maybeParseExportDefaultSpecifier(...arguments);
+    }
+
+    checkExport(node: N.ExportNamedDeclaration): void {
+      const { specifiers } = node;
+      if (specifiers && specifiers.length) {
+        node.specifiers = specifiers.filter(
+          node => node.exported.type === "Placeholder",
+        );
+      }
+      super.checkExport(node);
+      node.specifiers = specifiers;
+    }
+
+    parseImport(
+      node: N.Node,
+    ): N.ImportDeclaration | N.TsImportEqualsDeclaration {
+      const placeholder = this.parsePlaceholder("Identifier");
+      if (!placeholder) return super.parseImport(...arguments);
+
+      node.specifiers = [];
+
+      if (!this.isContextual("from") && !this.match(tt.comma)) {
+        // import %%STRING%%;
+        node.source = this.finishPlaceholder(placeholder, "StringLiteral");
+        this.semicolon();
+        return this.finishNode(node, "ImportDeclaration");
+      }
+
+      // import %%DEFAULT%% ...
+      const specifier = this.startNodeAtNode(placeholder);
+      specifier.local = placeholder;
+      this.finishNode(specifier, "ImportDefaultSpecifier");
+      node.specifiers.push(specifier);
+
+      if (this.eat(tt.comma)) {
+        // import %%DEFAULT%%, * as ...
+        const hasStarImport = this.maybeParseStarImportSpecifier(node);
+
+        // import %%DEFAULT%%, { ...
+        if (!hasStarImport) this.parseNamedImportSpecifiers(node);
+      }
+
+      this.expectContextual("from");
+      node.source = this.parseImportSource();
+      this.semicolon();
+      return this.finishNode(node, "ImportDeclaration");
+    }
+
+    parseImportSource(): MaybePlaceholder<"StringLiteral"> {
+      // import ... from %%STRING%%;
+
+      return (
+        this.parsePlaceholder("StringLiteral") ||
+        super.parseImportSource(...arguments)
+      );
+    }
+  };
diff --git a/packages/babel-parser/src/plugins/typescript.js b/packages/babel-parser/src/plugins/typescript.js
deleted file mode 100644
index 514fb1e8fb28..000000000000
--- a/packages/babel-parser/src/plugins/typescript.js
+++ /dev/null
@@ -1,2153 +0,0 @@
-// @flow
-
-import type { TokenType } from "../tokenizer/types";
-import { types as tt } from "../tokenizer/types";
-import { types as ct } from "../tokenizer/context";
-import * as N from "../types";
-import type { Pos, Position } from "../util/location";
-import Parser from "../parser";
-
-type TsModifier =
-  | "readonly"
-  | "abstract"
-  | "static"
-  | "public"
-  | "private"
-  | "protected";
-
-function nonNull<T>(x: ?T): T {
-  if (x == null) {
-    // $FlowIgnore
-    throw new Error(`Unexpected ${x} value.`);
-  }
-  return x;
-}
-
-function assert(x: boolean): void {
-  if (!x) {
-    throw new Error("Assert fail");
-  }
-}
-
-type ParsingContext =
-  | "EnumMembers"
-  | "HeritageClauseElement"
-  | "TupleElementTypes"
-  | "TypeMembers"
-  | "TypeParametersOrArguments";
-
-// Doesn't handle "void" or "null" because those are keywords, not identifiers.
-function keywordTypeFromName(
-  value: string,
-): N.TsKeywordTypeType | typeof undefined {
-  switch (value) {
-    case "any":
-      return "TSAnyKeyword";
-    case "boolean":
-      return "TSBooleanKeyword";
-    case "never":
-      return "TSNeverKeyword";
-    case "number":
-      return "TSNumberKeyword";
-    case "object":
-      return "TSObjectKeyword";
-    case "string":
-      return "TSStringKeyword";
-    case "symbol":
-      return "TSSymbolKeyword";
-    case "undefined":
-      return "TSUndefinedKeyword";
-    default:
-      return undefined;
-  }
-}
-
-export default (superClass: Class<Parser>): Class<Parser> =>
-  class extends superClass {
-    tsIsIdentifier(): boolean {
-      // TODO: actually a bit more complex in TypeScript, but shouldn't matter.
-      // See https://github.com/Microsoft/TypeScript/issues/15008
-      return this.match(tt.name);
-    }
-
-    tsNextTokenCanFollowModifier() {
-      // Note: TypeScript's implementation is much more complicated because
-      // more things are considered modifiers there.
-      // This implementation only handles modifiers not handled by @babel/parser itself. And "static".
-      // TODO: Would be nice to avoid lookahead. Want a hasLineBreakUpNext() method...
-      this.next();
-      return (
-        !this.hasPrecedingLineBreak() &&
-        !this.match(tt.parenL) &&
-        !this.match(tt.parenR) &&
-        !this.match(tt.colon) &&
-        !this.match(tt.eq) &&
-        !this.match(tt.question)
-      );
-    }
-
-    /** Parses a modifier matching one the given modifier names. */
-    tsParseModifier<T: TsModifier>(allowedModifiers: T[]): ?T {
-      if (!this.match(tt.name)) {
-        return undefined;
-      }
-
-      const modifier = this.state.value;
-      if (
-        allowedModifiers.indexOf(modifier) !== -1 &&
-        this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))
-      ) {
-        return modifier;
-      }
-      return undefined;
-    }
-
-    tsIsListTerminator(kind: ParsingContext): boolean {
-      switch (kind) {
-        case "EnumMembers":
-        case "TypeMembers":
-          return this.match(tt.braceR);
-        case "HeritageClauseElement":
-          return this.match(tt.braceL);
-        case "TupleElementTypes":
-          return this.match(tt.bracketR);
-        case "TypeParametersOrArguments":
-          return this.isRelational(">");
-      }
-
-      throw new Error("Unreachable");
-    }
-
-    tsParseList<T: N.Node>(kind: ParsingContext, parseElement: () => T): T[] {
-      const result: T[] = [];
-      while (!this.tsIsListTerminator(kind)) {
-        // Skipping "parseListElement" from the TS source since that's just for error handling.
-        result.push(parseElement());
-      }
-      return result;
-    }
-
-    tsParseDelimitedList<T: N.Node>(
-      kind: ParsingContext,
-      parseElement: () => T,
-    ): T[] {
-      return nonNull(
-        this.tsParseDelimitedListWorker(
-          kind,
-          parseElement,
-          /* expectSuccess */ true,
-        ),
-      );
-    }
-
-    tsTryParseDelimitedList<T: N.Node>(
-      kind: ParsingContext,
-      parseElement: () => ?T,
-    ): ?(T[]) {
-      return this.tsParseDelimitedListWorker(
-        kind,
-        parseElement,
-        /* expectSuccess */ false,
-      );
-    }
-
-    /**
-     * If !expectSuccess, returns undefined instead of failing to parse.
-     * If expectSuccess, parseElement should always return a defined value.
-     */
-    tsParseDelimitedListWorker<T: N.Node>(
-      kind: ParsingContext,
-      parseElement: () => ?T,
-      expectSuccess: boolean,
-    ): ?(T[]) {
-      const result = [];
-
-      while (true) {
-        if (this.tsIsListTerminator(kind)) {
-          break;
-        }
-
-        const element = parseElement();
-        if (element == null) {
-          return undefined;
-        }
-        result.push(element);
-
-        if (this.eat(tt.comma)) {
-          continue;
-        }
-
-        if (this.tsIsListTerminator(kind)) {
-          break;
-        }
-
-        if (expectSuccess) {
-          // This will fail with an error about a missing comma
-          this.expect(tt.comma);
-        }
-        return undefined;
-      }
-
-      return result;
-    }
-
-    tsParseBracketedList<T: N.Node>(
-      kind: ParsingContext,
-      parseElement: () => T,
-      bracket: boolean,
-      skipFirstToken: boolean,
-    ): T[] {
-      if (!skipFirstToken) {
-        if (bracket) {
-          this.expect(tt.bracketL);
-        } else {
-          this.expectRelational("<");
-        }
-      }
-
-      const result = this.tsParseDelimitedList(kind, parseElement);
-
-      if (bracket) {
-        this.expect(tt.bracketR);
-      } else {
-        this.expectRelational(">");
-      }
-
-      return result;
-    }
-
-    tsParseEntityName(allowReservedWords: boolean): N.TsEntityName {
-      let entity: N.TsEntityName = this.parseIdentifier();
-      while (this.eat(tt.dot)) {
-        const node: N.TsQualifiedName = this.startNodeAtNode(entity);
-        node.left = entity;
-        node.right = this.parseIdentifier(allowReservedWords);
-        entity = this.finishNode(node, "TSQualifiedName");
-      }
-      return entity;
-    }
-
-    tsParseTypeReference(): N.TsTypeReference {
-      const node: N.TsTypeReference = this.startNode();
-      node.typeName = this.tsParseEntityName(/* allowReservedWords */ false);
-      if (!this.hasPrecedingLineBreak() && this.isRelational("<")) {
-        node.typeParameters = this.tsParseTypeArguments();
-      }
-      return this.finishNode(node, "TSTypeReference");
-    }
-
-    tsParseThisTypePredicate(lhs: N.TsThisType): N.TsTypePredicate {
-      this.next();
-      const node: N.TsTypePredicate = this.startNode();
-      node.parameterName = lhs;
-      node.typeAnnotation = this.tsParseTypeAnnotation(/* eatColon */ false);
-      return this.finishNode(node, "TSTypePredicate");
-    }
-
-    tsParseThisTypeNode(): N.TsThisType {
-      const node: N.TsThisType = this.startNode();
-      this.next();
-      return this.finishNode(node, "TSThisType");
-    }
-
-    tsParseTypeQuery(): N.TsTypeQuery {
-      const node: N.TsTypeQuery = this.startNode();
-      this.expect(tt._typeof);
-      node.exprName = this.tsParseEntityName(/* allowReservedWords */ true);
-      return this.finishNode(node, "TSTypeQuery");
-    }
-
-    tsParseTypeParameter(): N.TsTypeParameter {
-      const node: N.TsTypeParameter = this.startNode();
-      node.name = this.parseIdentifierName(node.start);
-      node.constraint = this.tsEatThenParseType(tt._extends);
-      node.default = this.tsEatThenParseType(tt.eq);
-      return this.finishNode(node, "TSTypeParameter");
-    }
-
-    tsTryParseTypeParameters(): ?N.TsTypeParameterDeclaration {
-      if (this.isRelational("<")) {
-        return this.tsParseTypeParameters();
-      }
-    }
-
-    tsParseTypeParameters() {
-      const node: N.TsTypeParameterDeclaration = this.startNode();
-
-      if (this.isRelational("<") || this.match(tt.jsxTagStart)) {
-        this.next();
-      } else {
-        this.unexpected();
-      }
-
-      node.params = this.tsParseBracketedList(
-        "TypeParametersOrArguments",
-        this.tsParseTypeParameter.bind(this),
-        /* bracket */ false,
-        /* skipFirstToken */ true,
-      );
-      return this.finishNode(node, "TSTypeParameterDeclaration");
-    }
-
-    // Note: In TypeScript implementation we must provide `yieldContext` and `awaitContext`,
-    // but here it's always false, because this is only used for types.
-    tsFillSignature(
-      returnToken: TokenType,
-      signature: N.TsSignatureDeclaration,
-    ): void {
-      // Arrow fns *must* have return token (`=>`). Normal functions can omit it.
-      const returnTokenRequired = returnToken === tt.arrow;
-      signature.typeParameters = this.tsTryParseTypeParameters();
-      this.expect(tt.parenL);
-      signature.parameters = this.tsParseBindingListForSignature();
-      if (returnTokenRequired) {
-        signature.typeAnnotation = this.tsParseTypeOrTypePredicateAnnotation(
-          returnToken,
-        );
-      } else if (this.match(returnToken)) {
-        signature.typeAnnotation = this.tsParseTypeOrTypePredicateAnnotation(
-          returnToken,
-        );
-      }
-    }
-
-    tsParseBindingListForSignature(): $ReadOnlyArray<
-      N.Identifier | N.RestElement,
-    > {
-      return this.parseBindingList(tt.parenR).map(pattern => {
-        if (pattern.type !== "Identifier" && pattern.type !== "RestElement") {
-          throw this.unexpected(
-            pattern.start,
-            "Name in a signature must be an Identifier.",
-          );
-        }
-        return pattern;
-      });
-    }
-
-    tsParseTypeMemberSemicolon(): void {
-      if (!this.eat(tt.comma)) {
-        this.semicolon();
-      }
-    }
-
-    tsParseSignatureMember(
-      kind: "TSCallSignatureDeclaration" | "TSConstructSignatureDeclaration",
-    ): N.TsCallSignatureDeclaration | N.TsConstructSignatureDeclaration {
-      const node:
-        | N.TsCallSignatureDeclaration
-        | N.TsConstructSignatureDeclaration = this.startNode();
-      if (kind === "TSConstructSignatureDeclaration") {
-        this.expect(tt._new);
-      }
-      this.tsFillSignature(tt.colon, node);
-      this.tsParseTypeMemberSemicolon();
-      return this.finishNode(node, kind);
-    }
-
-    tsIsUnambiguouslyIndexSignature() {
-      this.next(); // Skip '{'
-      return this.eat(tt.name) && this.match(tt.colon);
-    }
-
-    tsTryParseIndexSignature(node: N.TsIndexSignature): ?N.TsIndexSignature {
-      if (
-        !(
-          this.match(tt.bracketL) &&
-          this.tsLookAhead(this.tsIsUnambiguouslyIndexSignature.bind(this))
-        )
-      ) {
-        return undefined;
-      }
-
-      this.expect(tt.bracketL);
-      const id = this.parseIdentifier();
-      this.expect(tt.colon);
-      id.typeAnnotation = this.tsParseTypeAnnotation(/* eatColon */ false);
-      this.expect(tt.bracketR);
-      node.parameters = [id];
-
-      const type = this.tsTryParseTypeAnnotation();
-      if (type) node.typeAnnotation = type;
-      this.tsParseTypeMemberSemicolon();
-      return this.finishNode(node, "TSIndexSignature");
-    }
-
-    tsParsePropertyOrMethodSignature(
-      node: N.TsPropertySignature | N.TsMethodSignature,
-      readonly: boolean,
-    ): N.TsPropertySignature | N.TsMethodSignature {
-      this.parsePropertyName(node);
-      if (this.eat(tt.question)) node.optional = true;
-      const nodeAny: any = node;
-
-      if (!readonly && (this.match(tt.parenL) || this.isRelational("<"))) {
-        const method: N.TsMethodSignature = nodeAny;
-        this.tsFillSignature(tt.colon, method);
-        this.tsParseTypeMemberSemicolon();
-        return this.finishNode(method, "TSMethodSignature");
-      } else {
-        const property: N.TsPropertySignature = nodeAny;
-        if (readonly) property.readonly = true;
-        const type = this.tsTryParseTypeAnnotation();
-        if (type) property.typeAnnotation = type;
-        this.tsParseTypeMemberSemicolon();
-        return this.finishNode(property, "TSPropertySignature");
-      }
-    }
-
-    tsParseTypeMember(): N.TsTypeElement {
-      if (this.match(tt.parenL) || this.isRelational("<")) {
-        return this.tsParseSignatureMember("TSCallSignatureDeclaration");
-      }
-      if (
-        this.match(tt._new) &&
-        this.tsLookAhead(this.tsIsStartOfConstructSignature.bind(this))
-      ) {
-        return this.tsParseSignatureMember("TSConstructSignatureDeclaration");
-      }
-      // Instead of fullStart, we create a node here.
-      const node: any = this.startNode();
-      const readonly = !!this.tsParseModifier(["readonly"]);
-
-      const idx = this.tsTryParseIndexSignature(node);
-      if (idx) {
-        if (readonly) node.readonly = true;
-        return idx;
-      }
-      return this.tsParsePropertyOrMethodSignature(node, readonly);
-    }
-
-    tsIsStartOfConstructSignature() {
-      this.next();
-      return this.match(tt.parenL) || this.isRelational("<");
-    }
-
-    tsParseTypeLiteral(): N.TsTypeLiteral {
-      const node: N.TsTypeLiteral = this.startNode();
-      node.members = this.tsParseObjectTypeMembers();
-      return this.finishNode(node, "TSTypeLiteral");
-    }
-
-    tsParseObjectTypeMembers(): $ReadOnlyArray<N.TsTypeElement> {
-      this.expect(tt.braceL);
-      const members = this.tsParseList(
-        "TypeMembers",
-        this.tsParseTypeMember.bind(this),
-      );
-      this.expect(tt.braceR);
-      return members;
-    }
-
-    tsIsStartOfMappedType(): boolean {
-      this.next();
-      if (this.eat(tt.plusMin)) {
-        return this.isContextual("readonly");
-      }
-      if (this.isContextual("readonly")) {
-        this.next();
-      }
-      if (!this.match(tt.bracketL)) {
-        return false;
-      }
-      this.next();
-      if (!this.tsIsIdentifier()) {
-        return false;
-      }
-      this.next();
-      return this.match(tt._in);
-    }
-
-    tsParseMappedTypeParameter(): N.TsTypeParameter {
-      const node: N.TsTypeParameter = this.startNode();
-      node.name = this.parseIdentifierName(node.start);
-      node.constraint = this.tsExpectThenParseType(tt._in);
-      return this.finishNode(node, "TSTypeParameter");
-    }
-
-    tsParseMappedType(): N.TsMappedType {
-      const node: N.TsMappedType = this.startNode();
-
-      this.expect(tt.braceL);
-
-      if (this.match(tt.plusMin)) {
-        node.readonly = this.state.value;
-        this.next();
-        this.expectContextual("readonly");
-      } else if (this.eatContextual("readonly")) {
-        node.readonly = true;
-      }
-
-      this.expect(tt.bracketL);
-      node.typeParameter = this.tsParseMappedTypeParameter();
-      this.expect(tt.bracketR);
-
-      if (this.match(tt.plusMin)) {
-        node.optional = this.state.value;
-        this.next();
-        this.expect(tt.question);
-      } else if (this.eat(tt.question)) {
-        node.optional = true;
-      }
-
-      node.typeAnnotation = this.tsTryParseType();
-      this.semicolon();
-      this.expect(tt.braceR);
-
-      return this.finishNode(node, "TSMappedType");
-    }
-
-    tsParseTupleType(): N.TsTupleType {
-      const node: N.TsTupleType = this.startNode();
-      node.elementTypes = this.tsParseBracketedList(
-        "TupleElementTypes",
-        this.tsParseType.bind(this),
-        /* bracket */ true,
-        /* skipFirstToken */ false,
-      );
-      return this.finishNode(node, "TSTupleType");
-    }
-
-    tsParseParenthesizedType(): N.TsParenthesizedType {
-      const node = this.startNode();
-      this.expect(tt.parenL);
-      node.typeAnnotation = this.tsParseType();
-      this.expect(tt.parenR);
-      return this.finishNode(node, "TSParenthesizedType");
-    }
-
-    tsParseFunctionOrConstructorType(
-      type: "TSFunctionType" | "TSConstructorType",
-    ): N.TsFunctionOrConstructorType {
-      const node: N.TsFunctionOrConstructorType = this.startNode();
-      if (type === "TSConstructorType") {
-        this.expect(tt._new);
-      }
-      this.tsFillSignature(tt.arrow, node);
-      return this.finishNode(node, type);
-    }
-
-    tsParseLiteralTypeNode(): N.TsLiteralType {
-      const node: N.TsLiteralType = this.startNode();
-      node.literal = (() => {
-        switch (this.state.type) {
-          case tt.num:
-            return this.parseLiteral(this.state.value, "NumericLiteral");
-          case tt.string:
-            return this.parseLiteral(this.state.value, "StringLiteral");
-          case tt._true:
-          case tt._false:
-            return this.parseBooleanLiteral();
-          default:
-            throw this.unexpected();
-        }
-      })();
-      return this.finishNode(node, "TSLiteralType");
-    }
-
-    tsParseNonArrayType(): N.TsType {
-      switch (this.state.type) {
-        case tt.name:
-        case tt._void:
-        case tt._null: {
-          const type = this.match(tt._void)
-            ? "TSVoidKeyword"
-            : this.match(tt._null)
-              ? "TSNullKeyword"
-              : keywordTypeFromName(this.state.value);
-          if (type !== undefined && this.lookahead().type !== tt.dot) {
-            const node: N.TsKeywordType = this.startNode();
-            this.next();
-            return this.finishNode(node, type);
-          }
-          return this.tsParseTypeReference();
-        }
-        case tt.string:
-        case tt.num:
-        case tt._true:
-        case tt._false:
-          return this.tsParseLiteralTypeNode();
-        case tt.plusMin:
-          if (this.state.value === "-") {
-            const node: N.TsLiteralType = this.startNode();
-            this.next();
-            if (!this.match(tt.num)) {
-              throw this.unexpected();
-            }
-            node.literal = this.parseLiteral(
-              -this.state.value,
-              "NumericLiteral",
-              node.start,
-              node.loc.start,
-            );
-            return this.finishNode(node, "TSLiteralType");
-          }
-          break;
-        case tt._this: {
-          const thisKeyword = this.tsParseThisTypeNode();
-          if (this.isContextual("is") && !this.hasPrecedingLineBreak()) {
-            return this.tsParseThisTypePredicate(thisKeyword);
-          } else {
-            return thisKeyword;
-          }
-        }
-        case tt._typeof:
-          return this.tsParseTypeQuery();
-        case tt.braceL:
-          return this.tsLookAhead(this.tsIsStartOfMappedType.bind(this))
-            ? this.tsParseMappedType()
-            : this.tsParseTypeLiteral();
-        case tt.bracketL:
-          return this.tsParseTupleType();
-        case tt.parenL:
-          return this.tsParseParenthesizedType();
-      }
-
-      throw this.unexpected();
-    }
-
-    tsParseArrayTypeOrHigher(): N.TsType {
-      let type = this.tsParseNonArrayType();
-      while (!this.hasPrecedingLineBreak() && this.eat(tt.bracketL)) {
-        if (this.match(tt.bracketR)) {
-          const node: N.TsArrayType = this.startNodeAtNode(type);
-          node.elementType = type;
-          this.expect(tt.bracketR);
-          type = this.finishNode(node, "TSArrayType");
-        } else {
-          const node: N.TsIndexedAccessType = this.startNodeAtNode(type);
-          node.objectType = type;
-          node.indexType = this.tsParseType();
-          this.expect(tt.bracketR);
-          type = this.finishNode(node, "TSIndexedAccessType");
-        }
-      }
-      return type;
-    }
-
-    tsParseTypeOperator(operator: "keyof" | "unique"): N.TsTypeOperator {
-      const node: N.TsTypeOperator = this.startNode();
-      this.expectContextual(operator);
-      node.operator = operator;
-      node.typeAnnotation = this.tsParseTypeOperatorOrHigher();
-      return this.finishNode(node, "TSTypeOperator");
-    }
-
-    tsParseInferType(): N.TsInferType {
-      const node = this.startNode();
-      this.expectContextual("infer");
-      const typeParameter = this.startNode();
-      typeParameter.name = this.parseIdentifierName(typeParameter.start);
-      node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
-      return this.finishNode(node, "TSInferType");
-    }
-
-    tsParseTypeOperatorOrHigher(): N.TsType {
-      const operator = ["keyof", "unique"].find(kw => this.isContextual(kw));
-      return operator
-        ? this.tsParseTypeOperator(operator)
-        : this.isContextual("infer")
-          ? this.tsParseInferType()
-          : this.tsParseArrayTypeOrHigher();
-    }
-
-    tsParseUnionOrIntersectionType(
-      kind: "TSUnionType" | "TSIntersectionType",
-      parseConstituentType: () => N.TsType,
-      operator: TokenType,
-    ): N.TsType {
-      this.eat(operator);
-      let type = parseConstituentType();
-      if (this.match(operator)) {
-        const types = [type];
-        while (this.eat(operator)) {
-          types.push(parseConstituentType());
-        }
-        const node: N.TsUnionType | N.TsIntersectionType = this.startNodeAtNode(
-          type,
-        );
-        node.types = types;
-        type = this.finishNode(node, kind);
-      }
-      return type;
-    }
-
-    tsParseIntersectionTypeOrHigher(): N.TsType {
-      return this.tsParseUnionOrIntersectionType(
-        "TSIntersectionType",
-        this.tsParseTypeOperatorOrHigher.bind(this),
-        tt.bitwiseAND,
-      );
-    }
-
-    tsParseUnionTypeOrHigher() {
-      return this.tsParseUnionOrIntersectionType(
-        "TSUnionType",
-        this.tsParseIntersectionTypeOrHigher.bind(this),
-        tt.bitwiseOR,
-      );
-    }
-
-    tsIsStartOfFunctionType() {
-      if (this.isRelational("<")) {
-        return true;
-      }
-      return (
-        this.match(tt.parenL) &&
-        this.tsLookAhead(this.tsIsUnambiguouslyStartOfFunctionType.bind(this))
-      );
-    }
-
-    tsSkipParameterStart(): boolean {
-      if (this.match(tt.name) || this.match(tt._this)) {
-        this.next();
-        return true;
-      }
-      return false;
-    }
-
-    tsIsUnambiguouslyStartOfFunctionType(): boolean {
-      this.next();
-      if (this.match(tt.parenR) || this.match(tt.ellipsis)) {
-        // ( )
-        // ( ...
-        return true;
-      }
-      if (this.tsSkipParameterStart()) {
-        if (
-          this.match(tt.colon) ||
-          this.match(tt.comma) ||
-          this.match(tt.question) ||
-          this.match(tt.eq)
-        ) {
-          // ( xxx :
-          // ( xxx ,
-          // ( xxx ?
-          // ( xxx =
-          return true;
-        }
-        if (this.match(tt.parenR)) {
-          this.next();
-          if (this.match(tt.arrow)) {
-            // ( xxx ) =>
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    tsParseTypeOrTypePredicateAnnotation(
-      returnToken: TokenType,
-    ): N.TsTypeAnnotation {
-      return this.tsInType(() => {
-        const t: N.TsTypeAnnotation = this.startNode();
-        this.expect(returnToken);
-
-        const typePredicateVariable =
-          this.tsIsIdentifier() &&
-          this.tsTryParse(this.tsParseTypePredicatePrefix.bind(this));
-
-        if (!typePredicateVariable) {
-          return this.tsParseTypeAnnotation(/* eatColon */ false, t);
-        }
-
-        const type = this.tsParseTypeAnnotation(/* eatColon */ false);
-
-        const node: N.TsTypePredicate = this.startNodeAtNode(
-          typePredicateVariable,
-        );
-        node.parameterName = typePredicateVariable;
-        node.typeAnnotation = type;
-        t.typeAnnotation = this.finishNode(node, "TSTypePredicate");
-        return this.finishNode(t, "TSTypeAnnotation");
-      });
-    }
-
-    tsTryParseTypeOrTypePredicateAnnotation(): ?N.TsTypeAnnotation {
-      return this.match(tt.colon)
-        ? this.tsParseTypeOrTypePredicateAnnotation(tt.colon)
-        : undefined;
-    }
-
-    tsTryParseTypeAnnotation(): ?N.TsTypeAnnotation {
-      return this.match(tt.colon) ? this.tsParseTypeAnnotation() : undefined;
-    }
-
-    tsTryParseType(): ?N.TsType {
-      return this.tsEatThenParseType(tt.colon);
-    }
-
-    tsParseTypePredicatePrefix(): ?N.Identifier {
-      const id = this.parseIdentifier();
-      if (this.isContextual("is") && !this.hasPrecedingLineBreak()) {
-        this.next();
-        return id;
-      }
-    }
-
-    tsParseTypeAnnotation(
-      eatColon = true,
-      t: N.TsTypeAnnotation = this.startNode(),
-    ): N.TsTypeAnnotation {
-      this.tsInType(() => {
-        if (eatColon) this.expect(tt.colon);
-        t.typeAnnotation = this.tsParseType();
-      });
-      return this.finishNode(t, "TSTypeAnnotation");
-    }
-
-    /** Be sure to be in a type context before calling this, using `tsInType`. */
-    tsParseType(): N.TsType {
-      // Need to set `state.inType` so that we don't parse JSX in a type context.
-      assert(this.state.inType);
-      const type = this.tsParseNonConditionalType();
-      if (this.hasPrecedingLineBreak() || !this.eat(tt._extends)) {
-        return type;
-      }
-      const node: N.TsConditionalType = this.startNodeAtNode(type);
-      node.checkType = type;
-      node.extendsType = this.tsParseNonConditionalType();
-      this.expect(tt.question);
-      node.trueType = this.tsParseType();
-      this.expect(tt.colon);
-      node.falseType = this.tsParseType();
-      return this.finishNode(node, "TSConditionalType");
-    }
-
-    tsParseNonConditionalType(): N.TsType {
-      if (this.tsIsStartOfFunctionType()) {
-        return this.tsParseFunctionOrConstructorType("TSFunctionType");
-      }
-      if (this.match(tt._new)) {
-        // As in `new () => Date`
-        return this.tsParseFunctionOrConstructorType("TSConstructorType");
-      }
-      return this.tsParseUnionTypeOrHigher();
-    }
-
-    tsParseTypeAssertion(): N.TsTypeAssertion {
-      const node: N.TsTypeAssertion = this.startNode();
-      // Not actually necessary to set state.inType because we never reach here if JSX plugin is enabled,
-      // but need `tsInType` to satisfy the assertion in `tsParseType`.
-      node.typeAnnotation = this.tsInType(() => this.tsParseType());
-      this.expectRelational(">");
-      node.expression = this.parseMaybeUnary();
-      return this.finishNode(node, "TSTypeAssertion");
-    }
-
-    tsParseHeritageClause(): $ReadOnlyArray<N.TsExpressionWithTypeArguments> {
-      return this.tsParseDelimitedList(
-        "HeritageClauseElement",
-        this.tsParseExpressionWithTypeArguments.bind(this),
-      );
-    }
-
-    tsParseExpressionWithTypeArguments(): N.TsExpressionWithTypeArguments {
-      const node: N.TsExpressionWithTypeArguments = this.startNode();
-      // Note: TS uses parseLeftHandSideExpressionOrHigher,
-      // then has grammar errors later if it's not an EntityName.
-      node.expression = this.tsParseEntityName(/* allowReservedWords */ false);
-      if (this.isRelational("<")) {
-        node.typeParameters = this.tsParseTypeArguments();
-      }
-
-      return this.finishNode(node, "TSExpressionWithTypeArguments");
-    }
-
-    tsParseInterfaceDeclaration(
-      node: N.TsInterfaceDeclaration,
-    ): N.TsInterfaceDeclaration {
-      node.id = this.parseIdentifier();
-      node.typeParameters = this.tsTryParseTypeParameters();
-      if (this.eat(tt._extends)) {
-        node.extends = this.tsParseHeritageClause();
-      }
-      const body: N.TSInterfaceBody = this.startNode();
-      body.body = this.tsParseObjectTypeMembers();
-      node.body = this.finishNode(body, "TSInterfaceBody");
-      return this.finishNode(node, "TSInterfaceDeclaration");
-    }
-
-    tsParseTypeAliasDeclaration(
-      node: N.TsTypeAliasDeclaration,
-    ): N.TsTypeAliasDeclaration {
-      node.id = this.parseIdentifier();
-      node.typeParameters = this.tsTryParseTypeParameters();
-      node.typeAnnotation = this.tsExpectThenParseType(tt.eq);
-      this.semicolon();
-      return this.finishNode(node, "TSTypeAliasDeclaration");
-    }
-
-    tsInNoContext<T>(cb: () => T): T {
-      const oldContext = this.state.context;
-      this.state.context = [oldContext[0]];
-      try {
-        return cb();
-      } finally {
-        this.state.context = oldContext;
-      }
-    }
-
-    /**
-     * Runs `cb` in a type context.
-     * This should be called one token *before* the first type token,
-     * so that the call to `next()` is run in type context.
-     */
-    tsInType<T>(cb: () => T): T {
-      const oldInType = this.state.inType;
-      this.state.inType = true;
-      try {
-        return cb();
-      } finally {
-        this.state.inType = oldInType;
-      }
-    }
-
-    tsEatThenParseType(token: TokenType): N.TsType | typeof undefined {
-      return !this.match(token) ? undefined : this.tsNextThenParseType();
-    }
-
-    tsExpectThenParseType(token: TokenType): N.TsType {
-      return this.tsDoThenParseType(() => this.expect(token));
-    }
-
-    tsNextThenParseType(): N.TsType {
-      return this.tsDoThenParseType(() => this.next());
-    }
-
-    tsDoThenParseType(cb: () => void): N.TsType {
-      return this.tsInType(() => {
-        cb();
-        return this.tsParseType();
-      });
-    }
-
-    tsParseEnumMember(): N.TsEnumMember {
-      const node: N.TsEnumMember = this.startNode();
-      // Computed property names are grammar errors in an enum, so accept just string literal or identifier.
-      node.id = this.match(tt.string)
-        ? this.parseLiteral(this.state.value, "StringLiteral")
-        : this.parseIdentifier(/* liberal */ true);
-      if (this.eat(tt.eq)) {
-        node.initializer = this.parseMaybeAssign();
-      }
-      return this.finishNode(node, "TSEnumMember");
-    }
-
-    tsParseEnumDeclaration(
-      node: N.TsEnumDeclaration,
-      isConst: boolean,
-    ): N.TsEnumDeclaration {
-      if (isConst) node.const = true;
-      node.id = this.parseIdentifier();
-      this.expect(tt.braceL);
-      node.members = this.tsParseDelimitedList(
-        "EnumMembers",
-        this.tsParseEnumMember.bind(this),
-      );
-      this.expect(tt.braceR);
-      return this.finishNode(node, "TSEnumDeclaration");
-    }
-
-    tsParseModuleBlock(): N.TsModuleBlock {
-      const node: N.TsModuleBlock = this.startNode();
-      this.expect(tt.braceL);
-      // Inside of a module block is considered "top-level", meaning it can have imports and exports.
-      this.parseBlockOrModuleBlockBody(
-        (node.body = []),
-        /* directives */ undefined,
-        /* topLevel */ true,
-        /* end */ tt.braceR,
-      );
-      return this.finishNode(node, "TSModuleBlock");
-    }
-
-    tsParseModuleOrNamespaceDeclaration(
-      node: N.TsModuleDeclaration,
-    ): N.TsModuleDeclaration {
-      node.id = this.parseIdentifier();
-      if (this.eat(tt.dot)) {
-        const inner = this.startNode();
-        this.tsParseModuleOrNamespaceDeclaration(inner);
-        node.body = inner;
-      } else {
-        node.body = this.tsParseModuleBlock();
-      }
-      return this.finishNode(node, "TSModuleDeclaration");
-    }
-
-    tsParseAmbientExternalModuleDeclaration(
-      node: N.TsModuleDeclaration,
-    ): N.TsModuleDeclaration {
-      if (this.isContextual("global")) {
-        node.global = true;
-        node.id = this.parseIdentifier();
-      } else if (this.match(tt.string)) {
-        node.id = this.parseExprAtom();
-      } else {
-        this.unexpected();
-      }
-
-      if (this.match(tt.braceL)) {
-        node.body = this.tsParseModuleBlock();
-      } else {
-        this.semicolon();
-      }
-
-      return this.finishNode(node, "TSModuleDeclaration");
-    }
-
-    tsParseImportEqualsDeclaration(
-      node: N.TsImportEqualsDeclaration,
-      isExport?: boolean,
-    ): N.TsImportEqualsDeclaration {
-      node.isExport = isExport || false;
-      node.id = this.parseIdentifier();
-      this.expect(tt.eq);
-      node.moduleReference = this.tsParseModuleReference();
-      this.semicolon();
-      return this.finishNode(node, "TSImportEqualsDeclaration");
-    }
-
-    tsIsExternalModuleReference(): boolean {
-      return (
-        this.isContextual("require") && this.lookahead().type === tt.parenL
-      );
-    }
-
-    tsParseModuleReference(): N.TsModuleReference {
-      return this.tsIsExternalModuleReference()
-        ? this.tsParseExternalModuleReference()
-        : this.tsParseEntityName(/* allowReservedWords */ false);
-    }
-
-    tsParseExternalModuleReference(): N.TsExternalModuleReference {
-      const node: N.TsExternalModuleReference = this.startNode();
-      this.expectContextual("require");
-      this.expect(tt.parenL);
-      if (!this.match(tt.string)) {
-        throw this.unexpected();
-      }
-      node.expression = this.parseLiteral(this.state.value, "StringLiteral");
-      this.expect(tt.parenR);
-      return this.finishNode(node, "TSExternalModuleReference");
-    }
-
-    // Utilities
-
-    tsLookAhead<T>(f: () => T): T {
-      const state = this.state.clone();
-      const res = f();
-      this.state = state;
-      return res;
-    }
-
-    tsTryParseAndCatch<T>(f: () => T): ?T {
-      const state = this.state.clone();
-      try {
-        return f();
-      } catch (e) {
-        if (e instanceof SyntaxError) {
-          this.state = state;
-          return undefined;
-        }
-        throw e;
-      }
-    }
-
-    tsTryParse<T>(f: () => ?T): ?T {
-      const state = this.state.clone();
-      const result = f();
-      if (result !== undefined && result !== false) {
-        return result;
-      } else {
-        this.state = state;
-        return undefined;
-      }
-    }
-
-    nodeWithSamePosition<T: N.Node>(original: N.Node, type: string): T {
-      const node = this.startNodeAtNode(original);
-      node.type = type;
-      node.end = original.end;
-      node.loc.end = original.loc.end;
-
-      if (original.leadingComments) {
-        node.leadingComments = original.leadingComments;
-      }
-      if (original.trailingComments) {
-        node.trailingComments = original.trailingComments;
-      }
-      if (original.innerComments) node.innerComments = original.innerComments;
-
-      return node;
-    }
-
-    tsTryParseDeclare(nany: any): ?N.Declaration {
-      switch (this.state.type) {
-        case tt._function:
-          this.next();
-          return this.parseFunction(nany, /* isStatement */ true);
-        case tt._class:
-          return this.parseClass(
-            nany,
-            /* isStatement */ true,
-            /* optionalId */ false,
-          );
-        case tt._const:
-          if (this.match(tt._const) && this.isLookaheadContextual("enum")) {
-            // `const enum = 0;` not allowed because "enum" is a strict mode reserved word.
-            this.expect(tt._const);
-            this.expectContextual("enum");
-            return this.tsParseEnumDeclaration(nany, /* isConst */ true);
-          }
-        // falls through
-        case tt._var:
-        case tt._let:
-          return this.parseVarStatement(nany, this.state.type);
-        case tt.name: {
-          const value = this.state.value;
-          if (value === "global") {
-            return this.tsParseAmbientExternalModuleDeclaration(nany);
-          } else {
-            return this.tsParseDeclaration(nany, value, /* next */ true);
-          }
-        }
-      }
-    }
-
-    // Note: this won't be called unless the keyword is allowed in `shouldParseExportDeclaration`.
-    tsTryParseExportDeclaration(): ?N.Declaration {
-      return this.tsParseDeclaration(
-        this.startNode(),
-        this.state.value,
-        /* next */ true,
-      );
-    }
-
-    tsParseExpressionStatement(node: any, expr: N.Identifier): ?N.Declaration {
-      switch (expr.name) {
-        case "declare": {
-          const declaration = this.tsTryParseDeclare(node);
-          if (declaration) {
-            declaration.declare = true;
-            return declaration;
-          }
-          break;
-        }
-        case "global":
-          // `global { }` (with no `declare`) may appear inside an ambient module declaration.
-          // Would like to use tsParseAmbientExternalModuleDeclaration here, but already ran past "global".
-          if (this.match(tt.braceL)) {
-            const mod: N.TsModuleDeclaration = node;
-            mod.global = true;
-            mod.id = expr;
-            mod.body = this.tsParseModuleBlock();
-            return this.finishNode(mod, "TSModuleDeclaration");
-          }
-          break;
-
-        default:
-          return this.tsParseDeclaration(node, expr.name, /* next */ false);
-      }
-    }
-
-    // Common to tsTryParseDeclare, tsTryParseExportDeclaration, and tsParseExpressionStatement.
-    tsParseDeclaration(
-      node: any,
-      value: string,
-      next: boolean,
-    ): ?N.Declaration {
-      switch (value) {
-        case "abstract":
-          if (next || this.match(tt._class)) {
-            const cls: N.ClassDeclaration = node;
-            cls.abstract = true;
-            if (next) this.next();
-            return this.parseClass(
-              cls,
-              /* isStatement */ true,
-              /* optionalId */ false,
-            );
-          }
-          break;
-
-        case "enum":
-          if (next || this.match(tt.name)) {
-            if (next) this.next();
-            return this.tsParseEnumDeclaration(node, /* isConst */ false);
-          }
-          break;
-
-        case "interface":
-          if (next || this.match(tt.name)) {
-            if (next) this.next();
-            return this.tsParseInterfaceDeclaration(node);
-          }
-          break;
-
-        case "module":
-          if (next) this.next();
-          if (this.match(tt.string)) {
-            return this.tsParseAmbientExternalModuleDeclaration(node);
-          } else if (next || this.match(tt.name)) {
-            return this.tsParseModuleOrNamespaceDeclaration(node);
-          }
-          break;
-
-        case "namespace":
-          if (next || this.match(tt.name)) {
-            if (next) this.next();
-            return this.tsParseModuleOrNamespaceDeclaration(node);
-          }
-          break;
-
-        case "type":
-          if (next || this.match(tt.name)) {
-            if (next) this.next();
-            return this.tsParseTypeAliasDeclaration(node);
-          }
-          break;
-      }
-    }
-
-    tsTryParseGenericAsyncArrowFunction(
-      startPos: number,
-      startLoc: Position,
-    ): ?N.ArrowFunctionExpression {
-      const res: ?N.ArrowFunctionExpression = this.tsTryParseAndCatch(() => {
-        const node: N.ArrowFunctionExpression = this.startNodeAt(
-          startPos,
-          startLoc,
-        );
-        node.typeParameters = this.tsParseTypeParameters();
-        // Don't use overloaded parseFunctionParams which would look for "<" again.
-        super.parseFunctionParams(node);
-        node.returnType = this.tsTryParseTypeOrTypePredicateAnnotation();
-        this.expect(tt.arrow);
-        return node;
-      });
-
-      if (!res) {
-        return undefined;
-      }
-
-      res.id = null;
-      res.generator = false;
-      res.expression = true; // May be set again by parseFunctionBody.
-      res.async = true;
-      this.parseFunctionBody(res, true);
-      return this.finishNode(res, "ArrowFunctionExpression");
-    }
-
-    tsParseTypeArguments(): N.TsTypeParameterInstantiation {
-      const node = this.startNode();
-      node.params = this.tsInType(() =>
-        // Temporarily remove a JSX parsing context, which makes us scan different tokens.
-        this.tsInNoContext(() => {
-          this.expectRelational("<");
-          return this.tsParseDelimitedList(
-            "TypeParametersOrArguments",
-            this.tsParseType.bind(this),
-          );
-        }),
-      );
-      // This reads the next token after the `>` too, so do this in the enclosing context.
-      // But be sure not to parse a regex in the jsx expression `<C<number> />`, so set exprAllowed = false
-      this.state.exprAllowed = false;
-      this.expectRelational(">");
-      return this.finishNode(node, "TSTypeParameterInstantiation");
-    }
-
-    tsIsDeclarationStart(): boolean {
-      if (this.match(tt.name)) {
-        switch (this.state.value) {
-          case "abstract":
-          case "declare":
-          case "enum":
-          case "interface":
-          case "module":
-          case "namespace":
-          case "type":
-            return true;
-        }
-      }
-
-      return false;
-    }
-
-    // ======================================================
-    // OVERRIDES
-    // ======================================================
-
-    isExportDefaultSpecifier(): boolean {
-      if (this.tsIsDeclarationStart()) return false;
-      return super.isExportDefaultSpecifier();
-    }
-
-    parseAssignableListItem(
-      allowModifiers: ?boolean,
-      decorators: N.Decorator[],
-    ): N.Pattern | N.TSParameterProperty {
-      let accessibility: ?N.Accessibility;
-      let readonly = false;
-      if (allowModifiers) {
-        accessibility = this.parseAccessModifier();
-        readonly = !!this.tsParseModifier(["readonly"]);
-      }
-
-      const left = this.parseMaybeDefault();
-      this.parseAssignableListItemTypes(left);
-      const elt = this.parseMaybeDefault(left.start, left.loc.start, left);
-      if (accessibility || readonly) {
-        const pp: N.TSParameterProperty = this.startNodeAtNode(elt);
-        if (decorators.length) {
-          pp.decorators = decorators;
-        }
-        if (accessibility) pp.accessibility = accessibility;
-        if (readonly) pp.readonly = readonly;
-        if (elt.type !== "Identifier" && elt.type !== "AssignmentPattern") {
-          throw this.raise(
-            pp.start,
-            "A parameter property may not be declared using a binding pattern.",
-          );
-        }
-        pp.parameter = elt;
-        return this.finishNode(pp, "TSParameterProperty");
-      } else {
-        if (decorators.length) {
-          left.decorators = decorators;
-        }
-        return elt;
-      }
-    }
-
-    parseFunctionBodyAndFinish(
-      node: N.BodilessFunctionOrMethodBase,
-      type: string,
-      allowExpressionBody?: boolean,
-    ): void {
-      // For arrow functions, `parseArrow` handles the return type itself.
-      if (!allowExpressionBody && this.match(tt.colon)) {
-        node.returnType = this.tsParseTypeOrTypePredicateAnnotation(tt.colon);
-      }
-
-      const bodilessType =
-        type === "FunctionDeclaration"
-          ? "TSDeclareFunction"
-          : type === "ClassMethod"
-            ? "TSDeclareMethod"
-            : undefined;
-      if (bodilessType && !this.match(tt.braceL) && this.isLineTerminator()) {
-        this.finishNode(node, bodilessType);
-        return;
-      }
-
-      super.parseFunctionBodyAndFinish(node, type, allowExpressionBody);
-    }
-
-    parseSubscript(
-      base: N.Expression,
-      startPos: number,
-      startLoc: Position,
-      noCalls: ?boolean,
-      state: N.ParseSubscriptState,
-    ): N.Expression {
-      if (!this.hasPrecedingLineBreak() && this.match(tt.bang)) {
-        this.state.exprAllowed = false;
-        this.next();
-
-        const nonNullExpression: N.TsNonNullExpression = this.startNodeAt(
-          startPos,
-          startLoc,
-        );
-        nonNullExpression.expression = base;
-        return this.finishNode(nonNullExpression, "TSNonNullExpression");
-      }
-
-      // There are number of things we are going to "maybe" parse, like type arguments on
-      // tagged template expressions. If any of them fail, walk it back and continue.
-      const result = this.tsTryParseAndCatch(() => {
-        if (this.isRelational("<")) {
-          if (!noCalls && this.atPossibleAsync(base)) {
-            // Almost certainly this is a generic async function `async <T>() => ...
-            // But it might be a call with a type argument `async<T>();`
-            const asyncArrowFn = this.tsTryParseGenericAsyncArrowFunction(
-              startPos,
-              startLoc,
-            );
-            if (asyncArrowFn) {
-              return asyncArrowFn;
-            }
-          }
-
-          const node: N.CallExpression = this.startNodeAt(startPos, startLoc);
-          node.callee = base;
-
-          const typeArguments = this.tsParseTypeArguments();
-
-          if (typeArguments) {
-            if (!noCalls && this.eat(tt.parenL)) {
-              // possibleAsync always false here, because we would have handled it above.
-              // $FlowIgnore (won't be any undefined arguments)
-              node.arguments = this.parseCallExpressionArguments(
-                tt.parenR,
-                /* possibleAsync */ false,
-              );
-              node.typeParameters = typeArguments;
-              return this.finishCallExpression(node);
-            } else if (this.match(tt.backQuote)) {
-              return this.parseTaggedTemplateExpression(
-                startPos,
-                startLoc,
-                base,
-                state,
-                typeArguments,
-              );
-            }
-          }
-        }
-
-        this.unexpected();
-      });
-
-      if (result) return result;
-
-      return super.parseSubscript(base, startPos, startLoc, noCalls, state);
-    }
-
-    parseNewArguments(node: N.NewExpression): void {
-      if (this.isRelational("<")) {
-        // tsTryParseAndCatch is expensive, so avoid if not necessary.
-        // 99% certain this is `new C<T>();`. But may be `new C < T;`, which is also legal.
-        const typeParameters = this.tsTryParseAndCatch(() => {
-          const args = this.tsParseTypeArguments();
-          if (!this.match(tt.parenL)) this.unexpected();
-          return args;
-        });
-        if (typeParameters) {
-          node.typeParameters = typeParameters;
-        }
-      }
-
-      super.parseNewArguments(node);
-    }
-
-    parseExprOp(
-      left: N.Expression,
-      leftStartPos: number,
-      leftStartLoc: Position,
-      minPrec: number,
-      noIn: ?boolean,
-    ) {
-      if (
-        nonNull(tt._in.binop) > minPrec &&
-        !this.hasPrecedingLineBreak() &&
-        this.isContextual("as")
-      ) {
-        const node: N.TsAsExpression = this.startNodeAt(
-          leftStartPos,
-          leftStartLoc,
-        );
-        node.expression = left;
-        node.typeAnnotation = this.tsNextThenParseType();
-        this.finishNode(node, "TSAsExpression");
-        return this.parseExprOp(
-          node,
-          leftStartPos,
-          leftStartLoc,
-          minPrec,
-          noIn,
-        );
-      }
-
-      return super.parseExprOp(left, leftStartPos, leftStartLoc, minPrec, noIn);
-    }
-
-    checkReservedWord(
-      word: string, // eslint-disable-line no-unused-vars
-      startLoc: number, // eslint-disable-line no-unused-vars
-      checkKeywords: boolean, // eslint-disable-line no-unused-vars
-      // eslint-disable-next-line no-unused-vars
-      isBinding: boolean,
-    ): void {
-      // Don't bother checking for TypeScript code.
-      // Strict mode words may be allowed as in `declare namespace N { const static: number; }`.
-      // And we have a type checker anyway, so don't bother having the parser do it.
-    }
-
-    /*
-    Don't bother doing this check in TypeScript code because:
-    1. We may have a nested export statement with the same name:
-      export const x = 0;
-      export namespace N {
-        export const x = 1;
-      }
-    2. We have a type checker to warn us about this sort of thing.
-    */
-    checkDuplicateExports() {}
-
-    parseImport(
-      node: N.Node,
-    ): N.ImportDeclaration | N.TsImportEqualsDeclaration {
-      if (this.match(tt.name) && this.lookahead().type === tt.eq) {
-        return this.tsParseImportEqualsDeclaration(node);
-      }
-      return super.parseImport(node);
-    }
-
-    parseExport(node: N.Node): N.Node {
-      if (this.match(tt._import)) {
-        // `export import A = B;`
-        this.expect(tt._import);
-        return this.tsParseImportEqualsDeclaration(node, /* isExport */ true);
-      } else if (this.eat(tt.eq)) {
-        // `export = x;`
-        const assign: N.TsExportAssignment = node;
-        assign.expression = this.parseExpression();
-        this.semicolon();
-        return this.finishNode(assign, "TSExportAssignment");
-      } else if (this.eatContextual("as")) {
-        // `export as namespace A;`
-        const decl: N.TsNamespaceExportDeclaration = node;
-        // See `parseNamespaceExportDeclaration` in TypeScript's own parser
-        this.expectContextual("namespace");
-        decl.id = this.parseIdentifier();
-        this.semicolon();
-        return this.finishNode(decl, "TSNamespaceExportDeclaration");
-      } else {
-        return super.parseExport(node);
-      }
-    }
-
-    isAbstractClass(): boolean {
-      return (
-        this.isContextual("abstract") && this.lookahead().type === tt._class
-      );
-    }
-
-    parseExportDefaultExpression(): N.Expression | N.Declaration {
-      if (this.isAbstractClass()) {
-        const cls = this.startNode();
-        this.next(); // Skip "abstract"
-        this.parseClass(cls, true, true);
-        cls.abstract = true;
-        return cls;
-      }
-
-      // export default interface allowed in:
-      // https://github.com/Microsoft/TypeScript/pull/16040
-      if (this.state.value === "interface") {
-        const result = this.tsParseDeclaration(
-          this.startNode(),
-          this.state.value,
-          true,
-        );
-
-        if (result) return result;
-      }
-
-      return super.parseExportDefaultExpression();
-    }
-
-    parseStatementContent(
-      declaration: boolean,
-      topLevel: ?boolean,
-    ): N.Statement {
-      if (this.state.type === tt._const) {
-        const ahead = this.lookahead();
-        if (ahead.type === tt.name && ahead.value === "enum") {
-          const node: N.TsEnumDeclaration = this.startNode();
-          this.expect(tt._const);
-          this.expectContextual("enum");
-          return this.tsParseEnumDeclaration(node, /* isConst */ true);
-        }
-      }
-      return super.parseStatementContent(declaration, topLevel);
-    }
-
-    parseAccessModifier(): ?N.Accessibility {
-      return this.tsParseModifier(["public", "protected", "private"]);
-    }
-
-    parseClassMember(
-      classBody: N.ClassBody,
-      member: any,
-      state: { hadConstructor: boolean },
-    ): void {
-      const accessibility = this.parseAccessModifier();
-      if (accessibility) member.accessibility = accessibility;
-
-      super.parseClassMember(classBody, member, state);
-    }
-
-    parseClassMemberWithIsStatic(
-      classBody: N.ClassBody,
-      member: any,
-      state: { hadConstructor: boolean },
-      isStatic: boolean,
-    ): void {
-      const methodOrProp: N.ClassMethod | N.ClassProperty = member;
-      const prop: N.ClassProperty = member;
-      const propOrIdx: N.ClassProperty | N.TsIndexSignature = member;
-
-      let abstract = false,
-        readonly = false;
-
-      const mod = this.tsParseModifier(["abstract", "readonly"]);
-      switch (mod) {
-        case "readonly":
-          readonly = true;
-          abstract = !!this.tsParseModifier(["abstract"]);
-          break;
-        case "abstract":
-          abstract = true;
-          readonly = !!this.tsParseModifier(["readonly"]);
-          break;
-      }
-
-      if (abstract) methodOrProp.abstract = true;
-      if (readonly) propOrIdx.readonly = true;
-
-      if (!abstract && !isStatic && !methodOrProp.accessibility) {
-        const idx = this.tsTryParseIndexSignature(member);
-        if (idx) {
-          classBody.body.push(idx);
-          return;
-        }
-      }
-
-      if (readonly) {
-        // Must be a property (if not an index signature).
-        methodOrProp.static = isStatic;
-        this.parseClassPropertyName(prop);
-        this.parsePostMemberNameModifiers(methodOrProp);
-        this.pushClassProperty(classBody, prop);
-        return;
-      }
-
-      super.parseClassMemberWithIsStatic(classBody, member, state, isStatic);
-    }
-
-    parsePostMemberNameModifiers(
-      methodOrProp: N.ClassMethod | N.ClassProperty,
-    ): void {
-      const optional = this.eat(tt.question);
-      if (optional) methodOrProp.optional = true;
-    }
-
-    // Note: The reason we do this in `parseExpressionStatement` and not `parseStatement`
-    // is that e.g. `type()` is valid JS, so we must try parsing that first.
-    // If it's really a type, we will parse `type` as the statement, and can correct it here
-    // by parsing the rest.
-    parseExpressionStatement(
-      node: N.ExpressionStatement,
-      expr: N.Expression,
-    ): N.Statement {
-      const decl =
-        expr.type === "Identifier"
-          ? this.tsParseExpressionStatement(node, expr)
-          : undefined;
-      return decl || super.parseExpressionStatement(node, expr);
-    }
-
-    // export type
-    // Should be true for anything parsed by `tsTryParseExportDeclaration`.
-    shouldParseExportDeclaration(): boolean {
-      if (this.tsIsDeclarationStart()) return true;
-      return super.shouldParseExportDeclaration();
-    }
-
-    // An apparent conditional expression could actually be an optional parameter in an arrow function.
-    parseConditional(
-      expr: N.Expression,
-      noIn: ?boolean,
-      startPos: number,
-      startLoc: Position,
-      refNeedsArrowPos?: ?Pos,
-    ): N.Expression {
-      // only do the expensive clone if there is a question mark
-      // and if we come from inside parens
-      if (!refNeedsArrowPos || !this.match(tt.question)) {
-        return super.parseConditional(
-          expr,
-          noIn,
-          startPos,
-          startLoc,
-          refNeedsArrowPos,
-        );
-      }
-
-      const state = this.state.clone();
-      try {
-        return super.parseConditional(expr, noIn, startPos, startLoc);
-      } catch (err) {
-        if (!(err instanceof SyntaxError)) {
-          // istanbul ignore next: no such error is expected
-          throw err;
-        }
-
-        this.state = state;
-        refNeedsArrowPos.start = err.pos || this.state.start;
-        return expr;
-      }
-    }
-
-    // Note: These "type casts" are *not* valid TS expressions.
-    // But we parse them here and change them when completing the arrow function.
-    parseParenItem(
-      node: N.Expression,
-      startPos: number,
-      startLoc: Position,
-    ): N.Expression {
-      node = super.parseParenItem(node, startPos, startLoc);
-      if (this.eat(tt.question)) {
-        node.optional = true;
-      }
-
-      if (this.match(tt.colon)) {
-        const typeCastNode: N.TsTypeCastExpression = this.startNodeAt(
-          startPos,
-          startLoc,
-        );
-        typeCastNode.expression = node;
-        typeCastNode.typeAnnotation = this.tsParseTypeAnnotation();
-
-        return this.finishNode(typeCastNode, "TSTypeCastExpression");
-      }
-
-      return node;
-    }
-
-    parseExportDeclaration(node: N.ExportNamedDeclaration): ?N.Declaration {
-      // "export declare" is equivalent to just "export".
-      const isDeclare = this.eatContextual("declare");
-
-      let declaration: ?N.Declaration;
-      if (this.match(tt.name)) {
-        declaration = this.tsTryParseExportDeclaration();
-      }
-      if (!declaration) {
-        declaration = super.parseExportDeclaration(node);
-      }
-
-      if (declaration && isDeclare) {
-        declaration.declare = true;
-      }
-
-      return declaration;
-    }
-
-    parseClassId(
-      node: N.Class,
-      isStatement: boolean,
-      optionalId: ?boolean,
-    ): void {
-      if ((!isStatement || optionalId) && this.isContextual("implements")) {
-        return;
-      }
-
-      super.parseClassId(...arguments);
-      const typeParameters = this.tsTryParseTypeParameters();
-      if (typeParameters) node.typeParameters = typeParameters;
-    }
-
-    parseClassProperty(node: N.ClassProperty): N.ClassProperty {
-      if (!node.optional && this.eat(tt.bang)) {
-        node.definite = true;
-      }
-
-      const type = this.tsTryParseTypeAnnotation();
-      if (type) node.typeAnnotation = type;
-      return super.parseClassProperty(node);
-    }
-
-    pushClassMethod(
-      classBody: N.ClassBody,
-      method: N.ClassMethod,
-      isGenerator: boolean,
-      isAsync: boolean,
-      isConstructor: boolean,
-    ): void {
-      const typeParameters = this.tsTryParseTypeParameters();
-      if (typeParameters) method.typeParameters = typeParameters;
-      super.pushClassMethod(
-        classBody,
-        method,
-        isGenerator,
-        isAsync,
-        isConstructor,
-      );
-    }
-
-    pushClassPrivateMethod(
-      classBody: N.ClassBody,
-      method: N.ClassPrivateMethod,
-      isGenerator: boolean,
-      isAsync: boolean,
-    ): void {
-      const typeParameters = this.tsTryParseTypeParameters();
-      if (typeParameters) method.typeParameters = typeParameters;
-      super.pushClassPrivateMethod(classBody, method, isGenerator, isAsync);
-    }
-
-    parseClassSuper(node: N.Class): void {
-      super.parseClassSuper(node);
-      if (node.superClass && this.isRelational("<")) {
-        node.superTypeParameters = this.tsParseTypeArguments();
-      }
-      if (this.eatContextual("implements")) {
-        node.implements = this.tsParseHeritageClause();
-      }
-    }
-
-    parseObjPropValue(prop: N.ObjectMember, ...args): void {
-      const typeParameters = this.tsTryParseTypeParameters();
-      if (typeParameters) prop.typeParameters = typeParameters;
-
-      super.parseObjPropValue(prop, ...args);
-    }
-
-    parseFunctionParams(node: N.Function, allowModifiers?: boolean): void {
-      const typeParameters = this.tsTryParseTypeParameters();
-      if (typeParameters) node.typeParameters = typeParameters;
-      super.parseFunctionParams(node, allowModifiers);
-    }
-
-    // `let x: number;`
-    parseVarHead(decl: N.VariableDeclarator): void {
-      super.parseVarHead(decl);
-      if (decl.id.type === "Identifier" && this.eat(tt.bang)) {
-        decl.definite = true;
-      }
-
-      const type = this.tsTryParseTypeAnnotation();
-      if (type) {
-        decl.id.typeAnnotation = type;
-        this.finishNode(decl.id, decl.id.type); // set end position to end of type
-      }
-    }
-
-    // parse the return type of an async arrow function - let foo = (async (): number => {});
-    parseAsyncArrowFromCallExpression(
-      node: N.ArrowFunctionExpression,
-      call: N.CallExpression,
-    ): N.ArrowFunctionExpression {
-      if (this.match(tt.colon)) {
-        node.returnType = this.tsParseTypeAnnotation();
-      }
-      return super.parseAsyncArrowFromCallExpression(node, call);
-    }
-
-    parseMaybeAssign(...args): N.Expression {
-      // Note: When the JSX plugin is on, type assertions (`<T> x`) aren't valid syntax.
-
-      let jsxError: ?SyntaxError;
-
-      if (this.match(tt.jsxTagStart)) {
-        const context = this.curContext();
-        assert(context === ct.j_oTag);
-        // Only time j_oTag is pushed is right after j_expr.
-        assert(this.state.context[this.state.context.length - 2] === ct.j_expr);
-
-        // Prefer to parse JSX if possible. But may be an arrow fn.
-        const state = this.state.clone();
-        try {
-          return super.parseMaybeAssign(...args);
-        } catch (err) {
-          if (!(err instanceof SyntaxError)) {
-            // istanbul ignore next: no such error is expected
-            throw err;
-          }
-
-          this.state = state;
-          // Pop the context added by the jsxTagStart.
-          assert(this.curContext() === ct.j_oTag);
-          this.state.context.pop();
-          assert(this.curContext() === ct.j_expr);
-          this.state.context.pop();
-          jsxError = err;
-        }
-      }
-
-      if (jsxError === undefined && !this.isRelational("<")) {
-        return super.parseMaybeAssign(...args);
-      }
-
-      // Either way, we're looking at a '<': tt.jsxTagStart or relational.
-
-      let arrowExpression;
-      let typeParameters: N.TsTypeParameterDeclaration;
-      const state = this.state.clone();
-      try {
-        // This is similar to TypeScript's `tryParseParenthesizedArrowFunctionExpression`.
-        typeParameters = this.tsParseTypeParameters();
-        arrowExpression = super.parseMaybeAssign(...args);
-        if (arrowExpression.type !== "ArrowFunctionExpression") {
-          this.unexpected(); // Go to the catch block (needs a SyntaxError).
-        }
-      } catch (err) {
-        if (!(err instanceof SyntaxError)) {
-          // istanbul ignore next: no such error is expected
-          throw err;
-        }
-
-        if (jsxError) {
-          throw jsxError;
-        }
-
-        // Try parsing a type cast instead of an arrow function.
-        // This will never happen outside of JSX.
-        // (Because in JSX the '<' should be a jsxTagStart and not a relational.
-        assert(!this.hasPlugin("jsx"));
-        // Parsing an arrow function failed, so try a type cast.
-        this.state = state;
-        // This will start with a type assertion (via parseMaybeUnary).
-        // But don't directly call `this.tsParseTypeAssertion` because we want to handle any binary after it.
-        return super.parseMaybeAssign(...args);
-      }
-
-      // Correct TypeScript code should have at least 1 type parameter, but don't crash on bad code.
-      if (typeParameters && typeParameters.params.length !== 0) {
-        this.resetStartLocationFromNode(
-          arrowExpression,
-          typeParameters.params[0],
-        );
-      }
-      arrowExpression.typeParameters = typeParameters;
-      return arrowExpression;
-    }
-
-    // Handle type assertions
-    parseMaybeUnary(refShorthandDefaultPos?: ?Pos): N.Expression {
-      if (!this.hasPlugin("jsx") && this.eatRelational("<")) {
-        return this.tsParseTypeAssertion();
-      } else {
-        return super.parseMaybeUnary(refShorthandDefaultPos);
-      }
-    }
-
-    parseArrow(node: N.ArrowFunctionExpression): ?N.ArrowFunctionExpression {
-      if (this.match(tt.colon)) {
-        // This is different from how the TS parser does it.
-        // TS uses lookahead. The Babel Parser parses it as a parenthesized expression and converts.
-        const state = this.state.clone();
-        try {
-          const returnType = this.tsParseTypeOrTypePredicateAnnotation(
-            tt.colon,
-          );
-          if (this.canInsertSemicolon()) this.unexpected();
-          if (!this.match(tt.arrow)) this.unexpected();
-          node.returnType = returnType;
-        } catch (err) {
-          if (err instanceof SyntaxError) {
-            this.state = state;
-          } else {
-            // istanbul ignore next: no such error is expected
-            throw err;
-          }
-        }
-      }
-
-      return super.parseArrow(node);
-    }
-
-    // Allow type annotations inside of a parameter list.
-    parseAssignableListItemTypes(param: N.Pattern) {
-      if (this.eat(tt.question)) {
-        if (param.type !== "Identifier") {
-          throw this.raise(
-            param.start,
-            "A binding pattern parameter cannot be optional in an implementation signature.",
-          );
-        }
-
-        param.optional = true;
-      }
-      const type = this.tsTryParseTypeAnnotation();
-      if (type) param.typeAnnotation = type;
-      return this.finishNode(param, param.type);
-    }
-
-    toAssignable(
-      node: N.Node,
-      isBinding: ?boolean,
-      contextDescription: string,
-    ): N.Node {
-      switch (node.type) {
-        case "TSTypeCastExpression":
-          return super.toAssignable(
-            this.typeCastToParameter(node),
-            isBinding,
-            contextDescription,
-          );
-        case "TSParameterProperty":
-          return super.toAssignable(node, isBinding, contextDescription);
-        case "TSAsExpression":
-        case "TSNonNullExpression":
-        case "TSTypeAssertion":
-          node.expression = this.toAssignable(
-            node.expression,
-            isBinding,
-            contextDescription,
-          );
-          return node;
-        default:
-          return super.toAssignable(node, isBinding, contextDescription);
-      }
-    }
-
-    checkLVal(
-      expr: N.Expression,
-      isBinding: ?boolean,
-      checkClashes: ?{ [key: string]: boolean },
-      contextDescription: string,
-    ): void {
-      switch (expr.type) {
-        case "TSTypeCastExpression":
-          // Allow "typecasts" to appear on the left of assignment expressions,
-          // because it may be in an arrow function.
-          // e.g. `const f = (foo: number = 0) => foo;`
-          return;
-        case "TSParameterProperty":
-          this.checkLVal(
-            expr.parameter,
-            isBinding,
-            checkClashes,
-            "parameter property",
-          );
-          return;
-        case "TSAsExpression":
-        case "TSNonNullExpression":
-        case "TSTypeAssertion":
-          this.checkLVal(
-            expr.expression,
-            isBinding,
-            checkClashes,
-            contextDescription,
-          );
-          return;
-        default:
-          super.checkLVal(expr, isBinding, checkClashes, contextDescription);
-          return;
-      }
-    }
-
-    parseBindingAtom(): N.Pattern {
-      switch (this.state.type) {
-        case tt._this:
-          // "this" may be the name of a parameter, so allow it.
-          return this.parseIdentifier(/* liberal */ true);
-        default:
-          return super.parseBindingAtom();
-      }
-    }
-
-    // === === === === === === === === === === === === === === === ===
-    // Note: All below methods are duplicates of something in flow.js.
-    // Not sure what the best way to combine these is.
-    // === === === === === === === === === === === === === === === ===
-
-    isClassMethod(): boolean {
-      return this.isRelational("<") || super.isClassMethod();
-    }
-
-    isClassProperty(): boolean {
-      return (
-        this.match(tt.bang) || this.match(tt.colon) || super.isClassProperty()
-      );
-    }
-
-    parseMaybeDefault(...args): N.Pattern {
-      const node = super.parseMaybeDefault(...args);
-
-      if (
-        node.type === "AssignmentPattern" &&
-        node.typeAnnotation &&
-        node.right.start < node.typeAnnotation.start
-      ) {
-        this.raise(
-          node.typeAnnotation.start,
-          "Type annotations must come before default assignments, " +
-            "e.g. instead of `age = 25: number` use `age: number = 25`",
-        );
-      }
-
-      return node;
-    }
-
-    // ensure that inside types, we bypass the jsx parser plugin
-    readToken(code: number): void {
-      if (this.state.inType && (code === 62 || code === 60)) {
-        return this.finishOp(tt.relational, 1);
-      } else {
-        return super.readToken(code);
-      }
-    }
-
-    toAssignableList(
-      exprList: N.Expression[],
-      isBinding: ?boolean,
-      contextDescription: string,
-    ): $ReadOnlyArray<N.Pattern> {
-      for (let i = 0; i < exprList.length; i++) {
-        const expr = exprList[i];
-        if (expr && expr.type === "TSTypeCastExpression") {
-          exprList[i] = this.typeCastToParameter(expr);
-        }
-      }
-      return super.toAssignableList(exprList, isBinding, contextDescription);
-    }
-
-    typeCastToParameter(node: N.TsTypeCastExpression): N.Node {
-      node.expression.typeAnnotation = node.typeAnnotation;
-
-      return this.finishNodeAt(
-        node.expression,
-        node.expression.type,
-        node.typeAnnotation.end,
-        node.typeAnnotation.loc.end,
-      );
-    }
-
-    toReferencedList(
-      exprList: $ReadOnlyArray<?N.Expression>,
-    ): $ReadOnlyArray<?N.Expression> {
-      for (let i = 0; i < exprList.length; i++) {
-        const expr = exprList[i];
-        if (
-          expr &&
-          expr._exprListItem &&
-          expr.type === "TsTypeCastExpression"
-        ) {
-          this.raise(expr.start, "Did not expect a type annotation here.");
-        }
-      }
-
-      return exprList;
-    }
-
-    shouldParseArrow() {
-      return this.match(tt.colon) || super.shouldParseArrow();
-    }
-
-    shouldParseAsyncArrow(): boolean {
-      return this.match(tt.colon) || super.shouldParseAsyncArrow();
-    }
-
-    canHaveLeadingDecorator() {
-      // Avoid unnecessary lookahead in checking for abstract class unless needed!
-      return super.canHaveLeadingDecorator() || this.isAbstractClass();
-    }
-
-    jsxParseOpeningElementAfterName(
-      node: N.JSXOpeningElement,
-    ): N.JSXOpeningElement {
-      const typeArguments = this.tsTryParseAndCatch(() =>
-        this.tsParseTypeArguments(),
-      );
-      if (typeArguments) node.typeParameters = typeArguments;
-      return super.jsxParseOpeningElementAfterName(node);
-    }
-  };
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
new file mode 100644
index 000000000000..fb6e8363a333
--- /dev/null
+++ b/packages/babel-parser/src/plugins/typescript/index.js
@@ -0,0 +1,2446 @@
+// @flow
+
+import type { TokenType } from "../../tokenizer/types";
+import { types as tt } from "../../tokenizer/types";
+import { types as ct } from "../../tokenizer/context";
+import * as N from "../../types";
+import type { Pos, Position } from "../../util/location";
+import type Parser from "../../parser";
+import {
+  type BindingTypes,
+  BIND_NONE,
+  SCOPE_OTHER,
+  BIND_TS_ENUM,
+  BIND_TS_CONST_ENUM,
+  BIND_TS_TYPE,
+  BIND_TS_INTERFACE,
+  BIND_TS_FN_TYPE,
+  BIND_TS_NAMESPACE,
+} from "../../util/scopeflags";
+import TypeScriptScopeHandler from "./scope";
+
+type TsModifier =
+  | "readonly"
+  | "abstract"
+  | "static"
+  | "public"
+  | "private"
+  | "protected";
+
+function nonNull<T>(x: ?T): T {
+  if (x == null) {
+    // $FlowIgnore
+    throw new Error(`Unexpected ${x} value.`);
+  }
+  return x;
+}
+
+function assert(x: boolean): void {
+  if (!x) {
+    throw new Error("Assert fail");
+  }
+}
+
+type ParsingContext =
+  | "EnumMembers"
+  | "HeritageClauseElement"
+  | "TupleElementTypes"
+  | "TypeMembers"
+  | "TypeParametersOrArguments";
+
+// Doesn't handle "void" or "null" because those are keywords, not identifiers.
+function keywordTypeFromName(
+  value: string,
+): N.TsKeywordTypeType | typeof undefined {
+  switch (value) {
+    case "any":
+      return "TSAnyKeyword";
+    case "boolean":
+      return "TSBooleanKeyword";
+    case "bigint":
+      return "TSBigIntKeyword";
+    case "never":
+      return "TSNeverKeyword";
+    case "number":
+      return "TSNumberKeyword";
+    case "object":
+      return "TSObjectKeyword";
+    case "string":
+      return "TSStringKeyword";
+    case "symbol":
+      return "TSSymbolKeyword";
+    case "undefined":
+      return "TSUndefinedKeyword";
+    case "unknown":
+      return "TSUnknownKeyword";
+    default:
+      return undefined;
+  }
+}
+
+export default (superClass: Class<Parser>): Class<Parser> =>
+  class extends superClass {
+    getScopeHandler(): Class<TypeScriptScopeHandler> {
+      return TypeScriptScopeHandler;
+    }
+
+    tsIsIdentifier(): boolean {
+      // TODO: actually a bit more complex in TypeScript, but shouldn't matter.
+      // See https://github.com/Microsoft/TypeScript/issues/15008
+      return this.match(tt.name);
+    }
+
+    tsNextTokenCanFollowModifier() {
+      // Note: TypeScript's implementation is much more complicated because
+      // more things are considered modifiers there.
+      // This implementation only handles modifiers not handled by @babel/parser itself. And "static".
+      // TODO: Would be nice to avoid lookahead. Want a hasLineBreakUpNext() method...
+      this.next();
+      return (
+        !this.hasPrecedingLineBreak() &&
+        !this.match(tt.parenL) &&
+        !this.match(tt.parenR) &&
+        !this.match(tt.colon) &&
+        !this.match(tt.eq) &&
+        !this.match(tt.question) &&
+        !this.match(tt.bang)
+      );
+    }
+
+    /** Parses a modifier matching one the given modifier names. */
+    tsParseModifier<T: TsModifier>(allowedModifiers: T[]): ?T {
+      if (!this.match(tt.name)) {
+        return undefined;
+      }
+
+      const modifier = this.state.value;
+      if (
+        allowedModifiers.indexOf(modifier) !== -1 &&
+        this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this))
+      ) {
+        return modifier;
+      }
+      return undefined;
+    }
+
+    tsIsListTerminator(kind: ParsingContext): boolean {
+      switch (kind) {
+        case "EnumMembers":
+        case "TypeMembers":
+          return this.match(tt.braceR);
+        case "HeritageClauseElement":
+          return this.match(tt.braceL);
+        case "TupleElementTypes":
+          return this.match(tt.bracketR);
+        case "TypeParametersOrArguments":
+          return this.isRelational(">");
+      }
+
+      throw new Error("Unreachable");
+    }
+
+    tsParseList<T: N.Node>(kind: ParsingContext, parseElement: () => T): T[] {
+      const result: T[] = [];
+      while (!this.tsIsListTerminator(kind)) {
+        // Skipping "parseListElement" from the TS source since that's just for error handling.
+        result.push(parseElement());
+      }
+      return result;
+    }
+
+    tsParseDelimitedList<T: N.Node>(
+      kind: ParsingContext,
+      parseElement: () => T,
+    ): T[] {
+      return nonNull(
+        this.tsParseDelimitedListWorker(
+          kind,
+          parseElement,
+          /* expectSuccess */ true,
+        ),
+      );
+    }
+
+    /**
+     * If !expectSuccess, returns undefined instead of failing to parse.
+     * If expectSuccess, parseElement should always return a defined value.
+     */
+    tsParseDelimitedListWorker<T: N.Node>(
+      kind: ParsingContext,
+      parseElement: () => ?T,
+      expectSuccess: boolean,
+    ): ?(T[]) {
+      const result = [];
+
+      while (true) {
+        if (this.tsIsListTerminator(kind)) {
+          break;
+        }
+
+        const element = parseElement();
+        if (element == null) {
+          return undefined;
+        }
+        result.push(element);
+
+        if (this.eat(tt.comma)) {
+          continue;
+        }
+
+        if (this.tsIsListTerminator(kind)) {
+          break;
+        }
+
+        if (expectSuccess) {
+          // This will fail with an error about a missing comma
+          this.expect(tt.comma);
+        }
+        return undefined;
+      }
+
+      return result;
+    }
+
+    tsParseBracketedList<T: N.Node>(
+      kind: ParsingContext,
+      parseElement: () => T,
+      bracket: boolean,
+      skipFirstToken: boolean,
+    ): T[] {
+      if (!skipFirstToken) {
+        if (bracket) {
+          this.expect(tt.bracketL);
+        } else {
+          this.expectRelational("<");
+        }
+      }
+
+      const result = this.tsParseDelimitedList(kind, parseElement);
+
+      if (bracket) {
+        this.expect(tt.bracketR);
+      } else {
+        this.expectRelational(">");
+      }
+
+      return result;
+    }
+
+    tsParseImportType(): N.TsImportType {
+      const node: N.TsImportType = this.startNode();
+      this.expect(tt._import);
+      this.expect(tt.parenL);
+      if (!this.match(tt.string)) {
+        throw this.unexpected(
+          null,
+          "Argument in a type import must be a string literal",
+        );
+      }
+
+      // For compatibility to estree we cannot call parseLiteral directly here
+      node.argument = this.parseExprAtom();
+      this.expect(tt.parenR);
+
+      if (this.eat(tt.dot)) {
+        node.qualifier = this.tsParseEntityName(/* allowReservedWords */ true);
+      }
+      if (this.isRelational("<")) {
+        node.typeParameters = this.tsParseTypeArguments();
+      }
+      return this.finishNode(node, "TSImportType");
+    }
+
+    tsParseEntityName(allowReservedWords: boolean): N.TsEntityName {
+      let entity: N.TsEntityName = this.parseIdentifier();
+      while (this.eat(tt.dot)) {
+        const node: N.TsQualifiedName = this.startNodeAtNode(entity);
+        node.left = entity;
+        node.right = this.parseIdentifier(allowReservedWords);
+        entity = this.finishNode(node, "TSQualifiedName");
+      }
+      return entity;
+    }
+
+    tsParseTypeReference(): N.TsTypeReference {
+      const node: N.TsTypeReference = this.startNode();
+      node.typeName = this.tsParseEntityName(/* allowReservedWords */ false);
+      if (!this.hasPrecedingLineBreak() && this.isRelational("<")) {
+        node.typeParameters = this.tsParseTypeArguments();
+      }
+      return this.finishNode(node, "TSTypeReference");
+    }
+
+    tsParseThisTypePredicate(lhs: N.TsThisType): N.TsTypePredicate {
+      this.next();
+      const node: N.TsTypePredicate = this.startNodeAtNode(lhs);
+      node.parameterName = lhs;
+      node.typeAnnotation = this.tsParseTypeAnnotation(/* eatColon */ false);
+      return this.finishNode(node, "TSTypePredicate");
+    }
+
+    tsParseThisTypeNode(): N.TsThisType {
+      const node: N.TsThisType = this.startNode();
+      this.next();
+      return this.finishNode(node, "TSThisType");
+    }
+
+    tsParseTypeQuery(): N.TsTypeQuery {
+      const node: N.TsTypeQuery = this.startNode();
+      this.expect(tt._typeof);
+      if (this.match(tt._import)) {
+        node.exprName = this.tsParseImportType();
+      } else {
+        node.exprName = this.tsParseEntityName(/* allowReservedWords */ true);
+      }
+      return this.finishNode(node, "TSTypeQuery");
+    }
+
+    tsParseTypeParameter(): N.TsTypeParameter {
+      const node: N.TsTypeParameter = this.startNode();
+      node.name = this.parseIdentifierName(node.start);
+      node.constraint = this.tsEatThenParseType(tt._extends);
+      node.default = this.tsEatThenParseType(tt.eq);
+      return this.finishNode(node, "TSTypeParameter");
+    }
+
+    tsTryParseTypeParameters(): ?N.TsTypeParameterDeclaration {
+      if (this.isRelational("<")) {
+        return this.tsParseTypeParameters();
+      }
+    }
+
+    tsParseTypeParameters() {
+      const node: N.TsTypeParameterDeclaration = this.startNode();
+
+      if (this.isRelational("<") || this.match(tt.jsxTagStart)) {
+        this.next();
+      } else {
+        this.unexpected();
+      }
+
+      node.params = this.tsParseBracketedList(
+        "TypeParametersOrArguments",
+        this.tsParseTypeParameter.bind(this),
+        /* bracket */ false,
+        /* skipFirstToken */ true,
+      );
+      return this.finishNode(node, "TSTypeParameterDeclaration");
+    }
+
+    tsTryNextParseConstantContext(): ?N.TsTypeReference {
+      if (this.lookahead().type === tt._const) {
+        this.next();
+        return this.tsParseTypeReference();
+      }
+      return null;
+    }
+
+    // Note: In TypeScript implementation we must provide `yieldContext` and `awaitContext`,
+    // but here it's always false, because this is only used for types.
+    tsFillSignature(
+      returnToken: TokenType,
+      signature: N.TsSignatureDeclaration,
+    ): void {
+      // Arrow fns *must* have return token (`=>`). Normal functions can omit it.
+      const returnTokenRequired = returnToken === tt.arrow;
+      signature.typeParameters = this.tsTryParseTypeParameters();
+      this.expect(tt.parenL);
+      signature.parameters = this.tsParseBindingListForSignature();
+      if (returnTokenRequired) {
+        signature.typeAnnotation = this.tsParseTypeOrTypePredicateAnnotation(
+          returnToken,
+        );
+      } else if (this.match(returnToken)) {
+        signature.typeAnnotation = this.tsParseTypeOrTypePredicateAnnotation(
+          returnToken,
+        );
+      }
+    }
+
+    tsParseBindingListForSignature(): $ReadOnlyArray<
+      N.Identifier | N.RestElement | N.ObjectPattern | N.ArrayPattern,
+    > {
+      return this.parseBindingList(tt.parenR).map(pattern => {
+        if (
+          pattern.type !== "Identifier" &&
+          pattern.type !== "RestElement" &&
+          pattern.type !== "ObjectPattern" &&
+          pattern.type !== "ArrayPattern"
+        ) {
+          throw this.unexpected(
+            pattern.start,
+            `Name in a signature must be an Identifier, ObjectPattern or ArrayPattern, instead got ${
+              pattern.type
+            }`,
+          );
+        }
+        return pattern;
+      });
+    }
+
+    tsParseTypeMemberSemicolon(): void {
+      if (!this.eat(tt.comma)) {
+        this.semicolon();
+      }
+    }
+
+    tsParseSignatureMember(
+      kind: "TSCallSignatureDeclaration" | "TSConstructSignatureDeclaration",
+      node: N.TsCallSignatureDeclaration | N.TsConstructSignatureDeclaration,
+    ): N.TsCallSignatureDeclaration | N.TsConstructSignatureDeclaration {
+      this.tsFillSignature(tt.colon, node);
+      this.tsParseTypeMemberSemicolon();
+      return this.finishNode(node, kind);
+    }
+
+    tsIsUnambiguouslyIndexSignature() {
+      this.next(); // Skip '{'
+      return this.eat(tt.name) && this.match(tt.colon);
+    }
+
+    tsTryParseIndexSignature(node: N.TsIndexSignature): ?N.TsIndexSignature {
+      if (
+        !(
+          this.match(tt.bracketL) &&
+          this.tsLookAhead(this.tsIsUnambiguouslyIndexSignature.bind(this))
+        )
+      ) {
+        return undefined;
+      }
+
+      this.expect(tt.bracketL);
+      const id = this.parseIdentifier();
+      id.typeAnnotation = this.tsParseTypeAnnotation();
+      this.resetEndLocation(id); // set end position to end of type
+
+      this.expect(tt.bracketR);
+      node.parameters = [id];
+
+      const type = this.tsTryParseTypeAnnotation();
+      if (type) node.typeAnnotation = type;
+      this.tsParseTypeMemberSemicolon();
+      return this.finishNode(node, "TSIndexSignature");
+    }
+
+    tsParsePropertyOrMethodSignature(
+      node: N.TsPropertySignature | N.TsMethodSignature,
+      readonly: boolean,
+    ): N.TsPropertySignature | N.TsMethodSignature {
+      if (this.eat(tt.question)) node.optional = true;
+      const nodeAny: any = node;
+
+      if (!readonly && (this.match(tt.parenL) || this.isRelational("<"))) {
+        const method: N.TsMethodSignature = nodeAny;
+        this.tsFillSignature(tt.colon, method);
+        this.tsParseTypeMemberSemicolon();
+        return this.finishNode(method, "TSMethodSignature");
+      } else {
+        const property: N.TsPropertySignature = nodeAny;
+        if (readonly) property.readonly = true;
+        const type = this.tsTryParseTypeAnnotation();
+        if (type) property.typeAnnotation = type;
+        this.tsParseTypeMemberSemicolon();
+        return this.finishNode(property, "TSPropertySignature");
+      }
+    }
+
+    tsParseTypeMember(): N.TsTypeElement {
+      const node: any = this.startNode();
+
+      if (this.match(tt.parenL) || this.isRelational("<")) {
+        return this.tsParseSignatureMember("TSCallSignatureDeclaration", node);
+      }
+
+      if (this.match(tt._new)) {
+        const id: N.Identifier = this.startNode();
+        this.next();
+        if (this.match(tt.parenL) || this.isRelational("<")) {
+          return this.tsParseSignatureMember(
+            "TSConstructSignatureDeclaration",
+            node,
+          );
+        } else {
+          node.key = this.createIdentifier(id, "new");
+          return this.tsParsePropertyOrMethodSignature(node, false);
+        }
+      }
+
+      const readonly = !!this.tsParseModifier(["readonly"]);
+
+      const idx = this.tsTryParseIndexSignature(node);
+      if (idx) {
+        if (readonly) node.readonly = true;
+        return idx;
+      }
+
+      this.parsePropertyName(node);
+      return this.tsParsePropertyOrMethodSignature(node, readonly);
+    }
+
+    tsParseTypeLiteral(): N.TsTypeLiteral {
+      const node: N.TsTypeLiteral = this.startNode();
+      node.members = this.tsParseObjectTypeMembers();
+      return this.finishNode(node, "TSTypeLiteral");
+    }
+
+    tsParseObjectTypeMembers(): $ReadOnlyArray<N.TsTypeElement> {
+      this.expect(tt.braceL);
+      const members = this.tsParseList(
+        "TypeMembers",
+        this.tsParseTypeMember.bind(this),
+      );
+      this.expect(tt.braceR);
+      return members;
+    }
+
+    tsIsStartOfMappedType(): boolean {
+      this.next();
+      if (this.eat(tt.plusMin)) {
+        return this.isContextual("readonly");
+      }
+      if (this.isContextual("readonly")) {
+        this.next();
+      }
+      if (!this.match(tt.bracketL)) {
+        return false;
+      }
+      this.next();
+      if (!this.tsIsIdentifier()) {
+        return false;
+      }
+      this.next();
+      return this.match(tt._in);
+    }
+
+    tsParseMappedTypeParameter(): N.TsTypeParameter {
+      const node: N.TsTypeParameter = this.startNode();
+      node.name = this.parseIdentifierName(node.start);
+      node.constraint = this.tsExpectThenParseType(tt._in);
+      return this.finishNode(node, "TSTypeParameter");
+    }
+
+    tsParseMappedType(): N.TsMappedType {
+      const node: N.TsMappedType = this.startNode();
+
+      this.expect(tt.braceL);
+
+      if (this.match(tt.plusMin)) {
+        node.readonly = this.state.value;
+        this.next();
+        this.expectContextual("readonly");
+      } else if (this.eatContextual("readonly")) {
+        node.readonly = true;
+      }
+
+      this.expect(tt.bracketL);
+      node.typeParameter = this.tsParseMappedTypeParameter();
+      this.expect(tt.bracketR);
+
+      if (this.match(tt.plusMin)) {
+        node.optional = this.state.value;
+        this.next();
+        this.expect(tt.question);
+      } else if (this.eat(tt.question)) {
+        node.optional = true;
+      }
+
+      node.typeAnnotation = this.tsTryParseType();
+      this.semicolon();
+      this.expect(tt.braceR);
+
+      return this.finishNode(node, "TSMappedType");
+    }
+
+    tsParseTupleType(): N.TsTupleType {
+      const node: N.TsTupleType = this.startNode();
+      node.elementTypes = this.tsParseBracketedList(
+        "TupleElementTypes",
+        this.tsParseTupleElementType.bind(this),
+        /* bracket */ true,
+        /* skipFirstToken */ false,
+      );
+
+      // Validate the elementTypes to ensure:
+      //   No mandatory elements may follow optional elements
+      //   If there's a rest element, it must be at the end of the tuple
+      let seenOptionalElement = false;
+      node.elementTypes.forEach(elementNode => {
+        if (elementNode.type === "TSOptionalType") {
+          seenOptionalElement = true;
+        } else if (seenOptionalElement && elementNode.type !== "TSRestType") {
+          this.raise(
+            elementNode.start,
+            "A required element cannot follow an optional element.",
+          );
+        }
+      });
+
+      return this.finishNode(node, "TSTupleType");
+    }
+
+    tsParseTupleElementType(): N.TsType {
+      // parses `...TsType[]`
+      if (this.match(tt.ellipsis)) {
+        const restNode: N.TsRestType = this.startNode();
+        this.next(); // skips ellipsis
+        restNode.typeAnnotation = this.tsParseType();
+        this.checkCommaAfterRest();
+        return this.finishNode(restNode, "TSRestType");
+      }
+
+      const type = this.tsParseType();
+      // parses `TsType?`
+      if (this.eat(tt.question)) {
+        const optionalTypeNode: N.TsOptionalType = this.startNodeAtNode(type);
+        optionalTypeNode.typeAnnotation = type;
+        return this.finishNode(optionalTypeNode, "TSOptionalType");
+      }
+      return type;
+    }
+
+    tsParseParenthesizedType(): N.TsParenthesizedType {
+      const node = this.startNode();
+      this.expect(tt.parenL);
+      node.typeAnnotation = this.tsParseType();
+      this.expect(tt.parenR);
+      return this.finishNode(node, "TSParenthesizedType");
+    }
+
+    tsParseFunctionOrConstructorType(
+      type: "TSFunctionType" | "TSConstructorType",
+    ): N.TsFunctionOrConstructorType {
+      const node: N.TsFunctionOrConstructorType = this.startNode();
+      if (type === "TSConstructorType") {
+        this.expect(tt._new);
+      }
+      this.tsFillSignature(tt.arrow, node);
+      return this.finishNode(node, type);
+    }
+
+    tsParseLiteralTypeNode(): N.TsLiteralType {
+      const node: N.TsLiteralType = this.startNode();
+      node.literal = (() => {
+        switch (this.state.type) {
+          case tt.num:
+          case tt.string:
+          case tt._true:
+          case tt._false:
+            // For compatibility to estree we cannot call parseLiteral directly here
+            return this.parseExprAtom();
+          default:
+            throw this.unexpected();
+        }
+      })();
+      return this.finishNode(node, "TSLiteralType");
+    }
+
+    tsParseTemplateLiteralType(): N.TsType {
+      const node: N.TsLiteralType = this.startNode();
+      const templateNode = this.parseTemplate(false);
+      if (templateNode.expressions.length > 0) {
+        throw this.raise(
+          templateNode.expressions[0].start,
+          "Template literal types cannot have any substitution",
+        );
+      }
+      node.literal = templateNode;
+      return this.finishNode(node, "TSLiteralType");
+    }
+
+    tsParseNonArrayType(): N.TsType {
+      switch (this.state.type) {
+        case tt.name:
+        case tt._void:
+        case tt._null: {
+          const type = this.match(tt._void)
+            ? "TSVoidKeyword"
+            : this.match(tt._null)
+            ? "TSNullKeyword"
+            : keywordTypeFromName(this.state.value);
+          if (type !== undefined && this.lookahead().type !== tt.dot) {
+            const node: N.TsKeywordType = this.startNode();
+            this.next();
+            return this.finishNode(node, type);
+          }
+          return this.tsParseTypeReference();
+        }
+        case tt.string:
+        case tt.num:
+        case tt._true:
+        case tt._false:
+          return this.tsParseLiteralTypeNode();
+        case tt.plusMin:
+          if (this.state.value === "-") {
+            const node: N.TsLiteralType = this.startNode();
+            if (this.lookahead().type !== tt.num) {
+              throw this.unexpected();
+            }
+            node.literal = this.parseMaybeUnary();
+            return this.finishNode(node, "TSLiteralType");
+          }
+          break;
+        case tt._this: {
+          const thisKeyword = this.tsParseThisTypeNode();
+          if (this.isContextual("is") && !this.hasPrecedingLineBreak()) {
+            return this.tsParseThisTypePredicate(thisKeyword);
+          } else {
+            return thisKeyword;
+          }
+        }
+        case tt._typeof:
+          return this.tsParseTypeQuery();
+        case tt._import:
+          return this.tsParseImportType();
+        case tt.braceL:
+          return this.tsLookAhead(this.tsIsStartOfMappedType.bind(this))
+            ? this.tsParseMappedType()
+            : this.tsParseTypeLiteral();
+        case tt.bracketL:
+          return this.tsParseTupleType();
+        case tt.parenL:
+          return this.tsParseParenthesizedType();
+        case tt.backQuote:
+          return this.tsParseTemplateLiteralType();
+      }
+
+      throw this.unexpected();
+    }
+
+    tsParseArrayTypeOrHigher(): N.TsType {
+      let type = this.tsParseNonArrayType();
+      while (!this.hasPrecedingLineBreak() && this.eat(tt.bracketL)) {
+        if (this.match(tt.bracketR)) {
+          const node: N.TsArrayType = this.startNodeAtNode(type);
+          node.elementType = type;
+          this.expect(tt.bracketR);
+          type = this.finishNode(node, "TSArrayType");
+        } else {
+          const node: N.TsIndexedAccessType = this.startNodeAtNode(type);
+          node.objectType = type;
+          node.indexType = this.tsParseType();
+          this.expect(tt.bracketR);
+          type = this.finishNode(node, "TSIndexedAccessType");
+        }
+      }
+      return type;
+    }
+
+    tsParseTypeOperator(
+      operator: "keyof" | "unique" | "readonly",
+    ): N.TsTypeOperator {
+      const node: N.TsTypeOperator = this.startNode();
+      this.expectContextual(operator);
+      node.operator = operator;
+      node.typeAnnotation = this.tsParseTypeOperatorOrHigher();
+
+      if (operator === "readonly") {
+        this.tsCheckTypeAnnotationForReadOnly(node);
+      }
+
+      return this.finishNode(node, "TSTypeOperator");
+    }
+
+    tsCheckTypeAnnotationForReadOnly(node: N.Node) {
+      switch (node.typeAnnotation.type) {
+        case "TSTupleType":
+        case "TSArrayType":
+          return;
+        default:
+          this.raise(
+            node.start,
+            "'readonly' type modifier is only permitted on array and tuple literal types.",
+          );
+      }
+    }
+
+    tsParseInferType(): N.TsInferType {
+      const node = this.startNode();
+      this.expectContextual("infer");
+      const typeParameter = this.startNode();
+      typeParameter.name = this.parseIdentifierName(typeParameter.start);
+      node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
+      return this.finishNode(node, "TSInferType");
+    }
+
+    tsParseTypeOperatorOrHigher(): N.TsType {
+      const operator = ["keyof", "unique", "readonly"].find(kw =>
+        this.isContextual(kw),
+      );
+      return operator
+        ? this.tsParseTypeOperator(operator)
+        : this.isContextual("infer")
+        ? this.tsParseInferType()
+        : this.tsParseArrayTypeOrHigher();
+    }
+
+    tsParseUnionOrIntersectionType(
+      kind: "TSUnionType" | "TSIntersectionType",
+      parseConstituentType: () => N.TsType,
+      operator: TokenType,
+    ): N.TsType {
+      this.eat(operator);
+      let type = parseConstituentType();
+      if (this.match(operator)) {
+        const types = [type];
+        while (this.eat(operator)) {
+          types.push(parseConstituentType());
+        }
+        const node: N.TsUnionType | N.TsIntersectionType = this.startNodeAtNode(
+          type,
+        );
+        node.types = types;
+        type = this.finishNode(node, kind);
+      }
+      return type;
+    }
+
+    tsParseIntersectionTypeOrHigher(): N.TsType {
+      return this.tsParseUnionOrIntersectionType(
+        "TSIntersectionType",
+        this.tsParseTypeOperatorOrHigher.bind(this),
+        tt.bitwiseAND,
+      );
+    }
+
+    tsParseUnionTypeOrHigher() {
+      return this.tsParseUnionOrIntersectionType(
+        "TSUnionType",
+        this.tsParseIntersectionTypeOrHigher.bind(this),
+        tt.bitwiseOR,
+      );
+    }
+
+    tsIsStartOfFunctionType() {
+      if (this.isRelational("<")) {
+        return true;
+      }
+      return (
+        this.match(tt.parenL) &&
+        this.tsLookAhead(this.tsIsUnambiguouslyStartOfFunctionType.bind(this))
+      );
+    }
+
+    tsSkipParameterStart(): boolean {
+      if (this.match(tt.name) || this.match(tt._this)) {
+        this.next();
+        return true;
+      }
+
+      if (this.match(tt.braceL)) {
+        let braceStackCounter = 1;
+        this.next();
+
+        while (braceStackCounter > 0) {
+          if (this.match(tt.braceL)) {
+            ++braceStackCounter;
+          } else if (this.match(tt.braceR)) {
+            --braceStackCounter;
+          }
+          this.next();
+        }
+        return true;
+      }
+
+      if (this.match(tt.bracketL)) {
+        let braceStackCounter = 1;
+        this.next();
+
+        while (braceStackCounter > 0) {
+          if (this.match(tt.bracketL)) {
+            ++braceStackCounter;
+          } else if (this.match(tt.bracketR)) {
+            --braceStackCounter;
+          }
+          this.next();
+        }
+        return true;
+      }
+
+      return false;
+    }
+
+    tsIsUnambiguouslyStartOfFunctionType(): boolean {
+      this.next();
+      if (this.match(tt.parenR) || this.match(tt.ellipsis)) {
+        // ( )
+        // ( ...
+        return true;
+      }
+      if (this.tsSkipParameterStart()) {
+        if (
+          this.match(tt.colon) ||
+          this.match(tt.comma) ||
+          this.match(tt.question) ||
+          this.match(tt.eq)
+        ) {
+          // ( xxx :
+          // ( xxx ,
+          // ( xxx ?
+          // ( xxx =
+          return true;
+        }
+        if (this.match(tt.parenR)) {
+          this.next();
+          if (this.match(tt.arrow)) {
+            // ( xxx ) =>
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
+    tsParseTypeOrTypePredicateAnnotation(
+      returnToken: TokenType,
+    ): N.TsTypeAnnotation {
+      return this.tsInType(() => {
+        const t: N.TsTypeAnnotation = this.startNode();
+        this.expect(returnToken);
+
+        const typePredicateVariable =
+          this.tsIsIdentifier() &&
+          this.tsTryParse(this.tsParseTypePredicatePrefix.bind(this));
+
+        if (!typePredicateVariable) {
+          return this.tsParseTypeAnnotation(/* eatColon */ false, t);
+        }
+
+        const type = this.tsParseTypeAnnotation(/* eatColon */ false);
+
+        const node: N.TsTypePredicate = this.startNodeAtNode(
+          typePredicateVariable,
+        );
+        node.parameterName = typePredicateVariable;
+        node.typeAnnotation = type;
+        t.typeAnnotation = this.finishNode(node, "TSTypePredicate");
+        return this.finishNode(t, "TSTypeAnnotation");
+      });
+    }
+
+    tsTryParseTypeOrTypePredicateAnnotation(): ?N.TsTypeAnnotation {
+      return this.match(tt.colon)
+        ? this.tsParseTypeOrTypePredicateAnnotation(tt.colon)
+        : undefined;
+    }
+
+    tsTryParseTypeAnnotation(): ?N.TsTypeAnnotation {
+      return this.match(tt.colon) ? this.tsParseTypeAnnotation() : undefined;
+    }
+
+    tsTryParseType(): ?N.TsType {
+      return this.tsEatThenParseType(tt.colon);
+    }
+
+    tsParseTypePredicatePrefix(): ?N.Identifier {
+      const id = this.parseIdentifier();
+      if (this.isContextual("is") && !this.hasPrecedingLineBreak()) {
+        this.next();
+        return id;
+      }
+    }
+
+    tsParseTypeAnnotation(
+      eatColon = true,
+      t: N.TsTypeAnnotation = this.startNode(),
+    ): N.TsTypeAnnotation {
+      this.tsInType(() => {
+        if (eatColon) this.expect(tt.colon);
+        t.typeAnnotation = this.tsParseType();
+      });
+      return this.finishNode(t, "TSTypeAnnotation");
+    }
+
+    /** Be sure to be in a type context before calling this, using `tsInType`. */
+    tsParseType(): N.TsType {
+      // Need to set `state.inType` so that we don't parse JSX in a type context.
+      assert(this.state.inType);
+      const type = this.tsParseNonConditionalType();
+      if (this.hasPrecedingLineBreak() || !this.eat(tt._extends)) {
+        return type;
+      }
+      const node: N.TsConditionalType = this.startNodeAtNode(type);
+      node.checkType = type;
+      node.extendsType = this.tsParseNonConditionalType();
+      this.expect(tt.question);
+      node.trueType = this.tsParseType();
+      this.expect(tt.colon);
+      node.falseType = this.tsParseType();
+      return this.finishNode(node, "TSConditionalType");
+    }
+
+    tsParseNonConditionalType(): N.TsType {
+      if (this.tsIsStartOfFunctionType()) {
+        return this.tsParseFunctionOrConstructorType("TSFunctionType");
+      }
+      if (this.match(tt._new)) {
+        // As in `new () => Date`
+        return this.tsParseFunctionOrConstructorType("TSConstructorType");
+      }
+      return this.tsParseUnionTypeOrHigher();
+    }
+
+    tsParseTypeAssertion(): N.TsTypeAssertion {
+      const node: N.TsTypeAssertion = this.startNode();
+      const _const = this.tsTryNextParseConstantContext();
+      node.typeAnnotation = _const || this.tsNextThenParseType();
+      this.expectRelational(">");
+      node.expression = this.parseMaybeUnary();
+      return this.finishNode(node, "TSTypeAssertion");
+    }
+
+    tsParseHeritageClause(
+      descriptor: string,
+    ): $ReadOnlyArray<N.TsExpressionWithTypeArguments> {
+      const originalStart = this.state.start;
+
+      const delimitedList = this.tsParseDelimitedList(
+        "HeritageClauseElement",
+        this.tsParseExpressionWithTypeArguments.bind(this),
+      );
+
+      if (!delimitedList.length) {
+        this.raise(originalStart, `'${descriptor}' list cannot be empty.`);
+      }
+
+      return delimitedList;
+    }
+
+    tsParseExpressionWithTypeArguments(): N.TsExpressionWithTypeArguments {
+      const node: N.TsExpressionWithTypeArguments = this.startNode();
+      // Note: TS uses parseLeftHandSideExpressionOrHigher,
+      // then has grammar errors later if it's not an EntityName.
+      node.expression = this.tsParseEntityName(/* allowReservedWords */ false);
+      if (this.isRelational("<")) {
+        node.typeParameters = this.tsParseTypeArguments();
+      }
+
+      return this.finishNode(node, "TSExpressionWithTypeArguments");
+    }
+
+    tsParseInterfaceDeclaration(
+      node: N.TsInterfaceDeclaration,
+    ): N.TsInterfaceDeclaration {
+      node.id = this.parseIdentifier();
+      this.checkLVal(
+        node.id,
+        BIND_TS_INTERFACE,
+        undefined,
+        "typescript interface declaration",
+      );
+      node.typeParameters = this.tsTryParseTypeParameters();
+      if (this.eat(tt._extends)) {
+        node.extends = this.tsParseHeritageClause("extends");
+      }
+      const body: N.TSInterfaceBody = this.startNode();
+      body.body = this.tsInType(this.tsParseObjectTypeMembers.bind(this));
+      node.body = this.finishNode(body, "TSInterfaceBody");
+      return this.finishNode(node, "TSInterfaceDeclaration");
+    }
+
+    tsParseTypeAliasDeclaration(
+      node: N.TsTypeAliasDeclaration,
+    ): N.TsTypeAliasDeclaration {
+      node.id = this.parseIdentifier();
+      this.checkLVal(node.id, BIND_TS_TYPE, undefined, "typescript type alias");
+
+      node.typeParameters = this.tsTryParseTypeParameters();
+      node.typeAnnotation = this.tsExpectThenParseType(tt.eq);
+      this.semicolon();
+      return this.finishNode(node, "TSTypeAliasDeclaration");
+    }
+
+    tsInNoContext<T>(cb: () => T): T {
+      const oldContext = this.state.context;
+      this.state.context = [oldContext[0]];
+      try {
+        return cb();
+      } finally {
+        this.state.context = oldContext;
+      }
+    }
+
+    /**
+     * Runs `cb` in a type context.
+     * This should be called one token *before* the first type token,
+     * so that the call to `next()` is run in type context.
+     */
+    tsInType<T>(cb: () => T): T {
+      const oldInType = this.state.inType;
+      this.state.inType = true;
+      try {
+        return cb();
+      } finally {
+        this.state.inType = oldInType;
+      }
+    }
+
+    tsEatThenParseType(token: TokenType): N.TsType | typeof undefined {
+      return !this.match(token) ? undefined : this.tsNextThenParseType();
+    }
+
+    tsExpectThenParseType(token: TokenType): N.TsType {
+      return this.tsDoThenParseType(() => this.expect(token));
+    }
+
+    tsNextThenParseType(): N.TsType {
+      return this.tsDoThenParseType(() => this.next());
+    }
+
+    tsDoThenParseType(cb: () => void): N.TsType {
+      return this.tsInType(() => {
+        cb();
+        return this.tsParseType();
+      });
+    }
+
+    tsParseEnumMember(): N.TsEnumMember {
+      const node: N.TsEnumMember = this.startNode();
+      // Computed property names are grammar errors in an enum, so accept just string literal or identifier.
+      node.id = this.match(tt.string)
+        ? this.parseExprAtom()
+        : this.parseIdentifier(/* liberal */ true);
+      if (this.eat(tt.eq)) {
+        node.initializer = this.parseMaybeAssign();
+      }
+      return this.finishNode(node, "TSEnumMember");
+    }
+
+    tsParseEnumDeclaration(
+      node: N.TsEnumDeclaration,
+      isConst: boolean,
+    ): N.TsEnumDeclaration {
+      if (isConst) node.const = true;
+      node.id = this.parseIdentifier();
+      this.checkLVal(
+        node.id,
+        isConst ? BIND_TS_CONST_ENUM : BIND_TS_ENUM,
+        undefined,
+        "typescript enum declaration",
+      );
+
+      this.expect(tt.braceL);
+      node.members = this.tsParseDelimitedList(
+        "EnumMembers",
+        this.tsParseEnumMember.bind(this),
+      );
+      this.expect(tt.braceR);
+      return this.finishNode(node, "TSEnumDeclaration");
+    }
+
+    tsParseModuleBlock(): N.TsModuleBlock {
+      const node: N.TsModuleBlock = this.startNode();
+      this.scope.enter(SCOPE_OTHER);
+
+      this.expect(tt.braceL);
+      // Inside of a module block is considered "top-level", meaning it can have imports and exports.
+      this.parseBlockOrModuleBlockBody(
+        (node.body = []),
+        /* directives */ undefined,
+        /* topLevel */ true,
+        /* end */ tt.braceR,
+      );
+      this.scope.exit();
+      return this.finishNode(node, "TSModuleBlock");
+    }
+
+    tsParseModuleOrNamespaceDeclaration(
+      node: N.TsModuleDeclaration,
+      nested?: boolean = false,
+    ): N.TsModuleDeclaration {
+      node.id = this.parseIdentifier();
+
+      if (!nested) {
+        this.checkLVal(
+          node.id,
+          BIND_TS_NAMESPACE,
+          null,
+          "module or namespace declaration",
+        );
+      }
+
+      if (this.eat(tt.dot)) {
+        const inner = this.startNode();
+        this.tsParseModuleOrNamespaceDeclaration(inner, true);
+        node.body = inner;
+      } else {
+        node.body = this.tsParseModuleBlock();
+      }
+      return this.finishNode(node, "TSModuleDeclaration");
+    }
+
+    tsParseAmbientExternalModuleDeclaration(
+      node: N.TsModuleDeclaration,
+    ): N.TsModuleDeclaration {
+      if (this.isContextual("global")) {
+        node.global = true;
+        node.id = this.parseIdentifier();
+      } else if (this.match(tt.string)) {
+        node.id = this.parseExprAtom();
+      } else {
+        this.unexpected();
+      }
+
+      if (this.match(tt.braceL)) {
+        node.body = this.tsParseModuleBlock();
+      } else {
+        this.semicolon();
+      }
+
+      return this.finishNode(node, "TSModuleDeclaration");
+    }
+
+    tsParseImportEqualsDeclaration(
+      node: N.TsImportEqualsDeclaration,
+      isExport?: boolean,
+    ): N.TsImportEqualsDeclaration {
+      node.isExport = isExport || false;
+      node.id = this.parseIdentifier();
+      this.expect(tt.eq);
+      node.moduleReference = this.tsParseModuleReference();
+      this.semicolon();
+      return this.finishNode(node, "TSImportEqualsDeclaration");
+    }
+
+    tsIsExternalModuleReference(): boolean {
+      return (
+        this.isContextual("require") && this.lookahead().type === tt.parenL
+      );
+    }
+
+    tsParseModuleReference(): N.TsModuleReference {
+      return this.tsIsExternalModuleReference()
+        ? this.tsParseExternalModuleReference()
+        : this.tsParseEntityName(/* allowReservedWords */ false);
+    }
+
+    tsParseExternalModuleReference(): N.TsExternalModuleReference {
+      const node: N.TsExternalModuleReference = this.startNode();
+      this.expectContextual("require");
+      this.expect(tt.parenL);
+      if (!this.match(tt.string)) {
+        throw this.unexpected();
+      }
+      // For compatibility to estree we cannot call parseLiteral directly here
+      node.expression = this.parseExprAtom();
+      this.expect(tt.parenR);
+      return this.finishNode(node, "TSExternalModuleReference");
+    }
+
+    // Utilities
+
+    tsLookAhead<T>(f: () => T): T {
+      const state = this.state.clone();
+      const res = f();
+      this.state = state;
+      return res;
+    }
+
+    tsTryParseAndCatch<T>(f: () => T): ?T {
+      const state = this.state.clone();
+      try {
+        return f();
+      } catch (e) {
+        if (e instanceof SyntaxError) {
+          this.state = state;
+          return undefined;
+        }
+        throw e;
+      }
+    }
+
+    tsTryParse<T>(f: () => ?T): ?T {
+      const state = this.state.clone();
+      const result = f();
+      if (result !== undefined && result !== false) {
+        return result;
+      } else {
+        this.state = state;
+        return undefined;
+      }
+    }
+
+    tsTryParseDeclare(nany: any): ?N.Declaration {
+      if (this.isLineTerminator()) {
+        return;
+      }
+      let starttype = this.state.type;
+      let kind;
+
+      if (this.isContextual("let")) {
+        starttype = tt._var;
+        kind = "let";
+      }
+
+      switch (starttype) {
+        case tt._function:
+          return this.parseFunctionStatement(
+            nany,
+            /* async */ false,
+            /* declarationPosition */ true,
+          );
+        case tt._class:
+          return this.parseClass(
+            nany,
+            /* isStatement */ true,
+            /* optionalId */ false,
+          );
+        case tt._const:
+          if (this.match(tt._const) && this.isLookaheadContextual("enum")) {
+            // `const enum = 0;` not allowed because "enum" is a strict mode reserved word.
+            this.expect(tt._const);
+            this.expectContextual("enum");
+            return this.tsParseEnumDeclaration(nany, /* isConst */ true);
+          }
+        // falls through
+        case tt._var:
+          kind = kind || this.state.value;
+          return this.parseVarStatement(nany, kind);
+        case tt.name: {
+          const value = this.state.value;
+          if (value === "global") {
+            return this.tsParseAmbientExternalModuleDeclaration(nany);
+          } else {
+            return this.tsParseDeclaration(nany, value, /* next */ true);
+          }
+        }
+      }
+    }
+
+    // Note: this won't be called unless the keyword is allowed in `shouldParseExportDeclaration`.
+    tsTryParseExportDeclaration(): ?N.Declaration {
+      return this.tsParseDeclaration(
+        this.startNode(),
+        this.state.value,
+        /* next */ true,
+      );
+    }
+
+    tsParseExpressionStatement(node: any, expr: N.Identifier): ?N.Declaration {
+      switch (expr.name) {
+        case "declare": {
+          const declaration = this.tsTryParseDeclare(node);
+          if (declaration) {
+            declaration.declare = true;
+            return declaration;
+          }
+          break;
+        }
+        case "global":
+          // `global { }` (with no `declare`) may appear inside an ambient module declaration.
+          // Would like to use tsParseAmbientExternalModuleDeclaration here, but already ran past "global".
+          if (this.match(tt.braceL)) {
+            const mod: N.TsModuleDeclaration = node;
+            mod.global = true;
+            mod.id = expr;
+            mod.body = this.tsParseModuleBlock();
+            return this.finishNode(mod, "TSModuleDeclaration");
+          }
+          break;
+
+        default:
+          return this.tsParseDeclaration(node, expr.name, /* next */ false);
+      }
+    }
+
+    // Common to tsTryParseDeclare, tsTryParseExportDeclaration, and tsParseExpressionStatement.
+    tsParseDeclaration(
+      node: any,
+      value: string,
+      next: boolean,
+    ): ?N.Declaration {
+      switch (value) {
+        case "abstract":
+          if (this.tsCheckLineTerminatorAndMatch(tt._class, next)) {
+            const cls: N.ClassDeclaration = node;
+            cls.abstract = true;
+            if (next) {
+              this.next();
+              if (!this.match(tt._class)) {
+                this.unexpected(null, tt._class);
+              }
+            }
+            return this.parseClass(
+              cls,
+              /* isStatement */ true,
+              /* optionalId */ false,
+            );
+          }
+          break;
+
+        case "enum":
+          if (next || this.match(tt.name)) {
+            if (next) this.next();
+            return this.tsParseEnumDeclaration(node, /* isConst */ false);
+          }
+          break;
+
+        case "interface":
+          if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
+            if (next) this.next();
+            return this.tsParseInterfaceDeclaration(node);
+          }
+          break;
+
+        case "module":
+          if (next) this.next();
+          if (this.match(tt.string)) {
+            return this.tsParseAmbientExternalModuleDeclaration(node);
+          } else if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
+            return this.tsParseModuleOrNamespaceDeclaration(node);
+          }
+          break;
+
+        case "namespace":
+          if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
+            if (next) this.next();
+            return this.tsParseModuleOrNamespaceDeclaration(node);
+          }
+          break;
+
+        case "type":
+          if (this.tsCheckLineTerminatorAndMatch(tt.name, next)) {
+            if (next) this.next();
+            return this.tsParseTypeAliasDeclaration(node);
+          }
+          break;
+      }
+    }
+
+    tsCheckLineTerminatorAndMatch(tokenType: TokenType, next: boolean) {
+      return (next || this.match(tokenType)) && !this.isLineTerminator();
+    }
+
+    tsTryParseGenericAsyncArrowFunction(
+      startPos: number,
+      startLoc: Position,
+    ): ?N.ArrowFunctionExpression {
+      if (!this.isRelational("<")) {
+        return undefined;
+      }
+      const res: ?N.ArrowFunctionExpression = this.tsTryParseAndCatch(() => {
+        const node: N.ArrowFunctionExpression = this.startNodeAt(
+          startPos,
+          startLoc,
+        );
+        node.typeParameters = this.tsParseTypeParameters();
+        // Don't use overloaded parseFunctionParams which would look for "<" again.
+        super.parseFunctionParams(node);
+        node.returnType = this.tsTryParseTypeOrTypePredicateAnnotation();
+        this.expect(tt.arrow);
+        return node;
+      });
+
+      if (!res) {
+        return undefined;
+      }
+
+      return this.parseArrowExpression(
+        res,
+        /* params are already set */ null,
+        /* async */ true,
+      );
+    }
+
+    tsParseTypeArguments(): N.TsTypeParameterInstantiation {
+      const node = this.startNode();
+      node.params = this.tsInType(() =>
+        // Temporarily remove a JSX parsing context, which makes us scan different tokens.
+        this.tsInNoContext(() => {
+          this.expectRelational("<");
+          return this.tsParseDelimitedList(
+            "TypeParametersOrArguments",
+            this.tsParseType.bind(this),
+          );
+        }),
+      );
+      // This reads the next token after the `>` too, so do this in the enclosing context.
+      // But be sure not to parse a regex in the jsx expression `<C<number> />`, so set exprAllowed = false
+      this.state.exprAllowed = false;
+      this.expectRelational(">");
+      return this.finishNode(node, "TSTypeParameterInstantiation");
+    }
+
+    tsIsDeclarationStart(): boolean {
+      if (this.match(tt.name)) {
+        switch (this.state.value) {
+          case "abstract":
+          case "declare":
+          case "enum":
+          case "interface":
+          case "module":
+          case "namespace":
+          case "type":
+            return true;
+        }
+      }
+
+      return false;
+    }
+
+    // ======================================================
+    // OVERRIDES
+    // ======================================================
+
+    isExportDefaultSpecifier(): boolean {
+      if (this.tsIsDeclarationStart()) return false;
+      return super.isExportDefaultSpecifier();
+    }
+
+    parseAssignableListItem(
+      allowModifiers: ?boolean,
+      decorators: N.Decorator[],
+    ): N.Pattern | N.TSParameterProperty {
+      // Store original location/position to include modifiers in range
+      const startPos = this.state.start;
+      const startLoc = this.state.startLoc;
+
+      let accessibility: ?N.Accessibility;
+      let readonly = false;
+      if (allowModifiers) {
+        accessibility = this.parseAccessModifier();
+        readonly = !!this.tsParseModifier(["readonly"]);
+      }
+
+      const left = this.parseMaybeDefault();
+      this.parseAssignableListItemTypes(left);
+      const elt = this.parseMaybeDefault(left.start, left.loc.start, left);
+      if (accessibility || readonly) {
+        const pp: N.TSParameterProperty = this.startNodeAt(startPos, startLoc);
+        if (decorators.length) {
+          pp.decorators = decorators;
+        }
+        if (accessibility) pp.accessibility = accessibility;
+        if (readonly) pp.readonly = readonly;
+        if (elt.type !== "Identifier" && elt.type !== "AssignmentPattern") {
+          throw this.raise(
+            pp.start,
+            "A parameter property may not be declared using a binding pattern.",
+          );
+        }
+        pp.parameter = elt;
+        return this.finishNode(pp, "TSParameterProperty");
+      }
+
+      if (decorators.length) {
+        left.decorators = decorators;
+      }
+
+      return elt;
+    }
+
+    parseFunctionBodyAndFinish(
+      node: N.BodilessFunctionOrMethodBase,
+      type: string,
+      isMethod?: boolean = false,
+    ): void {
+      if (this.match(tt.colon)) {
+        node.returnType = this.tsParseTypeOrTypePredicateAnnotation(tt.colon);
+      }
+
+      const bodilessType =
+        type === "FunctionDeclaration"
+          ? "TSDeclareFunction"
+          : type === "ClassMethod"
+          ? "TSDeclareMethod"
+          : undefined;
+      if (bodilessType && !this.match(tt.braceL) && this.isLineTerminator()) {
+        this.finishNode(node, bodilessType);
+        return;
+      }
+
+      super.parseFunctionBodyAndFinish(node, type, isMethod);
+    }
+
+    checkFunctionStatementId(node: N.Function): void {
+      if (!node.body && node.id) {
+        this.checkLVal(node.id, BIND_TS_FN_TYPE, null, "function name");
+      } else {
+        super.checkFunctionStatementId(...arguments);
+      }
+    }
+
+    parseSubscript(
+      base: N.Expression,
+      startPos: number,
+      startLoc: Position,
+      noCalls: ?boolean,
+      state: N.ParseSubscriptState,
+      maybeAsyncArrow: boolean,
+    ): N.Expression {
+      if (!this.hasPrecedingLineBreak() && this.match(tt.bang)) {
+        this.state.exprAllowed = false;
+        this.next();
+
+        const nonNullExpression: N.TsNonNullExpression = this.startNodeAt(
+          startPos,
+          startLoc,
+        );
+        nonNullExpression.expression = base;
+        return this.finishNode(nonNullExpression, "TSNonNullExpression");
+      }
+
+      if (this.isRelational("<")) {
+        // tsTryParseAndCatch is expensive, so avoid if not necessary.
+        // There are number of things we are going to "maybe" parse, like type arguments on
+        // tagged template expressions. If any of them fail, walk it back and continue.
+        const result = this.tsTryParseAndCatch(() => {
+          if (!noCalls && this.atPossibleAsync(base)) {
+            // Almost certainly this is a generic async function `async <T>() => ...
+            // But it might be a call with a type argument `async<T>();`
+            const asyncArrowFn = this.tsTryParseGenericAsyncArrowFunction(
+              startPos,
+              startLoc,
+            );
+            if (asyncArrowFn) {
+              return asyncArrowFn;
+            }
+          }
+
+          const node: N.CallExpression = this.startNodeAt(startPos, startLoc);
+          node.callee = base;
+
+          const typeArguments = this.tsParseTypeArguments();
+
+          if (typeArguments) {
+            if (!noCalls && this.eat(tt.parenL)) {
+              // possibleAsync always false here, because we would have handled it above.
+              // $FlowIgnore (won't be any undefined arguments)
+              node.arguments = this.parseCallExpressionArguments(
+                tt.parenR,
+                /* possibleAsync */ false,
+              );
+              node.typeParameters = typeArguments;
+              return this.finishCallExpression(node);
+            } else if (this.match(tt.backQuote)) {
+              return this.parseTaggedTemplateExpression(
+                startPos,
+                startLoc,
+                base,
+                state,
+                typeArguments,
+              );
+            }
+          }
+
+          this.unexpected();
+        });
+
+        if (result) return result;
+      }
+
+      return super.parseSubscript(
+        base,
+        startPos,
+        startLoc,
+        noCalls,
+        state,
+        maybeAsyncArrow,
+      );
+    }
+
+    parseNewArguments(node: N.NewExpression): void {
+      if (this.isRelational("<")) {
+        // tsTryParseAndCatch is expensive, so avoid if not necessary.
+        // 99% certain this is `new C<T>();`. But may be `new C < T;`, which is also legal.
+        const typeParameters = this.tsTryParseAndCatch(() => {
+          const args = this.tsParseTypeArguments();
+          if (!this.match(tt.parenL)) this.unexpected();
+          return args;
+        });
+        if (typeParameters) {
+          node.typeParameters = typeParameters;
+        }
+      }
+
+      super.parseNewArguments(node);
+    }
+
+    parseExprOp(
+      left: N.Expression,
+      leftStartPos: number,
+      leftStartLoc: Position,
+      minPrec: number,
+      noIn: ?boolean,
+    ) {
+      if (
+        nonNull(tt._in.binop) > minPrec &&
+        !this.hasPrecedingLineBreak() &&
+        this.isContextual("as")
+      ) {
+        const node: N.TsAsExpression = this.startNodeAt(
+          leftStartPos,
+          leftStartLoc,
+        );
+        node.expression = left;
+        const _const = this.tsTryNextParseConstantContext();
+        if (_const) {
+          node.typeAnnotation = _const;
+        } else {
+          node.typeAnnotation = this.tsNextThenParseType();
+        }
+        this.finishNode(node, "TSAsExpression");
+        return this.parseExprOp(
+          node,
+          leftStartPos,
+          leftStartLoc,
+          minPrec,
+          noIn,
+        );
+      }
+
+      return super.parseExprOp(left, leftStartPos, leftStartLoc, minPrec, noIn);
+    }
+
+    checkReservedWord(
+      word: string, // eslint-disable-line no-unused-vars
+      startLoc: number, // eslint-disable-line no-unused-vars
+      checkKeywords: boolean, // eslint-disable-line no-unused-vars
+      // eslint-disable-next-line no-unused-vars
+      isBinding: boolean,
+    ): void {
+      // Don't bother checking for TypeScript code.
+      // Strict mode words may be allowed as in `declare namespace N { const static: number; }`.
+      // And we have a type checker anyway, so don't bother having the parser do it.
+    }
+
+    /*
+    Don't bother doing this check in TypeScript code because:
+    1. We may have a nested export statement with the same name:
+      export const x = 0;
+      export namespace N {
+        export const x = 1;
+      }
+    2. We have a type checker to warn us about this sort of thing.
+    */
+    checkDuplicateExports() {}
+
+    parseImport(node: N.Node): N.AnyImport {
+      if (this.match(tt.name) && this.lookahead().type === tt.eq) {
+        return this.tsParseImportEqualsDeclaration(node);
+      }
+      return super.parseImport(node);
+    }
+
+    parseExport(node: N.Node): N.AnyExport {
+      if (this.match(tt._import)) {
+        // `export import A = B;`
+        this.expect(tt._import);
+        return this.tsParseImportEqualsDeclaration(node, /* isExport */ true);
+      } else if (this.eat(tt.eq)) {
+        // `export = x;`
+        const assign: N.TsExportAssignment = node;
+        assign.expression = this.parseExpression();
+        this.semicolon();
+        return this.finishNode(assign, "TSExportAssignment");
+      } else if (this.eatContextual("as")) {
+        // `export as namespace A;`
+        const decl: N.TsNamespaceExportDeclaration = node;
+        // See `parseNamespaceExportDeclaration` in TypeScript's own parser
+        this.expectContextual("namespace");
+        decl.id = this.parseIdentifier();
+        this.semicolon();
+        return this.finishNode(decl, "TSNamespaceExportDeclaration");
+      } else {
+        return super.parseExport(node);
+      }
+    }
+
+    isAbstractClass(): boolean {
+      return (
+        this.isContextual("abstract") && this.lookahead().type === tt._class
+      );
+    }
+
+    parseExportDefaultExpression(): N.Expression | N.Declaration {
+      if (this.isAbstractClass()) {
+        const cls = this.startNode();
+        this.next(); // Skip "abstract"
+        this.parseClass(cls, true, true);
+        cls.abstract = true;
+        return cls;
+      }
+
+      // export default interface allowed in:
+      // https://github.com/Microsoft/TypeScript/pull/16040
+      if (this.state.value === "interface") {
+        const result = this.tsParseDeclaration(
+          this.startNode(),
+          this.state.value,
+          true,
+        );
+
+        if (result) return result;
+      }
+
+      return super.parseExportDefaultExpression();
+    }
+
+    parseStatementContent(context: ?string, topLevel: ?boolean): N.Statement {
+      if (this.state.type === tt._const) {
+        const ahead = this.lookahead();
+        if (ahead.type === tt.name && ahead.value === "enum") {
+          const node: N.TsEnumDeclaration = this.startNode();
+          this.expect(tt._const);
+          this.expectContextual("enum");
+          return this.tsParseEnumDeclaration(node, /* isConst */ true);
+        }
+      }
+      return super.parseStatementContent(context, topLevel);
+    }
+
+    parseAccessModifier(): ?N.Accessibility {
+      return this.tsParseModifier(["public", "protected", "private"]);
+    }
+
+    parseClassMember(
+      classBody: N.ClassBody,
+      member: any,
+      state: { hadConstructor: boolean },
+      constructorAllowsSuper: boolean,
+    ): void {
+      const accessibility = this.parseAccessModifier();
+      if (accessibility) member.accessibility = accessibility;
+
+      super.parseClassMember(classBody, member, state, constructorAllowsSuper);
+    }
+
+    parseClassMemberWithIsStatic(
+      classBody: N.ClassBody,
+      member: any,
+      state: { hadConstructor: boolean },
+      isStatic: boolean,
+      constructorAllowsSuper: boolean,
+    ): void {
+      const methodOrProp: N.ClassMethod | N.ClassProperty = member;
+      const prop: N.ClassProperty = member;
+      const propOrIdx: N.ClassProperty | N.TsIndexSignature = member;
+
+      let abstract = false,
+        readonly = false;
+
+      const mod = this.tsParseModifier(["abstract", "readonly"]);
+      switch (mod) {
+        case "readonly":
+          readonly = true;
+          abstract = !!this.tsParseModifier(["abstract"]);
+          break;
+        case "abstract":
+          abstract = true;
+          readonly = !!this.tsParseModifier(["readonly"]);
+          break;
+      }
+
+      if (abstract) methodOrProp.abstract = true;
+      if (readonly) propOrIdx.readonly = true;
+
+      if (!abstract && !isStatic && !methodOrProp.accessibility) {
+        const idx = this.tsTryParseIndexSignature(member);
+        if (idx) {
+          classBody.body.push(idx);
+          return;
+        }
+      }
+
+      if (readonly) {
+        // Must be a property (if not an index signature).
+        methodOrProp.static = isStatic;
+        this.parseClassPropertyName(prop);
+        this.parsePostMemberNameModifiers(methodOrProp);
+        this.pushClassProperty(classBody, prop);
+        return;
+      }
+
+      super.parseClassMemberWithIsStatic(
+        classBody,
+        member,
+        state,
+        isStatic,
+        constructorAllowsSuper,
+      );
+    }
+
+    parsePostMemberNameModifiers(
+      methodOrProp: N.ClassMethod | N.ClassProperty,
+    ): void {
+      const optional = this.eat(tt.question);
+      if (optional) methodOrProp.optional = true;
+    }
+
+    // Note: The reason we do this in `parseExpressionStatement` and not `parseStatement`
+    // is that e.g. `type()` is valid JS, so we must try parsing that first.
+    // If it's really a type, we will parse `type` as the statement, and can correct it here
+    // by parsing the rest.
+    parseExpressionStatement(
+      node: N.ExpressionStatement,
+      expr: N.Expression,
+    ): N.Statement {
+      const decl =
+        expr.type === "Identifier"
+          ? this.tsParseExpressionStatement(node, expr)
+          : undefined;
+      return decl || super.parseExpressionStatement(node, expr);
+    }
+
+    // export type
+    // Should be true for anything parsed by `tsTryParseExportDeclaration`.
+    shouldParseExportDeclaration(): boolean {
+      if (this.tsIsDeclarationStart()) return true;
+      return super.shouldParseExportDeclaration();
+    }
+
+    // An apparent conditional expression could actually be an optional parameter in an arrow function.
+    parseConditional(
+      expr: N.Expression,
+      noIn: ?boolean,
+      startPos: number,
+      startLoc: Position,
+      refNeedsArrowPos?: ?Pos,
+    ): N.Expression {
+      // only do the expensive clone if there is a question mark
+      // and if we come from inside parens
+      if (!refNeedsArrowPos || !this.match(tt.question)) {
+        return super.parseConditional(
+          expr,
+          noIn,
+          startPos,
+          startLoc,
+          refNeedsArrowPos,
+        );
+      }
+
+      const state = this.state.clone();
+      try {
+        return super.parseConditional(expr, noIn, startPos, startLoc);
+      } catch (err) {
+        if (!(err instanceof SyntaxError)) {
+          // istanbul ignore next: no such error is expected
+          throw err;
+        }
+
+        this.state = state;
+        refNeedsArrowPos.start = err.pos || this.state.start;
+        return expr;
+      }
+    }
+
+    // Note: These "type casts" are *not* valid TS expressions.
+    // But we parse them here and change them when completing the arrow function.
+    parseParenItem(
+      node: N.Expression,
+      startPos: number,
+      startLoc: Position,
+    ): N.Expression {
+      node = super.parseParenItem(node, startPos, startLoc);
+      if (this.eat(tt.question)) {
+        node.optional = true;
+        // Include questionmark in location of node
+        // Don't use this.finishNode() as otherwise we might process comments twice and
+        // include already consumed parens
+        this.resetEndLocation(node);
+      }
+
+      if (this.match(tt.colon)) {
+        const typeCastNode: N.TsTypeCastExpression = this.startNodeAt(
+          startPos,
+          startLoc,
+        );
+        typeCastNode.expression = node;
+        typeCastNode.typeAnnotation = this.tsParseTypeAnnotation();
+
+        return this.finishNode(typeCastNode, "TSTypeCastExpression");
+      }
+
+      return node;
+    }
+
+    parseExportDeclaration(node: N.ExportNamedDeclaration): ?N.Declaration {
+      // Store original location/position
+      const startPos = this.state.start;
+      const startLoc = this.state.startLoc;
+
+      // "export declare" is equivalent to just "export".
+      const isDeclare = this.eatContextual("declare");
+
+      let declaration: ?N.Declaration;
+
+      if (this.match(tt.name)) {
+        declaration = this.tsTryParseExportDeclaration();
+      }
+      if (!declaration) {
+        declaration = super.parseExportDeclaration(node);
+      }
+
+      if (declaration && isDeclare) {
+        // Reset location to include `declare` in range
+        this.resetStartLocation(declaration, startPos, startLoc);
+
+        declaration.declare = true;
+      }
+
+      return declaration;
+    }
+
+    parseClassId(
+      node: N.Class,
+      isStatement: boolean,
+      optionalId: ?boolean,
+    ): void {
+      if ((!isStatement || optionalId) && this.isContextual("implements")) {
+        return;
+      }
+
+      super.parseClassId(...arguments);
+      const typeParameters = this.tsTryParseTypeParameters();
+      if (typeParameters) node.typeParameters = typeParameters;
+    }
+
+    parseClassProperty(node: N.ClassProperty): N.ClassProperty {
+      if (!node.optional && this.eat(tt.bang)) {
+        node.definite = true;
+      }
+
+      const type = this.tsTryParseTypeAnnotation();
+      if (type) node.typeAnnotation = type;
+      return super.parseClassProperty(node);
+    }
+
+    pushClassMethod(
+      classBody: N.ClassBody,
+      method: N.ClassMethod,
+      isGenerator: boolean,
+      isAsync: boolean,
+      isConstructor: boolean,
+      allowsDirectSuper: boolean,
+    ): void {
+      const typeParameters = this.tsTryParseTypeParameters();
+      if (typeParameters) method.typeParameters = typeParameters;
+      super.pushClassMethod(
+        classBody,
+        method,
+        isGenerator,
+        isAsync,
+        isConstructor,
+        allowsDirectSuper,
+      );
+    }
+
+    pushClassPrivateMethod(
+      classBody: N.ClassBody,
+      method: N.ClassPrivateMethod,
+      isGenerator: boolean,
+      isAsync: boolean,
+    ): void {
+      const typeParameters = this.tsTryParseTypeParameters();
+      if (typeParameters) method.typeParameters = typeParameters;
+      super.pushClassPrivateMethod(classBody, method, isGenerator, isAsync);
+    }
+
+    parseClassSuper(node: N.Class): void {
+      super.parseClassSuper(node);
+      if (node.superClass && this.isRelational("<")) {
+        node.superTypeParameters = this.tsParseTypeArguments();
+      }
+      if (this.eatContextual("implements")) {
+        node.implements = this.tsParseHeritageClause("implements");
+      }
+    }
+
+    parseObjPropValue(prop: N.ObjectMember, ...args): void {
+      const typeParameters = this.tsTryParseTypeParameters();
+      if (typeParameters) prop.typeParameters = typeParameters;
+
+      super.parseObjPropValue(prop, ...args);
+    }
+
+    parseFunctionParams(node: N.Function, allowModifiers?: boolean): void {
+      const typeParameters = this.tsTryParseTypeParameters();
+      if (typeParameters) node.typeParameters = typeParameters;
+      super.parseFunctionParams(node, allowModifiers);
+    }
+
+    // `let x: number;`
+    parseVarId(
+      decl: N.VariableDeclarator,
+      kind: "var" | "let" | "const",
+    ): void {
+      super.parseVarId(decl, kind);
+      if (decl.id.type === "Identifier" && this.eat(tt.bang)) {
+        decl.definite = true;
+      }
+
+      const type = this.tsTryParseTypeAnnotation();
+      if (type) {
+        decl.id.typeAnnotation = type;
+        this.resetEndLocation(decl.id); // set end position to end of type
+      }
+    }
+
+    // parse the return type of an async arrow function - let foo = (async (): number => {});
+    parseAsyncArrowFromCallExpression(
+      node: N.ArrowFunctionExpression,
+      call: N.CallExpression,
+    ): N.ArrowFunctionExpression {
+      if (this.match(tt.colon)) {
+        node.returnType = this.tsParseTypeAnnotation();
+      }
+      return super.parseAsyncArrowFromCallExpression(node, call);
+    }
+
+    parseMaybeAssign(...args): N.Expression {
+      // Note: When the JSX plugin is on, type assertions (`<T> x`) aren't valid syntax.
+
+      let jsxError: ?SyntaxError;
+
+      if (this.match(tt.jsxTagStart)) {
+        const context = this.curContext();
+        assert(context === ct.j_oTag);
+        // Only time j_oTag is pushed is right after j_expr.
+        assert(this.state.context[this.state.context.length - 2] === ct.j_expr);
+
+        // Prefer to parse JSX if possible. But may be an arrow fn.
+        const state = this.state.clone();
+        try {
+          return super.parseMaybeAssign(...args);
+        } catch (err) {
+          if (!(err instanceof SyntaxError)) {
+            // istanbul ignore next: no such error is expected
+            throw err;
+          }
+
+          this.state = state;
+          // Pop the context added by the jsxTagStart.
+          assert(this.curContext() === ct.j_oTag);
+          this.state.context.pop();
+          assert(this.curContext() === ct.j_expr);
+          this.state.context.pop();
+          jsxError = err;
+        }
+      }
+
+      if (jsxError === undefined && !this.isRelational("<")) {
+        return super.parseMaybeAssign(...args);
+      }
+
+      // Either way, we're looking at a '<': tt.jsxTagStart or relational.
+
+      let arrowExpression;
+      let typeParameters: N.TsTypeParameterDeclaration;
+      const state = this.state.clone();
+      try {
+        // This is similar to TypeScript's `tryParseParenthesizedArrowFunctionExpression`.
+        typeParameters = this.tsParseTypeParameters();
+        arrowExpression = super.parseMaybeAssign(...args);
+        if (
+          arrowExpression.type !== "ArrowFunctionExpression" ||
+          (arrowExpression.extra && arrowExpression.extra.parenthesized)
+        ) {
+          this.unexpected(); // Go to the catch block (needs a SyntaxError).
+        }
+      } catch (err) {
+        if (!(err instanceof SyntaxError)) {
+          // istanbul ignore next: no such error is expected
+          throw err;
+        }
+
+        if (jsxError) {
+          throw jsxError;
+        }
+
+        // Try parsing a type cast instead of an arrow function.
+        // This will never happen outside of JSX.
+        // (Because in JSX the '<' should be a jsxTagStart and not a relational.
+        assert(!this.hasPlugin("jsx"));
+        // Parsing an arrow function failed, so try a type cast.
+        this.state = state;
+        // This will start with a type assertion (via parseMaybeUnary).
+        // But don't directly call `this.tsParseTypeAssertion` because we want to handle any binary after it.
+        return super.parseMaybeAssign(...args);
+      }
+
+      // Correct TypeScript code should have at least 1 type parameter, but don't crash on bad code.
+      if (typeParameters && typeParameters.params.length !== 0) {
+        this.resetStartLocationFromNode(arrowExpression, typeParameters);
+      }
+      arrowExpression.typeParameters = typeParameters;
+      return arrowExpression;
+    }
+
+    // Handle type assertions
+    parseMaybeUnary(refShorthandDefaultPos?: ?Pos): N.Expression {
+      if (!this.hasPlugin("jsx") && this.isRelational("<")) {
+        return this.tsParseTypeAssertion();
+      } else {
+        return super.parseMaybeUnary(refShorthandDefaultPos);
+      }
+    }
+
+    parseArrow(node: N.ArrowFunctionExpression): ?N.ArrowFunctionExpression {
+      if (this.match(tt.colon)) {
+        // This is different from how the TS parser does it.
+        // TS uses lookahead. The Babel Parser parses it as a parenthesized expression and converts.
+        const state = this.state.clone();
+        try {
+          const returnType = this.tsParseTypeOrTypePredicateAnnotation(
+            tt.colon,
+          );
+          if (this.canInsertSemicolon() || !this.match(tt.arrow)) {
+            this.state = state;
+            return undefined;
+          }
+          node.returnType = returnType;
+        } catch (err) {
+          if (err instanceof SyntaxError) {
+            this.state = state;
+          } else {
+            // istanbul ignore next: no such error is expected
+            throw err;
+          }
+        }
+      }
+
+      return super.parseArrow(node);
+    }
+
+    // Allow type annotations inside of a parameter list.
+    parseAssignableListItemTypes(param: N.Pattern) {
+      if (this.eat(tt.question)) {
+        if (param.type !== "Identifier") {
+          throw this.raise(
+            param.start,
+            "A binding pattern parameter cannot be optional in an implementation signature.",
+          );
+        }
+
+        param.optional = true;
+      }
+      const type = this.tsTryParseTypeAnnotation();
+      if (type) param.typeAnnotation = type;
+      this.resetEndLocation(param);
+
+      return param;
+    }
+
+    toAssignable(
+      node: N.Node,
+      isBinding: ?boolean,
+      contextDescription: string,
+    ): N.Node {
+      switch (node.type) {
+        case "TSTypeCastExpression":
+          return super.toAssignable(
+            this.typeCastToParameter(node),
+            isBinding,
+            contextDescription,
+          );
+        case "TSParameterProperty":
+          return super.toAssignable(node, isBinding, contextDescription);
+        case "TSAsExpression":
+        case "TSNonNullExpression":
+        case "TSTypeAssertion":
+          node.expression = this.toAssignable(
+            node.expression,
+            isBinding,
+            contextDescription,
+          );
+          return node;
+        default:
+          return super.toAssignable(node, isBinding, contextDescription);
+      }
+    }
+
+    checkLVal(
+      expr: N.Expression,
+      bindingType: BindingTypes = BIND_NONE,
+      checkClashes: ?{ [key: string]: boolean },
+      contextDescription: string,
+    ): void {
+      switch (expr.type) {
+        case "TSTypeCastExpression":
+          // Allow "typecasts" to appear on the left of assignment expressions,
+          // because it may be in an arrow function.
+          // e.g. `const f = (foo: number = 0) => foo;`
+          return;
+        case "TSParameterProperty":
+          this.checkLVal(
+            expr.parameter,
+            bindingType,
+            checkClashes,
+            "parameter property",
+          );
+          return;
+        case "TSAsExpression":
+        case "TSNonNullExpression":
+        case "TSTypeAssertion":
+          this.checkLVal(
+            expr.expression,
+            bindingType,
+            checkClashes,
+            contextDescription,
+          );
+          return;
+        default:
+          super.checkLVal(expr, bindingType, checkClashes, contextDescription);
+          return;
+      }
+    }
+
+    parseBindingAtom(): N.Pattern {
+      switch (this.state.type) {
+        case tt._this:
+          // "this" may be the name of a parameter, so allow it.
+          return this.parseIdentifier(/* liberal */ true);
+        default:
+          return super.parseBindingAtom();
+      }
+    }
+
+    parseMaybeDecoratorArguments(expr: N.Expression): N.Expression {
+      if (this.isRelational("<")) {
+        const typeArguments = this.tsParseTypeArguments();
+
+        if (this.match(tt.parenL)) {
+          const call = super.parseMaybeDecoratorArguments(expr);
+          call.typeParameters = typeArguments;
+          return call;
+        }
+
+        this.unexpected(this.state.start, tt.parenL);
+      }
+
+      return super.parseMaybeDecoratorArguments(expr);
+    }
+
+    // === === === === === === === === === === === === === === === ===
+    // Note: All below methods are duplicates of something in flow.js.
+    // Not sure what the best way to combine these is.
+    // === === === === === === === === === === === === === === === ===
+
+    isClassMethod(): boolean {
+      return this.isRelational("<") || super.isClassMethod();
+    }
+
+    isClassProperty(): boolean {
+      return (
+        this.match(tt.bang) || this.match(tt.colon) || super.isClassProperty()
+      );
+    }
+
+    parseMaybeDefault(...args): N.Pattern {
+      const node = super.parseMaybeDefault(...args);
+
+      if (
+        node.type === "AssignmentPattern" &&
+        node.typeAnnotation &&
+        node.right.start < node.typeAnnotation.start
+      ) {
+        this.raise(
+          node.typeAnnotation.start,
+          "Type annotations must come before default assignments, " +
+            "e.g. instead of `age = 25: number` use `age: number = 25`",
+        );
+      }
+
+      return node;
+    }
+
+    // ensure that inside types, we bypass the jsx parser plugin
+    getTokenFromCode(code: number): void {
+      if (this.state.inType && (code === 62 || code === 60)) {
+        return this.finishOp(tt.relational, 1);
+      } else {
+        return super.getTokenFromCode(code);
+      }
+    }
+
+    toAssignableList(
+      exprList: N.Expression[],
+      isBinding: ?boolean,
+      contextDescription: string,
+    ): $ReadOnlyArray<N.Pattern> {
+      for (let i = 0; i < exprList.length; i++) {
+        const expr = exprList[i];
+        if (!expr) continue;
+        switch (expr.type) {
+          case "TSTypeCastExpression":
+            exprList[i] = this.typeCastToParameter(expr);
+            break;
+          case "TSAsExpression":
+          case "TSTypeAssertion":
+            this.raise(
+              expr.start,
+              "Unexpected type cast in parameter position.",
+            );
+            break;
+        }
+      }
+      return super.toAssignableList(exprList, isBinding, contextDescription);
+    }
+
+    typeCastToParameter(node: N.TsTypeCastExpression): N.Node {
+      node.expression.typeAnnotation = node.typeAnnotation;
+
+      this.resetEndLocation(
+        node.expression,
+        node.typeAnnotation.end,
+        node.typeAnnotation.loc.end,
+      );
+
+      return node.expression;
+    }
+
+    toReferencedList(
+      exprList: $ReadOnlyArray<?N.Expression>,
+      isInParens?: boolean, // eslint-disable-line no-unused-vars
+    ): $ReadOnlyArray<?N.Expression> {
+      for (let i = 0; i < exprList.length; i++) {
+        const expr = exprList[i];
+        if (
+          expr &&
+          expr._exprListItem &&
+          expr.type === "TsTypeCastExpression"
+        ) {
+          this.raise(expr.start, "Did not expect a type annotation here.");
+        }
+      }
+
+      return exprList;
+    }
+
+    shouldParseArrow() {
+      return this.match(tt.colon) || super.shouldParseArrow();
+    }
+
+    shouldParseAsyncArrow(): boolean {
+      return this.match(tt.colon) || super.shouldParseAsyncArrow();
+    }
+
+    canHaveLeadingDecorator() {
+      // Avoid unnecessary lookahead in checking for abstract class unless needed!
+      return super.canHaveLeadingDecorator() || this.isAbstractClass();
+    }
+
+    jsxParseOpeningElementAfterName(
+      node: N.JSXOpeningElement,
+    ): N.JSXOpeningElement {
+      if (this.isRelational("<")) {
+        const typeArguments = this.tsTryParseAndCatch(() =>
+          this.tsParseTypeArguments(),
+        );
+        if (typeArguments) node.typeParameters = typeArguments;
+      }
+      return super.jsxParseOpeningElementAfterName(node);
+    }
+
+    getGetterSetterExpectedParamCount(
+      method: N.ObjectMethod | N.ClassMethod,
+    ): number {
+      const baseCount = super.getGetterSetterExpectedParamCount(method);
+      const firstParam = method.params[0];
+      const hasContextParam =
+        firstParam &&
+        firstParam.type === "Identifier" &&
+        firstParam.name === "this";
+
+      return hasContextParam ? baseCount + 1 : baseCount;
+    }
+  };
diff --git a/packages/babel-parser/src/plugins/typescript/scope.js b/packages/babel-parser/src/plugins/typescript/scope.js
new file mode 100644
index 000000000000..f706f1e88e99
--- /dev/null
+++ b/packages/babel-parser/src/plugins/typescript/scope.js
@@ -0,0 +1,105 @@
+// @flow
+
+import ScopeHandler, { Scope } from "../../util/scope";
+import {
+  BIND_KIND_TYPE,
+  BIND_FLAGS_TS_ENUM,
+  BIND_FLAGS_TS_CONST_ENUM,
+  BIND_FLAGS_TS_EXPORT_ONLY,
+  BIND_KIND_VALUE,
+  BIND_FLAGS_CLASS,
+  type ScopeFlags,
+  type BindingTypes,
+} from "../../util/scopeflags";
+import * as N from "../../types";
+
+class TypeScriptScope extends Scope {
+  types: string[] = [];
+
+  // enums (which are also in .types)
+  enums: string[] = [];
+
+  // const enums (which are also in .enums and .types)
+  constEnums: string[] = [];
+
+  // classes (which are also in .lexical) and interface (which are also in .types)
+  classes: string[] = [];
+
+  // namespaces and bodyless-functions are too difficult to track,
+  // especially without type analysis.
+  // We need to track them anyway, to avoid "X is not defined" errors
+  // when exporting them.
+  exportOnlyBindings: string[] = [];
+}
+
+// See https://github.com/babel/babel/pull/9766#discussion_r268920730 for an
+// explanation of how typescript handles scope.
+
+export default class TypeScriptScopeHandler extends ScopeHandler<TypeScriptScope> {
+  createScope(flags: ScopeFlags): TypeScriptScope {
+    return new TypeScriptScope(flags);
+  }
+
+  declareName(name: string, bindingType: BindingTypes, pos: number) {
+    const scope = this.currentScope();
+    if (bindingType & BIND_FLAGS_TS_EXPORT_ONLY) {
+      this.maybeExportDefined(scope, name);
+      scope.exportOnlyBindings.push(name);
+      return;
+    }
+
+    super.declareName(...arguments);
+
+    if (bindingType & BIND_KIND_TYPE) {
+      if (!(bindingType & BIND_KIND_VALUE)) {
+        // "Value" bindings have already been registered by the superclass.
+        this.checkRedeclarationInScope(scope, name, bindingType, pos);
+        this.maybeExportDefined(scope, name);
+      }
+      scope.types.push(name);
+    }
+    if (bindingType & BIND_FLAGS_TS_ENUM) scope.enums.push(name);
+    if (bindingType & BIND_FLAGS_TS_CONST_ENUM) scope.constEnums.push(name);
+    if (bindingType & BIND_FLAGS_CLASS) scope.classes.push(name);
+  }
+
+  isRedeclaredInScope(
+    scope: TypeScriptScope,
+    name: string,
+    bindingType: BindingTypes,
+  ): boolean {
+    if (scope.enums.indexOf(name) > -1) {
+      if (bindingType & BIND_FLAGS_TS_ENUM) {
+        // Enums can be merged with other enums if they are both
+        //  const or both non-const.
+        const isConst = !!(bindingType & BIND_FLAGS_TS_CONST_ENUM);
+        const wasConst = scope.constEnums.indexOf(name) > -1;
+        return isConst !== wasConst;
+      }
+      return true;
+    }
+    if (bindingType & BIND_FLAGS_CLASS && scope.classes.indexOf(name) > -1) {
+      if (scope.lexical.indexOf(name) > -1) {
+        // Classes can be merged with interfaces
+        return !!(bindingType & BIND_KIND_VALUE);
+      } else {
+        // Interface can be merged with other classes or interfaces
+        return false;
+      }
+    }
+    if (bindingType & BIND_KIND_TYPE && scope.types.indexOf(name) > -1) {
+      return true;
+    }
+
+    return super.isRedeclaredInScope(...arguments);
+  }
+
+  checkLocalExport(id: N.Identifier) {
+    if (
+      this.scopeStack[0].types.indexOf(id.name) === -1 &&
+      this.scopeStack[0].exportOnlyBindings.indexOf(id.name) === -1
+    ) {
+      super.checkLocalExport(id);
+    }
+  }
+}
diff --git a/packages/babel-parser/src/tokenizer/context.js b/packages/babel-parser/src/tokenizer/context.js
index 11fe53d2d207..1d8108874f4a 100644
--- a/packages/babel-parser/src/tokenizer/context.js
+++ b/packages/babel-parser/src/tokenizer/context.js
@@ -12,7 +12,7 @@ export class TokContext {
     token: string,
     isExpr?: boolean,
     preserveSpace?: boolean,
-    override?: Function, // Takes a Tokenizer as a this-parameter, and returns void.
+    override?: ?Function, // Takes a Tokenizer as a this-parameter, and returns void.
   ) {
     this.token = token;
     this.isExpr = !!isExpr;
@@ -31,11 +31,12 @@ export const types: {
 } = {
   braceStatement: new TokContext("{", false),
   braceExpression: new TokContext("{", true),
-  templateQuasi: new TokContext("${", true),
+  templateQuasi: new TokContext("${", false),
   parenStatement: new TokContext("(", false),
   parenExpression: new TokContext("(", true),
   template: new TokContext("`", true, true, p => p.readTmplToken()),
   functionExpression: new TokContext("function", true),
+  functionStatement: new TokContext("function", false),
 };
 
 // Token-specific context update code
@@ -46,33 +47,26 @@ tt.parenR.updateContext = tt.braceR.updateContext = function() {
     return;
   }
 
-  const out = this.state.context.pop();
-  if (
-    out === types.braceStatement &&
-    this.curContext() === types.functionExpression
-  ) {
-    this.state.context.pop();
-    this.state.exprAllowed = false;
-  } else if (out === types.templateQuasi) {
-    this.state.exprAllowed = true;
-  } else {
-    this.state.exprAllowed = !out.isExpr;
+  let out = this.state.context.pop();
+  if (out === types.braceStatement && this.curContext().token === "function") {
+    out = this.state.context.pop();
   }
+
+  this.state.exprAllowed = !out.isExpr;
 };
 
 tt.name.updateContext = function(prevType) {
-  if (this.state.value === "of" && this.curContext() === types.parenStatement) {
-    this.state.exprAllowed = !prevType.beforeExpr;
-    return;
-  }
-
-  this.state.exprAllowed = false;
-
-  if (prevType === tt._let || prevType === tt._const || prevType === tt._var) {
-    if (lineBreak.test(this.input.slice(this.state.end))) {
-      this.state.exprAllowed = true;
+  let allowed = false;
+  if (prevType !== tt.dot) {
+    if (
+      (this.state.value === "of" && !this.state.exprAllowed) ||
+      (this.state.value === "yield" && this.scope.inGenerator)
+    ) {
+      allowed = true;
     }
   }
+  this.state.exprAllowed = allowed;
+
   if (this.state.isIterator) {
     this.state.isIterator = false;
   }
@@ -106,9 +100,23 @@ tt.incDec.updateContext = function() {
   // tokExprAllowed stays unchanged
 };
 
-tt._function.updateContext = function(prevType) {
-  if (this.state.exprAllowed && !this.braceIsBlock(prevType)) {
+tt._function.updateContext = tt._class.updateContext = function(prevType) {
+  if (
+    prevType.beforeExpr &&
+    prevType !== tt.semi &&
+    prevType !== tt._else &&
+    !(
+      prevType === tt._return &&
+      lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.start))
+    ) &&
+    !(
+      (prevType === tt.colon || prevType === tt.braceL) &&
+      this.curContext() === types.b_stat
+    )
+  ) {
     this.state.context.push(types.functionExpression);
+  } else {
+    this.state.context.push(types.functionStatement);
   }
 
   this.state.exprAllowed = false;
diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js
index 2b6cc06db3a4..ffb8cba8ca6f 100644
--- a/packages/babel-parser/src/tokenizer/index.js
+++ b/packages/babel-parser/src/tokenizer/index.js
@@ -3,11 +3,7 @@
 import type { Options } from "../options";
 import type { Position } from "../util/location";
 import * as charCodes from "charcodes";
-import {
-  isIdentifierStart,
-  isIdentifierChar,
-  isKeyword,
-} from "../util/identifier";
+import { isIdentifierStart, isIdentifierChar } from "../util/identifier";
 import { types as tt, keywords as keywordTypes, type TokenType } from "./types";
 import { type TokContext, types as ct } from "./context";
 import LocationParser from "../parser/location";
@@ -20,7 +16,7 @@ import {
 } from "../util/whitespace";
 import State from "./state";
 
-const VALID_REGEX_FLAGS = "gmsiyu";
+const VALID_REGEX_FLAGS = new Set(["g", "m", "s", "i", "y", "u"]);
 
 // The following character codes are forbidden from being
 // an immediate sibling of NumericLiteralSeparator _
@@ -120,7 +116,9 @@ export default class Tokenizer extends LocationParser {
   constructor(options: Options, input: string) {
     super();
     this.state = new State();
-    this.state.init(options, input);
+    this.state.init(options);
+    this.input = input;
+    this.length = input.length;
     this.isLookahead = false;
   }
 
@@ -157,12 +155,6 @@ export default class Tokenizer extends LocationParser {
 
   // TODO
 
-  isKeyword(word: string): boolean {
-    return isKeyword(word);
-  }
-
-  // TODO
-
   lookahead(): State {
     const old = this.state;
     this.state = old.clone(true);
@@ -206,7 +198,7 @@ export default class Tokenizer extends LocationParser {
     this.state.octalPosition = null;
     this.state.start = this.state.pos;
     this.state.startLoc = this.state.curPosition();
-    if (this.state.pos >= this.input.length) {
+    if (this.state.pos >= this.length) {
       this.finishToken(tt.eof);
       return;
     }
@@ -214,17 +206,7 @@ export default class Tokenizer extends LocationParser {
     if (curContext.override) {
       curContext.override(this);
     } else {
-      this.readToken(this.input.codePointAt(this.state.pos));
-    }
-  }
-
-  readToken(code: number): void {
-    // Identifier or keyword. '\uXXXX' sequences are allowed in
-    // identifiers, so '\' also dispatches to that.
-    if (isIdentifierStart(code) || code === charCodes.backslash) {
-      this.readWord();
-    } else {
-      this.getTokenFromCode(code);
+      this.getTokenFromCode(this.input.codePointAt(this.state.pos));
     }
   }
 
@@ -244,11 +226,9 @@ export default class Tokenizer extends LocationParser {
       loc: new SourceLocation(startLoc, endLoc),
     };
 
-    if (!this.isLookahead) {
-      if (this.options.tokens) this.state.tokens.push(comment);
-      this.state.comments.push(comment);
-      this.addComment(comment);
-    }
+    if (this.options.tokens) this.state.tokens.push(comment);
+    this.state.comments.push(comment);
+    this.addComment(comment);
   }
 
   skipBlockComment(): void {
@@ -268,6 +248,10 @@ export default class Tokenizer extends LocationParser {
       this.state.lineStart = match.index + match[0].length;
     }
 
+    // If we are doing a lookahead right now we need to advance the position (above code)
+    // but we do not want to push the comment to the state.
+    if (this.isLookahead) return;
+
     this.pushComment(
       true,
       this.input.slice(start + 2, end),
@@ -282,18 +266,22 @@ export default class Tokenizer extends LocationParser {
     const start = this.state.pos;
     const startLoc = this.state.curPosition();
     let ch = this.input.charCodeAt((this.state.pos += startSkip));
-    if (this.state.pos < this.input.length) {
+    if (this.state.pos < this.length) {
       while (
         ch !== charCodes.lineFeed &&
         ch !== charCodes.carriageReturn &&
         ch !== charCodes.lineSeparator &&
         ch !== charCodes.paragraphSeparator &&
-        ++this.state.pos < this.input.length
+        ++this.state.pos < this.length
       ) {
         ch = this.input.charCodeAt(this.state.pos);
       }
     }
 
+    // If we are doing a lookahead right now we need to advance the position (above code)
+    // but we do not want to push the comment to the state.
+    if (this.isLookahead) return;
+
     this.pushComment(
       false,
       this.input.slice(start + startSkip, this.state.pos),
@@ -308,9 +296,14 @@ export default class Tokenizer extends LocationParser {
   // whitespace and comments, and.
 
   skipSpace(): void {
-    loop: while (this.state.pos < this.input.length) {
+    loop: while (this.state.pos < this.length) {
       const ch = this.input.charCodeAt(this.state.pos);
       switch (ch) {
+        case charCodes.space:
+        case charCodes.nonBreakingSpace:
+        case charCodes.tab:
+          ++this.state.pos;
+          break;
         case charCodes.carriageReturn:
           if (
             this.input.charCodeAt(this.state.pos + 1) === charCodes.lineFeed
@@ -363,7 +356,7 @@ export default class Tokenizer extends LocationParser {
     this.state.type = type;
     this.state.value = val;
 
-    this.updateContext(prevType);
+    if (!this.isLookahead) this.updateContext(prevType);
   }
 
   // ### Token reading
@@ -374,7 +367,36 @@ export default class Tokenizer extends LocationParser {
   // into it.
   //
   // All in the name of speed.
-  //
+
+  // number sign is "#"
+  readToken_numberSign(): void {
+    if (this.state.pos === 0 && this.readToken_interpreter()) {
+      return;
+    }
+
+    const nextPos = this.state.pos + 1;
+    const next = this.input.charCodeAt(nextPos);
+    if (next >= charCodes.digit0 && next <= charCodes.digit9) {
+      this.raise(this.state.pos, "Unexpected digit after hash token");
+    }
+
+    if (
+      (this.hasPlugin("classPrivateProperties") ||
+        this.hasPlugin("classPrivateMethods")) &&
+      this.state.classLevel > 0
+    ) {
+      ++this.state.pos;
+      this.finishToken(tt.hash);
+      return;
+    } else if (
+      this.getPluginOption("pipelineOperator", "proposal") === "smart"
+    ) {
+      this.finishOp(tt.hash, 1);
+    } else {
+      this.raise(this.state.pos, "Unexpected character '#'");
+    }
+  }
+
   readToken_dot(): void {
     const next = this.input.charCodeAt(this.state.pos + 1);
     if (next >= charCodes.digit0 && next <= charCodes.digit9) {
@@ -409,7 +431,7 @@ export default class Tokenizer extends LocationParser {
   }
 
   readToken_interpreter(): boolean {
-    if (this.state.pos !== 0 || this.state.input.length < 2) return false;
+    if (this.state.pos !== 0 || this.length < 2) return false;
 
     const start = this.state.pos;
     this.state.pos += 1;
@@ -422,7 +444,7 @@ export default class Tokenizer extends LocationParser {
       ch !== charCodes.carriageReturn &&
       ch !== charCodes.lineSeparator &&
       ch !== charCodes.paragraphSeparator &&
-      ++this.state.pos < this.input.length
+      ++this.state.pos < this.length
     ) {
       ch = this.input.charCodeAt(this.state.pos);
     }
@@ -457,7 +479,7 @@ export default class Tokenizer extends LocationParser {
   }
 
   readToken_pipe_amp(code: number): void {
-    // '|&'
+    // '||' '&&' '||=' '&&='
     const next = this.input.charCodeAt(this.state.pos + 1);
 
     if (next === code) {
@@ -477,10 +499,6 @@ export default class Tokenizer extends LocationParser {
       if (next === charCodes.greaterThan) {
         this.finishOp(tt.pipeline, 2);
         return;
-      } else if (next === charCodes.rightCurlyBrace && this.hasPlugin("flow")) {
-        // '|}'
-        this.finishOp(tt.braceBarR, 2);
-        return;
       }
     }
 
@@ -514,7 +532,10 @@ export default class Tokenizer extends LocationParser {
         next === charCodes.dash &&
         !this.inModule &&
         this.input.charCodeAt(this.state.pos + 2) === charCodes.greaterThan &&
-        lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.pos))
+        (this.state.lastTokEnd === 0 ||
+          lineBreak.test(
+            this.input.slice(this.state.lastTokEnd, this.state.pos),
+          ))
       ) {
         // A `-->` line comment
         this.skipLineComment(3);
@@ -622,26 +643,6 @@ export default class Tokenizer extends LocationParser {
 
   getTokenFromCode(code: number): void {
     switch (code) {
-      case charCodes.numberSign:
-        if (this.state.pos === 0 && this.readToken_interpreter()) {
-          return;
-        }
-
-        if (
-          (this.hasPlugin("classPrivateProperties") ||
-            this.hasPlugin("classPrivateMethods")) &&
-          this.state.classLevel > 0
-        ) {
-          ++this.state.pos;
-          this.finishToken(tt.hash);
-          return;
-        } else {
-          this.raise(
-            this.state.pos,
-            `Unexpected character '${String.fromCodePoint(code)}'`,
-          );
-        }
-
       // The interpretation of a dot depends on whether it is followed
       // by a digit or another two dots.
 
@@ -674,19 +675,10 @@ export default class Tokenizer extends LocationParser {
         ++this.state.pos;
         this.finishToken(tt.bracketR);
         return;
-
       case charCodes.leftCurlyBrace:
-        if (
-          this.hasPlugin("flow") &&
-          this.input.charCodeAt(this.state.pos + 1) === charCodes.verticalBar
-        ) {
-          this.finishOp(tt.braceBarL, 2);
-        } else {
-          ++this.state.pos;
-          this.finishToken(tt.braceL);
-        }
+        ++this.state.pos;
+        this.finishToken(tt.braceL);
         return;
-
       case charCodes.rightCurlyBrace:
         ++this.state.pos;
         this.finishToken(tt.braceR);
@@ -707,10 +699,6 @@ export default class Tokenizer extends LocationParser {
       case charCodes.questionMark:
         this.readToken_question();
         return;
-      case charCodes.atSign:
-        ++this.state.pos;
-        this.finishToken(tt.at);
-        return;
 
       case charCodes.graveAccent:
         ++this.state.pos;
@@ -796,6 +784,25 @@ export default class Tokenizer extends LocationParser {
       case charCodes.tilde:
         this.finishOp(tt.tilde, 1);
         return;
+
+      case charCodes.atSign:
+        ++this.state.pos;
+        this.finishToken(tt.at);
+        return;
+
+      case charCodes.numberSign:
+        this.readToken_numberSign();
+        return;
+
+      case charCodes.backslash:
+        this.readWord();
+        return;
+
+      default:
+        if (isIdentifierStart(code)) {
+          this.readWord();
+          return;
+        }
     }
 
     this.raise(
@@ -814,7 +821,7 @@ export default class Tokenizer extends LocationParser {
     const start = this.state.pos;
     let escaped, inClass;
     for (;;) {
-      if (this.state.pos >= this.input.length) {
+      if (this.state.pos >= this.length) {
         this.raise(start, "Unterminated regular expression");
       }
       const ch = this.input.charAt(this.state.pos);
@@ -840,11 +847,11 @@ export default class Tokenizer extends LocationParser {
 
     let mods = "";
 
-    while (this.state.pos < this.input.length) {
+    while (this.state.pos < this.length) {
       const char = this.input[this.state.pos];
       const charCode = this.input.codePointAt(this.state.pos);
 
-      if (VALID_REGEX_FLAGS.indexOf(char) > -1) {
+      if (VALID_REGEX_FLAGS.has(char)) {
         if (mods.indexOf(char) > -1) {
           this.raise(this.state.pos + 1, "Duplicate regular expression flag");
         }
@@ -881,10 +888,10 @@ export default class Tokenizer extends LocationParser {
       radix === 16
         ? allowedNumericSeparatorSiblings.hex
         : radix === 10
-          ? allowedNumericSeparatorSiblings.dec
-          : radix === 8
-            ? allowedNumericSeparatorSiblings.oct
-            : allowedNumericSeparatorSiblings.bin;
+        ? allowedNumericSeparatorSiblings.dec
+        : radix === 8
+        ? allowedNumericSeparatorSiblings.oct
+        : allowedNumericSeparatorSiblings.bin;
 
     let total = 0;
 
@@ -971,14 +978,26 @@ export default class Tokenizer extends LocationParser {
 
   readNumber(startsWithDot: boolean): void {
     const start = this.state.pos;
-    let octal = this.input.charCodeAt(start) === charCodes.digit0;
     let isFloat = false;
     let isBigInt = false;
 
     if (!startsWithDot && this.readInt(10) === null) {
       this.raise(start, "Invalid number");
     }
-    if (octal && this.state.pos == start + 1) octal = false; // number === 0
+    let octal =
+      this.state.pos - start >= 2 &&
+      this.input.charCodeAt(start) === charCodes.digit0;
+    if (octal) {
+      if (this.state.strict) {
+        this.raise(
+          start,
+          "Legacy octal literals are not allowed in strict mode",
+        );
+      }
+      if (/[89]/.test(this.input.slice(start, this.state.pos))) {
+        octal = false;
+      }
+    }
 
     let next = this.input.charCodeAt(this.state.pos);
     if (next === charCodes.dot && !octal) {
@@ -1022,18 +1041,7 @@ export default class Tokenizer extends LocationParser {
       return;
     }
 
-    let val;
-    if (isFloat) {
-      val = parseFloat(str);
-    } else if (!octal || str.length === 1) {
-      val = parseInt(str, 10);
-    } else if (this.state.strict) {
-      this.raise(start, "Invalid number");
-    } else if (/[89]/.test(str)) {
-      val = parseInt(str, 10);
-    } else {
-      val = parseInt(str, 8);
-    }
+    const val = octal ? parseInt(str, 8) : parseFloat(str);
     this.finishToken(tt.num, val);
   }
 
@@ -1070,9 +1078,8 @@ export default class Tokenizer extends LocationParser {
   readString(quote: number): void {
     let out = "",
       chunkStart = ++this.state.pos;
-    const hasJsonStrings = this.hasPlugin("jsonStrings");
     for (;;) {
-      if (this.state.pos >= this.input.length) {
+      if (this.state.pos >= this.length) {
         this.raise(this.state.start, "Unterminated string constant");
       }
       const ch = this.input.charCodeAt(this.state.pos);
@@ -1083,10 +1090,11 @@ export default class Tokenizer extends LocationParser {
         out += this.readEscapedChar(false);
         chunkStart = this.state.pos;
       } else if (
-        hasJsonStrings &&
-        (ch === charCodes.lineSeparator || ch === charCodes.paragraphSeparator)
+        ch === charCodes.lineSeparator ||
+        ch === charCodes.paragraphSeparator
       ) {
         ++this.state.pos;
+        ++this.state.curLine;
       } else if (isNewLine(ch)) {
         this.raise(this.state.start, "Unterminated string constant");
       } else {
@@ -1104,7 +1112,7 @@ export default class Tokenizer extends LocationParser {
       chunkStart = this.state.pos,
       containsInvalid = false;
     for (;;) {
-      if (this.state.pos >= this.input.length) {
+      if (this.state.pos >= this.length) {
         this.raise(this.state.start, "Unterminated template");
       }
       const ch = this.input.charCodeAt(this.state.pos);
@@ -1196,6 +1204,8 @@ export default class Tokenizer extends LocationParser {
       case charCodes.lineFeed:
         this.state.lineStart = this.state.pos;
         ++this.state.curLine;
+      case charCodes.lineSeparator:
+      case charCodes.paragraphSeparator:
         return "";
       default:
         if (ch >= charCodes.digit0 && ch <= charCodes.digit7) {
@@ -1209,7 +1219,13 @@ export default class Tokenizer extends LocationParser {
             octalStr = octalStr.slice(0, -1);
             octal = parseInt(octalStr, 8);
           }
-          if (octal > 0) {
+          this.state.pos += octalStr.length - 1;
+          const next = this.input.charCodeAt(this.state.pos);
+          if (
+            octalStr !== "0" ||
+            next === charCodes.digit8 ||
+            next === charCodes.digit9
+          ) {
             if (inTemplate) {
               this.state.invalidTemplateEscapePosition = codePos;
               return null;
@@ -1222,9 +1238,10 @@ export default class Tokenizer extends LocationParser {
               this.state.octalPosition = codePos;
             }
           }
-          this.state.pos += octalStr.length - 1;
+
           return String.fromCharCode(octal);
         }
+
         return String.fromCharCode(ch);
     }
   }
@@ -1252,21 +1269,24 @@ export default class Tokenizer extends LocationParser {
   // as a micro-optimization.
 
   readWord1(): string {
+    let word = "";
     this.state.containsEsc = false;
-    let word = "",
-      first = true,
-      chunkStart = this.state.pos;
-    while (this.state.pos < this.input.length) {
+    const start = this.state.pos;
+    let chunkStart = this.state.pos;
+
+    while (this.state.pos < this.length) {
       const ch = this.input.codePointAt(this.state.pos);
       if (isIdentifierChar(ch)) {
         this.state.pos += ch <= 0xffff ? 1 : 2;
       } else if (this.state.isIterator && ch === charCodes.atSign) {
-        this.state.pos += 1;
+        ++this.state.pos;
       } else if (ch === charCodes.backslash) {
         this.state.containsEsc = true;
 
         word += this.input.slice(chunkStart, this.state.pos);
         const escStart = this.state.pos;
+        const identifierCheck =
+          this.state.pos === start ? isIdentifierStart : isIdentifierChar;
 
         if (this.input.charCodeAt(++this.state.pos) !== charCodes.lowercaseU) {
           this.raise(
@@ -1277,8 +1297,11 @@ export default class Tokenizer extends LocationParser {
 
         ++this.state.pos;
         const esc = this.readCodePoint(true);
-        // $FlowFixMe (thinks esc may be null, but throwOnInvalid is true)
-        if (!(first ? isIdentifierStart : isIdentifierChar)(esc, true)) {
+
+        if (
+          // $FlowFixMe (thinks esc may be null, but throwOnInvalid is true)
+          !identifierCheck(esc, true)
+        ) {
           this.raise(escStart, "Invalid Unicode escape");
         }
 
@@ -1288,7 +1311,6 @@ export default class Tokenizer extends LocationParser {
       } else {
         break;
       }
-      first = false;
     }
     return word + this.input.slice(chunkStart, this.state.pos);
   }
@@ -1302,14 +1324,10 @@ export default class Tokenizer extends LocationParser {
 
   readWord(): void {
     const word = this.readWord1();
-    let type = tt.name;
-
-    if (this.isKeyword(word)) {
-      if (this.state.containsEsc) {
-        this.raise(this.state.pos, `Escape sequence in keyword ${word}`);
-      }
+    const type = keywordTypes.get(word) || tt.name;
 
-      type = keywordTypes[word];
+    if (type.keyword && this.state.containsEsc) {
+      this.raise(this.state.pos, `Escape sequence in keyword ${word}`);
     }
 
     // Allow @@iterator and @@asyncIterator as a identifier only inside type
@@ -1324,14 +1342,24 @@ export default class Tokenizer extends LocationParser {
   }
 
   braceIsBlock(prevType: TokenType): boolean {
-    if (prevType === tt.colon) {
-      const parent = this.curContext();
-      if (parent === ct.braceStatement || parent === ct.braceExpression) {
-        return !parent.isExpr;
-      }
+    const parent = this.curContext();
+    if (parent === ct.functionExpression || parent === ct.functionStatement) {
+      return true;
+    }
+    if (
+      prevType === tt.colon &&
+      (parent === ct.braceStatement || parent === ct.braceExpression)
+    ) {
+      return !parent.isExpr;
     }
 
-    if (prevType === tt._return) {
+    // The check for `tt.name && exprAllowed` detects whether we are
+    // after a `yield` or `of` construct. See the `updateContext` for
+    // `tt.name`.
+    if (
+      prevType === tt._return ||
+      (prevType === tt.name && this.state.exprAllowed)
+    ) {
       return lineBreak.test(
         this.input.slice(this.state.lastTokEnd, this.state.start),
       );
@@ -1341,13 +1369,22 @@ export default class Tokenizer extends LocationParser {
       prevType === tt._else ||
       prevType === tt.semi ||
       prevType === tt.eof ||
-      prevType === tt.parenR
+      prevType === tt.parenR ||
+      prevType === tt.arrow
     ) {
       return true;
     }
 
     if (prevType === tt.braceL) {
-      return this.curContext() === ct.braceStatement;
+      return parent === ct.braceStatement;
+    }
+
+    if (
+      prevType === tt._var ||
+      prevType === tt._const ||
+      prevType === tt.name
+    ) {
+      return false;
     }
 
     if (prevType === tt.relational) {
diff --git a/packages/babel-parser/src/tokenizer/state.js b/packages/babel-parser/src/tokenizer/state.js
index 364ceec96d32..80842fbc5103 100644
--- a/packages/babel-parser/src/tokenizer/state.js
+++ b/packages/babel-parser/src/tokenizer/state.js
@@ -8,86 +8,44 @@ import { types as ct, type TokContext } from "./context";
 import type { Token } from "./index";
 import { types as tt, type TokenType } from "./types";
 
-export default class State {
-  init(options: Options, input: string): void {
-    this.strict =
-      options.strictMode === false ? false : options.sourceType === "module";
-
-    this.input = input;
-
-    this.potentialArrowAt = -1;
-
-    this.noArrowAt = [];
-    this.noArrowParamsConversionAt = [];
-
-    this.inMethod = false;
-    this.inFunction = false;
-    this.inParameters = false;
-    this.maybeInArrowParameters = false;
-    this.inGenerator = false;
-    this.inAsync = false;
-    this.inPropertyName = false;
-    this.inType = false;
-    this.inClassProperty = false;
-    this.noAnonFunctionType = false;
-    this.hasFlowComment = false;
-    this.isIterator = false;
-
-    this.classLevel = 0;
-
-    this.labels = [];
-
-    this.decoratorStack = [[]];
+type TopicContextState = {
+  // When a topic binding has been currently established,
+  // then this is 1. Otherwise, it is 0. This is forwards compatible
+  // with a future plugin for multiple lexical topics.
+  maxNumOfResolvableTopics: number,
+
+  // When a topic binding has been currently established, and if that binding
+  // has been used as a topic reference `#`, then this is 0. Otherwise, it is
+  // `null`. This is forwards compatible with a future plugin for multiple
+  // lexical topics.
+  maxTopicIndex: null | 0,
+};
 
-    this.yieldInPossibleArrowParameters = null;
-
-    this.tokens = [];
+export default class State {
+  strict: boolean;
+  curLine: number;
 
-    this.comments = [];
+  // And, if locations are used, the {line, column} object
+  // corresponding to those offsets
+  startLoc: Position;
+  endLoc: Position;
 
-    this.trailingComments = [];
-    this.leadingComments = [];
-    this.commentStack = [];
-    // $FlowIgnore
-    this.commentPreviousNode = null;
+  init(options: Options): void {
+    this.strict =
+      options.strictMode === false ? false : options.sourceType === "module";
 
-    this.pos = this.lineStart = 0;
     this.curLine = options.startLine;
-
-    this.type = tt.eof;
-    this.value = null;
-    this.start = this.end = this.pos;
     this.startLoc = this.endLoc = this.curPosition();
-
-    // $FlowIgnore
-    this.lastTokEndLoc = this.lastTokStartLoc = null;
-    this.lastTokStart = this.lastTokEnd = this.pos;
-
-    this.context = [ct.braceStatement];
-    this.exprAllowed = true;
-
-    this.containsEsc = this.containsOctal = false;
-    this.octalPosition = null;
-
-    this.invalidTemplateEscapePosition = null;
-
-    this.exportedIdentifiers = [];
   }
 
-  // TODO
-  strict: boolean;
-
-  // TODO
-  input: string;
-
   // Used to signify the start of a potential arrow function
-  potentialArrowAt: number;
+  potentialArrowAt: number = -1;
 
   // Used to signify the start of an expression which looks like a
   // typed arrow function, but it isn't
   // e.g. a ? (b) : c => d
   //          ^
-  noArrowAt: number[];
+  noArrowAt: number[] = [];
 
   // Used to signify the start of an expression whose params, if it looks like
   // an arrow function, shouldn't be converted to assignable nodes.
@@ -95,106 +53,114 @@ export default class State {
   // conditional expressions.
   // e.g. a ? (b) : c => d
   //          ^
-  noArrowParamsConversionAt: number[];
-
-  // Flags to track whether we are in a function, a generator.
-  inFunction: boolean;
-  inParameters: boolean;
-  maybeInArrowParameters: boolean;
-  inGenerator: boolean;
-  inMethod: boolean | N.MethodKind;
-  inAsync: boolean;
-  inType: boolean;
-  noAnonFunctionType: boolean;
-  inPropertyName: boolean;
-  inClassProperty: boolean;
-  hasFlowComment: boolean;
-  isIterator: boolean;
+  noArrowParamsConversionAt: number[] = [];
+
+  // A comma after "...a" is only allowed in spread, but not in rest.
+  // Since we parse destructuring patterns as array/object literals
+  // and then convert them, we need to track it.
+  commaAfterSpreadAt: number = -1;
+
+  // Flags to track
+  inParameters: boolean = false;
+  maybeInArrowParameters: boolean = false;
+  inPipeline: boolean = false;
+  inType: boolean = false;
+  noAnonFunctionType: boolean = false;
+  inPropertyName: boolean = false;
+  inClassProperty: boolean = false;
+  hasFlowComment: boolean = false;
+  isIterator: boolean = false;
+
+  // For the smartPipelines plugin:
+  topicContext: TopicContextState = {
+    maxNumOfResolvableTopics: 0,
+    maxTopicIndex: null,
+  };
+
+  // For the F# plugin
+  soloAwait: boolean = false;
+  inFSharpPipelineDirectBody: boolean = false;
 
   // Check whether we are in a (nested) class or not.
-  classLevel: number;
+  classLevel: number = 0;
 
   // Labels in scope.
   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 {}
   // where @foo belongs to the outer class and @bar to the inner
-  decoratorStack: Array<Array<N.Decorator>>;
+  decoratorStack: Array<Array<N.Decorator>> = [[]];
 
-  // The first yield expression inside parenthesized expressions and arrow
-  // function parameters. It is used to disallow yield in arrow function
-  // parameters.
-  yieldInPossibleArrowParameters: ?N.YieldExpression;
+  // Positions to delayed-check that yield/await does not exist in default parameters.
+  yieldPos: number = 0;
+  awaitPos: number = 0;
 
   // Token store.
-  tokens: Array<Token | N.Comment>;
+  tokens: Array<Token | N.Comment> = [];
 
   // Comment store.
-  comments: Array<N.Comment>;
+  comments: Array<N.Comment> = [];
 
   // Comment attachment store
-  trailingComments: Array<N.Comment>;
-  leadingComments: Array<N.Comment>;
+  trailingComments: Array<N.Comment> = [];
+  leadingComments: Array<N.Comment> = [];
   commentStack: Array<{
     start: number,
     leadingComments: ?Array<N.Comment>,
     trailingComments: ?Array<N.Comment>,
     type: string,
-  }>;
-  commentPreviousNode: N.Node;
+  }> = [];
+  // $FlowIgnore this is initialized when the parser starts.
+  commentPreviousNode: N.Node = null;
 
   // The current position of the tokenizer in the input.
-  pos: number;
-  lineStart: number;
-  curLine: number;
+  pos: number = 0;
+  lineStart: number = 0;
 
   // Properties of the current token:
   // Its type
-  type: TokenType;
+  type: TokenType = tt.eof;
 
   // For tokens that include more information than their type, the value
-  value: any;
+  value: any = null;
 
   // Its start and end offset
-  start: number;
-  end: number;
-
-  // And, if locations are used, the {line, column} object
-  // corresponding to those offsets
-  startLoc: Position;
-  endLoc: Position;
+  start: number = 0;
+  end: number = 0;
 
   // Position information for the previous token
-  lastTokEndLoc: Position;
-  lastTokStartLoc: Position;
-  lastTokStart: number;
-  lastTokEnd: number;
+  // $FlowIgnore this is initialized when generating the second token.
+  lastTokEndLoc: Position = null;
+  // $FlowIgnore this is initialized when generating the second token.
+  lastTokStartLoc: Position = null;
+  lastTokStart: number = 0;
+  lastTokEnd: number = 0;
 
   // The context stack is used to superficially track syntactic
   // context to predict whether a regular expression is allowed in a
   // given position.
-  context: Array<TokContext>;
-  exprAllowed: boolean;
+  context: Array<TokContext> = [ct.braceStatement];
+  exprAllowed: boolean = true;
 
   // Used to signal to callers of `readWord1` whether the word
   // contained any escape sequences. This is needed because words with
   // escape sequences must not be interpreted as keywords.
-  containsEsc: boolean;
+  containsEsc: boolean = false;
 
   // TODO
-  containsOctal: boolean;
-  octalPosition: ?number;
+  containsOctal: boolean = false;
+  octalPosition: ?number = null;
 
   // Names of exports store. `default` is stored as a name for both
   // `export default foo;` and `export { foo as default };`.
-  exportedIdentifiers: Array<string>;
+  exportedIdentifiers: Array<string> = [];
 
-  invalidTemplateEscapePosition: ?number;
+  invalidTemplateEscapePosition: ?number = null;
 
   curPosition(): Position {
     return new Position(this.curLine, this.pos - this.lineStart);
@@ -202,17 +168,20 @@ export default class State {
 
   clone(skipArrays?: boolean): State {
     const state = new State();
-    Object.keys(this).forEach(key => {
+    const keys = Object.keys(this);
+    for (let i = 0, length = keys.length; i < length; i++) {
+      const key = keys[i];
       // $FlowIgnore
       let val = this[key];
 
-      if ((!skipArrays || key === "context") && Array.isArray(val)) {
+      if (!skipArrays && Array.isArray(val)) {
         val = val.slice();
       }
 
       // $FlowIgnore
       state[key] = val;
-    });
+    }
+
     return state;
   }
 }
diff --git a/packages/babel-parser/src/tokenizer/types.js b/packages/babel-parser/src/tokenizer/types.js
index 14e94d32ab09..34fd891c9256 100644
--- a/packages/babel-parser/src/tokenizer/types.js
+++ b/packages/babel-parser/src/tokenizer/types.js
@@ -13,7 +13,12 @@
 // expressions and divisions. It is set on all token types that can
 // be followed by an expression (thus, a slash after them would be a
 // regular expression).
-//
+
+// The `startsExpr` property is used to determine whether an expression
+// may be the “argument” subexpression of a `yield` expression or
+// `yield` statement. It is set on all token types that may be at the
+// start of a subexpression.
+
 // `isLoop` marks a keyword as starting a loop, which is important
 // to know when parsing a label, in order to allow or disallow
 // continue jumps to that label.
@@ -27,7 +32,6 @@ const postfix = true;
 
 type TokenOptions = {
   keyword?: string,
-
   beforeExpr?: boolean,
   startsExpr?: boolean,
   rightAssociative?: boolean,
@@ -61,16 +65,21 @@ export class TokenType {
     this.isAssign = !!conf.isAssign;
     this.prefix = !!conf.prefix;
     this.postfix = !!conf.postfix;
-    this.binop = conf.binop === 0 ? 0 : conf.binop || null;
+    this.binop = conf.binop != null ? conf.binop : null;
     this.updateContext = null;
   }
 }
 
-function KeywordTokenType(keyword: string, options: TokenOptions = {}) {
-  return new TokenType(keyword, { ...options, keyword });
+export const keywords = new Map<string, TokenType>();
+
+function createKeyword(name: string, options: TokenOptions = {}): TokenType {
+  options.keyword = name;
+  const token = new TokenType(name, options);
+  keywords.set(name, token);
+  return token;
 }
 
-function BinopTokenType(name: string, binop: number) {
+function createBinop(name: string, binop: number) {
   return new TokenType(name, { beforeExpr, binop });
 }
 
@@ -104,7 +113,7 @@ export const types: { [name: string]: TokenType } = {
   backQuote: new TokenType("`", { startsExpr }),
   dollarBraceL: new TokenType("${", { beforeExpr, startsExpr }),
   at: new TokenType("@"),
-  hash: new TokenType("#"),
+  hash: new TokenType("#", { startsExpr }),
 
   // Special hashbang token.
   interpreterDirective: new TokenType("#!..."),
@@ -128,68 +137,60 @@ export const types: { [name: string]: TokenType } = {
   incDec: new TokenType("++/--", { prefix, postfix, startsExpr }),
   bang: new TokenType("!", { beforeExpr, prefix, startsExpr }),
   tilde: new TokenType("~", { beforeExpr, prefix, startsExpr }),
-  pipeline: new BinopTokenType("|>", 0),
-  nullishCoalescing: new BinopTokenType("??", 1),
-  logicalOR: new BinopTokenType("||", 1),
-  logicalAND: new BinopTokenType("&&", 2),
-  bitwiseOR: new BinopTokenType("|", 3),
-  bitwiseXOR: new BinopTokenType("^", 4),
-  bitwiseAND: new BinopTokenType("&", 5),
-  equality: new BinopTokenType("==/!=", 6),
-  relational: new BinopTokenType("</>", 7),
-  bitShift: new BinopTokenType("<</>>", 8),
+  pipeline: createBinop("|>", 0),
+  nullishCoalescing: createBinop("??", 1),
+  logicalOR: createBinop("||", 1),
+  logicalAND: createBinop("&&", 2),
+  bitwiseOR: createBinop("|", 3),
+  bitwiseXOR: createBinop("^", 4),
+  bitwiseAND: createBinop("&", 5),
+  equality: createBinop("==/!=/===/!==", 6),
+  relational: createBinop("</>/<=/>=", 7),
+  bitShift: createBinop("<</>>/>>>", 8),
   plusMin: new TokenType("+/-", { beforeExpr, binop: 9, prefix, startsExpr }),
-  modulo: new BinopTokenType("%", 10),
-  star: new BinopTokenType("*", 10),
-  slash: new BinopTokenType("/", 10),
+  modulo: createBinop("%", 10),
+  star: createBinop("*", 10),
+  slash: createBinop("/", 10),
   exponent: new TokenType("**", {
     beforeExpr,
     binop: 11,
     rightAssociative: true,
   }),
-};
 
-export const keywords = {
-  break: new KeywordTokenType("break"),
-  case: new KeywordTokenType("case", { beforeExpr }),
-  catch: new KeywordTokenType("catch"),
-  continue: new KeywordTokenType("continue"),
-  debugger: new KeywordTokenType("debugger"),
-  default: new KeywordTokenType("default", { beforeExpr }),
-  do: new KeywordTokenType("do", { isLoop, beforeExpr }),
-  else: new KeywordTokenType("else", { beforeExpr }),
-  finally: new KeywordTokenType("finally"),
-  for: new KeywordTokenType("for", { isLoop }),
-  function: new KeywordTokenType("function", { startsExpr }),
-  if: new KeywordTokenType("if"),
-  return: new KeywordTokenType("return", { beforeExpr }),
-  switch: new KeywordTokenType("switch"),
-  throw: new KeywordTokenType("throw", { beforeExpr, prefix, startsExpr }),
-  try: new KeywordTokenType("try"),
-  var: new KeywordTokenType("var"),
-  let: new KeywordTokenType("let"),
-  const: new KeywordTokenType("const"),
-  while: new KeywordTokenType("while", { isLoop }),
-  with: new KeywordTokenType("with"),
-  new: new KeywordTokenType("new", { beforeExpr, startsExpr }),
-  this: new KeywordTokenType("this", { startsExpr }),
-  super: new KeywordTokenType("super", { startsExpr }),
-  class: new KeywordTokenType("class"),
-  extends: new KeywordTokenType("extends", { beforeExpr }),
-  export: new KeywordTokenType("export"),
-  import: new KeywordTokenType("import", { startsExpr }),
-  yield: new KeywordTokenType("yield", { beforeExpr, startsExpr }),
-  null: new KeywordTokenType("null", { startsExpr }),
-  true: new KeywordTokenType("true", { startsExpr }),
-  false: new KeywordTokenType("false", { startsExpr }),
-  in: new KeywordTokenType("in", { beforeExpr, binop: 7 }),
-  instanceof: new KeywordTokenType("instanceof", { beforeExpr, binop: 7 }),
-  typeof: new KeywordTokenType("typeof", { beforeExpr, prefix, startsExpr }),
-  void: new KeywordTokenType("void", { beforeExpr, prefix, startsExpr }),
-  delete: new KeywordTokenType("delete", { beforeExpr, prefix, startsExpr }),
+  // Keywords
+  _break: createKeyword("break"),
+  _case: createKeyword("case", { beforeExpr }),
+  _catch: createKeyword("catch"),
+  _continue: createKeyword("continue"),
+  _debugger: createKeyword("debugger"),
+  _default: createKeyword("default", { beforeExpr }),
+  _do: createKeyword("do", { isLoop, beforeExpr }),
+  _else: createKeyword("else", { beforeExpr }),
+  _finally: createKeyword("finally"),
+  _for: createKeyword("for", { isLoop }),
+  _function: createKeyword("function", { startsExpr }),
+  _if: createKeyword("if"),
+  _return: createKeyword("return", { beforeExpr }),
+  _switch: createKeyword("switch"),
+  _throw: createKeyword("throw", { beforeExpr, prefix, startsExpr }),
+  _try: createKeyword("try"),
+  _var: createKeyword("var"),
+  _const: createKeyword("const"),
+  _while: createKeyword("while", { isLoop }),
+  _with: createKeyword("with"),
+  _new: createKeyword("new", { beforeExpr, startsExpr }),
+  _this: createKeyword("this", { startsExpr }),
+  _super: createKeyword("super", { startsExpr }),
+  _class: createKeyword("class", { startsExpr }),
+  _extends: createKeyword("extends", { beforeExpr }),
+  _export: createKeyword("export"),
+  _import: createKeyword("import", { startsExpr }),
+  _null: createKeyword("null", { startsExpr }),
+  _true: createKeyword("true", { startsExpr }),
+  _false: createKeyword("false", { startsExpr }),
+  _in: createKeyword("in", { beforeExpr, binop: 7 }),
+  _instanceof: createKeyword("instanceof", { beforeExpr, binop: 7 }),
+  _typeof: createKeyword("typeof", { beforeExpr, prefix, startsExpr }),
+  _void: createKeyword("void", { beforeExpr, prefix, startsExpr }),
+  _delete: createKeyword("delete", { beforeExpr, prefix, startsExpr }),
 };
-
-// Map keyword names to token types.
-Object.keys(keywords).forEach(name => {
-  types["_" + name] = keywords[name];
-});
diff --git a/packages/babel-parser/src/types.js b/packages/babel-parser/src/types.js
index 0e872275633a..2c5992d2ba6c 100644
--- a/packages/babel-parser/src/types.js
+++ b/packages/babel-parser/src/types.js
@@ -3,6 +3,7 @@
 import type { SourceType } from "./options";
 import type { Token } from "./tokenizer";
 import type { SourceLocation } from "./util/location";
+import type { PlaceholderTypes } from "./plugins/placeholders";
 
 /*
  * If making any changes to the AST, update:
@@ -45,6 +46,7 @@ export type Pattern =
   | ArrayPattern
   | RestElement
   | AssignmentPattern;
+//| Placeholder<"Pattern">;
 export type Declaration =
   | VariableDeclaration
   | ClassDeclaration
@@ -53,6 +55,8 @@ export type Declaration =
   | TsTypeAliasDeclaration
   | TsEnumDeclaration
   | TsModuleDeclaration;
+// | Placeholder<"Declaration">;
+
 export type DeclarationBase = NodeBase & {
   // TypeScript allows declarations to be prefixed by `declare`.
   //TODO: a FunctionDeclaration is never "declare", because it's a TSDeclareFunction instead.
@@ -78,6 +82,7 @@ export type Identifier = PatternBase & {
   // TypeScript only. Used in case of an optional parameter.
   optional?: ?true,
 };
+// | Placeholder<"Identifier">;
 
 export type PrivateName = NodeBase & {
   type: "PrivateName",
@@ -188,6 +193,7 @@ export type BlockStatement = NodeBase & {
   body: Array<Statement>, // TODO: $ReadOnlyArray
   directives: $ReadOnlyArray<Directive>,
 };
+// | Placeholder<"BlockStatement">;
 
 export type EmptyStatement = NodeBase & {
   type: "EmptyStatement",
@@ -257,8 +263,6 @@ export type TryStatement = NodeBase & {
   block: BlockStatement,
   handler: CatchClause | null,
   finalizer: BlockStatement | null,
-
-  guardedHandlers: $ReadOnlyArray<empty>, // TODO: Not in spec
 };
 
 export type CatchClause = NodeBase & {
@@ -340,6 +344,8 @@ export type VariableDeclarator = NodeBase & {
 
 // Misc
 
+export type ArgumentPlaceholder = NodeBase & { type: "ArgumentPlaceholder" };
+
 export type Decorator = NodeBase & {
   type: "Decorator",
   expression: Expression,
@@ -398,7 +404,7 @@ export type ObjectMemberBase = NodeBase & {
   decorators: $ReadOnlyArray<Decorator>,
   kind?: "get" | "set" | "method",
   method: boolean, // TODO: Not in spec
-
+  typeParameters?: ?TypeParameterInstantiationBase, // TODO: Not in spec
   variance?: ?FlowVariance, // TODO: Not in spec
 };
 
@@ -566,6 +572,43 @@ export type SequenceExpression = NodeBase & {
   expressions: $ReadOnlyArray<Expression>,
 };
 
+export type ParenthesizedExpression = NodeBase & {
+  type: "ParenthesizedExpression",
+  expression: Expression,
+};
+
+// Pipelines
+
+export type PipelineBody = NodeBase & {
+  type: "PipelineBody",
+};
+
+export type PipelineBareFunctionBody = NodeBase & {
+  type: "PipelineBareFunctionBody",
+  callee: Expression,
+};
+
+export type PipelineBareConstructorBody = NodeBase & {
+  type: "PipelineBareConstructorBody",
+  callee: Expression,
+};
+
+export type PipelineBareAwaitedFunctionBody = NodeBase & {
+  type: "PipelineBareAwaitedFunctionBody",
+  callee: Expression,
+};
+
+export type PipelineTopicBody = NodeBase & {
+  type: "PipelineTopicBody",
+  expression: Expression,
+};
+
+export type PipelineStyle =
+  | "PipelineBareFunction"
+  | "PipelineBareConstructor"
+  | "PipelineBareAwaitedFunction"
+  | "PipelineTopicExpression";
+
 // Template Literals
 
 export type TemplateLiteral = NodeBase & {
@@ -648,6 +691,7 @@ export type ClassBody = NodeBase & {
   type: "ClassBody",
   body: Array<ClassMember | TsIndexSignature>, // TODO: $ReadOnlyArray
 };
+// | Placeholder<"ClassBody">;
 
 export type ClassMemberBase = NodeBase &
   HasDecorators & {
@@ -751,7 +795,9 @@ export type AnyExport =
   | ExportNamedDeclaration
   | ExportDefaultDeclaration
   | ExportAllDeclaration
-  | TsExportAssignment;
+  | TsExportAssignment
+  | TsImportEqualsDeclaration
+  | TsNamespaceExportDeclaration;
 
 export type ModuleSpecifier = NodeBase & {
   local: Identifier,
@@ -788,7 +834,7 @@ export type ImportNamespaceSpecifier = ModuleSpecifier & {
 export type ExportNamedDeclaration = NodeBase & {
   type: "ExportNamedDeclaration",
   declaration: ?Declaration,
-  specifiers: $ReadOnlyArray<ExportSpecifier>,
+  specifiers: $ReadOnlyArray<ExportSpecifier | ExportDefaultSpecifier>,
   source: ?Literal,
 
   exportKind?: "type" | "value", // TODO: Not in spec
@@ -797,6 +843,12 @@ export type ExportNamedDeclaration = NodeBase & {
 export type ExportSpecifier = NodeBase & {
   type: "ExportSpecifier",
   exported: Identifier,
+  local: Identifier,
+};
+
+export type ExportDefaultSpecifier = NodeBase & {
+  type: "ExportDefaultSpecifier",
+  exported: Identifier,
 };
 
 export type ExportDefaultDeclaration = NodeBase & {
@@ -1037,7 +1089,9 @@ export type TsSignatureDeclaration =
 
 export type TsSignatureDeclarationOrIndexSignatureBase = NodeBase & {
   // Not using TypeScript's "ParameterDeclaration" here, since it's inconsistent with regular functions.
-  parameters: $ReadOnlyArray<Identifier | RestElement>,
+  parameters: $ReadOnlyArray<
+    Identifier | RestElement | ObjectPattern | ArrayPattern,
+  >,
   typeAnnotation: ?TsTypeAnnotation,
 };
 
@@ -1104,6 +1158,8 @@ export type TsType =
   | TsTypeLiteral
   | TsArrayType
   | TsTupleType
+  | TsOptionalType
+  | TsRestType
   | TsUnionOrIntersectionType
   | TsConditionalType
   | TsInferType
@@ -1112,6 +1168,7 @@ export type TsType =
   | TsIndexedAccessType
   | TsMappedType
   | TsLiteralType
+  | TsImportType
   // TODO: This probably shouldn't be included here.
   | TsTypePredicate;
 
@@ -1119,9 +1176,11 @@ export type TsTypeBase = NodeBase;
 
 export type TsKeywordTypeType =
   | "TSAnyKeyword"
+  | "TSUnknownKeyword"
   | "TSNumberKeyword"
   | "TSObjectKeyword"
   | "TSBooleanKeyword"
+  | "TSBigIntKeyword"
   | "TSStringKeyword"
   | "TSSymbolKeyword"
   | "TSVoidKeyword"
@@ -1165,7 +1224,7 @@ export type TsTypePredicate = TsTypeBase & {
 // `typeof` operator
 export type TsTypeQuery = TsTypeBase & {
   type: "TSTypeQuery",
-  exprName: TsEntityName,
+  exprName: TsEntityName | TsImportType,
 };
 
 export type TsTypeLiteral = TsTypeBase & {
@@ -1183,6 +1242,16 @@ export type TsTupleType = TsTypeBase & {
   elementTypes: $ReadOnlyArray<TsType>,
 };
 
+export type TsOptionalType = TsTypeBase & {
+  type: "TSOptionalType",
+  typeAnnotation: TsType,
+};
+
+export type TsRestType = TsTypeBase & {
+  type: "TSRestType",
+  typeAnnotation: TsType,
+};
+
 export type TsUnionOrIntersectionType = TsUnionType | TsIntersectionType;
 
 export type TsUnionOrIntersectionTypeBase = TsTypeBase & {
@@ -1217,7 +1286,7 @@ export type TsParenthesizedType = TsTypeBase & {
 
 export type TsTypeOperator = TsTypeBase & {
   type: "TSTypeOperator",
-  operator: "keyof" | "unique",
+  operator: "keyof" | "unique" | "readonly",
   typeAnnotation: TsType,
 };
 
@@ -1237,7 +1306,14 @@ export type TsMappedType = TsTypeBase & {
 
 export type TsLiteralType = TsTypeBase & {
   type: "TSLiteralType",
-  literal: NumericLiteral | StringLiteral | BooleanLiteral,
+  literal: NumericLiteral | StringLiteral | BooleanLiteral | TemplateLiteral,
+};
+
+export type TsImportType = TsTypeBase & {
+  type: "TsImportType",
+  argument: StringLiteral,
+  qualifier?: TsEntityName,
+  typeParameters?: TsTypeParameterInstantiation,
 };
 
 // ================
@@ -1355,6 +1431,16 @@ export type TsNonNullExpression = NodeBase & {
   expression: Expression,
 };
 
+// ================
+// Babel placeholders %%foo%%
+// ================
+
+export type Placeholder<N: PlaceholderTypes> = NodeBase & {
+  type: "Placeholder",
+  id: Identifier,
+  expectedNode: N,
+};
+
 // ================
 // Other
 // ================
diff --git a/packages/babel-parser/src/util/identifier.js b/packages/babel-parser/src/util/identifier.js
index 1c50fcaf278e..7fda0e27de71 100644
--- a/packages/babel-parser/src/util/identifier.js
+++ b/packages/babel-parser/src/util/identifier.js
@@ -3,42 +3,74 @@
 // @flow
 
 import * as charCodes from "charcodes";
+import { keywords } from "../tokenizer/types";
+
+const reservedWords = {
+  strict: [
+    "implements",
+    "interface",
+    "let",
+    "package",
+    "private",
+    "protected",
+    "public",
+    "static",
+    "yield",
+  ],
+  strictBind: ["eval", "arguments"],
+};
 
-function makePredicate(words: string): (str: string) => boolean {
-  const wordsArr = words.split(" ");
-  return function(str) {
-    return wordsArr.indexOf(str) >= 0;
-  };
-}
-
-// Reserved word lists for various dialects of the language
+const reservedWordsStrictSet = new Set(reservedWords.strict);
+const reservedWordsStrictBindSet = new Set(
+  reservedWords.strict.concat(reservedWords.strictBind),
+);
 
-export const reservedWords = {
-  "6": makePredicate("enum await"),
-  strict: makePredicate(
-    "implements interface let package private protected public static yield",
-  ),
-  strictBind: makePredicate("eval arguments"),
+/**
+ * Checks if word is a reserved word in non-strict mode
+ */
+export const isReservedWord = (word: string, inModule: boolean): boolean => {
+  return (inModule && word === "await") || word === "enum";
 };
 
-// And the keywords
+/**
+ * Checks if word is a reserved word in non-binding strict mode
+ *
+ * Includes non-strict reserved words
+ */
+export function isStrictReservedWord(word: string, inModule: boolean): boolean {
+  return isReservedWord(word, inModule) || reservedWordsStrictSet.has(word);
+}
+
+/**
+ * Checks if word is a reserved word in binding strict mode
+ *
+ * Includes non-strict reserved words and non-binding strict reserved words
+ */
+export function isStrictBindReservedWord(
+  word: string,
+  inModule: boolean,
+): boolean {
+  return isReservedWord(word, inModule) || reservedWordsStrictBindSet.has(word);
+}
 
-export const isKeyword = makePredicate(
-  "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this let const class extends export import yield super",
-);
+export function isKeyword(word: string): boolean {
+  return keywords.has(word);
+}
+
+export const keywordRelationalOperator = /^in(stanceof)?$/;
 
 // ## Character categories
 
-// Big ugly regular expressions that matches characters in the
+// Big ugly regular expressions that match characters in the
 // whitespace, identifier, and identifier-start categories. These
 // are only applied when a character is found to actually have a
 // code point above 0x80.
 // Generated by `scripts/generate-identifier-regex.js`.
 
 /* prettier-ignore */
-let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u08a0-\u08b4\u08b6-\u08bd\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fef\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7b9\ua7f7-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab65\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
+let nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u037f\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u052f\u0531-\u0556\u0559\u0560-\u0588\u05d0-\u05ea\u05ef-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0860-\u086a\u08a0-\u08b4\u08b6-\u08bd\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u09fc\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0af9\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c39\u0c3d\u0c58-\u0c5a\u0c60\u0c61\u0c80\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d54-\u0d56\u0d5f-\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e86-\u0e8a\u0e8c-\u0ea3\u0ea5\u0ea7-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f5\u13f8-\u13fd\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f8\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1878\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191e\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1c80-\u1c88\u1c90-\u1cba\u1cbd-\u1cbf\u1ce9-\u1cec\u1cee-\u1cf3\u1cf5\u1cf6\u1cfa\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2118-\u211d\u2124\u2126\u2128\u212a-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309b-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fef\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua69d\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua7bf\ua7c2-\ua7c6\ua7f7-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua8fd\ua8fe\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\ua9e0-\ua9e4\ua9e6-\ua9ef\ua9fa-\ua9fe\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa7e-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uab30-\uab5a\uab5c-\uab67\uab70-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
 /* prettier-ignore */
-let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d3-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2-\u1cf4\u1cf7-\u1cf9\u1dc0-\u1df9\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
+let nonASCIIidentifierChars = "\u200c\u200d\xb7\u0300-\u036f\u0387\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u0669\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u06f0-\u06f9\u0711\u0730-\u074a\u07a6-\u07b0\u07c0-\u07c9\u07eb-\u07f3\u07fd\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08d3-\u08e1\u08e3-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u09e6-\u09ef\u09fe\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0ae6-\u0aef\u0afa-\u0aff\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c00-\u0c04\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c66-\u0c6f\u0c81-\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0ce6-\u0cef\u0d00-\u0d03\u0d3b\u0d3c\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0de6-\u0def\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0e50-\u0e59\u0eb1\u0eb4-\u0ebc\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1040-\u1049\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b4-\u17d3\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u18a9\u1920-\u192b\u1930-\u193b\u1946-\u194f\u19d0-\u19da\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1ab0-\u1abd\u1b00-\u1b04\u1b34-\u1b44\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1bad\u1bb0-\u1bb9\u1be6-\u1bf3\u1c24-\u1c37\u1c40-\u1c49\u1c50-\u1c59\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf4\u1cf7-\u1cf9\u1dc0-\u1df9\u1dfb-\u1dff\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua620-\ua629\ua66f\ua674-\ua67d\ua69e\ua69f\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c5\ua8d0-\ua8d9\ua8e0-\ua8f1\ua8ff-\ua909\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\ua9d0-\ua9d9\ua9e5\ua9f0-\ua9f9\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa50-\uaa59\uaa7b-\uaa7d\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uaaeb-\uaaef\uaaf5\uaaf6\uabe3-\uabea\uabec\uabed\uabf0-\uabf9\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
 
 const nonASCIIidentifierStart = new RegExp(
   "[" + nonASCIIidentifierStartChars + "]",
@@ -55,16 +87,16 @@ nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
 // offset to the next range, and then a size of the range. They were
 // generated by `scripts/generate-identifier-regex.js`.
 /* prettier-ignore */
-const astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,14,29,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,28,43,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,14,35,477,28,11,0,9,21,190,52,76,44,33,24,27,35,30,0,12,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,54,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,86,26,230,43,117,63,32,0,257,0,11,39,8,0,22,0,12,39,3,3,20,0,35,56,264,8,2,36,18,0,50,29,113,6,2,1,2,37,22,0,26,5,2,1,2,31,15,0,328,18,270,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,689,63,129,68,12,0,67,12,65,1,31,6129,15,754,9486,286,82,395,2309,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,4149,196,60,67,1213,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42710,42,4148,12,221,3,5761,15,7472,3104,541];
+const astralIdentifierStartCodes = [0,11,2,25,2,18,2,1,2,14,3,13,35,122,70,52,268,28,4,48,48,31,14,29,6,37,11,29,3,35,5,7,2,4,43,157,19,35,5,35,5,39,9,51,157,310,10,21,11,7,153,5,3,0,2,43,2,1,4,0,3,22,11,22,10,30,66,18,2,1,11,21,11,25,71,55,7,1,65,0,16,3,2,2,2,28,43,28,4,28,36,7,2,27,28,53,11,21,11,18,14,17,111,72,56,50,14,50,14,35,477,28,11,0,9,21,155,22,13,52,76,44,33,24,27,35,30,0,12,34,4,0,13,47,15,3,22,0,2,0,36,17,2,24,85,6,2,0,2,3,2,14,2,9,8,46,39,7,3,1,3,21,2,6,2,1,2,4,4,0,19,0,13,4,159,52,19,3,21,0,33,47,21,1,2,0,185,46,42,3,37,47,21,0,60,42,14,0,72,26,230,43,117,63,32,0,161,7,3,38,17,0,2,0,29,0,11,39,8,0,22,0,12,45,20,0,35,56,264,8,2,36,18,0,50,29,113,6,2,1,2,37,22,0,26,5,2,1,2,31,15,0,328,18,270,921,103,110,18,195,2749,1070,4050,582,8634,568,8,30,114,29,19,47,17,3,32,20,6,18,689,63,129,74,6,0,67,12,65,1,2,0,29,6135,9,754,9486,286,50,2,18,3,9,395,2309,106,6,12,4,8,8,9,5991,84,2,70,2,1,3,0,3,1,3,3,2,11,2,0,2,6,2,64,2,3,3,7,2,6,2,27,2,3,2,4,2,0,4,6,2,339,3,24,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,30,2,24,2,7,2357,44,11,6,17,0,370,43,1301,196,60,67,8,0,1205,3,2,26,2,1,2,0,3,0,2,9,2,3,2,0,2,0,7,0,5,0,2,0,2,0,2,2,2,1,2,0,3,0,2,0,2,0,2,0,2,0,2,1,2,0,3,3,2,6,2,3,2,3,2,0,2,9,2,16,6,2,2,4,2,16,4421,42710,42,4148,12,221,3,5761,15,7472,3104,541];
 /* prettier-ignore */
-const astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,574,3,9,9,525,10,176,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,6,1,45,0,13,2,49,13,9,3,4,9,83,11,7,0,161,11,6,9,7,3,56,1,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,5,0,82,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,243,14,166,9,280,9,41,6,2,3,9,0,10,10,47,15,406,7,2,7,17,9,57,21,2,13,123,5,4,0,2,1,2,6,2,0,9,9,49,4,2,1,2,4,9,9,330,3,19306,9,135,4,60,6,26,9,1016,45,17,3,19723,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,2214,6,110,6,6,9,792487,239];
+const astralIdentifierCodes = [509,0,227,0,150,4,294,9,1368,2,2,1,6,3,41,2,5,0,166,1,574,3,9,9,525,10,176,2,54,14,32,9,16,3,46,10,54,9,7,2,37,13,2,9,6,1,45,0,13,2,49,13,9,3,4,9,83,11,7,0,161,11,6,9,7,3,56,1,2,6,3,1,3,2,10,0,11,1,3,6,4,4,193,17,10,9,5,0,82,19,13,9,214,6,3,8,28,1,83,16,16,9,82,12,9,9,84,14,5,9,243,14,166,9,232,6,3,6,4,0,29,9,41,6,2,3,9,0,10,10,47,15,406,7,2,7,17,9,57,21,2,13,123,5,4,0,2,1,2,6,2,0,9,9,49,4,2,1,2,4,9,9,330,3,19306,9,135,4,60,6,26,9,1014,0,2,54,8,3,19723,1,5319,4,4,5,9,7,3,6,31,3,149,2,1418,49,513,54,5,49,9,0,15,0,23,4,2,14,1361,6,2,16,3,6,2,1,2,4,262,6,10,9,419,13,1495,6,110,6,6,9,792487,239];
 
 // This has a complexity linear to the value of the code. The
 // assumption is that looking up astral identifier characters is
 // rare.
 function isInAstralSet(code: number, set: $ReadOnlyArray<number>): boolean {
   let pos = 0x10000;
-  for (let i = 0; i < set.length; i += 2) {
+  for (let i = 0, length = set.length; i < length; i += 2) {
     pos += set[i];
     if (pos > code) return false;
 
diff --git a/packages/babel-parser/src/util/scope.js b/packages/babel-parser/src/util/scope.js
new file mode 100644
index 000000000000..e40cb53e3e33
--- /dev/null
+++ b/packages/babel-parser/src/util/scope.js
@@ -0,0 +1,215 @@
+// @flow
+import {
+  SCOPE_ARROW,
+  SCOPE_ASYNC,
+  SCOPE_DIRECT_SUPER,
+  SCOPE_FUNCTION,
+  SCOPE_GENERATOR,
+  SCOPE_SIMPLE_CATCH,
+  SCOPE_SUPER,
+  SCOPE_PROGRAM,
+  SCOPE_VAR,
+  SCOPE_CLASS,
+  BIND_SCOPE_FUNCTION,
+  BIND_SCOPE_VAR,
+  BIND_SCOPE_LEXICAL,
+  BIND_KIND_VALUE,
+  type ScopeFlags,
+  type BindingTypes,
+} from "./scopeflags";
+import * as N from "../types";
+
+// Start an AST node, attaching a start offset.
+export class Scope {
+  flags: ScopeFlags;
+  // A list of var-declared names in the current lexical scope
+  var: string[] = [];
+  // A list of lexically-declared names in the current lexical scope
+  lexical: string[] = [];
+  // A list of lexically-declared FunctionDeclaration names in the current lexical scope
+  functions: string[] = [];
+
+  constructor(flags: ScopeFlags) {
+    this.flags = flags;
+  }
+}
+
+type raiseFunction = (number, string) => void;
+
+// The functions in this module keep track of declared variables in the
+// current scope in order to detect duplicate variable names.
+export default class ScopeHandler<IScope: Scope = Scope> {
+  scopeStack: Array<IScope> = [];
+  raise: raiseFunction;
+  inModule: boolean;
+  undefinedExports: Map<string, number> = new Map();
+
+  constructor(raise: raiseFunction, inModule: boolean) {
+    this.raise = raise;
+    this.inModule = inModule;
+  }
+
+  get inFunction() {
+    return (this.currentVarScope().flags & SCOPE_FUNCTION) > 0;
+  }
+  get inGenerator() {
+    return (this.currentVarScope().flags & SCOPE_GENERATOR) > 0;
+  }
+  get inAsync() {
+    return (this.currentVarScope().flags & SCOPE_ASYNC) > 0;
+  }
+  get allowSuper() {
+    return (this.currentThisScope().flags & SCOPE_SUPER) > 0;
+  }
+  get allowDirectSuper() {
+    return (this.currentThisScope().flags & SCOPE_DIRECT_SUPER) > 0;
+  }
+  get inNonArrowFunction() {
+    return (this.currentThisScope().flags & SCOPE_FUNCTION) > 0;
+  }
+  get treatFunctionsAsVar() {
+    return this.treatFunctionsAsVarInScope(this.currentScope());
+  }
+
+  createScope(flags: ScopeFlags): Scope {
+    return new Scope(flags);
+  }
+  // This method will be overwritten by subclasses
+  +createScope: (flags: ScopeFlags) => IScope;
+
+  enter(flags: ScopeFlags) {
+    this.scopeStack.push(this.createScope(flags));
+  }
+
+  exit() {
+    this.scopeStack.pop();
+  }
+
+  // The spec says:
+  // > At the top level of a function, or script, function declarations are
+  // > treated like var declarations rather than like lexical declarations.
+  treatFunctionsAsVarInScope(scope: IScope): boolean {
+    return !!(
+      scope.flags & SCOPE_FUNCTION ||
+      (!this.inModule && scope.flags & SCOPE_PROGRAM)
+    );
+  }
+
+  declareName(name: string, bindingType: BindingTypes, pos: number) {
+    let scope = this.currentScope();
+    if (bindingType & BIND_SCOPE_LEXICAL || bindingType & BIND_SCOPE_FUNCTION) {
+      this.checkRedeclarationInScope(scope, name, bindingType, pos);
+
+      if (bindingType & BIND_SCOPE_FUNCTION) {
+        scope.functions.push(name);
+      } else {
+        scope.lexical.push(name);
+      }
+
+      if (bindingType & BIND_SCOPE_LEXICAL) {
+        this.maybeExportDefined(scope, name);
+      }
+    } else if (bindingType & BIND_SCOPE_VAR) {
+      for (let i = this.scopeStack.length - 1; i >= 0; --i) {
+        scope = this.scopeStack[i];
+        this.checkRedeclarationInScope(scope, name, bindingType, pos);
+        scope.var.push(name);
+        this.maybeExportDefined(scope, name);
+
+        if (scope.flags & SCOPE_VAR) break;
+      }
+    }
+    if (this.inModule && scope.flags & SCOPE_PROGRAM) {
+      this.undefinedExports.delete(name);
+    }
+  }
+
+  maybeExportDefined(scope: IScope, name: string) {
+    if (this.inModule && scope.flags & SCOPE_PROGRAM) {
+      this.undefinedExports.delete(name);
+    }
+  }
+
+  checkRedeclarationInScope(
+    scope: IScope,
+    name: string,
+    bindingType: BindingTypes,
+    pos: number,
+  ) {
+    if (this.isRedeclaredInScope(scope, name, bindingType)) {
+      this.raise(pos, `Identifier '${name}' has already been declared`);
+    }
+  }
+
+  isRedeclaredInScope(
+    scope: IScope,
+    name: string,
+    bindingType: BindingTypes,
+  ): boolean {
+    if (!(bindingType & BIND_KIND_VALUE)) return false;
+
+    if (bindingType & BIND_SCOPE_LEXICAL) {
+      return (
+        scope.lexical.indexOf(name) > -1 ||
+        scope.functions.indexOf(name) > -1 ||
+        scope.var.indexOf(name) > -1
+      );
+    }
+
+    if (bindingType & BIND_SCOPE_FUNCTION) {
+      return (
+        scope.lexical.indexOf(name) > -1 ||
+        (!this.treatFunctionsAsVarInScope(scope) &&
+          scope.var.indexOf(name) > -1)
+      );
+    }
+
+    return (
+      (scope.lexical.indexOf(name) > -1 &&
+        !(scope.flags & SCOPE_SIMPLE_CATCH && scope.lexical[0] === name)) ||
+      (!this.treatFunctionsAsVarInScope(scope) &&
+        scope.functions.indexOf(name) > -1)
+    );
+  }
+
+  checkLocalExport(id: N.Identifier) {
+    if (
+      this.scopeStack[0].lexical.indexOf(id.name) === -1 &&
+      this.scopeStack[0].var.indexOf(id.name) === -1 &&
+      // In strict mode, scope.functions will always be empty.
+      // Modules are strict by default, but the `scriptMode` option
+      // can overwrite this behavior.
+      this.scopeStack[0].functions.indexOf(id.name) === -1
+    ) {
+      this.undefinedExports.set(id.name, id.start);
+    }
+  }
+
+  currentScope(): IScope {
+    return this.scopeStack[this.scopeStack.length - 1];
+  }
+
+  // $FlowIgnore
+  currentVarScope(): IScope {
+    for (let i = this.scopeStack.length - 1; ; i--) {
+      const scope = this.scopeStack[i];
+      if (scope.flags & SCOPE_VAR) {
+        return scope;
+      }
+    }
+  }
+
+  // Could be useful for `this`, `new.target`, `super()`, `super.property`, and `super[property]`.
+  // $FlowIgnore
+  currentThisScope(): IScope {
+    for (let i = this.scopeStack.length - 1; ; i--) {
+      const scope = this.scopeStack[i];
+      if (
+        (scope.flags & SCOPE_VAR || scope.flags & SCOPE_CLASS) &&
+        !(scope.flags & SCOPE_ARROW)
+      ) {
+        return scope;
+      }
+    }
+  }
+}
diff --git a/packages/babel-parser/src/util/scopeflags.js b/packages/babel-parser/src/util/scopeflags.js
new file mode 100644
index 000000000000..8c9697b3a416
--- /dev/null
+++ b/packages/babel-parser/src/util/scopeflags.js
@@ -0,0 +1,85 @@
+// @flow
+
+// Each scope gets a bitset that may contain these flags
+// prettier-ignore
+export const SCOPE_OTHER        = 0b000000000,
+             SCOPE_PROGRAM      = 0b000000001,
+             SCOPE_FUNCTION     = 0b000000010,
+             SCOPE_ASYNC        = 0b000000100,
+             SCOPE_GENERATOR    = 0b000001000,
+             SCOPE_ARROW        = 0b000010000,
+             SCOPE_SIMPLE_CATCH = 0b000100000,
+             SCOPE_SUPER        = 0b001000000,
+             SCOPE_DIRECT_SUPER = 0b010000000,
+             SCOPE_CLASS        = 0b100000000,
+             SCOPE_VAR = SCOPE_PROGRAM | SCOPE_FUNCTION;
+
+export type ScopeFlags =
+  | typeof SCOPE_OTHER
+  | typeof SCOPE_PROGRAM
+  | typeof SCOPE_FUNCTION
+  | typeof SCOPE_VAR
+  | typeof SCOPE_ASYNC
+  | typeof SCOPE_GENERATOR
+  | typeof SCOPE_ARROW
+  | typeof SCOPE_SIMPLE_CATCH
+  | typeof SCOPE_SUPER
+  | typeof SCOPE_DIRECT_SUPER
+  | typeof SCOPE_CLASS;
+
+export function functionFlags(isAsync: boolean, isGenerator: boolean) {
+  return (
+    SCOPE_FUNCTION |
+    (isAsync ? SCOPE_ASYNC : 0) |
+    (isGenerator ? SCOPE_GENERATOR : 0)
+  );
+}
+
+// These flags are meant to be _only_ used inside the Scope class (or subclasses).
+// prettier-ignore
+export const BIND_KIND_VALUE           = 0b00000_0000_01,
+             BIND_KIND_TYPE            = 0b00000_0000_10,
+             // Used in checkLVal and declareName to determine the type of a binding
+             BIND_SCOPE_VAR            = 0b00000_0001_00, // Var-style binding
+             BIND_SCOPE_LEXICAL        = 0b00000_0010_00, // Let- or const-style binding
+             BIND_SCOPE_FUNCTION       = 0b00000_0100_00, // Function declaration
+             BIND_SCOPE_OUTSIDE        = 0b00000_1000_00, // Special case for function names as
+                                                   // bound inside the function
+             // Misc flags
+             BIND_FLAGS_NONE           = 0b00001_0000_00,
+             BIND_FLAGS_CLASS          = 0b00010_0000_00,
+             BIND_FLAGS_TS_ENUM        = 0b00100_0000_00,
+             BIND_FLAGS_TS_CONST_ENUM  = 0b01000_0000_00,
+             BIND_FLAGS_TS_EXPORT_ONLY = 0b10000_0000_00;
+
+// These flags are meant to be _only_ used by Scope consumers
+// prettier-ignore
+/*                              =    is value?    |    is type?    |      scope          |    misc flags    */
+export const BIND_CLASS         = BIND_KIND_VALUE | BIND_KIND_TYPE | BIND_SCOPE_LEXICAL  | BIND_FLAGS_CLASS  ,
+             BIND_LEXICAL       = BIND_KIND_VALUE | 0              | BIND_SCOPE_LEXICAL  | 0                 ,
+             BIND_VAR           = BIND_KIND_VALUE | 0              | BIND_SCOPE_VAR      | 0                 ,
+             BIND_FUNCTION      = BIND_KIND_VALUE | 0              | BIND_SCOPE_FUNCTION | 0                 ,
+             BIND_TS_INTERFACE  = 0               | BIND_KIND_TYPE | 0                   | BIND_FLAGS_CLASS  ,
+             BIND_TS_TYPE       = 0               | BIND_KIND_TYPE | 0                   | 0                 ,
+             BIND_TS_ENUM       = BIND_KIND_VALUE | BIND_KIND_TYPE | BIND_SCOPE_LEXICAL  | BIND_FLAGS_TS_ENUM,
+             BIND_TS_FN_TYPE    = 0               | 0              | 0            | BIND_FLAGS_TS_EXPORT_ONLY,
+             // These bindings don't introduce anything in the scope. They are used for assignments and
+             // function expressions IDs.
+             BIND_NONE          = 0               | 0              | 0                   | BIND_FLAGS_NONE   ,
+             BIND_OUTSIDE       = BIND_KIND_VALUE | 0              | 0                   | BIND_FLAGS_NONE   ,
+
+             BIND_TS_CONST_ENUM = BIND_TS_ENUM | BIND_FLAGS_TS_CONST_ENUM,
+             BIND_TS_NAMESPACE  = BIND_TS_FN_TYPE;
+
+export type BindingTypes =
+  | typeof BIND_NONE
+  | typeof BIND_OUTSIDE
+  | typeof BIND_VAR
+  | typeof BIND_LEXICAL
+  | typeof BIND_CLASS
+  | typeof BIND_FUNCTION
+  | typeof BIND_TS_INTERFACE
+  | typeof BIND_TS_TYPE
+  | typeof BIND_TS_ENUM
+  | typeof BIND_TS_FN_TYPE
+  | typeof BIND_TS_NAMESPACE;
diff --git a/packages/babel-parser/src/util/whitespace.js b/packages/babel-parser/src/util/whitespace.js
index d82d87413d90..2fdbc3d423f5 100644
--- a/packages/babel-parser/src/util/whitespace.js
+++ b/packages/babel-parser/src/util/whitespace.js
@@ -4,7 +4,7 @@ import * as charCodes from "charcodes";
 
 // Matches a whole line break (where CRLF is considered a single
 // line break). Used to count lines.
-export const lineBreak = /\r\n?|\n|\u2028|\u2029/;
+export const lineBreak = /\r\n?|[\n\u2028\u2029]/;
 export const lineBreakG = new RegExp(lineBreak.source, "g");
 
 // https://tc39.github.io/ecma262/#sec-line-terminators
diff --git a/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/7/options.json b/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/7/options.json
index d58bb015bf01..12b18792fcc4 100644
--- a/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/7/options.json
+++ b/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/7/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:10)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/8/options.json b/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/8/options.json
index e2125b704132..5f24fc4399ed 100644
--- a/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/8/options.json
+++ b/packages/babel-parser/test/expressions/is-expression-babel-parser/fail/8/options.json
@@ -1,4 +1,4 @@
 {
   "strictMode": true,
-  "throws": "public is a reserved word in strict mode (2:0)"
+  "throws": "Unexpected reserved word 'public' (2:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/input.js b/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/input.js
new file mode 100644
index 000000000000..753a9cfbb2b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/input.js
@@ -0,0 +1,12 @@
+// One
+(1);
+
+/* Two */
+(2);
+
+(
+  // Three
+  3
+);
+
+(/* Four */ 4);
diff --git a/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/options.json b/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/options.json
new file mode 100644
index 000000000000..0861962d889d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/options.json
@@ -0,0 +1,3 @@
+{
+  "createParenthesizedExpressions": true
+}
diff --git a/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/output.json b/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/output.json
new file mode 100644
index 000000000000..761463790803
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/basic/create-parenthesized-expressions/output.json
@@ -0,0 +1,391 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 65,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 12,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 65,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 12,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 7,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "ParenthesizedExpression",
+          "start": 7,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 3
+            }
+          },
+          "expression": {
+            "type": "NumericLiteral",
+            "start": 8,
+            "end": 9,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 1
+              },
+              "end": {
+                "line": 2,
+                "column": 2
+              }
+            },
+            "extra": {
+              "rawValue": 1,
+              "raw": "1"
+            },
+            "value": 1
+          }
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " One",
+            "start": 0,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              }
+            }
+          }
+        ],
+        "trailingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " Two ",
+            "start": 13,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 0
+              },
+              "end": {
+                "line": 4,
+                "column": 9
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 23,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 5,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "ParenthesizedExpression",
+          "start": 23,
+          "end": 26,
+          "loc": {
+            "start": {
+              "line": 5,
+              "column": 0
+            },
+            "end": {
+              "line": 5,
+              "column": 3
+            }
+          },
+          "expression": {
+            "type": "NumericLiteral",
+            "start": 24,
+            "end": 25,
+            "loc": {
+              "start": {
+                "line": 5,
+                "column": 1
+              },
+              "end": {
+                "line": 5,
+                "column": 2
+              }
+            },
+            "extra": {
+              "rawValue": 2,
+              "raw": "2"
+            },
+            "value": 2
+          }
+        },
+        "leadingComments": [
+          {
+            "type": "CommentBlock",
+            "value": " Two ",
+            "start": 13,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 0
+              },
+              "end": {
+                "line": 4,
+                "column": 9
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 29,
+        "end": 48,
+        "loc": {
+          "start": {
+            "line": 7,
+            "column": 0
+          },
+          "end": {
+            "line": 10,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "ParenthesizedExpression",
+          "start": 29,
+          "end": 47,
+          "loc": {
+            "start": {
+              "line": 7,
+              "column": 0
+            },
+            "end": {
+              "line": 10,
+              "column": 1
+            }
+          },
+          "expression": {
+            "type": "NumericLiteral",
+            "start": 44,
+            "end": 45,
+            "loc": {
+              "start": {
+                "line": 9,
+                "column": 2
+              },
+              "end": {
+                "line": 9,
+                "column": 3
+              }
+            },
+            "extra": {
+              "rawValue": 3,
+              "raw": "3"
+            },
+            "value": 3,
+            "leadingComments": [
+              {
+                "type": "CommentLine",
+                "value": " Three",
+                "start": 33,
+                "end": 41,
+                "loc": {
+                  "start": {
+                    "line": 8,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 10
+                  }
+                }
+              }
+            ]
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 50,
+        "end": 65,
+        "loc": {
+          "start": {
+            "line": 12,
+            "column": 0
+          },
+          "end": {
+            "line": 12,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "ParenthesizedExpression",
+          "start": 50,
+          "end": 64,
+          "loc": {
+            "start": {
+              "line": 12,
+              "column": 0
+            },
+            "end": {
+              "line": 12,
+              "column": 14
+            }
+          },
+          "expression": {
+            "type": "NumericLiteral",
+            "start": 62,
+            "end": 63,
+            "loc": {
+              "start": {
+                "line": 12,
+                "column": 12
+              },
+              "end": {
+                "line": 12,
+                "column": 13
+              }
+            },
+            "extra": {
+              "rawValue": 4,
+              "raw": "4"
+            },
+            "value": 4,
+            "leadingComments": [
+              {
+                "type": "CommentBlock",
+                "value": " Four ",
+                "start": 51,
+                "end": 61,
+                "loc": {
+                  "start": {
+                    "line": 12,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 12,
+                    "column": 11
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " One",
+      "start": 0,
+      "end": 6,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 6
+        }
+      }
+    },
+    {
+      "type": "CommentBlock",
+      "value": " Two ",
+      "start": 13,
+      "end": 22,
+      "loc": {
+        "start": {
+          "line": 4,
+          "column": 0
+        },
+        "end": {
+          "line": 4,
+          "column": 9
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " Three",
+      "start": 33,
+      "end": 41,
+      "loc": {
+        "start": {
+          "line": 8,
+          "column": 2
+        },
+        "end": {
+          "line": 8,
+          "column": 10
+        }
+      }
+    },
+    {
+      "type": "CommentBlock",
+      "value": " Four ",
+      "start": 51,
+      "end": 61,
+      "loc": {
+        "start": {
+          "line": 12,
+          "column": 1
+        },
+        "end": {
+          "line": 12,
+          "column": 11
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/comments/html/first-line/input.js b/packages/babel-parser/test/fixtures/comments/html/first-line/input.js
new file mode 100644
index 000000000000..9fe3a97d3a3a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/html/first-line/input.js
@@ -0,0 +1 @@
+/**/ --> comment
diff --git a/packages/babel-parser/test/fixtures/comments/html/first-line/output.json b/packages/babel-parser/test/fixtures/comments/html/first-line/output.json
new file mode 100644
index 000000000000..d42874927c64
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/comments/html/first-line/output.json
@@ -0,0 +1,102 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [],
+    "innerComments": [
+      {
+        "type": "CommentBlock",
+        "value": "",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        }
+      },
+      {
+        "type": "CommentLine",
+        "value": " comment",
+        "start": 5,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 5
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        }
+      }
+    ]
+  },
+  "comments": [
+    {
+      "type": "CommentBlock",
+      "value": "",
+      "start": 0,
+      "end": 4,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 4
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " comment",
+      "start": 5,
+      "end": 16,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 5
+        },
+        "end": {
+          "line": 1,
+          "column": 16
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/330/input.js b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-inside-loop/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/es2015/uncategorised/330/input.js
rename to packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-inside-loop/input.js
diff --git a/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-inside-loop/options.json b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-inside-loop/options.json
new file mode 100644
index 000000000000..05a7826ae8ba
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-inside-loop/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "In non-strict mode code, functions can only be declared at top level, inside a block, or as the body of an if statement (1:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-labeled-inside-loop/input.js b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-labeled-inside-loop/input.js
new file mode 100644
index 000000000000..241ddc1cde1c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-labeled-inside-loop/input.js
@@ -0,0 +1 @@
+while (1) foo: bar: function foo(){}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-labeled-inside-loop/options.json b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-labeled-inside-loop/options.json
new file mode 100644
index 000000000000..395620bfa2f8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/categorized/invalid-fn-decl-labeled-inside-loop/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "In non-strict mode code, functions can only be declared at top level, inside a block, or as the body of an if statement (1:20)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/object/invalid-escape-get/input.js b/packages/babel-parser/test/fixtures/core/object/invalid-escape-get/input.js
new file mode 100644
index 000000000000..208cd4d559e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/object/invalid-escape-get/input.js
@@ -0,0 +1 @@
+({ ge\u0074 x() {} })
diff --git a/packages/babel-parser/test/fixtures/core/object/invalid-escape-get/options.json b/packages/babel-parser/test/fixtures/core/object/invalid-escape-get/options.json
new file mode 100644
index 000000000000..0cd822570731
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/object/invalid-escape-get/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-false/input.js b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-false/input.js
new file mode 100644
index 000000000000..3e4ef35fdb8f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-false/input.js
@@ -0,0 +1 @@
+for await (const i of imports) {}
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-false/options.json b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-false/options.json
new file mode 100644
index 000000000000..40babbccd785
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-false/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \"(\" (1:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/input.js b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/input.js
new file mode 100644
index 000000000000..3e4ef35fdb8f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/input.js
@@ -0,0 +1 @@
+for await (const i of imports) {}
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/options.json b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/options.json
new file mode 100644
index 000000000000..40360d582b73
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/options.json
@@ -0,0 +1,3 @@
+{
+  "allowAwaitOutsideFunction": true
+}
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/output.json b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/output.json
new file mode 100644
index 000000000000..259b3ffcf47c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowAwaitOutsideFunction-true/output.json
@@ -0,0 +1,136 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 33
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ForOfStatement",
+        "start": 0,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 33
+          }
+        },
+        "await": true,
+        "left": {
+          "type": "VariableDeclaration",
+          "start": 11,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 11
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "declarations": [
+            {
+              "type": "VariableDeclarator",
+              "start": 17,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "id": {
+                "type": "Identifier",
+                "start": 17,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "identifierName": "i"
+                },
+                "name": "i"
+              },
+              "init": null
+            }
+          ],
+          "kind": "const"
+        },
+        "right": {
+          "type": "Identifier",
+          "start": 22,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 22
+            },
+            "end": {
+              "line": 1,
+              "column": 29
+            },
+            "identifierName": "imports"
+          },
+          "name": "imports"
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start": 31,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 31
+            },
+            "end": {
+              "line": 1,
+              "column": 33
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/input.js b/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/input.js
new file mode 100644
index 000000000000..f604032cb6d6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/input.js
@@ -0,0 +1 @@
+export { foo };
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/options.json b/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/options.json
new file mode 100644
index 000000000000..2de0f0b2d678
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "allowUndeclaredExports": true
+}
diff --git a/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/output.json b/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/output.json
new file mode 100644
index 000000000000..a454ef5bbdb2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/opts/allowUndeclaredExports/output.json
@@ -0,0 +1,103 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/regression/9374/input.js b/packages/babel-parser/test/fixtures/core/regression/9374/input.js
new file mode 100644
index 000000000000..bce5ddf8e157
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/9374/input.js
@@ -0,0 +1,3 @@
+function* test() {
+  yield new Foo();
+}
diff --git a/packages/babel-parser/test/fixtures/core/regression/9374/output.json b/packages/babel-parser/test/fixtures/core/regression/9374/output.json
new file mode 100644
index 000000000000..c32f37d64bc1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/9374/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 39,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 39,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 39,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            },
+            "identifierName": "test"
+          },
+          "name": "test"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 17,
+          "end": 39,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 21,
+              "end": 37,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 18
+                }
+              },
+              "expression": {
+                "type": "YieldExpression",
+                "start": 21,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 17
+                  }
+                },
+                "delegate": false,
+                "argument": {
+                  "type": "NewExpression",
+                  "start": 27,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 17
+                    }
+                  },
+                  "callee": {
+                    "type": "Identifier",
+                    "start": 31,
+                    "end": 34,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 15
+                      },
+                      "identifierName": "Foo"
+                    },
+                    "name": "Foo"
+                  },
+                  "arguments": []
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/regression/non-octal-float-strict-mode/input.js b/packages/babel-parser/test/fixtures/core/regression/non-octal-float-strict-mode/input.js
new file mode 100644
index 000000000000..cbc4507bfeae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/non-octal-float-strict-mode/input.js
@@ -0,0 +1 @@
+09.5
diff --git a/packages/babel-parser/test/fixtures/core/regression/non-octal-float-strict-mode/options.json b/packages/babel-parser/test/fixtures/core/regression/non-octal-float-strict-mode/options.json
new file mode 100644
index 000000000000..8ac5b45f7194
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/non-octal-float-strict-mode/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Legacy octal literals are not allowed in strict mode (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/regression/non-octal-float/input.js b/packages/babel-parser/test/fixtures/core/regression/non-octal-float/input.js
new file mode 100644
index 000000000000..cbc4507bfeae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/non-octal-float/input.js
@@ -0,0 +1 @@
+09.5
diff --git a/packages/babel-parser/test/fixtures/core/regression/non-octal-float/output.json b/packages/babel-parser/test/fixtures/core/regression/non-octal-float/output.json
new file mode 100644
index 000000000000..f48f7a786775
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/non-octal-float/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 9.5,
+            "raw": "09.5"
+          },
+          "value": 9.5
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/input.js b/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/input.js
new file mode 100644
index 000000000000..80b817b29181
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/input.js
@@ -0,0 +1 @@
+07.5
diff --git a/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/options.json b/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/options.json
new file mode 100644
index 000000000000..a89de70c61e5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/octal-float-fail/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/regression/use-strict-with-pre-semi/input.js b/packages/babel-parser/test/fixtures/core/regression/use-strict-with-pre-semi/input.js
new file mode 100644
index 000000000000..b6452ebfc3ad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/use-strict-with-pre-semi/input.js
@@ -0,0 +1,3 @@
+function a ([a] = []) {
+ ; 'use strict'; with ({}) {}
+}
diff --git a/packages/babel-parser/test/fixtures/core/regression/use-strict-with-pre-semi/output.json b/packages/babel-parser/test/fixtures/core/regression/use-strict-with-pre-semi/output.json
new file mode 100644
index 000000000000..694c18f640d7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/regression/use-strict-with-pre-semi/output.json
@@ -0,0 +1,252 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 55,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 55,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 55,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "a"
+          },
+          "name": "a"
+        },
+        "generator": false,
+        "async": false,
+        "params": [
+          {
+            "type": "AssignmentPattern",
+            "start": 12,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 12
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "left": {
+              "type": "ArrayPattern",
+              "start": 12,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 12
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 13,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a"
+                }
+              ]
+            },
+            "right": {
+              "type": "ArrayExpression",
+              "start": 18,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "elements": []
+            }
+          }
+        ],
+        "body": {
+          "type": "BlockStatement",
+          "start": 22,
+          "end": 55,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 22
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "EmptyStatement",
+              "start": 25,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 1
+                },
+                "end": {
+                  "line": 2,
+                  "column": 2
+                }
+              }
+            },
+            {
+              "type": "ExpressionStatement",
+              "start": 27,
+              "end": 40,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 3
+                },
+                "end": {
+                  "line": 2,
+                  "column": 16
+                }
+              },
+              "expression": {
+                "type": "StringLiteral",
+                "start": 27,
+                "end": 39,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 15
+                  }
+                },
+                "extra": {
+                  "rawValue": "use strict",
+                  "raw": "'use strict'"
+                },
+                "value": "use strict"
+              }
+            },
+            {
+              "type": "WithStatement",
+              "start": 41,
+              "end": 53,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 17
+                },
+                "end": {
+                  "line": 2,
+                  "column": 29
+                }
+              },
+              "object": {
+                "type": "ObjectExpression",
+                "start": 47,
+                "end": 49,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 23
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 25
+                  }
+                },
+                "properties": []
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 51,
+                "end": 53,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 27
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 29
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex-nested/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex-nested/input.js
new file mode 100644
index 000000000000..9c289f87c3ee
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex-nested/input.js
@@ -0,0 +1,5 @@
+{
+  let bar;
+  var foo = 1;
+  let foo = 1;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex-nested/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex-nested/options.json
new file mode 100644
index 000000000000..b09098cda9c8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex-nested/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (4:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex/input.js
new file mode 100644
index 000000000000..512f6888653d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex/input.js
@@ -0,0 +1,3 @@
+let bar;
+var foo = 1;
+let foo = 1;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex/options.json
new file mode 100644
index 000000000000..37dd7bff7207
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-lex/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (3:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var-nested/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var-nested/input.js
new file mode 100644
index 000000000000..59ae63e301b7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var-nested/input.js
@@ -0,0 +1,5 @@
+{
+  let bar;
+  let foo = 1;
+  var foo = 1;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var-nested/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var-nested/options.json
new file mode 100644
index 000000000000..b09098cda9c8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var-nested/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (4:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var/input.js
new file mode 100644
index 000000000000..aebd03c05710
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var/input.js
@@ -0,0 +1,3 @@
+let bar;
+let foo = 1;
+var foo = 1;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var/options.json
new file mode 100644
index 000000000000..37dd7bff7207
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-2nd-lvl-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (3:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-arr-destr/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-arr-destr/input.js
new file mode 100644
index 000000000000..0ed8680e4854
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-arr-destr/input.js
@@ -0,0 +1,3 @@
+try {
+} catch ([foo, foo]) {
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-arr-destr/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-arr-destr/options.json
new file mode 100644
index 000000000000..70121ca46ead
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-arr-destr/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (2:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-dbl-let/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-dbl-let/input.js
new file mode 100644
index 000000000000..5ccd99323ac8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-dbl-let/input.js
@@ -0,0 +1 @@
+let foo; try {} catch (foo) {} let foo;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-dbl-let/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-dbl-let/options.json
new file mode 100644
index 000000000000..386e81ecdc4c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-dbl-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (1:35)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-func/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-func/input.js
new file mode 100644
index 000000000000..c53b6b3d03fc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-func/input.js
@@ -0,0 +1,4 @@
+try {
+} catch (foo) {
+  function foo() {}
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-func/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-func/options.json
new file mode 100644
index 000000000000..62b0c73eb164
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-func/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (3:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/input.js
new file mode 100644
index 000000000000..32d85119a543
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/input.js
@@ -0,0 +1,4 @@
+try {
+} catch (foo) {
+  if (1) function foo() {}
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/output.json
new file mode 100644
index 000000000000..a465e0c09fb0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-hang-func/output.json
@@ -0,0 +1,206 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 50,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 50,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 50,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 2,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 8,
+          "end": 50,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 2
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "param": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 12
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "body": {
+            "type": "BlockStatement",
+            "start": 20,
+            "end": 50,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 14
+              },
+              "end": {
+                "line": 4,
+                "column": 1
+              }
+            },
+            "body": [
+              {
+                "type": "IfStatement",
+                "start": 24,
+                "end": 48,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 26
+                  }
+                },
+                "test": {
+                  "type": "NumericLiteral",
+                  "start": 28,
+                  "end": 29,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 7
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                },
+                "consequent": {
+                  "type": "FunctionDeclaration",
+                  "start": 31,
+                  "end": 48,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 26
+                    }
+                  },
+                  "id": {
+                    "type": "Identifier",
+                    "start": 40,
+                    "end": 43,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 21
+                      },
+                      "identifierName": "foo"
+                    },
+                    "name": "foo"
+                  },
+                  "generator": false,
+                  "async": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 46,
+                    "end": 48,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 24
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 26
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                },
+                "alternate": null
+              }
+            ],
+            "directives": []
+          }
+        },
+        "finalizer": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/input.js
new file mode 100644
index 000000000000..f223972849fe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/input.js
@@ -0,0 +1,4 @@
+try {
+} catch (foo) {
+}
+let foo;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/output.json
new file mode 100644
index 000000000000..8c0ce7e4c006
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let-outside/output.json
@@ -0,0 +1,168 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 2,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 8,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 2
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "param": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 12
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "body": {
+            "type": "BlockStatement",
+            "start": 20,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 14
+              },
+              "end": {
+                "line": 3,
+                "column": 1
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        },
+        "finalizer": null
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 24,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 28,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 4
+              },
+              "end": {
+                "line": 4,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 28,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 4
+                },
+                "end": {
+                  "line": 4,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let/input.js
new file mode 100644
index 000000000000..8e4af00ffaed
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let/input.js
@@ -0,0 +1,4 @@
+try {
+} catch (foo) {
+  let foo;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let/options.json
new file mode 100644
index 000000000000..254a763e653e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (3:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-obj-destr/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-obj-destr/input.js
new file mode 100644
index 000000000000..b8a800685aa4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-obj-destr/input.js
@@ -0,0 +1,3 @@
+try {
+} catch ({ a: foo, b: { c: [foo] } }) {
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-obj-destr/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-obj-destr/options.json
new file mode 100644
index 000000000000..a00c2989e1b1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-obj-destr/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (2:28)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-arr-destr/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-arr-destr/input.js
new file mode 100644
index 000000000000..0c5630af7e93
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-arr-destr/input.js
@@ -0,0 +1,4 @@
+try {
+} catch ([foo]) {
+  var foo;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-arr-destr/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-arr-destr/options.json
new file mode 100644
index 000000000000..ff69adb0860a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-arr-destr/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (3:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/input.js
new file mode 100644
index 000000000000..6cdcb267c2b3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/input.js
@@ -0,0 +1,7 @@
+try {
+} catch (foo) {
+  try {
+  } catch (_) {
+    var foo;
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/output.json
new file mode 100644
index 000000000000..1baae9250df9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-nested/output.json
@@ -0,0 +1,252 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 64,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 7,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 64,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 7,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 64,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 1
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 2,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 8,
+          "end": 64,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 2
+            },
+            "end": {
+              "line": 7,
+              "column": 1
+            }
+          },
+          "param": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 12
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "body": {
+            "type": "BlockStatement",
+            "start": 20,
+            "end": 64,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 14
+              },
+              "end": {
+                "line": 7,
+                "column": 1
+              }
+            },
+            "body": [
+              {
+                "type": "TryStatement",
+                "start": 24,
+                "end": 62,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 3
+                  }
+                },
+                "block": {
+                  "type": "BlockStatement",
+                  "start": 28,
+                  "end": 33,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 3
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                },
+                "handler": {
+                  "type": "CatchClause",
+                  "start": 34,
+                  "end": 62,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 3
+                    }
+                  },
+                  "param": {
+                    "type": "Identifier",
+                    "start": 41,
+                    "end": 42,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 12
+                      },
+                      "identifierName": "_"
+                    },
+                    "name": "_"
+                  },
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 44,
+                    "end": 62,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 3
+                      }
+                    },
+                    "body": [
+                      {
+                        "type": "VariableDeclaration",
+                        "start": 50,
+                        "end": 58,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 12
+                          }
+                        },
+                        "declarations": [
+                          {
+                            "type": "VariableDeclarator",
+                            "start": 54,
+                            "end": 57,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 8
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 11
+                              }
+                            },
+                            "id": {
+                              "type": "Identifier",
+                              "start": 54,
+                              "end": 57,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 8
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 11
+                                },
+                                "identifierName": "foo"
+                              },
+                              "name": "foo"
+                            },
+                            "init": null
+                          }
+                        ],
+                        "kind": "var"
+                      }
+                    ],
+                    "directives": []
+                  }
+                },
+                "finalizer": null
+              }
+            ],
+            "directives": []
+          }
+        },
+        "finalizer": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/input.js
new file mode 100644
index 000000000000..a93f6a37bda5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/input.js
@@ -0,0 +1,4 @@
+try {
+} catch ({ foo }) {
+  var foo;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/options.json
new file mode 100644
index 000000000000..ff69adb0860a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-obj-destr/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (3:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/input.js
new file mode 100644
index 000000000000..cd2df9964963
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/input.js
@@ -0,0 +1,4 @@
+try {
+} catch (foo) {
+}
+var foo;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/output.json
new file mode 100644
index 000000000000..f9626718bb97
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var-outside/output.json
@@ -0,0 +1,168 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 2,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 8,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 2
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "param": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 12
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "body": {
+            "type": "BlockStatement",
+            "start": 20,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 14
+              },
+              "end": {
+                "line": 3,
+                "column": 1
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        },
+        "finalizer": null
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 24,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 28,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 4
+              },
+              "end": {
+                "line": 4,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 28,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 4
+                },
+                "end": {
+                  "line": 4,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/input.js
new file mode 100644
index 000000000000..e2983d96dca8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/input.js
@@ -0,0 +1,4 @@
+try {
+} catch (foo) {
+  var foo;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/output.json
new file mode 100644
index 000000000000..54bc80b8062d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-catch-var/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 2,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 8,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 2
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "param": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 12
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "body": {
+            "type": "BlockStatement",
+            "start": 20,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 14
+              },
+              "end": {
+                "line": 4,
+                "column": 1
+              }
+            },
+            "body": [
+              {
+                "type": "VariableDeclaration",
+                "start": 24,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 10
+                  }
+                },
+                "declarations": [
+                  {
+                    "type": "VariableDeclarator",
+                    "start": 28,
+                    "end": 31,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 9
+                      }
+                    },
+                    "id": {
+                      "type": "Identifier",
+                      "start": 28,
+                      "end": 31,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 9
+                        },
+                        "identifierName": "foo"
+                      },
+                      "name": "foo"
+                    },
+                    "init": null
+                  }
+                ],
+                "kind": "var"
+              }
+            ],
+            "directives": []
+          }
+        },
+        "finalizer": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-class/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-class/input.js
new file mode 100644
index 000000000000..3996f21e1238
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-class/input.js
@@ -0,0 +1,2 @@
+class foo {};
+class foo {};
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-class/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-class/options.json
new file mode 100644
index 000000000000..cdd0ac832c57
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-const/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-const/input.js
new file mode 100644
index 000000000000..0f7aaf2b6905
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-const/input.js
@@ -0,0 +1,2 @@
+class foo {};
+const foo = 1;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-const/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-const/options.json
new file mode 100644
index 000000000000..c45b9bf38290
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-const/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (2:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-func/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-func/input.js
new file mode 100644
index 000000000000..0953b37d0ca1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-func/input.js
@@ -0,0 +1,2 @@
+class foo {};
+function foo () {};
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-func/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-func/options.json
new file mode 100644
index 000000000000..58aaf9d99d22
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-func/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (2:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-let/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-let/input.js
new file mode 100644
index 000000000000..970f577a71e9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-let/input.js
@@ -0,0 +1,2 @@
+class foo {};
+let foo = 1;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-let/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-let/options.json
new file mode 100644
index 000000000000..bf89e4692c99
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (2:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-var/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-var/input.js
new file mode 100644
index 000000000000..0cbd916cdb6b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-var/input.js
@@ -0,0 +1,2 @@
+class foo {};
+var foo;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-var/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-var/options.json
new file mode 100644
index 000000000000..bf89e4692c99
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-class-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (2:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-const-const/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-const-const/input.js
new file mode 100644
index 000000000000..206de74b498c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-const-const/input.js
@@ -0,0 +1 @@
+const foo=1, foo=2;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-const-const/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-const-const/options.json
new file mode 100644
index 000000000000..d62aabfd1b07
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-const-const/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (1:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-gen/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-gen/input.js
new file mode 100644
index 000000000000..b5a6ac21d8aa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-gen/input.js
@@ -0,0 +1 @@
+{ function f() {} function* f() {} }
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-gen/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-gen/options.json
new file mode 100644
index 000000000000..c083e3d4c063
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-gen/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'f' has already been declared (1:28)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module-sloppy/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module-sloppy/input.js
new file mode 100644
index 000000000000..31ea14cffbb8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module-sloppy/input.js
@@ -0,0 +1 @@
+{ function foo() {} function foo() {} }
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module-sloppy/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module-sloppy/options.json
new file mode 100644
index 000000000000..3f4250fbe917
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module-sloppy/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Identifier 'foo' has already been declared (1:29)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module/input.js
new file mode 100644
index 000000000000..11a6da2a7eb8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module/input.js
@@ -0,0 +1,2 @@
+function foo() {}
+function foo() {}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module/options.json
new file mode 100644
index 000000000000..23553cce3705
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-module/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws":"Identifier 'foo' has already been declared (2:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/input.js
new file mode 100644
index 000000000000..31ea14cffbb8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/input.js
@@ -0,0 +1 @@
+{ function foo() {} function foo() {} }
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/options.json
new file mode 100644
index 000000000000..b412ffe6712f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/output.json
new file mode 100644
index 000000000000..94ae24d249a9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script-sloppy/output.json
@@ -0,0 +1,157 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 39,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 39
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 39,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 39
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "BlockStatement",
+        "start": 0,
+        "end": 39,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 39
+          }
+        },
+        "body": [
+          {
+            "type": "FunctionDeclaration",
+            "start": 2,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 2
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 11,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 11
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "generator": false,
+            "async": false,
+            "params": [],
+            "body": {
+              "type": "BlockStatement",
+              "start": 17,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                }
+              },
+              "body": [],
+              "directives": []
+            }
+          },
+          {
+            "type": "FunctionDeclaration",
+            "start": 20,
+            "end": 37,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 20
+              },
+              "end": {
+                "line": 1,
+                "column": 37
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 29,
+              "end": 32,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 29
+                },
+                "end": {
+                  "line": 1,
+                  "column": 32
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "generator": false,
+            "async": false,
+            "params": [],
+            "body": {
+              "type": "BlockStatement",
+              "start": 35,
+              "end": 37,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 35
+                },
+                "end": {
+                  "line": 1,
+                  "column": 37
+                }
+              },
+              "body": [],
+              "directives": []
+            }
+          }
+        ],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/input.js
new file mode 100644
index 000000000000..11a6da2a7eb8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/input.js
@@ -0,0 +1,2 @@
+function foo() {}
+function foo() {}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/options.json
new file mode 100644
index 000000000000..b412ffe6712f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/output.json
new file mode 100644
index 000000000000..af377ce80461
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-script/output.json
@@ -0,0 +1,139 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 35,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 35,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 15,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 18,
+        "end": 35,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 17
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 27,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 12
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 33,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 15
+            },
+            "end": {
+              "line": 2,
+              "column": 17
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var-sloppy/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var-sloppy/input.js
new file mode 100644
index 000000000000..7f32f625bccf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var-sloppy/input.js
@@ -0,0 +1,4 @@
+{
+  function foo() {}
+  var foo = 1;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var-sloppy/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var-sloppy/options.json
new file mode 100644
index 000000000000..ff69adb0860a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var-sloppy/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (3:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var/input.js
new file mode 100644
index 000000000000..3248c1cf455b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var/input.js
@@ -0,0 +1,2 @@
+function foo() {}
+var foo = 1;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var/output.json
new file mode 100644
index 000000000000..d2a2c6f9982d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-func-var/output.json
@@ -0,0 +1,157 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 15,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 18,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 12
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 22,
+            "end": 29,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 11
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 22,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": {
+              "type": "NumericLiteral",
+              "start": 28,
+              "end": 29,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 10
+                },
+                "end": {
+                  "line": 2,
+                  "column": 11
+                }
+              },
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-func/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-func/input.js
new file mode 100644
index 000000000000..cc9c09466785
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-func/input.js
@@ -0,0 +1 @@
+{ function* f() {} function f() {} }
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-func/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-func/options.json
new file mode 100644
index 000000000000..c083e3d4c063
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-func/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'f' has already been declared (1:28)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/input.js
new file mode 100644
index 000000000000..a43e0c8581d5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/input.js
@@ -0,0 +1,2 @@
+function *foo() {};
+function *foo() {};
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/options.json
new file mode 100644
index 000000000000..b412ffe6712f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/output.json
new file mode 100644
index 000000000000..e5bce9fb21da
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-gen-gen-script/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 39,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 39,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 16,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "EmptyStatement",
+        "start": 18,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 18
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        }
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 20,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 18
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 30,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 13
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 36,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 16
+            },
+            "end": {
+              "line": 2,
+              "column": 18
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "EmptyStatement",
+        "start": 38,
+        "end": 39,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 18
+          },
+          "end": {
+            "line": 2,
+            "column": 19
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-let-let/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-let-let/input.js
new file mode 100644
index 000000000000..60494395b6a6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-let-let/input.js
@@ -0,0 +1 @@
+let foo, foo;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-let-let/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-let-let/options.json
new file mode 100644
index 000000000000..714354e14501
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-let-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'foo' has already been declared (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-let-var/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-let-var/input.js
new file mode 100644
index 000000000000..79a65c0ee2de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-let-var/input.js
@@ -0,0 +1,4 @@
+{
+  let a;
+  { var a; }
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-let-var/options.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-let-var/options.json
new file mode 100644
index 000000000000..a0925d495610
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-let-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'a' has already been declared (3:8)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-var-let/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-var-let/input.js
new file mode 100644
index 000000000000..b5bbb6d44168
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-var-let/input.js
@@ -0,0 +1,4 @@
+{
+  var a;
+  { let a; }
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-var-let/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-var-let/output.json
new file mode 100644
index 000000000000..239db26973c2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-nested-var-let/output.json
@@ -0,0 +1,173 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "BlockStatement",
+        "start": 0,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "body": [
+          {
+            "type": "VariableDeclaration",
+            "start": 4,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 2
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              }
+            },
+            "declarations": [
+              {
+                "type": "VariableDeclarator",
+                "start": 8,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 7
+                  }
+                },
+                "id": {
+                  "type": "Identifier",
+                  "start": 8,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 7
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a"
+                },
+                "init": null
+              }
+            ],
+            "kind": "var"
+          },
+          {
+            "type": "BlockStatement",
+            "start": 13,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 2
+              },
+              "end": {
+                "line": 3,
+                "column": 12
+              }
+            },
+            "body": [
+              {
+                "type": "VariableDeclaration",
+                "start": 15,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 10
+                  }
+                },
+                "declarations": [
+                  {
+                    "type": "VariableDeclarator",
+                    "start": 19,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 9
+                      }
+                    },
+                    "id": {
+                      "type": "Identifier",
+                      "start": 19,
+                      "end": 20,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 9
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "init": null
+                  }
+                ],
+                "kind": "let"
+              }
+            ],
+            "directives": []
+          }
+        ],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-var-var/input.js b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-var-var/input.js
new file mode 100644
index 000000000000..260da8ced85a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-var-var/input.js
@@ -0,0 +1 @@
+var foo, foo;
diff --git a/packages/babel-parser/test/fixtures/core/scope/dupl-bind-var-var/output.json b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-var-var/output.json
new file mode 100644
index 000000000000..0be8a0eea29f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/dupl-bind-var-var/output.json
@@ -0,0 +1,119 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 13
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          },
+          {
+            "type": "VariableDeclarator",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/for-let/input.js b/packages/babel-parser/test/fixtures/core/scope/for-let/input.js
new file mode 100644
index 000000000000..a169b4038040
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/for-let/input.js
@@ -0,0 +1,3 @@
+for (let i = 0;;) {
+    let i;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/for-let/output.json b/packages/babel-parser/test/fixtures/core/scope/for-let/output.json
new file mode 100644
index 000000000000..8af98b16aa63
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/for-let/output.json
@@ -0,0 +1,191 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ForStatement",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "init": {
+          "type": "VariableDeclaration",
+          "start": 5,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "declarations": [
+            {
+              "type": "VariableDeclarator",
+              "start": 9,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "id": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "identifierName": "i"
+                },
+                "name": "i"
+              },
+              "init": {
+                "type": "NumericLiteral",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": 0,
+                  "raw": "0"
+                },
+                "value": 0
+              }
+            }
+          ],
+          "kind": "let"
+        },
+        "test": null,
+        "update": null,
+        "body": {
+          "type": "BlockStatement",
+          "start": 18,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 18
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "VariableDeclaration",
+              "start": 24,
+              "end": 30,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 10
+                }
+              },
+              "declarations": [
+                {
+                  "type": "VariableDeclarator",
+                  "start": 28,
+                  "end": 29,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 9
+                    }
+                  },
+                  "id": {
+                    "type": "Identifier",
+                    "start": 28,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 9
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "init": null
+                }
+              ],
+              "kind": "let"
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/for-var/input.js b/packages/babel-parser/test/fixtures/core/scope/for-var/input.js
new file mode 100644
index 000000000000..400b636e5c84
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/for-var/input.js
@@ -0,0 +1,3 @@
+for (let i = 0;;) {
+    var i;
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/for-var/options.json b/packages/babel-parser/test/fixtures/core/scope/for-var/options.json
new file mode 100644
index 000000000000..10e45adf4560
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/for-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'i' has already been declared (2:8)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/let-assign/input.js b/packages/babel-parser/test/fixtures/core/scope/let-assign/input.js
new file mode 100644
index 000000000000..a66eb5ab6774
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/let-assign/input.js
@@ -0,0 +1 @@
+let x = 1; x = 2;
diff --git a/packages/babel-parser/test/fixtures/core/scope/let-assign/output.json b/packages/babel-parser/test/fixtures/core/scope/let-assign/output.json
new file mode 100644
index 000000000000..508af9fc85d2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/let-assign/output.json
@@ -0,0 +1,173 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 9,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 9
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "NumericLiteral",
+              "start": 8,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 11,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 11
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 11,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 11
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 11,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "NumericLiteral",
+            "start": 15,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "extra": {
+              "rawValue": 2,
+              "raw": "2"
+            },
+            "value": 2
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-as-default/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as-default/input.js
new file mode 100644
index 000000000000..df3d92761397
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as-default/input.js
@@ -0,0 +1 @@
+export { encrypt as default };
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-as-default/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as-default/options.json
new file mode 100644
index 000000000000..8448889cf253
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as-default/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Export 'encrypt' is not defined (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-as/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as/input.js
new file mode 100644
index 000000000000..f14dc079868b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as/input.js
@@ -0,0 +1,2 @@
+export { encrypt as decrypt };
+function decrypt() {}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-as/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as/options.json
new file mode 100644
index 000000000000..8448889cf253
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-as/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Export 'encrypt' is not defined (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-block/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-block/input.js
new file mode 100644
index 000000000000..1e993e373a01
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-block/input.js
@@ -0,0 +1,4 @@
+{
+  function encrypt() {}
+}
+export { encrypt }
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-block/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-block/options.json
new file mode 100644
index 000000000000..0844d3e80e68
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-block/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Export 'encrypt' is not defined (4:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin-as/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin-as/input.js
new file mode 100644
index 000000000000..2ab393fc2343
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin-as/input.js
@@ -0,0 +1 @@
+export { Object as Obj };
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin-as/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin-as/options.json
new file mode 100644
index 000000000000..cbab70613300
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin-as/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Export 'Object' is not defined (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin/input.js
new file mode 100644
index 000000000000..8ddd96dff319
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin/input.js
@@ -0,0 +1 @@
+export { Object };
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin/options.json
new file mode 100644
index 000000000000..cbab70613300
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-builtin/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Export 'Object' is not defined (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/input.js
new file mode 100644
index 000000000000..87d3720d82fd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/input.js
@@ -0,0 +1,3 @@
+function a() {}
+
+export { a };
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/options.json
new file mode 100644
index 000000000000..0580fdad26f5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "strictMode": false
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/output.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/output.json
new file mode 100644
index 000000000000..e59b53b2e0ed
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-1/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "a"
+          },
+          "name": "a"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 13,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 17,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 26,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 9
+              },
+              "end": {
+                "line": 3,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 26,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 10
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 26,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 10
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/input.js
new file mode 100644
index 000000000000..aacd737fb7b9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/input.js
@@ -0,0 +1,2 @@
+export { a };
+function a() {}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/options.json
new file mode 100644
index 000000000000..0580fdad26f5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "strictMode": false
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/output.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/output.json
new file mode 100644
index 000000000000..16b50c7b3875
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-function-loose-mode-2/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 29,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 29,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 15
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 14,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 23,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            },
+            "identifierName": "a"
+          },
+          "name": "a"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 27,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 13
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-if/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-if/input.js
new file mode 100644
index 000000000000..6d6c87fb7a38
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-if/input.js
@@ -0,0 +1,2 @@
+export { encrypt };
+if (true) function encrypt() {}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-if/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-if/options.json
new file mode 100644
index 000000000000..2c97b3ce5a78
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-if/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "In strict mode code, functions can only be declared at top level or inside a block (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/input.js
new file mode 100644
index 000000000000..b8a0b5223551
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/input.js
@@ -0,0 +1,4 @@
+{
+  var encrypt
+}
+export { encrypt }
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/options.json
new file mode 100644
index 000000000000..2104ca43283f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "module"
+}
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/output.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/output.json
new file mode 100644
index 000000000000..91e34252dbc5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export-var/output.json
@@ -0,0 +1,172 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 18
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "BlockStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "body": [
+          {
+            "type": "VariableDeclaration",
+            "start": 4,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 2
+              },
+              "end": {
+                "line": 2,
+                "column": 13
+              }
+            },
+            "declarations": [
+              {
+                "type": "VariableDeclarator",
+                "start": 8,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 13
+                  }
+                },
+                "id": {
+                  "type": "Identifier",
+                  "start": 8,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 13
+                    },
+                    "identifierName": "encrypt"
+                  },
+                  "name": "encrypt"
+                },
+                "init": null
+              }
+            ],
+            "kind": "var"
+          }
+        ],
+        "directives": []
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 18,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 18
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 27,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 9
+              },
+              "end": {
+                "line": 4,
+                "column": 16
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 27,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 9
+                },
+                "end": {
+                  "line": 4,
+                  "column": 16
+                },
+                "identifierName": "encrypt"
+              },
+              "name": "encrypt"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 27,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 9
+                },
+                "end": {
+                  "line": 4,
+                  "column": 16
+                },
+                "identifierName": "encrypt"
+              },
+              "name": "encrypt"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export/input.js b/packages/babel-parser/test/fixtures/core/scope/undecl-export/input.js
new file mode 100644
index 000000000000..7ec871cd2f99
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export/input.js
@@ -0,0 +1 @@
+export { encrypt };
diff --git a/packages/babel-parser/test/fixtures/core/scope/undecl-export/options.json b/packages/babel-parser/test/fixtures/core/scope/undecl-export/options.json
new file mode 100644
index 000000000000..8448889cf253
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/scope/undecl-export/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Export 'encrypt' is not defined (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/276/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/276/output.json
index d363a5d4cc63..7124a7ba6fff 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/276/output.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/276/output.json
@@ -109,7 +109,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/277/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/277/output.json
index 80dde4eca487..0f104da5ae82 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/277/output.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/277/output.json
@@ -109,7 +109,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/278/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/278/output.json
index 4b11f881deec..8721f9d98403 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/278/output.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/278/output.json
@@ -109,7 +109,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/279/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/279/output.json
index fbcb70be2667..49094bb0e6bd 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/279/output.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/279/output.json
@@ -176,7 +176,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/280/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/280/output.json
index ea48a4030059..b1589f69dcee 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/280/output.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/280/output.json
@@ -61,7 +61,6 @@
           "directives": []
         },
         "handler": null,
-        "guardedHandlers": [],
         "finalizer": {
           "type": "BlockStatement",
           "start": 16,
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/281/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/281/output.json
index bc19c5698fbf..7bb5acfbedbb 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/281/output.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/281/output.json
@@ -225,7 +225,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/282/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/282/output.json
index dc667d97efc5..91b008540089 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/282/output.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/282/output.json
@@ -225,7 +225,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": {
           "type": "BlockStatement",
           "start": 47,
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/382/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/382/options.json
index 27a7b64d71d4..2b91be8d5115 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/382/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/382/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:4)"
+  "throws": "Unexpected keyword 'if' (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/396/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/396/options.json
index 570ef651fb67..2e1b1cc3aa43 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/396/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/396/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \")\" (1:18)"
+  "throws": "Rest element must be last element (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/397/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/397/options.json
index cb6c66081ebf..f9543317a817 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/397/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/397/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:11)"
+  "throws": "Unexpected keyword 'if' (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/398/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/398/options.json
index cb6c66081ebf..bba7a057d842 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/398/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/398/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:11)"
+  "throws": "Unexpected keyword 'true' (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/399/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/399/options.json
index cb6c66081ebf..b04b18396af1 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/399/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/399/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:11)"
+  "throws": "Unexpected keyword 'false' (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/400/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/400/options.json
index cb6c66081ebf..667f2cc8816d 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/400/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/400/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:11)"
+  "throws": "Unexpected keyword 'null' (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/401/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/401/options.json
index 2a28555f76db..fa57d4f43f70 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/401/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/401/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Unexpected keyword 'null' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/402/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/402/options.json
index 2a28555f76db..c4a7ead13704 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/402/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/402/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Unexpected keyword 'true' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/403/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/403/options.json
index 2a28555f76db..0e9cf8962aae 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/403/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/403/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Unexpected keyword 'false' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/404/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/404/options.json
index 2a28555f76db..a87aa98c0e01 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/404/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/404/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Unexpected keyword 'if' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/468/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/468/options.json
index 28f88106148b..b463f315f9eb 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/468/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/468/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:36)"
-}
+  "throws": "Binding 'eval' in strict mode (1:36)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/469/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/469/options.json
index 913c7bb59f38..9e9f875dfbb5 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/469/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/469/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:36)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:36)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/470/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/470/options.json
index 0306783e6eef..b5fd79ff5ff1 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/470/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/470/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:47)"
-}
+  "throws": "Binding 'eval' in strict mode (1:47)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/471/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/471/options.json
index d1ae2825366a..15b7ac855374 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/471/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/471/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:47)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:47)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/472/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/472/options.json
index 3bcd668ab1b1..95f470aed511 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/472/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/472/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/473/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/473/options.json
index 04db3a217825..ef45890ab53f 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/473/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/473/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/474/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/474/options.json
index 48fd4ff41936..2783b68b3d58 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/474/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/474/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/475/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/475/options.json
index 48fd4ff41936..2783b68b3d58 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/475/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/475/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/476/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/476/options.json
index d579a92e2358..fe2654496fc9 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/476/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/476/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/477/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/477/options.json
index d579a92e2358..fe2654496fc9 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/477/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/477/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/478/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/478/options.json
index 3bcd668ab1b1..95f470aed511 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/478/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/478/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/479/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/479/options.json
index 3bcd668ab1b1..95f470aed511 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/479/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/479/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/480/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/480/options.json
index 04db3a217825..ef45890ab53f 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/480/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/480/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/481/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/481/options.json
index 04db3a217825..ef45890ab53f 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/481/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/481/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/482/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/482/options.json
index 71bbcc0b9c1c..6db4ae7bf008 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/482/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/482/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:41)"
-}
+  "throws": "Binding 'eval' in strict mode (1:41)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/483/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/483/options.json
index 544d28f50291..b02fb725c767 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/483/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/483/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:41)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:41)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/484/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/484/options.json
index bf851387b4c6..a7490f9321d4 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/484/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/484/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'eval' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/485/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/485/options.json
index e4d477b8e4ec..80b8b2d85caa 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/485/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/485/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/486/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/486/options.json
index f6c8eea4b0d3..706ba8380c70 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/486/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/486/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:42)"
-}
+  "throws": "Binding 'eval' in strict mode (1:42)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/487/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/487/options.json
index d26216e0a364..d0e461af3911 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/487/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/487/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:42)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:42)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/488/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/488/options.json
index 69e4925a3ffd..ee2e7d7c7745 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/488/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/488/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:10)"
-}
+  "throws": "Binding 'eval' in strict mode (1:10)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/489/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/489/options.json
index fbdc57cfc8fa..bb4b812bab32 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/489/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/489/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:10)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:10)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/490/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/490/options.json
index 0306783e6eef..b5fd79ff5ff1 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/490/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/490/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:47)"
-}
+  "throws": "Binding 'eval' in strict mode (1:47)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/491/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/491/options.json
index c2d1e1a69b41..ff90f09173c4 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/491/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/491/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:10)"
-}
+  "throws": "Binding 'package' in strict mode (1:10)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/492/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/492/options.json
index 92828dc4f1c9..b8f97ca4fe56 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/492/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/492/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:48)"
-}
+  "throws": "Binding 'eval' in strict mode (1:48)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/493/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/493/options.json
index 71bbcc0b9c1c..6db4ae7bf008 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/493/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/493/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:41)"
-}
+  "throws": "Binding 'eval' in strict mode (1:41)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/494/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/494/options.json
index 241eccc1bf6d..e80a856d48a0 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/494/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/494/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:49)"
-}
+  "throws": "Binding 'eval' in strict mode (1:49)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/495/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/495/options.json
index f56e7311d854..d93d5b2aa62e 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/495/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/495/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/496/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/496/options.json
index 0e1962195156..5d2dc563b16e 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/496/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/496/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/497/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/497/options.json
index 92828dc4f1c9..b8f97ca4fe56 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/497/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/497/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:48)"
-}
+  "throws": "Binding 'eval' in strict mode (1:48)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/498/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/498/options.json
index e9f6bf4d32ff..ab7000409bab 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/498/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/498/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:48)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:48)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/500/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/500/options.json
index ec4ea95dc9cb..45ca229c1e8e 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/500/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/500/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (1:33)"
+  "throws": "Legacy octal literals are not allowed in strict mode (1:33)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/502/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/502/options.json
index dd200e16e5bf..8f6c8218f747 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/502/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/502/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (1:36)"
+  "throws": "Legacy octal literals are not allowed in strict mode (1:36)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/504/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/504/options.json
index 2748b9f03d9e..0641de45e29a 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/504/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/504/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "implements is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'implements' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/505/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/505/options.json
index 6efaf057ca5c..859238d0423f 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/505/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/505/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "interface is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'interface' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/506/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/506/options.json
index 61578ad8f860..344c7075f4bf 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/506/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/506/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'package' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/507/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/507/options.json
index da502d0daa6a..9fb9deaf9cba 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/507/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/507/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "private is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'private' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/508/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/508/options.json
index 6fd44c0e1ba5..292fb56f1cf3 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/508/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/508/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "protected is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'protected' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/509/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/509/options.json
index 3a41c740eaac..d5f48446906a 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/509/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/509/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "public is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'public' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/510/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/510/options.json
index 764205122e0f..0f41ff2e6f24 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/510/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/510/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'static' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/511/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/511/options.json
index e316c4fc64fd..fff472344fd7 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/511/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/511/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'static' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/512/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/512/options.json
index 9b6fddd2ebba..d4d0a96bfb64 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/512/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/512/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'static' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/513/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/513/options.json
index a2eac88ba69d..91bc36d3f360 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/513/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/513/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:23)"
+  "throws": "Unexpected reserved word 'static' (1:23)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/514/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/514/options.json
index e23388601bb0..8b20b9a7df36 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/514/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/514/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:14)"
+  "throws": "Argument name clash (1:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/515/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/515/options.json
index 0bb96c96d88e..e227bd1a6b74 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/515/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/515/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:11)"
-}
+  "throws": "Binding 'eval' in strict mode (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/516/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/516/options.json
index 7551a61b9e0b..8e1f9af4ec47 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/516/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/516/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:11)"
-}
+  "throws": "Binding 'package' in strict mode (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/517/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/517/options.json
index 660e54ca2a82..9d2a58081596 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/517/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/517/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:43)"
+  "throws": "Argument name clash (1:43)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/518/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/518/options.json
index 28545ded1456..61c3bbb5abe0 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/518/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/518/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:15)"
+  "throws": "Argument name clash (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/519/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/519/options.json
index 0f592c74a35b..ae469fbd59da 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/519/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/519/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:44)"
+  "throws": "Argument name clash (1:44)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/520/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/520/options.json
index b52d2d2e1520..3c24c608c88a 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/520/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/520/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:12)"
-}
+  "throws": "Binding 'eval' in strict mode (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/521/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/521/options.json
index 7b80f0e455ce..96d524816cc9 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/521/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/521/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:12)"
-}
+  "throws": "Binding 'package' in strict mode (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/522/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/522/options.json
index 3696be182d05..0b443b9bacfa 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/522/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/522/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (1:65)"
+  "throws": "Legacy octal literals are not allowed in strict mode (1:65)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/523/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/523/options.json
index 27a7b64d71d4..60a9d5934bd2 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/523/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/523/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:4)"
+  "throws": "Unexpected keyword 'this' (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/544/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/544/options.json
index 8874a76e59d1..37c243afff2a 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/544/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/544/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "public is a reserved word in strict mode (2:8)"
+  "throws": "Unexpected reserved word 'public' (2:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/545/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/545/options.json
index 560bb8988152..b09fdddc9d0a 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/545/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/545/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "public is a reserved word in strict mode (1:8)"
+  "throws": "Unexpected reserved word 'public' (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/547/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/547/options.json
index 20c9b2493e67..c2fb6377e80d 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/547/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/547/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (2:8)"
+  "throws": "Unexpected reserved word 'arguments' (2:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/548/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/548/options.json
index d2dd99623cd3..4183c2e22534 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/548/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/548/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "arguments is a reserved word in strict mode (1:8)"
+  "throws": "Unexpected reserved word 'arguments' (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/550/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/550/options.json
index f635fb88c5c9..5cee88d901e4 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/550/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/550/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (2:10)"
+  "throws": "Legacy octal literals are not allowed in strict mode (2:10)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/552/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/552/options.json
index f635fb88c5c9..5cee88d901e4 100644
--- a/packages/babel-parser/test/fixtures/core/uncategorised/552/options.json
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/552/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (2:10)"
+  "throws": "Legacy octal literals are not allowed in strict mode (2:10)"
 }
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/555/input.js b/packages/babel-parser/test/fixtures/core/uncategorised/555/input.js
new file mode 100644
index 000000000000..2c262ab21189
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/555/input.js
@@ -0,0 +1,6 @@
+function foo ( 
+    first,
+    ...second,
+    third,
+) {
+};
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/555/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/555/options.json
new file mode 100644
index 000000000000..c1c6450ba3c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/555/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (3:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/556/input.js b/packages/babel-parser/test/fixtures/core/uncategorised/556/input.js
new file mode 100644
index 000000000000..13cfa4015d22
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/556/input.js
@@ -0,0 +1 @@
+({x}) = {x: 1};
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/556/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/556/options.json
new file mode 100644
index 000000000000..eff49cbfba64
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/556/options.json
@@ -0,0 +1,4 @@
+{
+  "createParenthesizedExpressions": true,
+  "throws": "You're trying to assign to a parenthesized expression, eg. instead of `({a}) = 0` use `({a} = 0)` (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/557/input.js b/packages/babel-parser/test/fixtures/core/uncategorised/557/input.js
new file mode 100644
index 000000000000..40d925520dfa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/557/input.js
@@ -0,0 +1 @@
+("hello");
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/557/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/557/options.json
new file mode 100644
index 000000000000..0861962d889d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/557/options.json
@@ -0,0 +1,3 @@
+{
+  "createParenthesizedExpressions": true
+}
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/557/output.json b/packages/babel-parser/test/fixtures/core/uncategorised/557/output.json
new file mode 100644
index 000000000000..b1f49f00e99f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/557/output.json
@@ -0,0 +1,85 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "ParenthesizedExpression",
+          "start": 0,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            }
+          },
+          "expression": {
+            "type": "StringLiteral",
+            "start": 1,
+            "end": 8,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 8
+              }
+            },
+            "extra": {
+              "rawValue": "hello",
+              "raw": "\"hello\""
+            },
+            "value": "hello"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/558/input.js b/packages/babel-parser/test/fixtures/core/uncategorised/558/input.js
new file mode 100644
index 000000000000..2cf717d47db3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/558/input.js
@@ -0,0 +1 @@
+([a]) = []
diff --git a/packages/babel-parser/test/fixtures/core/uncategorised/558/options.json b/packages/babel-parser/test/fixtures/core/uncategorised/558/options.json
new file mode 100644
index 000000000000..f37c4bc95c57
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/uncategorised/558/options.json
@@ -0,0 +1,4 @@
+{
+  "createParenthesizedExpressions": true,
+  "throws": "You're trying to assign to a parenthesized expression, eg. instead of `([a]) = 0` use `([a] = 0)` (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/core/valid-escape/async/input.js b/packages/babel-parser/test/fixtures/core/valid-escape/async/input.js
new file mode 100644
index 000000000000..2e12a7c8d0a9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/valid-escape/async/input.js
@@ -0,0 +1 @@
+(\u0061sync ())
diff --git a/packages/babel-parser/test/fixtures/core/valid-escape/async/output.json b/packages/babel-parser/test/fixtures/core/valid-escape/async/output.json
new file mode 100644
index 000000000000..e220d3207f6b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/core/valid-escape/async/output.json
@@ -0,0 +1,87 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 1,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 1,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              },
+              "identifierName": "async"
+            },
+            "name": "async"
+          },
+          "arguments": [],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-rest/input.js b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-rest/input.js
new file mode 100644
index 000000000000..d4aba7bf5562
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-rest/input.js
@@ -0,0 +1 @@
+[...a,] = [];
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-rest/options.json b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-rest/options.json
new file mode 100644
index 000000000000..daa827f45cc4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-rest/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-spread/input.js b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-spread/input.js
new file mode 100644
index 000000000000..7161cc852a5d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-spread/input.js
@@ -0,0 +1 @@
+[...a,];
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-spread/output.json b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-spread/output.json
new file mode 100644
index 000000000000..5874666e2695
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/comma-after-spread/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 8,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 8,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "ArrayExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "elements": [
+            {
+              "type": "SpreadElement",
+              "start": 1,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 4,
+                "end": 5,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/array-rest-spread/invalid-location/options.json b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/invalid-location/options.json
index 97dce207c844..0dac59b7a808 100644
--- a/packages/babel-parser/test/fixtures/es2015/array-rest-spread/invalid-location/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/array-rest-spread/invalid-location/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "The rest element has to be the last element when destructuring (1:1)"
+  "throws": "Rest element must be last element (1:1)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/comma-after-rest-param/input.js b/packages/babel-parser/test/fixtures/es2015/arrow-functions/comma-after-rest-param/input.js
new file mode 100644
index 000000000000..d06c522c05b3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/arrow-functions/comma-after-rest-param/input.js
@@ -0,0 +1 @@
+(...rest,) => {}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/comma-after-rest-param/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/comma-after-rest-param/options.json
new file mode 100644
index 000000000000..65ed8c638978
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/arrow-functions/comma-after-rest-param/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (1:8)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/input.js b/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/input.js
new file mode 100644
index 000000000000..6626a35389c8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/input.js
@@ -0,0 +1 @@
+(foo) => {}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/options.json
new file mode 100644
index 000000000000..0861962d889d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/options.json
@@ -0,0 +1,3 @@
+{
+  "createParenthesizedExpressions": true
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/output.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/output.json
new file mode 100644
index 000000000000..09568c70bbb9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/arrow-functions/create-parenthesized-expressions/output.json
@@ -0,0 +1,104 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 1,
+              "end": 4,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 4
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 9,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/invalid-rest-in-params/input.js b/packages/babel-parser/test/fixtures/es2015/arrow-functions/invalid-rest-in-params/input.js
new file mode 100644
index 000000000000..c13825de4f0a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/arrow-functions/invalid-rest-in-params/input.js
@@ -0,0 +1,5 @@
+(
+    first,
+    ...second,
+    third
+) => {};
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/invalid-rest-in-params/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/invalid-rest-in-params/options.json
new file mode 100644
index 000000000000..c1c6450ba3c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/arrow-functions/invalid-rest-in-params/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (3:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/object-rest-spread/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/object-rest-spread/options.json
deleted file mode 100644
index 4de042a69733..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/arrow-functions/object-rest-spread/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["objectRestSpread"]
-}
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/params-invalid-rest-trailing-comma/input.js b/packages/babel-parser/test/fixtures/es2015/arrow-functions/params-invalid-rest-trailing-comma/input.js
deleted file mode 100644
index d55ef5bce0b8..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/arrow-functions/params-invalid-rest-trailing-comma/input.js
+++ /dev/null
@@ -1 +0,0 @@
-(...a,) => {};
diff --git a/packages/babel-parser/test/fixtures/es2015/arrow-functions/params-invalid-rest-trailing-comma/options.json b/packages/babel-parser/test/fixtures/es2015/arrow-functions/params-invalid-rest-trailing-comma/options.json
deleted file mode 100644
index a85e470aeb8b..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/arrow-functions/params-invalid-rest-trailing-comma/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "A trailing comma is not permitted after the rest element (1:5)"
-}
diff --git a/packages/babel-parser/test/fixtures/es2015/class-methods/direct-super-outside-constructor/options.json b/packages/babel-parser/test/fixtures/es2015/class-methods/direct-super-outside-constructor/options.json
index 96ed06f4ca3e..9461325c423a 100644
--- a/packages/babel-parser/test/fixtures/es2015/class-methods/direct-super-outside-constructor/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/class-methods/direct-super-outside-constructor/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "super() is only valid inside a class constructor. Make sure the method name is spelled exactly as 'constructor'. (2:8)"
+  "throws": "super() is only valid inside a class constructor of a subclass. Maybe a typo in the method name ('constructor') or not extending another class? (2:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/class-methods/disallow-duplicate-method-params/input.js b/packages/babel-parser/test/fixtures/es2015/class-methods/disallow-duplicate-method-params/input.js
new file mode 100644
index 000000000000..101e2b77cc79
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class-methods/disallow-duplicate-method-params/input.js
@@ -0,0 +1,3 @@
+class Foo {
+    bar(a, a) {}
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/class-methods/disallow-duplicate-method-params/options.json b/packages/babel-parser/test/fixtures/es2015/class-methods/disallow-duplicate-method-params/options.json
new file mode 100644
index 000000000000..c7a2c3ba50a0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class-methods/disallow-duplicate-method-params/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Argument name clash (2:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/class/division/input.js b/packages/babel-parser/test/fixtures/es2015/class/division/input.js
new file mode 100644
index 000000000000..590fe776ecf6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/division/input.js
@@ -0,0 +1,9 @@
+x = class{} / foo
+
+x = class{}
+/ foo / g
+
+(x = class{} / foo)
+
+(x = class{}
+/ foo / g)
diff --git a/packages/babel-parser/test/fixtures/es2015/class/division/output.json b/packages/babel-parser/test/fixtures/es2015/class/division/output.json
new file mode 100644
index 000000000000..0a4a21ad4d20
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/division/output.json
@@ -0,0 +1,561 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 86,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 9,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 86,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 9,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "BinaryExpression",
+            "start": 4,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "left": {
+              "type": "ClassExpression",
+              "start": 4,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "id": null,
+              "superClass": null,
+              "body": {
+                "type": "ClassBody",
+                "start": 9,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "body": []
+              }
+            },
+            "operator": "/",
+            "right": {
+              "type": "Identifier",
+              "start": 14,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            }
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 19,
+        "end": 86,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 19,
+          "end": 86,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 9,
+              "column": 10
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 19,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "BinaryExpression",
+            "start": 23,
+            "end": 86,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 4
+              },
+              "end": {
+                "line": 9,
+                "column": 10
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 23,
+              "end": 36,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 4,
+                  "column": 5
+                }
+              },
+              "left": {
+                "type": "ClassExpression",
+                "start": 23,
+                "end": 30,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 11
+                  }
+                },
+                "id": null,
+                "superClass": null,
+                "body": {
+                  "type": "ClassBody",
+                  "start": 28,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 11
+                    }
+                  },
+                  "body": []
+                }
+              },
+              "operator": "/",
+              "right": {
+                "type": "Identifier",
+                "start": 33,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 5
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              }
+            },
+            "operator": "/",
+            "right": {
+              "type": "CallExpression",
+              "start": 39,
+              "end": 86,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 8
+                },
+                "end": {
+                  "line": 9,
+                  "column": 10
+                }
+              },
+              "callee": {
+                "type": "CallExpression",
+                "start": 39,
+                "end": 61,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 19
+                  }
+                },
+                "callee": {
+                  "type": "Identifier",
+                  "start": 39,
+                  "end": 40,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 9
+                    },
+                    "identifierName": "g"
+                  },
+                  "name": "g"
+                },
+                "arguments": [
+                  {
+                    "type": "AssignmentExpression",
+                    "start": 43,
+                    "end": 60,
+                    "loc": {
+                      "start": {
+                        "line": 6,
+                        "column": 1
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 18
+                      }
+                    },
+                    "operator": "=",
+                    "left": {
+                      "type": "Identifier",
+                      "start": 43,
+                      "end": 44,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 1
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 2
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    },
+                    "right": {
+                      "type": "BinaryExpression",
+                      "start": 47,
+                      "end": 60,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 18
+                        }
+                      },
+                      "left": {
+                        "type": "ClassExpression",
+                        "start": 47,
+                        "end": 54,
+                        "loc": {
+                          "start": {
+                            "line": 6,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 6,
+                            "column": 12
+                          }
+                        },
+                        "id": null,
+                        "superClass": null,
+                        "body": {
+                          "type": "ClassBody",
+                          "start": 52,
+                          "end": 54,
+                          "loc": {
+                            "start": {
+                              "line": 6,
+                              "column": 10
+                            },
+                            "end": {
+                              "line": 6,
+                              "column": 12
+                            }
+                          },
+                          "body": []
+                        }
+                      },
+                      "operator": "/",
+                      "right": {
+                        "type": "Identifier",
+                        "start": 57,
+                        "end": 60,
+                        "loc": {
+                          "start": {
+                            "line": 6,
+                            "column": 15
+                          },
+                          "end": {
+                            "line": 6,
+                            "column": 18
+                          },
+                          "identifierName": "foo"
+                        },
+                        "name": "foo"
+                      }
+                    }
+                  }
+                ]
+              },
+              "arguments": [
+                {
+                  "type": "AssignmentExpression",
+                  "start": 64,
+                  "end": 85,
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 9
+                    }
+                  },
+                  "operator": "=",
+                  "left": {
+                    "type": "Identifier",
+                    "start": 64,
+                    "end": 65,
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 1
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 2
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "right": {
+                    "type": "BinaryExpression",
+                    "start": 68,
+                    "end": 85,
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 9
+                      }
+                    },
+                    "left": {
+                      "type": "BinaryExpression",
+                      "start": 68,
+                      "end": 81,
+                      "loc": {
+                        "start": {
+                          "line": 8,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 9,
+                          "column": 5
+                        }
+                      },
+                      "left": {
+                        "type": "ClassExpression",
+                        "start": 68,
+                        "end": 75,
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 12
+                          }
+                        },
+                        "id": null,
+                        "superClass": null,
+                        "body": {
+                          "type": "ClassBody",
+                          "start": 73,
+                          "end": 75,
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 10
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 12
+                            }
+                          },
+                          "body": []
+                        }
+                      },
+                      "operator": "/",
+                      "right": {
+                        "type": "Identifier",
+                        "start": 78,
+                        "end": 81,
+                        "loc": {
+                          "start": {
+                            "line": 9,
+                            "column": 2
+                          },
+                          "end": {
+                            "line": 9,
+                            "column": 5
+                          },
+                          "identifierName": "foo"
+                        },
+                        "name": "foo"
+                      }
+                    },
+                    "operator": "/",
+                    "right": {
+                      "type": "Identifier",
+                      "start": 84,
+                      "end": 85,
+                      "loc": {
+                        "start": {
+                          "line": 9,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 9,
+                          "column": 9
+                        },
+                        "identifierName": "g"
+                      },
+                      "name": "g"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/class/extends-strict/input.js b/packages/babel-parser/test/fixtures/es2015/class/extends-strict/input.js
new file mode 100644
index 000000000000..2bc6c813e8ed
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/extends-strict/input.js
@@ -0,0 +1,4 @@
+class C extends (function B() {
+  with ({});
+  return B;
+}()) {}
diff --git a/packages/babel-parser/test/fixtures/es2015/class/extends-strict/options.json b/packages/babel-parser/test/fixtures/es2015/class/extends-strict/options.json
new file mode 100644
index 000000000000..09a1c52e4354
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/extends-strict/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'with' in strict mode (2:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-get/input.js b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-get/input.js
new file mode 100644
index 000000000000..dca801f8de29
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-get/input.js
@@ -0,0 +1 @@
+class X { ge\u0074 x() {} }
diff --git a/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-get/options.json b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-get/options.json
new file mode 100644
index 000000000000..1e730e170733
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-get/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:19)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-set/input.js b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-set/input.js
new file mode 100644
index 000000000000..fafbe9ab9f4d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-set/input.js
@@ -0,0 +1 @@
+class X { se\u0074 x(value) {} }
diff --git a/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-set/options.json b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-set/options.json
new file mode 100644
index 000000000000..1e730e170733
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-set/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:19)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-static/input.js b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-static/input.js
new file mode 100644
index 000000000000..a561f8c32135
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-static/input.js
@@ -0,0 +1 @@
+class X { st\u0061tic y() {} }
diff --git a/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-static/options.json b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-static/options.json
new file mode 100644
index 000000000000..b23f881870cf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/class/invalid-escape-static/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:22)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/destructuring/binding-this/options.json b/packages/babel-parser/test/fixtures/es2015/destructuring/binding-this/options.json
index bc51e124a0f3..1b54b61689e7 100644
--- a/packages/babel-parser/test/fixtures/es2015/destructuring/binding-this/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/destructuring/binding-this/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "this is a reserved word (1:6)"
+  "throws": "Unexpected keyword 'this' (1:6)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-array/options.json b/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-array/options.json
index 6b5d54181044..dfcad1b5cbf0 100644
--- a/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-array/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-array/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "You're trying to assign to a parenthesized expression, eg. instead of `([a]) = 0` use `([a] = 0)` (1:1)"
+  "throws": "You're trying to assign to a parenthesized expression, eg. instead of `([a]) = 0` use `([a] = 0)` (1:1)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-object/options.json b/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-object/options.json
index 783a56a70523..d0fb48924093 100644
--- a/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-object/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/destructuring/parenthesized-lhs-object/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "You're trying to assign to a parenthesized expression, eg. instead of `({a}) = 0` use `({a} = 0)` (1:1)"
+  "throws": "You're trying to assign to a parenthesized expression, eg. instead of `({a}) = 0` use `({a} = 0)` (1:1)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/for-in/bare-initializer/options.json b/packages/babel-parser/test/fixtures/es2015/for-in/bare-initializer/options.json
new file mode 100644
index 000000000000..f5710cd7a9c9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-in/bare-initializer/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid left-hand side in for-loop (2:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-in/bare-initializer/output.json b/packages/babel-parser/test/fixtures/es2015/for-in/bare-initializer/output.json
deleted file mode 100644
index 5a1b605cbce2..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/for-in/bare-initializer/output.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 25,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 2,
-      "column": 18
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 25,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 18
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "VariableDeclaration",
-        "start": 0,
-        "end": 6,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 6
-          }
-        },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 5,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 5
-              }
-            },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 5,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 5
-                },
-                "identifierName": "a"
-              },
-              "name": "a"
-            },
-            "init": null
-          }
-        ],
-        "kind": "var"
-      },
-      {
-        "type": "ForInStatement",
-        "start": 7,
-        "end": 25,
-        "loc": {
-          "start": {
-            "line": 2,
-            "column": 0
-          },
-          "end": {
-            "line": 2,
-            "column": 18
-          }
-        },
-        "left": {
-          "type": "AssignmentPattern",
-          "start": 12,
-          "end": 17,
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 5
-            },
-            "end": {
-              "line": 2,
-              "column": 10
-            }
-          },
-          "left": {
-            "type": "Identifier",
-            "start": 12,
-            "end": 13,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 5
-              },
-              "end": {
-                "line": 2,
-                "column": 6
-              },
-              "identifierName": "a"
-            },
-            "name": "a"
-          },
-          "right": {
-            "type": "NumericLiteral",
-            "start": 16,
-            "end": 17,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 9
-              },
-              "end": {
-                "line": 2,
-                "column": 10
-              }
-            },
-            "extra": {
-              "rawValue": 0,
-              "raw": "0"
-            },
-            "value": 0
-          }
-        },
-        "right": {
-          "type": "ObjectExpression",
-          "start": 21,
-          "end": 23,
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 14
-            },
-            "end": {
-              "line": 2,
-              "column": 16
-            }
-          },
-          "properties": []
-        },
-        "body": {
-          "type": "EmptyStatement",
-          "start": 24,
-          "end": 25,
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 17
-            },
-            "end": {
-              "line": 2,
-              "column": 18
-            }
-          }
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-in/const-initializer/options.json b/packages/babel-parser/test/fixtures/es2015/for-in/const-initializer/options.json
index 85e8252d6fda..dd3b73e5d533 100644
--- a/packages/babel-parser/test/fixtures/es2015/for-in/const-initializer/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/for-in/const-initializer/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:17)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-in/let-initializer/options.json b/packages/babel-parser/test/fixtures/es2015/for-in/let-initializer/options.json
index a717ca0fa7e7..dd3b73e5d533 100644
--- a/packages/babel-parser/test/fixtures/es2015/for-in/let-initializer/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/for-in/let-initializer/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:15)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-in/strict-initializer/options.json b/packages/babel-parser/test/fixtures/es2015/for-in/strict-initializer/options.json
index 497c2b2bde92..0048427255c0 100644
--- a/packages/babel-parser/test/fixtures/es2015/for-in/strict-initializer/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/for-in/strict-initializer/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "for-in initializer in strict mode (2:15)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (2:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-in/var-arraybindingpattern-initializer/options.json b/packages/babel-parser/test/fixtures/es2015/for-in/var-arraybindingpattern-initializer/options.json
index 85e8252d6fda..dd3b73e5d533 100644
--- a/packages/babel-parser/test/fixtures/es2015/for-in/var-arraybindingpattern-initializer/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/for-in/var-arraybindingpattern-initializer/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:17)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-in/var-objectbindingpattern-initializer/options.json b/packages/babel-parser/test/fixtures/es2015/for-in/var-objectbindingpattern-initializer/options.json
index 85e8252d6fda..dd3b73e5d533 100644
--- a/packages/babel-parser/test/fixtures/es2015/for-in/var-objectbindingpattern-initializer/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/for-in/var-objectbindingpattern-initializer/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:17)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/bare-initializer/input.js b/packages/babel-parser/test/fixtures/es2015/for-of/bare-initializer/input.js
new file mode 100644
index 000000000000..1afade4a7fd9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/bare-initializer/input.js
@@ -0,0 +1,2 @@
+var a;
+for (a = 0 of {});
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/bare-initializer/options.json b/packages/babel-parser/test/fixtures/es2015/for-of/bare-initializer/options.json
new file mode 100644
index 000000000000..f5710cd7a9c9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/bare-initializer/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid left-hand side in for-loop (2:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/input.js b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/input.js
new file mode 100644
index 000000000000..fc8fecda1a78
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/input.js
@@ -0,0 +1 @@
+for (const {a} of /b/) {}
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/output.json b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/output.json
new file mode 100644
index 000000000000..e6724bdbc964
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-const/output.json
@@ -0,0 +1,194 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 25
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 25
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ForOfStatement",
+        "start": 0,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 25
+          }
+        },
+        "await": false,
+        "left": {
+          "type": "VariableDeclaration",
+          "start": 5,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "declarations": [
+            {
+              "type": "VariableDeclarator",
+              "start": 11,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 11
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "id": {
+                "type": "ObjectPattern",
+                "start": 11,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 12,
+                    "end": 13,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 13
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 12,
+                      "end": 13,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 13
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "computed": false,
+                    "shorthand": true,
+                    "value": {
+                      "type": "Identifier",
+                      "start": 12,
+                      "end": 13,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 13
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "extra": {
+                      "shorthand": true
+                    }
+                  }
+                ]
+              },
+              "init": null
+            }
+          ],
+          "kind": "const"
+        },
+        "right": {
+          "type": "RegExpLiteral",
+          "start": 18,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 18
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "extra": {
+            "raw": "/b/"
+          },
+          "pattern": "b",
+          "flags": ""
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start": 23,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 23
+            },
+            "end": {
+              "line": 1,
+              "column": 25
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/input.js b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/input.js
new file mode 100644
index 000000000000..0bf988b293f8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/input.js
@@ -0,0 +1 @@
+for (let {a} of /b/) {}
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/output.json b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/output.json
new file mode 100644
index 000000000000..6c74fa327abb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-let/output.json
@@ -0,0 +1,194 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 23
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 23
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ForOfStatement",
+        "start": 0,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 23
+          }
+        },
+        "await": false,
+        "left": {
+          "type": "VariableDeclaration",
+          "start": 5,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "declarations": [
+            {
+              "type": "VariableDeclarator",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "id": {
+                "type": "ObjectPattern",
+                "start": 9,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 10,
+                      "end": 11,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "computed": false,
+                    "shorthand": true,
+                    "value": {
+                      "type": "Identifier",
+                      "start": 10,
+                      "end": 11,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "extra": {
+                      "shorthand": true
+                    }
+                  }
+                ]
+              },
+              "init": null
+            }
+          ],
+          "kind": "let"
+        },
+        "right": {
+          "type": "RegExpLiteral",
+          "start": 16,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "extra": {
+            "raw": "/b/"
+          },
+          "pattern": "b",
+          "flags": ""
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start": 21,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 21
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/input.js b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/input.js
new file mode 100644
index 000000000000..cef3e0ee5228
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/input.js
@@ -0,0 +1 @@
+for (var {a} of /b/) {}
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/output.json b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/output.json
new file mode 100644
index 000000000000..507f3b6495e3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/brackets-var/output.json
@@ -0,0 +1,194 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 23
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 23
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ForOfStatement",
+        "start": 0,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 23
+          }
+        },
+        "await": false,
+        "left": {
+          "type": "VariableDeclaration",
+          "start": 5,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "declarations": [
+            {
+              "type": "VariableDeclarator",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "id": {
+                "type": "ObjectPattern",
+                "start": 9,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 10,
+                      "end": 11,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "computed": false,
+                    "shorthand": true,
+                    "value": {
+                      "type": "Identifier",
+                      "start": 10,
+                      "end": 11,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "extra": {
+                      "shorthand": true
+                    }
+                  }
+                ]
+              },
+              "init": null
+            }
+          ],
+          "kind": "var"
+        },
+        "right": {
+          "type": "RegExpLiteral",
+          "start": 16,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "extra": {
+            "raw": "/b/"
+          },
+          "pattern": "b",
+          "flags": ""
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start": 21,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 21
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/input.js b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/input.js
new file mode 100644
index 000000000000..7d8403183214
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/input.js
@@ -0,0 +1 @@
+for (x \u006ff y) {}
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/options.json b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/options.json
new file mode 100644
index 000000000000..6b9933a77108
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-escape-of/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:7)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/invalid-expr/input.js b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-expr/input.js
new file mode 100644
index 000000000000..90f5a5a32748
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-expr/input.js
@@ -0,0 +1 @@
+for (let x of y, z) {}
diff --git a/packages/babel-parser/test/fixtures/es2015/for-of/invalid-expr/options.json b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-expr/options.json
new file mode 100644
index 000000000000..e4ff6fef3cde
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/for-of/invalid-expr/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \")\" (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/generators/invalid-escape-yield/input.js b/packages/babel-parser/test/fixtures/es2015/generators/invalid-escape-yield/input.js
new file mode 100644
index 000000000000..521b91facbbc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/generators/invalid-escape-yield/input.js
@@ -0,0 +1 @@
+(function* () { y\u0069eld 10 })
diff --git a/packages/babel-parser/test/fixtures/es2015/generators/invalid-escape-yield/options.json b/packages/babel-parser/test/fixtures/es2015/generators/invalid-escape-yield/options.json
new file mode 100644
index 000000000000..dcd45c9b9715
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/generators/invalid-escape-yield/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Can not use 'yield' as identifier inside a generator (1:16)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/generators/invalid-hanging/input.js b/packages/babel-parser/test/fixtures/es2015/generators/invalid-hanging/input.js
new file mode 100644
index 000000000000..b6864d7c339c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/generators/invalid-hanging/input.js
@@ -0,0 +1 @@
+if (1) function *foo() {}
diff --git a/packages/babel-parser/test/fixtures/es2015/generators/invalid-hanging/options.json b/packages/babel-parser/test/fixtures/es2015/generators/invalid-hanging/options.json
new file mode 100644
index 000000000000..8cdac51705a1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/generators/invalid-hanging/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Generators can only be declared at the top level or inside a block (1:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/let/invalid-escape/input.js b/packages/babel-parser/test/fixtures/es2015/let/invalid-escape/input.js
new file mode 100644
index 000000000000..b5cc585a2a7f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/invalid-escape/input.js
@@ -0,0 +1 @@
+le\u0074 x = 5
diff --git a/packages/babel-parser/test/fixtures/es2015/let/invalid-escape/options.json b/packages/babel-parser/test/fixtures/es2015/let/invalid-escape/options.json
new file mode 100644
index 000000000000..410ecd16fddf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/invalid-escape/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-1/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-1/input.js
new file mode 100644
index 000000000000..2b8952b97363
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-1/input.js
@@ -0,0 +1 @@
+let + 1
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-1/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-1/output.json
new file mode 100644
index 000000000000..d5896aa4d598
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-1/output.json
@@ -0,0 +1,103 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "let"
+            },
+            "name": "let"
+          },
+          "operator": "+",
+          "right": {
+            "type": "NumericLiteral",
+            "start": 6,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "extra": {
+              "rawValue": 1,
+              "raw": "1"
+            },
+            "value": 1
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-2/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-2/input.js
new file mode 100644
index 000000000000..15ea1476df39
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-2/input.js
@@ -0,0 +1 @@
+var let = 1
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-2/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-2/output.json
new file mode 100644
index 000000000000..dc261c3dcbfb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-2/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "let"
+              },
+              "name": "let"
+            },
+            "init": {
+              "type": "NumericLiteral",
+              "start": 10,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-3/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-3/input.js
new file mode 100644
index 000000000000..bf4301ea135c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-3/input.js
@@ -0,0 +1 @@
+let instanceof Foo
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-3/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-3/output.json
new file mode 100644
index 000000000000..b0f5399086e7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-3/output.json
@@ -0,0 +1,100 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "let"
+            },
+            "name": "let"
+          },
+          "operator": "instanceof",
+          "right": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              },
+              "identifierName": "Foo"
+            },
+            "name": "Foo"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-4/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-4/input.js
new file mode 100644
index 000000000000..8b1ded17c053
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-4/input.js
@@ -0,0 +1 @@
+let in {}
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-4/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-4/output.json
new file mode 100644
index 000000000000..96851ba7aa04
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-4/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 9,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 9
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 9,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 9
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 9,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 9
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "let"
+            },
+            "name": "let"
+          },
+          "operator": "in",
+          "right": {
+            "type": "ObjectExpression",
+            "start": 7,
+            "end": 9,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 9
+              }
+            },
+            "properties": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-5/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-5/input.js
new file mode 100644
index 000000000000..5ddea3e168cd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-5/input.js
@@ -0,0 +1,2 @@
+if (1) let
+{}
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-5/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-5/output.json
new file mode 100644
index 000000000000..ade78031a623
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-5/output.json
@@ -0,0 +1,120 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "IfStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "test": {
+          "type": "NumericLiteral",
+          "start": 4,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 1,
+            "raw": "1"
+          },
+          "value": 1
+        },
+        "consequent": {
+          "type": "ExpressionStatement",
+          "start": 7,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "expression": {
+            "type": "Identifier",
+            "start": 7,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              },
+              "identifierName": "let"
+            },
+            "name": "let"
+          }
+        },
+        "alternate": null
+      },
+      {
+        "type": "BlockStatement",
+        "start": 11,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 2
+          }
+        },
+        "body": [],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-6/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-6/input.js
new file mode 100644
index 000000000000..2ebfa83ecf36
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-6/input.js
@@ -0,0 +1,2 @@
+while (0) let
+foo
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-6/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-6/output.json
new file mode 100644
index 000000000000..c51c3538f169
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-6/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "WhileStatement",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "test": {
+          "type": "NumericLiteral",
+          "start": 7,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0"
+          },
+          "value": 0
+        },
+        "body": {
+          "type": "ExpressionStatement",
+          "start": 10,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "expression": {
+            "type": "Identifier",
+            "start": 10,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              },
+              "identifierName": "let"
+            },
+            "name": "let"
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 14,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 14,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 3
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-7/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-7/input.js
new file mode 100644
index 000000000000..7036d1f8e435
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-7/input.js
@@ -0,0 +1,2 @@
+while (0) let
+instanceof Foo
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-7/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-7/output.json
new file mode 100644
index 000000000000..721e29212ee3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-7/output.json
@@ -0,0 +1,135 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "WhileStatement",
+        "start": 0,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "test": {
+          "type": "NumericLiteral",
+          "start": 7,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0"
+          },
+          "value": 0
+        },
+        "body": {
+          "type": "ExpressionStatement",
+          "start": 10,
+          "end": 28,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "expression": {
+            "type": "BinaryExpression",
+            "start": 10,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 2,
+                "column": 14
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 10,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "let"
+              },
+              "name": "let"
+            },
+            "operator": "instanceof",
+            "right": {
+              "type": "Identifier",
+              "start": 25,
+              "end": 28,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 11
+                },
+                "end": {
+                  "line": 2,
+                  "column": 14
+                },
+                "identifierName": "Foo"
+              },
+              "name": "Foo"
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-strict-fail/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-strict-fail/input.js
new file mode 100644
index 000000000000..dc734683c900
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-strict-fail/input.js
@@ -0,0 +1,2 @@
+"use strict";
+let + 1
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-strict-fail/options.json b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-strict-fail/options.json
new file mode 100644
index 000000000000..ab238c8bbff9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-as-identifier-strict-fail/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected reserved word 'let' (2:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/input.js
new file mode 100644
index 000000000000..c1eb32d32577
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/input.js
@@ -0,0 +1 @@
+let { let } = {};
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/options.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/options.json
new file mode 100644
index 000000000000..f57eb3dfe6c2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-1/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'let' is not allowed to be used as a name in 'let' or 'const' declarations. (1:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/input.js
new file mode 100644
index 000000000000..24c395ad2c48
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/input.js
@@ -0,0 +1 @@
+const { let } = {};
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/options.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/options.json
new file mode 100644
index 000000000000..365d76ddf46e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-2/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'let' is not allowed to be used as a name in 'let' or 'const' declarations. (1:8)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-3/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-3/input.js
new file mode 100644
index 000000000000..346cb602094b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-3/input.js
@@ -0,0 +1 @@
+let [let] = [];
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-3/options.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-3/options.json
new file mode 100644
index 000000000000..d83275e4a85a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-3/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'let' is not allowed to be used as a name in 'let' or 'const' declarations. (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-4/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-4/input.js
new file mode 100644
index 000000000000..8c5f4099aed6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-4/input.js
@@ -0,0 +1 @@
+const [let] = [];
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-4/options.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-4/options.json
new file mode 100644
index 000000000000..456948bdd272
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-4/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'let' is not allowed to be used as a name in 'let' or 'const' declarations. (1:7)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-5/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-5/input.js
new file mode 100644
index 000000000000..27fcc4afa2f1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-5/input.js
@@ -0,0 +1 @@
+let let
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-5/options.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-5/options.json
new file mode 100644
index 000000000000..4ca932f989ae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-5/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'let' is not allowed to be used as a name in 'let' or 'const' declarations. (1:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-6/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-6/input.js
new file mode 100644
index 000000000000..9514d67a4443
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-6/input.js
@@ -0,0 +1 @@
+const let = ''
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-6/options.json b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-6/options.json
new file mode 100644
index 000000000000..f57eb3dfe6c2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-at-binding-list-fail-6/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'let' is not allowed to be used as a name in 'let' or 'const' declarations. (1:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-block-with-newline/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-block-with-newline/input.js
new file mode 100644
index 000000000000..37a324ee20da
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-block-with-newline/input.js
@@ -0,0 +1,4 @@
+if (false) {
+    L: let // ASI
+    {}
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-block-with-newline/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-block-with-newline/output.json
new file mode 100644
index 000000000000..c2a68fccc8ec
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-block-with-newline/output.json
@@ -0,0 +1,220 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 39,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 39,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "IfStatement",
+        "start": 0,
+        "end": 39,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "test": {
+          "type": "BooleanLiteral",
+          "start": 4,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            }
+          },
+          "value": false
+        },
+        "consequent": {
+          "type": "BlockStatement",
+          "start": 11,
+          "end": 39,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 11
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "LabeledStatement",
+              "start": 17,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 10
+                }
+              },
+              "body": {
+                "type": "ExpressionStatement",
+                "start": 20,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 10
+                  }
+                },
+                "expression": {
+                  "type": "Identifier",
+                  "start": 20,
+                  "end": 23,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 10
+                    },
+                    "identifierName": "let"
+                  },
+                  "name": "let"
+                }
+              },
+              "label": {
+                "type": "Identifier",
+                "start": 17,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "identifierName": "L"
+                },
+                "name": "L"
+              },
+              "trailingComments": [
+                {
+                  "type": "CommentLine",
+                  "value": " ASI",
+                  "start": 24,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 17
+                    }
+                  }
+                }
+              ]
+            },
+            {
+              "type": "BlockStatement",
+              "start": 35,
+              "end": 37,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 6
+                }
+              },
+              "body": [],
+              "directives": [],
+              "leadingComments": [
+                {
+                  "type": "CommentLine",
+                  "value": " ASI",
+                  "start": 24,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 17
+                    }
+                  }
+                }
+              ]
+            }
+          ],
+          "directives": []
+        },
+        "alternate": null
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " ASI",
+      "start": 24,
+      "end": 30,
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 11
+        },
+        "end": {
+          "line": 2,
+          "column": 17
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-arr-dstrk/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-arr-dstrk/input.js
new file mode 100644
index 000000000000..7edb379b842f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-arr-dstrk/input.js
@@ -0,0 +1,2 @@
+let
+    [a] = [1];
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-arr-dstrk/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-arr-dstrk/output.json
new file mode 100644
index 000000000000..f21958466322
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-arr-dstrk/output.json
@@ -0,0 +1,139 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 8,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 13
+              }
+            },
+            "id": {
+              "type": "ArrayPattern",
+              "start": 8,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 7
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 9,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 6
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a"
+                }
+              ]
+            },
+            "init": {
+              "type": "ArrayExpression",
+              "start": 14,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 10
+                },
+                "end": {
+                  "line": 2,
+                  "column": 13
+                }
+              },
+              "elements": [
+                {
+                  "type": "NumericLiteral",
+                  "start": 15,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/input.js
new file mode 100644
index 000000000000..ba8c8801a664
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/input.js
@@ -0,0 +1,2 @@
+let
+    { a } = { a: 1 };
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/output.json
new file mode 100644
index 000000000000..3b6eb431c234
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak-obj-dstrk/output.json
@@ -0,0 +1,212 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 8,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 20
+              }
+            },
+            "id": {
+              "type": "ObjectPattern",
+              "start": 8,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 9
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 10,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 7
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                }
+              ]
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 16,
+              "end": 24,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 12
+                },
+                "end": {
+                  "line": 2,
+                  "column": 20
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 18,
+                  "end": 22,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 18
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 18,
+                    "end": 19,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 15
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "NumericLiteral",
+                    "start": 21,
+                    "end": 22,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 18
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak/input.js b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak/input.js
new file mode 100644
index 000000000000..e1e10c74e656
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak/input.js
@@ -0,0 +1,2 @@
+let
+    a;
diff --git a/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak/output.json b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak/output.json
new file mode 100644
index 000000000000..53f9ebb8102c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/let/let-with-linebreak/output.json
@@ -0,0 +1,86 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 8,
+            "end": 9,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 8,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/expression/input.js b/packages/babel-parser/test/fixtures/es2015/meta-properties/expression/input.js
new file mode 100644
index 000000000000..932ee841bdb3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/expression/input.js
@@ -0,0 +1,3 @@
+const A = function() {
+  new.target;
+};
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/expression/output.json b/packages/babel-parser/test/fixtures/es2015/meta-properties/expression/output.json
new file mode 100644
index 000000000000..f5f3e41b514d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/expression/output.json
@@ -0,0 +1,186 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 39,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 39,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 39,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 2
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 3,
+                "column": 1
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "init": {
+              "type": "FunctionExpression",
+              "start": 10,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 3,
+                  "column": 1
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 21,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 1
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ExpressionStatement",
+                    "start": 25,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 13
+                      }
+                    },
+                    "expression": {
+                      "type": "MetaProperty",
+                      "start": 25,
+                      "end": 35,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 2
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 12
+                        }
+                      },
+                      "meta": {
+                        "type": "Identifier",
+                        "start": 25,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 2
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 5
+                          },
+                          "identifierName": "new"
+                        },
+                        "name": "new"
+                      },
+                      "property": {
+                        "type": "Identifier",
+                        "start": 29,
+                        "end": 35,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 6
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 12
+                          },
+                          "identifierName": "target"
+                        },
+                        "name": "target"
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/invalid-arrow-function/input.js b/packages/babel-parser/test/fixtures/es2015/meta-properties/invalid-arrow-function/input.js
new file mode 100644
index 000000000000..f13bdd7175a1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/invalid-arrow-function/input.js
@@ -0,0 +1,3 @@
+const A = () => {
+  new.target;
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/invalid-arrow-function/options.json b/packages/babel-parser/test/fixtures/es2015/meta-properties/invalid-arrow-function/options.json
new file mode 100644
index 000000000000..4be1533d8e29
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/invalid-arrow-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "new.target can only be used in functions (2:2)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/nested-arrow-function/input.js b/packages/babel-parser/test/fixtures/es2015/meta-properties/nested-arrow-function/input.js
new file mode 100644
index 000000000000..a3f74c60f128
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/nested-arrow-function/input.js
@@ -0,0 +1 @@
+function A() { return () => new.target }
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/nested-arrow-function/output.json b/packages/babel-parser/test/fixtures/es2015/meta-properties/nested-arrow-function/output.json
new file mode 100644
index 000000000000..447bc2741c32
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/nested-arrow-function/output.json
@@ -0,0 +1,171 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 40
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 40
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 40
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 13,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 40
+            }
+          },
+          "body": [
+            {
+              "type": "ReturnStatement",
+              "start": 15,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 15
+                },
+                "end": {
+                  "line": 1,
+                  "column": 38
+                }
+              },
+              "argument": {
+                "type": "ArrowFunctionExpression",
+                "start": 22,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 38
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "MetaProperty",
+                  "start": 28,
+                  "end": 38,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 28
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 38
+                    }
+                  },
+                  "meta": {
+                    "type": "Identifier",
+                    "start": 28,
+                    "end": 31,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 31
+                      },
+                      "identifierName": "new"
+                    },
+                    "name": "new"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 32,
+                    "end": 38,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 32
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 38
+                      },
+                      "identifierName": "target"
+                    },
+                    "name": "target"
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/new-target-invalid-escaped-target/input.js b/packages/babel-parser/test/fixtures/es2015/meta-properties/new-target-invalid-escaped-target/input.js
new file mode 100644
index 000000000000..70a512c677a7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/new-target-invalid-escaped-target/input.js
@@ -0,0 +1 @@
+function f() { new.ta\u0072get; }
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/new-target-invalid-escaped-target/options.json b/packages/babel-parser/test/fixtures/es2015/meta-properties/new-target-invalid-escaped-target/options.json
new file mode 100644
index 000000000000..4f4b2be4c186
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/new-target-invalid-escaped-target/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The only valid meta property for new is new.target (1:19)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/statement/input.js b/packages/babel-parser/test/fixtures/es2015/meta-properties/statement/input.js
new file mode 100644
index 000000000000..ecd7c772f6c6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/statement/input.js
@@ -0,0 +1,3 @@
+function A() {
+  new.target;
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/meta-properties/statement/output.json b/packages/babel-parser/test/fixtures/es2015/meta-properties/statement/output.json
new file mode 100644
index 000000000000..80af5ec9a8db
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/meta-properties/statement/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 13,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 17,
+              "end": 28,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 13
+                }
+              },
+              "expression": {
+                "type": "MetaProperty",
+                "start": 17,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 12
+                  }
+                },
+                "meta": {
+                  "type": "Identifier",
+                  "start": 17,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 5
+                    },
+                    "identifierName": "new"
+                  },
+                  "name": "new"
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 21,
+                  "end": 27,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 12
+                    },
+                    "identifierName": "target"
+                  },
+                  "name": "target"
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/input.js b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/input.js
index 01d2b22e0b82..30c0f0d29bb5 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/input.js
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/input.js
@@ -1 +1,3 @@
+const toString = 1;
+
 export { toString };
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/output.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/output.json
index 190e09b28697..7d37c8dcb67b 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/output.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-builtin/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 20,
+  "end": 41,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
+      "line": 3,
       "column": 20
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 20,
+    "end": 41,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
+        "line": 3,
         "column": 20
       }
     },
@@ -30,9 +30,9 @@
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "VariableDeclaration",
         "start": 0,
-        "end": 20,
+        "end": 19,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,105 @@
           },
           "end": {
             "line": 1,
+            "column": 19
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 6,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                },
+                "identifierName": "toString"
+              },
+              "name": "toString"
+            },
+            "init": {
+              "type": "NumericLiteral",
+              "start": 17,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            }
+          }
+        ],
+        "kind": "const"
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 21,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
             "column": 20
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 9,
-            "end": 17,
+            "start": 30,
+            "end": 38,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 3,
                 "column": 9
               },
               "end": {
-                "line": 1,
+                "line": 3,
                 "column": 17
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 9,
-              "end": 17,
+              "start": 30,
+              "end": 38,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 9
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 17
                 },
                 "identifierName": "toString"
@@ -78,15 +147,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 9,
-              "end": 17,
+              "start": 30,
+              "end": 38,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 9
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 17
                 },
                 "identifierName": "toString"
@@ -95,7 +164,8 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-class-declaration/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-class-declaration/options.json
index da02d625454d..3bdafe893282 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-class-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-class-declaration/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`Foo` has already been exported. Exported identifiers must be unique. (2:0)"
+  "throws": "`Foo` has already been exported. Exported identifiers must be unique. (2:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/input.js b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/input.js
new file mode 100644
index 000000000000..9e0ccdcfd313
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/input.js
@@ -0,0 +1,2 @@
+export { foo };
+export const { foo = 1 } = bar;
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/options.json
new file mode 100644
index 000000000000..d3d3a199e6e0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring-assignment/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "`foo` has already been exported. Exported identifiers must be unique. (2:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring10/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring10/options.json
index 949358ec6eed..446a980f5409 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring10/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring10/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:20)"
+  "throws": "Identifier 'foo' has already been declared (2:20)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring11/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring11/options.json
index 57351167b6d8..09b3fa97a0d1 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring11/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring11/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo4` has already been exported. Exported identifiers must be unique. (2:50)"
+  "throws": "Identifier 'foo4' has already been declared (2:50)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring12/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring12/options.json
index 0e56c6bc93c2..3a7173c837e3 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring12/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring12/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo4` has already been exported. Exported identifiers must be unique. (2:49)"
+  "throws": "Identifier 'foo4' has already been declared (2:49)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring13/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring13/options.json
index 31e5df6a02d6..d3fc42a61ba1 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring13/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring13/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo4` has already been exported. Exported identifiers must be unique. (2:58)"
+  "throws": "Identifier 'foo4' has already been declared (2:58)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring14/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring14/options.json
index e83f7864857e..80640e0ce127 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring14/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring14/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:21)"
+  "throws": "Identifier 'foo' has already been declared (2:21)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring15/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring15/options.json
index ec6423f048d4..ea3a9b62f493 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring15/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring15/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo2` has already been exported. Exported identifiers must be unique. (2:13)"
+  "throws": "Identifier 'foo2' has already been declared (2:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring16/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring16/options.json
index 0e5dcf8f6136..42c862ad273a 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring16/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring16/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:22)"
+  "throws": "Identifier 'foo' has already been declared (2:22)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring17/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring17/options.json
index ec41da52d1ef..125c2618435d 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring17/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring17/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`bar` has already been exported. Exported identifiers must be unique. (2:13)"
+  "throws": "Identifier 'bar' has already been declared (2:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring18/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring18/options.json
index 6485ac8dc189..bf345ea77127 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring18/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring18/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:28)"
+  "throws": "Identifier 'foo' has already been declared (2:28)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring19/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring19/options.json
index 8fd67e8c9c92..bf2483362193 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring19/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring19/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:29)"
+  "throws": "Identifier 'foo' has already been declared (2:29)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring2/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring2/options.json
index 9589d0397278..2cbe06c40914 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring2/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring2/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:15)"
+  "throws": "Identifier 'foo' has already been declared (2:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring3/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring3/options.json
index 46ee12ba139d..d36390356990 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring3/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring3/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:0)"
+  "throws": "Identifier 'foo' has already been declared (2:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring4/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring4/options.json
index 96a5f1f604b3..46358493589c 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring4/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring4/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:14)"
+  "throws": "Identifier 'foo' has already been declared (2:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring5/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring5/options.json
index 46ee12ba139d..d36390356990 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring5/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring5/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:0)"
+  "throws": "Identifier 'foo' has already been declared (2:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring6/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring6/options.json
index 96a5f1f604b3..46358493589c 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring6/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring6/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:14)"
+  "throws": "Identifier 'foo' has already been declared (2:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring7/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring7/options.json
index 9589d0397278..2cbe06c40914 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring7/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring7/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:15)"
+  "throws": "Identifier 'foo' has already been declared (2:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring8/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring8/options.json
index 6d16161f43e1..982078d803c6 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring8/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring8/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`Foo` has already been exported. Exported identifiers must be unique. (2:15)"
+  "throws": "Identifier 'Foo' has already been declared (2:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring9/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring9/options.json
index beeef9dfc6d2..f79b5469b1c0 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring9/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-destructuring9/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`Foo` has already been exported. Exported identifiers must be unique. (2:14)"
+  "throws": "Identifier 'Foo' has already been declared (2:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-function-declaration/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-function-declaration/options.json
index 46ee12ba139d..1923e4752336 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-function-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-function-declaration/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:0)"
+  "throws": "`foo` has already been exported. Exported identifiers must be unique. (2:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-variable-declaration/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-variable-declaration/options.json
index be53f65c5065..9fdf7082da17 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-variable-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export-variable-declaration/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:13)"
+  "throws": "`foo` has already been exported. Exported identifiers must be unique. (2:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export/options.json b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export/options.json
index b18b70590683..9bb46f4778eb 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/duplicate-named-export/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:9)"
+  "throws": "`foo` has already been exported. Exported identifiers must be unique. (2:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration/options.json b/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration/options.json
index d8dbb9adfc3e..734063430a9e 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Only expressions, functions or classes are allowed as the `default` export. (1:15)"
+  "throws": "Only expressions, functions or classes are allowed as the `default` export. (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration2/options.json b/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration2/options.json
index d8dbb9adfc3e..734063430a9e 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration2/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration2/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Only expressions, functions or classes are allowed as the `default` export. (1:15)"
+  "throws": "Only expressions, functions or classes are allowed as the `default` export. (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration3/options.json b/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration3/options.json
index d8dbb9adfc3e..734063430a9e 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration3/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/export-default-variable-declaration3/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Only expressions, functions or classes are allowed as the `default` export. (1:15)"
+  "throws": "Only expressions, functions or classes are allowed as the `default` export. (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/input.js b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/input.js
new file mode 100644
index 000000000000..0248bf7b6bd9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/input.js
@@ -0,0 +1 @@
+export { if } from 'foo'
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/output.json b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/output.json
new file mode 100644
index 000000000000..5455a5287944
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/output.json
@@ -0,0 +1,122 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                },
+                "identifierName": "if"
+              },
+              "name": "if"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                },
+                "identifierName": "if"
+              },
+              "name": "if"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 19,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 19
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "extra": {
+            "rawValue": "foo",
+            "raw": "'foo'"
+          },
+          "value": "foo"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-flow/options.json b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-flow/options.json
index 243fc2686d70..379fb1f86234 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-flow/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-flow/options.json
@@ -1,4 +1,4 @@
 {
   "plugins": ["flow"],
-  "throws": "default is a reserved word (1:9)"
+  "throws": "Unexpected keyword 'default' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof-flow/options.json b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof-flow/options.json
index fa0493b7e1e2..cda01e8412c3 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof-flow/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof-flow/options.json
@@ -1,4 +1,4 @@
 {
   "plugins": ["flow"],
-  "throws": "typeof is a reserved word (1:9)"
+  "throws": "Unexpected keyword 'typeof' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof/options.json b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof/options.json
index 0f27b53e91cb..a45cdb986dd1 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword-typeof/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "typeof is a reserved word (1:9)"
+  "throws": "Unexpected keyword 'typeof' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword/options.json b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword/options.json
index 96dff35646b5..2c6a46df3f6e 100644
--- a/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/modules/import-invalid-keyword/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "debugger is a reserved word (1:9)"
+  "throws": "Unexpected keyword 'debugger' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-export-as/input.js b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-export-as/input.js
new file mode 100644
index 000000000000..bce203058944
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-export-as/input.js
@@ -0,0 +1 @@
+export { X \u0061s Y }
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-export-as/options.json b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-export-as/options.json
new file mode 100644
index 000000000000..16c061d4dfd4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-export-as/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Unexpected token, expected \",\" (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-import-from/input.js b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-import-from/input.js
new file mode 100644
index 000000000000..3f4408ab6e4c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-import-from/input.js
@@ -0,0 +1 @@
+import X fro\u006d 'x'
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-import-from/options.json b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-import-from/options.json
new file mode 100644
index 000000000000..6dab969b1115
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/invalid-escape-import-from/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Unexpected token (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/object/async-method-linebreak/input.js b/packages/babel-parser/test/fixtures/es2015/object/async-method-linebreak/input.js
new file mode 100644
index 000000000000..f50ae43d068a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/object/async-method-linebreak/input.js
@@ -0,0 +1,4 @@
+({
+    async
+    foo() {}
+})
diff --git a/packages/babel-parser/test/fixtures/es2015/object/async-method-linebreak/options.json b/packages/babel-parser/test/fixtures/es2015/object/async-method-linebreak/options.json
new file mode 100644
index 000000000000..978486d6a57c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/object/async-method-linebreak/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (3:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/object/disallow-duplicate-method-params/input.js b/packages/babel-parser/test/fixtures/es2015/object/disallow-duplicate-method-params/input.js
new file mode 100644
index 000000000000..b916cd4df9b4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/object/disallow-duplicate-method-params/input.js
@@ -0,0 +1,3 @@
+({
+    bar(a, a) {}
+})
diff --git a/packages/babel-parser/test/fixtures/es2015/object/disallow-duplicate-method-params/options.json b/packages/babel-parser/test/fixtures/es2015/object/disallow-duplicate-method-params/options.json
new file mode 100644
index 000000000000..c7a2c3ba50a0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/object/disallow-duplicate-method-params/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Argument name clash (2:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/shorthand/1/options.json b/packages/babel-parser/test/fixtures/es2015/shorthand/1/options.json
index a618f5e2ef1b..eaa26955dc77 100644
--- a/packages/babel-parser/test/fixtures/es2015/shorthand/1/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/shorthand/1/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "const is a reserved word (1:11)"
+  "throws": "Unexpected keyword 'const' (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/shorthand/2/options.json b/packages/babel-parser/test/fixtures/es2015/shorthand/2/options.json
index 7691eb820fec..be39a4451388 100644
--- a/packages/babel-parser/test/fixtures/es2015/shorthand/2/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/shorthand/2/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "this is a reserved word (1:8)"
+  "throws": "Unexpected keyword 'this' (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-class/options.json b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-class/options.json
index b283ca722e0c..91b308200e05 100644
--- a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-class/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-class/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid labeled declaration (1:5)"
+  "throws": "Unexpected token (1:5)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-const/options.json b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-const/options.json
index b283ca722e0c..a064a678e553 100644
--- a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-const/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-const/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid labeled declaration (1:5)"
+  "throws": "Lexical declaration cannot appear in a single-statement context (1:5)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-async/options.json b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-async/options.json
index b283ca722e0c..95aaacb458f8 100644
--- a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-async/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-async/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid labeled declaration (1:5)"
+  "throws": "Async functions can only be declared at the top level or inside a block (1:5)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-generator/options.json b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-generator/options.json
index b283ca722e0c..3f6e90c7cd27 100644
--- a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-generator/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-generator/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid labeled declaration (1:5)"
+  "throws": "Generators can only be declared at the top level or inside a block (1:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-strict/options.json b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-strict/options.json
index e54e8652f3dc..1eebe15c408e 100644
--- a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-strict/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-func-strict/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid labeled declaration (1:35)"
+  "throws": "In strict mode code, functions can only be declared at top level or inside a block (1:35)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-let/options.json b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-let/options.json
index b283ca722e0c..e4ae9a99d01b 100644
--- a/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-let/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/statements/label-invalid-let/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid labeled declaration (1:5)"
+  "throws": "Unexpected token, expected \";\" (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/109/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/109/options.json
index 715f71e32a2e..c145a86bc613 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/109/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/109/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:16)"
-}
+  "throws": "for-of loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/123/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/123/options.json
new file mode 100644
index 000000000000..fdf74cefe1b2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/123/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "super() is only valid inside a class constructor of a subclass. Maybe a typo in the method name ('constructor') or not extending another class? (1:40)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/123/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/123/output.json
deleted file mode 100644
index 56f49a7b6964..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/123/output.json
+++ /dev/null
@@ -1,243 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 51,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 51
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 51,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 51
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "ExpressionStatement",
-        "start": 14,
-        "end": 51,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 14
-          },
-          "end": {
-            "line": 1,
-            "column": 51
-          }
-        },
-        "expression": {
-          "type": "ClassExpression",
-          "start": 15,
-          "end": 50,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 15
-            },
-            "end": {
-              "line": 1,
-              "column": 50
-            }
-          },
-          "id": {
-            "type": "Identifier",
-            "start": 21,
-            "end": 22,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 21
-              },
-              "end": {
-                "line": 1,
-                "column": 22
-              },
-              "identifierName": "A"
-            },
-            "name": "A"
-          },
-          "superClass": null,
-          "body": {
-            "type": "ClassBody",
-            "start": 23,
-            "end": 50,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 23
-              },
-              "end": {
-                "line": 1,
-                "column": 50
-              }
-            },
-            "body": [
-              {
-                "type": "ClassMethod",
-                "start": 24,
-                "end": 49,
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 24
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 49
-                  }
-                },
-                "static": false,
-                "key": {
-                  "type": "Identifier",
-                  "start": 24,
-                  "end": 35,
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 24
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 35
-                    },
-                    "identifierName": "constructor"
-                  },
-                  "name": "constructor"
-                },
-                "computed": false,
-                "kind": "constructor",
-                "id": null,
-                "generator": false,
-                "async": false,
-                "params": [],
-                "body": {
-                  "type": "BlockStatement",
-                  "start": 38,
-                  "end": 49,
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 38
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 49
-                    }
-                  },
-                  "body": [
-                    {
-                      "type": "ExpressionStatement",
-                      "start": 40,
-                      "end": 47,
-                      "loc": {
-                        "start": {
-                          "line": 1,
-                          "column": 40
-                        },
-                        "end": {
-                          "line": 1,
-                          "column": 47
-                        }
-                      },
-                      "expression": {
-                        "type": "CallExpression",
-                        "start": 40,
-                        "end": 47,
-                        "loc": {
-                          "start": {
-                            "line": 1,
-                            "column": 40
-                          },
-                          "end": {
-                            "line": 1,
-                            "column": 47
-                          }
-                        },
-                        "callee": {
-                          "type": "Super",
-                          "start": 40,
-                          "end": 45,
-                          "loc": {
-                            "start": {
-                              "line": 1,
-                              "column": 40
-                            },
-                            "end": {
-                              "line": 1,
-                              "column": 45
-                            }
-                          }
-                        },
-                        "arguments": []
-                      }
-                    }
-                  ],
-                  "directives": []
-                }
-              }
-            ]
-          },
-          "extra": {
-            "parenthesized": true,
-            "parenStart": 14
-          }
-        }
-      }
-    ],
-    "directives": [
-      {
-        "type": "Directive",
-        "start": 0,
-        "end": 13,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 13
-          }
-        },
-        "value": {
-          "type": "DirectiveLiteral",
-          "start": 0,
-          "end": 12,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 0
-            },
-            "end": {
-              "line": 1,
-              "column": 12
-            }
-          },
-          "value": "use strict",
-          "extra": {
-            "raw": "\"use strict\"",
-            "rawValue": "use strict"
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/166/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/166/options.json
new file mode 100644
index 000000000000..3481bedf3cc1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/166/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Argument name clash (1:16)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/166/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/166/output.json
deleted file mode 100644
index 8f278a52ae1e..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/166/output.json
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 22,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 22
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 22,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 22
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "FunctionDeclaration",
-        "start": 0,
-        "end": 22,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 22
-          }
-        },
-        "id": {
-          "type": "Identifier",
-          "start": 9,
-          "end": 10,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 9
-            },
-            "end": {
-              "line": 1,
-              "column": 10
-            },
-            "identifierName": "x"
-          },
-          "name": "x"
-        },
-        "generator": false,
-        "async": false,
-        "params": [
-          {
-            "type": "Identifier",
-            "start": 11,
-            "end": 12,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 11
-              },
-              "end": {
-                "line": 1,
-                "column": 12
-              },
-              "identifierName": "a"
-            },
-            "name": "a"
-          },
-          {
-            "type": "ObjectPattern",
-            "start": 14,
-            "end": 19,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 14
-              },
-              "end": {
-                "line": 1,
-                "column": 19
-              }
-            },
-            "properties": [
-              {
-                "type": "ObjectProperty",
-                "start": 16,
-                "end": 17,
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 16
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 17
-                  }
-                },
-                "method": false,
-                "key": {
-                  "type": "Identifier",
-                  "start": 16,
-                  "end": 17,
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 16
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 17
-                    },
-                    "identifierName": "a"
-                  },
-                  "name": "a"
-                },
-                "computed": false,
-                "shorthand": true,
-                "value": {
-                  "type": "Identifier",
-                  "start": 16,
-                  "end": 17,
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 16
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 17
-                    },
-                    "identifierName": "a"
-                  },
-                  "name": "a"
-                },
-                "extra": {
-                  "shorthand": true
-                }
-              }
-            ]
-          }
-        ],
-        "body": {
-          "type": "BlockStatement",
-          "start": 20,
-          "end": 22,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 20
-            },
-            "end": {
-              "line": 1,
-              "column": 22
-            }
-          },
-          "body": [],
-          "directives": []
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/22/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/22/input.js
index 7db23de554b2..4fa5abf7ff0d 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/22/input.js
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/22/input.js
@@ -1,3 +1,3 @@
 `\n\r\b\v\t\f\
 \
-`
\ No newline at end of file
+\
\
`
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/22/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/22/output.json
index 7152cd61dec3..0dff1ff533a1 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/22/output.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/22/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 18,
+  "end": 22,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 3,
-      "column": 1
+      "column": 5
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 18,
+    "end": 22,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 3,
-        "column": 1
+        "column": 5
       }
     },
     "sourceType": "script",
@@ -32,7 +32,7 @@
       {
         "type": "ExpressionStatement",
         "start": 0,
-        "end": 18,
+        "end": 22,
         "loc": {
           "start": {
             "line": 1,
@@ -40,13 +40,13 @@
           },
           "end": {
             "line": 3,
-            "column": 1
+            "column": 5
           }
         },
         "expression": {
           "type": "TemplateLiteral",
           "start": 0,
-          "end": 18,
+          "end": 22,
           "loc": {
             "start": {
               "line": 1,
@@ -54,7 +54,7 @@
             },
             "end": {
               "line": 3,
-              "column": 1
+              "column": 5
             }
           },
           "expressions": [],
@@ -62,7 +62,7 @@
             {
               "type": "TemplateElement",
               "start": 1,
-              "end": 17,
+              "end": 21,
               "loc": {
                 "start": {
                   "line": 1,
@@ -70,11 +70,11 @@
                 },
                 "end": {
                   "line": 3,
-                  "column": 0
+                  "column": 4
                 }
               },
               "value": {
-                "raw": "\\n\\r\\b\\v\\t\\f\\\n\\\n",
+                "raw": "\\n\\r\\b\\v\\t\\f\\\n\\\n\\\u2028\\\u2029",
                 "cooked": "\n\r\b\u000b\t\f"
               },
               "tail": true
@@ -85,4 +85,4 @@
     ],
     "directives": []
   }
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/226/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/226/options.json
index 2a28555f76db..74c1a72d5030 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/226/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/226/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Unexpected keyword 'default' (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/227/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/227/options.json
index c83fb4f88207..6c907b0a7009 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/227/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/227/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:44)"
-}
+  "throws": "Binding 'eval' in strict mode (1:44)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/228/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/228/options.json
index 9f34dba23230..a33dde469094 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/228/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/228/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:37)"
+  "throws": "Argument name clash (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/229/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/229/options.json
index 27a7b64d71d4..5c79fd4f4ff2 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/229/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/229/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:4)"
+  "throws": "Unexpected keyword 'super' (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/230/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/230/options.json
index 27a7b64d71d4..8a17d90eba69 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/230/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/230/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:4)"
+  "throws": "Unexpected keyword 'default' (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/231/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/231/options.json
index 27a7b64d71d4..8a17d90eba69 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/231/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/231/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:4)"
+  "throws": "Unexpected keyword 'default' (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/232/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/232/options.json
index 158f0af7b450..d91e2a5bbc25 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/232/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/232/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:6)"
+  "throws": "Unexpected keyword 'default' (1:6)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/233/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/233/options.json
index 36804413e800..178fa1e528b2 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/233/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/233/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:20)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:20)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/234/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/234/options.json
index 058a7e41389f..4ca97da7ca86 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/234/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/234/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:20)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:20)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/235/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/235/options.json
index 715f71e32a2e..dd3b73e5d533 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/235/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/235/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:16)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/236/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/236/options.json
index 715f71e32a2e..c145a86bc613 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/236/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/236/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:16)"
-}
+  "throws": "for-of loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/242/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/242/options.json
index f56e7311d854..02a0eafbbbbe 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/242/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/242/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/243/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/243/options.json
index c5e6f0e62338..e4abe279ab29 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/243/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/243/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:14)"
-}
+  "throws": "Binding 'eval' in strict mode (1:14)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/244/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/244/options.json
index 3168d40d55f8..c2a4aaec255e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/244/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/244/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:14)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:14)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/245/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/245/options.json
index f56e7311d854..d93d5b2aa62e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/245/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/245/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/246/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/246/options.json
index 0e1962195156..5d2dc563b16e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/246/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/246/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/247/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/247/options.json
index f56e7311d854..d93d5b2aa62e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/247/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/247/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/248/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/248/options.json
index 6d0445e20eb7..b99fd35222b1 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/248/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/248/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:18)"
+  "throws": "Argument name clash (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/249/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/249/options.json
index 0f2c1bee90b0..79a05e62290e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/249/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/249/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (1:21)"
+  "throws": "Legacy octal literals are not allowed in strict mode (1:21)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/277/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/277/options.json
index 570ef651fb67..2e1b1cc3aa43 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/277/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/277/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \")\" (1:18)"
+  "throws": "Rest element must be last element (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/280/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/280/options.json
index 0c0a9d0136e3..5cbee309bd50 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/280/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/280/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:30)"
+  "throws": "Argument name clash (1:30)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/281/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/281/options.json
index 4773c60e5b99..8dba9882c0dc 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/281/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/281/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:47)"
+  "throws": "Argument name clash (1:47)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/283/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/283/options.json
index 2da83bcd6f69..daa827f45cc4 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/283/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/283/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \")\" (1:5)"
+  "throws": "Rest element must be last element (1:5)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/289/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/289/options.json
index bcd69af2d7fe..8ed5553896c1 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/289/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/289/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:5)"
-}
+  "throws": "Binding 'eval' in strict mode (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/292/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/292/input.js
deleted file mode 100644
index e15ba6bf99fa..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/292/input.js
+++ /dev/null
@@ -1 +0,0 @@
-[...a, ] = b
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/292/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/292/output.json
deleted file mode 100644
index 6a0709961325..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/292/output.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 12,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 12
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 12,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 12
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "ExpressionStatement",
-        "start": 0,
-        "end": 12,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 12
-          }
-        },
-        "expression": {
-          "type": "AssignmentExpression",
-          "start": 0,
-          "end": 12,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 0
-            },
-            "end": {
-              "line": 1,
-              "column": 12
-            }
-          },
-          "operator": "=",
-          "left": {
-            "type": "ArrayPattern",
-            "start": 0,
-            "end": 8,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 0
-              },
-              "end": {
-                "line": 1,
-                "column": 8
-              }
-            },
-            "elements": [
-              {
-                "type": "RestElement",
-                "start": 1,
-                "end": 5,
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 1
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 5
-                  }
-                },
-                "argument": {
-                  "type": "Identifier",
-                  "start": 4,
-                  "end": 5,
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 4
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 5
-                    },
-                    "identifierName": "a"
-                  },
-                  "name": "a"
-                }
-              }
-            ]
-          },
-          "right": {
-            "type": "Identifier",
-            "start": 11,
-            "end": 12,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 11
-              },
-              "end": {
-                "line": 1,
-                "column": 12
-              },
-              "identifierName": "b"
-            },
-            "name": "b"
-          }
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/296/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/296/options.json
index f56e7311d854..d93d5b2aa62e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/296/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/296/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/297/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/297/options.json
index 12e8741b8a16..224716db8070 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/297/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/297/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:1)"
-}
+  "throws": "Binding 'eval' in strict mode (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/313/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/313/output.json
index a66c95114fd8..1714f8b7d8a3 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/313/output.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/313/output.json
@@ -164,7 +164,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/328/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/328/options.json
index c958665c03e2..b98beb83593e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/328/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/328/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:7)"
+  "throws": "Unexpected token, expected \";\" (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/329/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/329/options.json
index 2a28555f76db..97818d2eea7e 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/329/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/329/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Lexical declaration cannot appear in a single-statement context (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/330/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/330/options.json
deleted file mode 100644
index 89bfc2d73f8a..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/330/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:10)"
-}
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/332/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/332/options.json
index b346a7872ac8..610884bb674c 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/332/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/332/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:18)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:18)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/333/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/333/options.json
index 46c5c8d53f1b..567e40541c5b 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/333/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/333/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:16)"
+  "throws": "Unexpected reserved word 'eval' (1:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/334/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/334/options.json
index 92b68ac333f4..e45ea16ee8a4 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/334/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/334/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "eval is a reserved word in strict mode (1:4)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:4)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/353/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/353/input.js
deleted file mode 100644
index 727c567cc1bd..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/353/input.js
+++ /dev/null
@@ -1 +0,0 @@
-({ __proto__, __proto__: 2 })
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/353/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/353/options.json
deleted file mode 100644
index a8b5ad2f5b20..000000000000
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/353/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Redefinition of __proto__ property (1:14)"
-}
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/357/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/357/options.json
index d295c5a3a3ea..c148ada0c73a 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/357/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/357/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "await is a reserved word (1:0)"
+  "throws": "Can not use keyword 'await' outside an async function (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/359/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/359/options.json
index dfa11a2d85f2..fa250ba921b1 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/359/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/359/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "await is a reserved word (1:6)"
+  "throws": "Can not use keyword 'await' outside an async function (1:6)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/361/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/361/options.json
index 6a60772f964c..fd81c5071d1d 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/361/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/361/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "await is a reserved word (1:8)"
+  "throws": "Can not use keyword 'await' outside an async function (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/363/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/363/options.json
index e9917bc90876..a72d4ab0ff7f 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/363/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/363/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "await is a reserved word (1:15)"
+  "throws": "Can not use keyword 'await' outside an async function (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/365/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/365/options.json
index e703907857e2..18d9310bd147 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/365/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/365/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "await is a reserved word (1:9)"
+  "throws": "Can not use keyword 'await' outside an async function (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/367/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/367/options.json
index dfa11a2d85f2..fa250ba921b1 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/367/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/367/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "await is a reserved word (1:6)"
+  "throws": "Can not use keyword 'await' outside an async function (1:6)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/368/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/368/options.json
index be7cb5854a46..bd449d1a1743 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/368/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/368/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "script",
-  "throws": "enum is a reserved word (1:0)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/369/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/369/options.json
index 471868697d3c..a8c4888490b6 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/369/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/369/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "enum is a reserved word (1:0)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/370/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/370/options.json
index b792a5158df3..eb23932ac559 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/370/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/370/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "script",
-  "throws": "enum is a reserved word (1:6)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/371/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/371/options.json
index 4a7908c1fb06..caa406928d15 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/371/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/371/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "enum is a reserved word (1:6)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/372/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/372/options.json
index 67b6ff2f165c..1b022077e7c6 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/372/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/372/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "script",
-  "throws": "enum is a reserved word (1:8)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:8)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/373/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/373/options.json
index 5c2c250e155f..dd3434fd06e4 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/373/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/373/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "enum is a reserved word (1:8)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:8)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/374/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/374/options.json
index b10f9979f560..e8900a801461 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/374/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/374/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "script",
-  "throws": "enum is a reserved word (1:15)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/375/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/375/options.json
index dc427ad7ef35..8169da7d9069 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/375/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/375/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "enum is a reserved word (1:15)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/376/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/376/options.json
index 8d226ef8ec1d..24b609367ea8 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/376/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/376/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "script",
-  "throws": "enum is a reserved word (1:9)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/377/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/377/options.json
index cdfa39cc09b9..51b7612a6eef 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/377/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/377/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "enum is a reserved word (1:9)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/378/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/378/options.json
index b792a5158df3..eb23932ac559 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/378/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/378/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "script",
-  "throws": "enum is a reserved word (1:6)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/379/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/379/options.json
index 4a7908c1fb06..caa406928d15 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/379/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/379/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "enum is a reserved word (1:6)"
-}
+  "throws": "Unexpected reserved word 'enum' (1:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/392/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/392/options.json
index 3b74c452196d..9f52ab64aeef 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/392/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/392/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "ES2015 named imports do not destructure. Use another statement for destructuring after the import. (1:19)",
+  "throws": "ES2015 named imports do not destructure. Use another statement for destructuring after the import. (1:19)",
   "sourceType": "module"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/394/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/394/input.js
new file mode 100644
index 000000000000..d6a05dcf09c2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/394/input.js
@@ -0,0 +1,4 @@
+var a;
+(a) = {};
+(a.b) = {};
+(a['c']) = {};
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/394/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/394/options.json
new file mode 100644
index 000000000000..0861962d889d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/394/options.json
@@ -0,0 +1,3 @@
+{
+  "createParenthesizedExpressions": true
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/394/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/394/output.json
new file mode 100644
index 000000000000..3eccd63cbd63
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/394/output.json
@@ -0,0 +1,392 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 43,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 43,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 7,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 9
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 7,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 8
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "ParenthesizedExpression",
+            "start": 7,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 3
+              }
+            },
+            "expression": {
+              "type": "Identifier",
+              "start": 8,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 1
+                },
+                "end": {
+                  "line": 2,
+                  "column": 2
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            }
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 13,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 6
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              }
+            },
+            "properties": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 17,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 17,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 10
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "ParenthesizedExpression",
+            "start": 17,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 5
+              }
+            },
+            "expression": {
+              "type": "MemberExpression",
+              "start": 18,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 1
+                },
+                "end": {
+                  "line": 3,
+                  "column": 4
+                }
+              },
+              "object": {
+                "type": "Identifier",
+                "start": 18,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 2
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              },
+              "property": {
+                "type": "Identifier",
+                "start": 20,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "identifierName": "b"
+                },
+                "name": "b"
+              },
+              "computed": false
+            }
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 25,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 8
+              },
+              "end": {
+                "line": 3,
+                "column": 10
+              }
+            },
+            "properties": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 29,
+        "end": 43,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 29,
+          "end": 42,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 0
+            },
+            "end": {
+              "line": 4,
+              "column": 13
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "ParenthesizedExpression",
+            "start": 29,
+            "end": 37,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 0
+              },
+              "end": {
+                "line": 4,
+                "column": 8
+              }
+            },
+            "expression": {
+              "type": "MemberExpression",
+              "start": 30,
+              "end": 36,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 1
+                },
+                "end": {
+                  "line": 4,
+                  "column": 7
+                }
+              },
+              "object": {
+                "type": "Identifier",
+                "start": 30,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 2
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              },
+              "property": {
+                "type": "StringLiteral",
+                "start": 32,
+                "end": 35,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 6
+                  }
+                },
+                "extra": {
+                  "rawValue": "c",
+                  "raw": "'c'"
+                },
+                "value": "c"
+              },
+              "computed": true
+            }
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 40,
+            "end": 42,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 11
+              },
+              "end": {
+                "line": 4,
+                "column": 13
+              }
+            },
+            "properties": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/395/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/395/input.js
new file mode 100644
index 000000000000..874dec75a9cc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/395/input.js
@@ -0,0 +1 @@
+([a.a]) => 42
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/395/options.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/395/options.json
new file mode 100644
index 000000000000..db72a6af957d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/395/options.json
@@ -0,0 +1,4 @@
+{
+  "createParenthesizedExpressions": true,
+  "throws": "Invalid left-hand side in arrow function parameters (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/86/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/86/input.js
index ebdd242449e5..bc9adbfd19cc 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/86/input.js
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/86/input.js
@@ -1 +1,2 @@
-export { encrypt }
\ No newline at end of file
+export { encrypt }
+function encrypt () {}
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/86/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/86/output.json
index 6f2e67893ccb..7e4ade49890c 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/86/output.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/86/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 18,
+  "end": 41,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 18
+      "line": 2,
+      "column": 22
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 18,
+    "end": 41,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 18
+        "line": 2,
+        "column": 22
       }
     },
     "sourceType": "module",
@@ -43,7 +43,6 @@
             "column": 18
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
@@ -95,7 +94,60 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 19,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 22
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 28,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 16
+            },
+            "identifierName": "encrypt"
+          },
+          "name": "encrypt"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 39,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 20
+            },
+            "end": {
+              "line": 2,
+              "column": 22
+            }
+          },
+          "body": [],
+          "directives": []
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/87/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/87/input.js
index 04615d4b6f31..9e82122a4077 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/87/input.js
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/87/input.js
@@ -1 +1,3 @@
-export { encrypt, decrypt }
\ No newline at end of file
+function encrypt () {}
+class decrypt{}
+export { encrypt, decrypt }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/87/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/87/output.json
index f7a0baef7991..28e7320743b9 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/87/output.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/87/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 27,
+  "end": 66,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
+      "line": 3,
       "column": 27
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 27,
+    "end": 66,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
+        "line": 3,
         "column": 27
       }
     },
@@ -30,9 +30,9 @@
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "FunctionDeclaration",
         "start": 0,
-        "end": 27,
+        "end": 22,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,136 @@
           },
           "end": {
             "line": 1,
+            "column": 22
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            },
+            "identifierName": "encrypt"
+          },
+          "name": "encrypt"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 20,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 20
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "ClassDeclaration",
+        "start": 23,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 29,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 13
+            },
+            "identifierName": "decrypt"
+          },
+          "name": "decrypt"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 36,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 13
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 39,
+        "end": 66,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
             "column": 27
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 9,
-            "end": 16,
+            "start": 48,
+            "end": 55,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 3,
                 "column": 9
               },
               "end": {
-                "line": 1,
+                "line": 3,
                 "column": 16
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 9,
-              "end": 16,
+              "start": 48,
+              "end": 55,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 9
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 16
                 },
                 "identifierName": "encrypt"
@@ -78,15 +178,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 9,
-              "end": 16,
+              "start": 48,
+              "end": 55,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 9
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 16
                 },
                 "identifierName": "encrypt"
@@ -96,29 +196,29 @@
           },
           {
             "type": "ExportSpecifier",
-            "start": 18,
-            "end": 25,
+            "start": 57,
+            "end": 64,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 3,
                 "column": 18
               },
               "end": {
-                "line": 1,
+                "line": 3,
                 "column": 25
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 18,
-              "end": 25,
+              "start": 57,
+              "end": 64,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 18
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 25
                 },
                 "identifierName": "decrypt"
@@ -127,15 +227,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 18,
-              "end": 25,
+              "start": 57,
+              "end": 64,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 18
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 25
                 },
                 "identifierName": "decrypt"
@@ -144,7 +244,8 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/88/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/88/input.js
index 9f663623f952..1f9f9289b167 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/88/input.js
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/88/input.js
@@ -1 +1,2 @@
-export { encrypt as default }
\ No newline at end of file
+import encrypt from "";
+export { encrypt as default }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/88/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/88/output.json
index 425419eb9509..25b0fd97418a 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/88/output.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/88/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 29,
+  "end": 53,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
+      "line": 2,
       "column": 29
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 29,
+    "end": 53,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
+        "line": 2,
         "column": 29
       }
     },
@@ -30,9 +30,9 @@
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "ImportDeclaration",
         "start": 0,
-        "end": 29,
+        "end": 23,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,104 @@
           },
           "end": {
             "line": 1,
+            "column": 23
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 7,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                },
+                "identifierName": "encrypt"
+              },
+              "name": "encrypt"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 20,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 20
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "extra": {
+            "rawValue": "",
+            "raw": "\"\""
+          },
+          "value": ""
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 24,
+        "end": 53,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
             "column": 29
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 9,
-            "end": 27,
+            "start": 33,
+            "end": 51,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 9
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 27
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 9,
-              "end": 16,
+              "start": 33,
+              "end": 40,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 9
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 16
                 },
                 "identifierName": "encrypt"
@@ -78,15 +146,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 20,
-              "end": 27,
+              "start": 44,
+              "end": 51,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 20
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 27
                 },
                 "identifierName": "default"
@@ -95,7 +163,8 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/89/input.js b/packages/babel-parser/test/fixtures/es2015/uncategorised/89/input.js
index fec65aa2e838..f1526616e3f4 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/89/input.js
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/89/input.js
@@ -1 +1,3 @@
-export { encrypt, decrypt as dec }
\ No newline at end of file
+function encrypt() {}
+class decrypt {}
+export { encrypt, decrypt as dec }
diff --git a/packages/babel-parser/test/fixtures/es2015/uncategorised/89/output.json b/packages/babel-parser/test/fixtures/es2015/uncategorised/89/output.json
index 7f1186d778ed..6e52c6fd4d1f 100644
--- a/packages/babel-parser/test/fixtures/es2015/uncategorised/89/output.json
+++ b/packages/babel-parser/test/fixtures/es2015/uncategorised/89/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 34,
+  "end": 73,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
+      "line": 3,
       "column": 34
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 34,
+    "end": 73,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
+        "line": 3,
         "column": 34
       }
     },
@@ -30,9 +30,9 @@
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "FunctionDeclaration",
         "start": 0,
-        "end": 34,
+        "end": 21,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,136 @@
           },
           "end": {
             "line": 1,
+            "column": 21
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            },
+            "identifierName": "encrypt"
+          },
+          "name": "encrypt"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 19,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 19
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "ClassDeclaration",
+        "start": 22,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 28,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 13
+            },
+            "identifierName": "decrypt"
+          },
+          "name": "decrypt"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 36,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 14
+            },
+            "end": {
+              "line": 2,
+              "column": 16
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 39,
+        "end": 73,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
             "column": 34
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 9,
-            "end": 16,
+            "start": 48,
+            "end": 55,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 3,
                 "column": 9
               },
               "end": {
-                "line": 1,
+                "line": 3,
                 "column": 16
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 9,
-              "end": 16,
+              "start": 48,
+              "end": 55,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 9
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 16
                 },
                 "identifierName": "encrypt"
@@ -78,15 +178,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 9,
-              "end": 16,
+              "start": 48,
+              "end": 55,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 9
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 16
                 },
                 "identifierName": "encrypt"
@@ -96,29 +196,29 @@
           },
           {
             "type": "ExportSpecifier",
-            "start": 18,
-            "end": 32,
+            "start": 57,
+            "end": 71,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 3,
                 "column": 18
               },
               "end": {
-                "line": 1,
+                "line": 3,
                 "column": 32
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 18,
-              "end": 25,
+              "start": 57,
+              "end": 64,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 18
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 25
                 },
                 "identifierName": "decrypt"
@@ -127,15 +227,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 29,
-              "end": 32,
+              "start": 68,
+              "end": 71,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 3,
                   "column": 29
                 },
                 "end": {
-                  "line": 1,
+                  "line": 3,
                   "column": 32
                 },
                 "identifierName": "dec"
@@ -144,7 +244,8 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/accessor-name-inst-computed-yield-expr/input.js b/packages/babel-parser/test/fixtures/es2015/yield/accessor-name-inst-computed-yield-expr/input.js
new file mode 100644
index 000000000000..c1ce97544cdb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/accessor-name-inst-computed-yield-expr/input.js
@@ -0,0 +1,9 @@
+var yieldSet, C, iter;
+function* g() {
+  class C_ {
+    get [yield]() { return 'get yield'; }
+    set [yield](param) { yieldSet = param; }
+  }
+
+  C = C_;
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/accessor-name-inst-computed-yield-expr/output.json b/packages/babel-parser/test/fixtures/es2015/yield/accessor-name-inst-computed-yield-expr/output.json
new file mode 100644
index 000000000000..1082894c21d5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/accessor-name-inst-computed-yield-expr/output.json
@@ -0,0 +1,552 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 155,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 9,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 155,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 9,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "yieldSet"
+              },
+              "name": "yieldSet"
+            },
+            "init": null
+          },
+          {
+            "type": "VariableDeclarator",
+            "start": 14,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 14
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 14,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                },
+                "identifierName": "C"
+              },
+              "name": "C"
+            },
+            "init": null
+          },
+          {
+            "type": "VariableDeclarator",
+            "start": 17,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 17
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 17,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                },
+                "identifierName": "iter"
+              },
+              "name": "iter"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 23,
+        "end": 155,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 33,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "g"
+          },
+          "name": "g"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 37,
+          "end": 155,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 14
+            },
+            "end": {
+              "line": 9,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassDeclaration",
+              "start": 41,
+              "end": 142,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 2
+                },
+                "end": {
+                  "line": 6,
+                  "column": 3
+                }
+              },
+              "id": {
+                "type": "Identifier",
+                "start": 47,
+                "end": 49,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 10
+                  },
+                  "identifierName": "C_"
+                },
+                "name": "C_"
+              },
+              "superClass": null,
+              "body": {
+                "type": "ClassBody",
+                "start": 50,
+                "end": 142,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 3
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ClassMethod",
+                    "start": 56,
+                    "end": 93,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 41
+                      }
+                    },
+                    "static": false,
+                    "key": {
+                      "type": "YieldExpression",
+                      "start": 61,
+                      "end": 66,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 9
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 14
+                        }
+                      },
+                      "delegate": false,
+                      "argument": null
+                    },
+                    "computed": true,
+                    "kind": "get",
+                    "id": null,
+                    "generator": false,
+                    "async": false,
+                    "params": [],
+                    "body": {
+                      "type": "BlockStatement",
+                      "start": 70,
+                      "end": 93,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 41
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ReturnStatement",
+                          "start": 72,
+                          "end": 91,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 20
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 39
+                            }
+                          },
+                          "argument": {
+                            "type": "StringLiteral",
+                            "start": 79,
+                            "end": 90,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 27
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 38
+                              }
+                            },
+                            "extra": {
+                              "rawValue": "get yield",
+                              "raw": "'get yield'"
+                            },
+                            "value": "get yield"
+                          }
+                        }
+                      ],
+                      "directives": []
+                    }
+                  },
+                  {
+                    "type": "ClassMethod",
+                    "start": 98,
+                    "end": 138,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 44
+                      }
+                    },
+                    "static": false,
+                    "key": {
+                      "type": "YieldExpression",
+                      "start": 103,
+                      "end": 108,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 9
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 14
+                        }
+                      },
+                      "delegate": false,
+                      "argument": null
+                    },
+                    "computed": true,
+                    "kind": "set",
+                    "id": null,
+                    "generator": false,
+                    "async": false,
+                    "params": [
+                      {
+                        "type": "Identifier",
+                        "start": 110,
+                        "end": 115,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 21
+                          },
+                          "identifierName": "param"
+                        },
+                        "name": "param"
+                      }
+                    ],
+                    "body": {
+                      "type": "BlockStatement",
+                      "start": 117,
+                      "end": 138,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 44
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ExpressionStatement",
+                          "start": 119,
+                          "end": 136,
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 25
+                            },
+                            "end": {
+                              "line": 5,
+                              "column": 42
+                            }
+                          },
+                          "expression": {
+                            "type": "AssignmentExpression",
+                            "start": 119,
+                            "end": 135,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 25
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 41
+                              }
+                            },
+                            "operator": "=",
+                            "left": {
+                              "type": "Identifier",
+                              "start": 119,
+                              "end": 127,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 25
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 33
+                                },
+                                "identifierName": "yieldSet"
+                              },
+                              "name": "yieldSet"
+                            },
+                            "right": {
+                              "type": "Identifier",
+                              "start": 130,
+                              "end": 135,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 36
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 41
+                                },
+                                "identifierName": "param"
+                              },
+                              "name": "param"
+                            }
+                          }
+                        }
+                      ],
+                      "directives": []
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              "type": "ExpressionStatement",
+              "start": 146,
+              "end": 153,
+              "loc": {
+                "start": {
+                  "line": 8,
+                  "column": 2
+                },
+                "end": {
+                  "line": 8,
+                  "column": 9
+                }
+              },
+              "expression": {
+                "type": "AssignmentExpression",
+                "start": 146,
+                "end": 152,
+                "loc": {
+                  "start": {
+                    "line": 8,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 8
+                  }
+                },
+                "operator": "=",
+                "left": {
+                  "type": "Identifier",
+                  "start": 146,
+                  "end": 147,
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 3
+                    },
+                    "identifierName": "C"
+                  },
+                  "name": "C"
+                },
+                "right": {
+                  "type": "Identifier",
+                  "start": 150,
+                  "end": 152,
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 8
+                    },
+                    "identifierName": "C_"
+                  },
+                  "name": "C_"
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/asi2/input.js b/packages/babel-parser/test/fixtures/es2015/yield/asi2/input.js
new file mode 100644
index 000000000000..137d219c49ac
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/asi2/input.js
@@ -0,0 +1,3 @@
+function *f() { yield
+{}/1/g
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/asi2/output.json b/packages/babel-parser/test/fixtures/es2015/yield/asi2/output.json
new file mode 100644
index 000000000000..2d86b5998e19
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/asi2/output.json
@@ -0,0 +1,172 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 14,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 14
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 16,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 16
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                }
+              },
+              "expression": {
+                "type": "YieldExpression",
+                "start": 16,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 21
+                  }
+                },
+                "delegate": false,
+                "argument": null
+              }
+            },
+            {
+              "type": "BlockStatement",
+              "start": 22,
+              "end": 24,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 0
+                },
+                "end": {
+                  "line": 2,
+                  "column": 2
+                }
+              },
+              "body": [],
+              "directives": []
+            },
+            {
+              "type": "ExpressionStatement",
+              "start": 24,
+              "end": 28,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 6
+                }
+              },
+              "expression": {
+                "type": "RegExpLiteral",
+                "start": 24,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 6
+                  }
+                },
+                "extra": {
+                  "raw": "/1/g"
+                },
+                "pattern": "1",
+                "flags": "g"
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-class-wrapped/input.js b/packages/babel-parser/test/fixtures/es2015/yield/function-name-class-wrapped/input.js
new file mode 100644
index 000000000000..49ee007baab6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-class-wrapped/input.js
@@ -0,0 +1,3 @@
+function* wrap() {
+    class A {*yield() {}}
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-class-wrapped/output.json b/packages/babel-parser/test/fixtures/es2015/yield/function-name-class-wrapped/output.json
new file mode 100644
index 000000000000..c646340e65e3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-class-wrapped/output.json
@@ -0,0 +1,194 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            },
+            "identifierName": "wrap"
+          },
+          "name": "wrap"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 17,
+          "end": 46,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassDeclaration",
+              "start": 23,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 25
+                }
+              },
+              "id": {
+                "type": "Identifier",
+                "start": 29,
+                "end": 30,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 11
+                  },
+                  "identifierName": "A"
+                },
+                "name": "A"
+              },
+              "superClass": null,
+              "body": {
+                "type": "ClassBody",
+                "start": 31,
+                "end": 44,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 25
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ClassMethod",
+                    "start": 32,
+                    "end": 43,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 24
+                      }
+                    },
+                    "static": false,
+                    "kind": "method",
+                    "key": {
+                      "type": "Identifier",
+                      "start": 33,
+                      "end": 38,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 19
+                        },
+                        "identifierName": "yield"
+                      },
+                      "name": "yield"
+                    },
+                    "computed": false,
+                    "id": null,
+                    "generator": true,
+                    "async": false,
+                    "params": [],
+                    "body": {
+                      "type": "BlockStatement",
+                      "start": 41,
+                      "end": 43,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 22
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 24
+                        }
+                      },
+                      "body": [],
+                      "directives": []
+                    }
+                  }
+                ]
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-function-declaration-inside-generator/options.json b/packages/babel-parser/test/fixtures/es2015/yield/function-name-function-declaration-inside-generator/options.json
index f14f9cb5405b..37d7f62549c6 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/function-name-function-declaration-inside-generator/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-function-declaration-inside-generator/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (2:11)"
+  "throws": "Can not use 'yield' as identifier inside a generator (2:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-expression/options.json b/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-expression/options.json
index 9a7dc6156a16..72f8d0e0e4c3 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-expression/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-expression/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:11)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-wrapped/input.js b/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-wrapped/input.js
new file mode 100644
index 000000000000..40ee514dea77
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-wrapped/input.js
@@ -0,0 +1,3 @@
+function* wrap() {
+    ({*yield() {}})
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-wrapped/output.json b/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-wrapped/output.json
new file mode 100644
index 000000000000..6856b64eb17a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-generator-wrapped/output.json
@@ -0,0 +1,180 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            },
+            "identifierName": "wrap"
+          },
+          "name": "wrap"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 17,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 23,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 19
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 24,
+                "end": 37,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 18
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectMethod",
+                    "start": 25,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 17
+                      }
+                    },
+                    "method": true,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 26,
+                      "end": 31,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 7
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 12
+                        },
+                        "identifierName": "yield"
+                      },
+                      "name": "yield"
+                    },
+                    "computed": false,
+                    "kind": "method",
+                    "id": null,
+                    "generator": true,
+                    "async": false,
+                    "params": [],
+                    "body": {
+                      "type": "BlockStatement",
+                      "start": 34,
+                      "end": 36,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 15
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 17
+                        }
+                      },
+                      "body": [],
+                      "directives": []
+                    }
+                  }
+                ],
+                "extra": {
+                  "parenthesized": true,
+                  "parenStart": 23
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict-body/options.json b/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict-body/options.json
index cf06e871cca3..091e7958db52 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict-body/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict-body/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'yield' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict/options.json b/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict/options.json
index 18a54259fa2b..320734ea2ef7 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/function-name-strict/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (2:9)"
+  "throws": "Unexpected reserved word 'yield' (2:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/in-class-heritage/options.json b/packages/babel-parser/test/fixtures/es2015/yield/in-class-heritage/options.json
index 7fc68d96502e..e817f30acb5c 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/in-class-heritage/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/in-class-heritage/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \"{\" (1:22)"
+  "throws": "Unexpected reserved word 'yield' (1:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/in-iterator-stmt/input.js b/packages/babel-parser/test/fixtures/es2015/yield/in-iterator-stmt/input.js
new file mode 100644
index 000000000000..0fcdd4ad2801
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/in-iterator-stmt/input.js
@@ -0,0 +1,3 @@
+function* g() {
+  for (yield '' in {}; ; ) ;
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/in-iterator-stmt/options.json b/packages/babel-parser/test/fixtures/es2015/yield/in-iterator-stmt/options.json
new file mode 100644
index 000000000000..ad46a65e5082
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/in-iterator-stmt/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid left-hand side in for-in statement (2:7)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/input-not-followed-by-regex/input.js b/packages/babel-parser/test/fixtures/es2015/yield/input-not-followed-by-regex/input.js
new file mode 100644
index 000000000000..da0a10b54aec
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/input-not-followed-by-regex/input.js
@@ -0,0 +1 @@
+function *f2() { () => yield / 1 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/input-not-followed-by-regex/output.json b/packages/babel-parser/test/fixtures/es2015/yield/input-not-followed-by-regex/output.json
new file mode 100644
index 000000000000..7b6b61f8c0b8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/input-not-followed-by-regex/output.json
@@ -0,0 +1,175 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            },
+            "identifierName": "f2"
+          },
+          "name": "f2"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 15,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 17,
+              "end": 32,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 32
+                }
+              },
+              "expression": {
+                "type": "ArrowFunctionExpression",
+                "start": 17,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 32
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BinaryExpression",
+                  "start": 23,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 23
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 32
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 23,
+                    "end": 28,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "identifierName": "yield"
+                    },
+                    "name": "yield"
+                  },
+                  "operator": "/",
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 31,
+                    "end": 32,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 31
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 32
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-1/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-1/options.json
index 7ef6a50f452a..75b3f62fdacb 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-1/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-1/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:7)"
+  "throws": "Yield cannot be used as name inside a generator function (2:7)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-2/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-2/options.json
index f688f165a938..9d35f54190c8 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-2/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-2/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:15)"
+  "throws": "Yield cannot be used as name inside a generator function (2:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-3/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-3/options.json
index 7ef6a50f452a..75b3f62fdacb 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-3/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-3/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:7)"
+  "throws": "Yield cannot be used as name inside a generator function (2:7)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-4/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-4/options.json
index d1db2cc80935..b3ac060855bb 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-4/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-4/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:17)"
+  "throws": "Yield cannot be used as name inside a generator function (2:17)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-5/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-5/options.json
index 5722b6eb30f3..379c08c57e90 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-5/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-5/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:8)"
+  "throws": "Yield cannot be used as name inside a generator function (2:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/input.js b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/input.js
new file mode 100644
index 000000000000..896d8fcb5cf9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/input.js
@@ -0,0 +1,3 @@
+function* fn() {
+  (x = (yield)) => {};
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/options.json
new file mode 100644
index 000000000000..379c08c57e90
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-inside-arrow-inside-generator-6/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Yield cannot be used as name inside a generator function (2:8)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-strict/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-strict/options.json
index 4654361314fb..ecc179f974cb 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-strict/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-default-strict/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (2:16)"
+  "throws": "Unexpected reserved word 'yield' (2:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-1/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-1/options.json
index 120123c80f54..b566d4944c2c 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-1/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-1/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:3)"
+  "throws": "Yield cannot be used as name inside a generator function (2:3)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-2/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-2/options.json
index 120123c80f54..b566d4944c2c 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-2/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-2/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:3)"
+  "throws": "Yield cannot be used as name inside a generator function (2:3)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-3/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-3/options.json
index 46a75b41eb84..479a9a79f900 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-3/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-arrow-inside-generator-3/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (2:9)"
+  "throws": "Yield cannot be used as name inside a generator function (2:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator-method/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator-method/options.json
index 9a7dc6156a16..72f8d0e0e4c3 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator-method/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator-method/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:11)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator/options.json
index 6cd6ffe02ca9..dcab4205d32f 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-generator/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:13)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict-body/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict-body/options.json
index 37e79f9fb8c7..cb8efaaa0aff 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict-body/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict-body/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:12)"
-}
+  "throws": "Binding 'yield' in strict mode (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict/options.json b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict/options.json
index e65626183cd2..75bdf3d53d6e 100644
--- a/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict/options.json
+++ b/packages/babel-parser/test/fixtures/es2015/yield/parameter-name-strict/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (2:12)"
+  "throws": "Unexpected reserved word 'yield' (2:12)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/yield class/input.js b/packages/babel-parser/test/fixtures/es2015/yield/yield class/input.js
new file mode 100644
index 000000000000..ea7121a71eae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/yield class/input.js	
@@ -0,0 +1 @@
+function* bar() { yield class {} }
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/yield class/output.json b/packages/babel-parser/test/fixtures/es2015/yield/yield class/output.json
new file mode 100644
index 000000000000..e4526ece7675
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/yield class/output.json	
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            },
+            "identifierName": "bar"
+          },
+          "name": "bar"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 16,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 18,
+              "end": 32,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 32
+                }
+              },
+              "expression": {
+                "type": "YieldExpression",
+                "start": 18,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 32
+                  }
+                },
+                "delegate": false,
+                "argument": {
+                  "type": "ClassExpression",
+                  "start": 24,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 32
+                    }
+                  },
+                  "id": null,
+                  "superClass": null,
+                  "body": {
+                    "type": "ClassBody",
+                    "start": 30,
+                    "end": 32,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 30
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 32
+                      }
+                    },
+                    "body": []
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/yield-as-identifier/input.js b/packages/babel-parser/test/fixtures/es2015/yield/yield-as-identifier/input.js
new file mode 100644
index 000000000000..79676acd5f12
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/yield-as-identifier/input.js
@@ -0,0 +1 @@
+var yield = 2
diff --git a/packages/babel-parser/test/fixtures/es2015/yield/yield-as-identifier/output.json b/packages/babel-parser/test/fixtures/es2015/yield/yield-as-identifier/output.json
new file mode 100644
index 000000000000..b0139b0da807
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/yield/yield-as-identifier/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 13
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                },
+                "identifierName": "yield"
+              },
+              "name": "yield"
+            },
+            "init": {
+              "type": "NumericLiteral",
+              "start": 12,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 12
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                }
+              },
+              "extra": {
+                "rawValue": 2,
+                "raw": "2"
+              },
+              "value": 2
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/10/options.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/10/options.json
index 73054f4644b0..2c624e8cec70 100644
--- a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/10/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/10/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:1)"
+  "throws": "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:1)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/11/options.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/11/options.json
index f6d96ba3a1f7..f04c5c035abb 100644
--- a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/11/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/11/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:2)"
+  "throws": "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/12/options.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/12/options.json
index f6d96ba3a1f7..f04c5c035abb 100644
--- a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/12/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/12/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:2)"
+  "throws": "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/15/input.js b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/15/input.js
new file mode 100644
index 000000000000..63fce35a8a19
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/15/input.js
@@ -0,0 +1 @@
+-(5) ** 6;
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/15/options.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/15/options.json
new file mode 100644
index 000000000000..c694133bf2b1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/15/options.json
@@ -0,0 +1,4 @@
+{
+  "createParenthesizedExpressions": true,
+  "throws": "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/16/input.js b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/16/input.js
new file mode 100644
index 000000000000..47b91d35a849
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/16/input.js
@@ -0,0 +1 @@
+(-5 ** 6);
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/16/options.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/16/options.json
new file mode 100644
index 000000000000..19687fbe197a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/16/options.json
@@ -0,0 +1,4 @@
+{
+  "createParenthesizedExpressions": true,
+  "throws": "Illegal expression. Wrap left hand side or entire exponentiation in parentheses. (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/2/output.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/2/output.json
index e4e9ecd32a5d..e840aecbd18a 100644
--- a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/2/output.json
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/2/output.json
@@ -124,4 +124,4 @@
     ],
     "directives": []
   }
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/7/output.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/7/output.json
index c4f295eacffd..2fb85f363b06 100644
--- a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/7/output.json
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/7/output.json
@@ -160,4 +160,4 @@
     ],
     "directives": []
   }
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/8/output.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/8/output.json
index fd863ac0f6f6..56c71d7d2533 100644
--- a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/8/output.json
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/8/output.json
@@ -156,4 +156,4 @@
     ],
     "directives": []
   }
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/9/output.json b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/9/output.json
index c3f4e42e1c0c..2691c6433738 100644
--- a/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/9/output.json
+++ b/packages/babel-parser/test/fixtures/es2016/exponentiation-operator/9/output.json
@@ -124,4 +124,4 @@
     ],
     "directives": []
   }
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern-default/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern-default/options.json
index 5a257f4e5d33..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern-default/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern-default/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:11)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern/options.json
index 5a257f4e5d33..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/array-pattern/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:11)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/arrow-function/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/arrow-function/options.json
index 2e6ae0771c86..089b542c3704 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/arrow-function/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/arrow-function/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:9)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-arrow-function/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-arrow-function/options.json
index 0c31636171e0..089b542c3704 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-arrow-function/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-arrow-function/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:15)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-function/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-function/options.json
index ff8a46ae1aec..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-function/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/async-function/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:17)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/default/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/default/options.json
index 5a257f4e5d33..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/default/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/default/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:11)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-function/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-function/options.json
index 65ff709b5f39..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-function/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-function/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:12)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-method/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-method/options.json
index dd467e6578aa..9908b496fd2a 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-method/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/generator-method/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (2:6)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (2:5)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/method/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/method/options.json
index ac620235e917..5d0e394f2b9d 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/method/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/method/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (2:4)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (2:3)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern-default/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern-default/options.json
index 5a257f4e5d33..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern-default/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern-default/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:11)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern/options.json
index 5a257f4e5d33..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/object-pattern/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:11)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/rest/options.json b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/rest/options.json
index 5a257f4e5d33..12b18792fcc4 100644
--- a/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/rest/options.json
+++ b/packages/babel-parser/test/fixtures/es2016/simple-parameter-list/rest/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Non-simple parameter in strict mode (1:11)"
+  "throws": "Illegal 'use strict' directive in function with non-simple parameter list (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/2/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/2/options.json
index 1525fbf2506c..c6f19067ee66 100644
--- a/packages/babel-parser/test/fixtures/es2017/async-functions/2/options.json
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/2/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "await* has been removed from the async functions proposal. Use Promise.all() instead. (2:2)"
+  "throws": "await* has been removed from the async functions proposal. Use Promise.all() instead. (2:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-declaration-name/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-declaration-name/input.js
new file mode 100644
index 000000000000..60b70d4a68e9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-declaration-name/input.js
@@ -0,0 +1 @@
+async function await() {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-declaration-name/output.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-declaration-name/output.json
new file mode 100644
index 000000000000..2d128072e784
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-declaration-name/output.json
@@ -0,0 +1,87 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 25
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 25
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 25
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            },
+            "identifierName": "await"
+          },
+          "name": "await"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 23,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 23
+            },
+            "end": {
+              "line": 1,
+              "column": 25
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-expression-name/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-expression-name/input.js
new file mode 100644
index 000000000000..5102f04c3f84
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-expression-name/input.js
@@ -0,0 +1 @@
+(async function await() {});
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-expression-name/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-expression-name/options.json
new file mode 100644
index 000000000000..022428647fee
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-async-function-expression-name/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Can not use 'await' as identifier inside an async function (1:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/input.js
new file mode 100644
index 000000000000..1df99191e510
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/input.js
@@ -0,0 +1,3 @@
+async function foo() {
+  function await() {}
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/options.json
new file mode 100644
index 000000000000..d45274982dc1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-declaration-name-inside-async-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Can not use 'await' as identifier inside an async function (2:11)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-expression-name-inside-async-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-expression-name-inside-async-function/input.js
new file mode 100644
index 000000000000..97183151654b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-expression-name-inside-async-function/input.js
@@ -0,0 +1,3 @@
+async function fn() {
+  (function await() {});
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-expression-name-inside-async-function/output.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-expression-name-inside-async-function/output.json
new file mode 100644
index 000000000000..701abef485a0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-function-expression-name-inside-async-function/output.json
@@ -0,0 +1,159 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 48,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 48,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 48,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            },
+            "identifierName": "fn"
+          },
+          "name": "fn"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 20,
+          "end": 48,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 20
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 24,
+              "end": 46,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 24
+                }
+              },
+              "expression": {
+                "type": "FunctionExpression",
+                "start": 25,
+                "end": 44,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 22
+                  }
+                },
+                "id": {
+                  "type": "Identifier",
+                  "start": 34,
+                  "end": 39,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 17
+                    },
+                    "identifierName": "await"
+                  },
+                  "name": "await"
+                },
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 42,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 22
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                },
+                "extra": {
+                  "parenthesized": true,
+                  "parenStart": 24
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-identifier-inside-parameters-of-nested-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-identifier-inside-parameters-of-nested-function/input.js
new file mode 100644
index 000000000000..ec2205553408
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-identifier-inside-parameters-of-nested-function/input.js
@@ -0,0 +1,3 @@
+async function fn() {
+  function g(x = await) {}
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-identifier-inside-parameters-of-nested-function/output.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-identifier-inside-parameters-of-nested-function/output.json
new file mode 100644
index 000000000000..1ad9f719af7c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-identifier-inside-parameters-of-nested-function/output.json
@@ -0,0 +1,190 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 50,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 50,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 50,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            },
+            "identifierName": "fn"
+          },
+          "name": "fn"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 20,
+          "end": 50,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 20
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "FunctionDeclaration",
+              "start": 24,
+              "end": 48,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 26
+                }
+              },
+              "id": {
+                "type": "Identifier",
+                "start": 33,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 12
+                  },
+                  "identifierName": "g"
+                },
+                "name": "g"
+              },
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "AssignmentPattern",
+                  "start": 35,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 22
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 35,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 14
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "right": {
+                    "type": "Identifier",
+                    "start": 39,
+                    "end": 44,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 22
+                      },
+                      "identifierName": "await"
+                    },
+                    "name": "await"
+                  }
+                }
+              ],
+              "body": {
+                "type": "BlockStatement",
+                "start": 46,
+                "end": 48,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 26
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/input.js
new file mode 100644
index 000000000000..b27b79ef4ae1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/input.js
@@ -0,0 +1,3 @@
+async function fn() {
+  async (x = async(y = await 2)) => {};
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/options.json
new file mode 100644
index 000000000000..9a4cb65743b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-call-inside-parameters-of-async-arrow-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Await cannot be used as name inside an async function (2:23)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-function-call/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-function-call/input.js
new file mode 100644
index 000000000000..d41288f1156b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-function-call/input.js
@@ -0,0 +1,3 @@
+async function fn() {
+  async(x = await 2);
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-function-call/output.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-function-call/output.json
new file mode 100644
index 000000000000..39c5735ec936
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arguments-of-async-function-call/output.json
@@ -0,0 +1,205 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 45,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 45,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 45,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            },
+            "identifierName": "fn"
+          },
+          "name": "fn"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 20,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 20
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 24,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 21
+                }
+              },
+              "expression": {
+                "type": "CallExpression",
+                "start": 24,
+                "end": 42,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 20
+                  }
+                },
+                "callee": {
+                  "type": "Identifier",
+                  "start": 24,
+                  "end": 29,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 7
+                    },
+                    "identifierName": "async"
+                  },
+                  "name": "async"
+                },
+                "arguments": [
+                  {
+                    "type": "AssignmentExpression",
+                    "start": 30,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 19
+                      }
+                    },
+                    "operator": "=",
+                    "left": {
+                      "type": "Identifier",
+                      "start": 30,
+                      "end": 31,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 9
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    },
+                    "right": {
+                      "type": "AwaitExpression",
+                      "start": 34,
+                      "end": 41,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 19
+                        }
+                      },
+                      "argument": {
+                        "type": "NumericLiteral",
+                        "start": 40,
+                        "end": 41,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 19
+                          }
+                        },
+                        "extra": {
+                          "rawValue": 2,
+                          "raw": "2"
+                        },
+                        "value": 2
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-expression-disallowed/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-expression-disallowed/input.js
new file mode 100644
index 000000000000..5f0476d83191
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-expression-disallowed/input.js
@@ -0,0 +1 @@
+() => { await x }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-expression-disallowed/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-expression-disallowed/options.json
new file mode 100644
index 000000000000..6079f56395bd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-expression-disallowed/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:14)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/input.js
new file mode 100644
index 000000000000..cbc9d51ace79
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/input.js
@@ -0,0 +1 @@
+() => { await }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/options.json
new file mode 100644
index 000000000000..b412ffe6712f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/output.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/output.json
new file mode 100644
index 000000000000..f6ca7cfa0d20
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-arrow-identifier-allowed/output.json
@@ -0,0 +1,119 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [],
+          "body": {
+            "type": "BlockStatement",
+            "start": 6,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "body": [
+              {
+                "type": "ExpressionStatement",
+                "start": 8,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "expression": {
+                  "type": "Identifier",
+                  "start": 8,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "identifierName": "await"
+                  },
+                  "name": "await"
+                }
+              }
+            ],
+            "directives": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/input.js
new file mode 100644
index 000000000000..f137977faf1d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/input.js
@@ -0,0 +1 @@
+async (x = await 2) => {};
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/options.json
new file mode 100644
index 000000000000..ceaee67ee6b4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-async-arrow-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:17)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/input.js
new file mode 100644
index 000000000000..39aea232a5ce
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/input.js
@@ -0,0 +1,3 @@
+async function fn() {
+  (x = await 2) => {};
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/options.json
new file mode 100644
index 000000000000..7cec39290c2a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-arrow-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Await cannot be used as name inside an async function (2:7)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/input.js
new file mode 100644
index 000000000000..7571a193f836
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/input.js
@@ -0,0 +1,3 @@
+async function fn() {
+  async (x = await 2) => {};
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/options.json
new file mode 100644
index 000000000000..b45bba7cab4a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-async-arrow-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Await cannot be used as name inside an async function (2:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/input.js
new file mode 100644
index 000000000000..f9a4ebddb333
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/input.js
@@ -0,0 +1,3 @@
+async function foo() {
+  function bar(x = await 2) {}
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/options.json
new file mode 100644
index 000000000000..b260169ecd70
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters-of-nested-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (2:25)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters/input.js
new file mode 100644
index 000000000000..52459e1a27a6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters/input.js
@@ -0,0 +1 @@
+async function fn(x = await 2) {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters/options.json
new file mode 100644
index 000000000000..f4af75f31164
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parameters/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "await is not allowed in async function parameters (1:22)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parenthesized-assign/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parenthesized-assign/input.js
new file mode 100644
index 000000000000..fd46caa54ce3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parenthesized-assign/input.js
@@ -0,0 +1,3 @@
+async function fn() {
+  (x = await 2);
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parenthesized-assign/output.json b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parenthesized-assign/output.json
new file mode 100644
index 000000000000..76cec56e0208
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/await-inside-parenthesized-assign/output.json
@@ -0,0 +1,175 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            },
+            "identifierName": "fn"
+          },
+          "name": "fn"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 20,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 20
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 24,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 16
+                }
+              },
+              "expression": {
+                "type": "AssignmentExpression",
+                "start": 25,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 14
+                  }
+                },
+                "operator": "=",
+                "left": {
+                  "type": "Identifier",
+                  "start": 25,
+                  "end": 26,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 4
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "right": {
+                  "type": "AwaitExpression",
+                  "start": 29,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 14
+                    }
+                  },
+                  "argument": {
+                    "type": "NumericLiteral",
+                    "start": 35,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 14
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 2,
+                      "raw": "2"
+                    },
+                    "value": 2
+                  }
+                },
+                "extra": {
+                  "parenthesized": true,
+                  "parenStart": 24
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/export-invalid/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/export-invalid/options.json
index 5da632286fbb..758834b289e0 100644
--- a/packages/babel-parser/test/fixtures/es2017/async-functions/export-invalid/options.json
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/export-invalid/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "Unexpected token, expected \"function\" (1:21)"
+  "throws": "Unexpected token, expected \"=>\" (1:31)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-class-method/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-class-method/input.js
new file mode 100644
index 000000000000..4dd0cd76e362
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-class-method/input.js
@@ -0,0 +1 @@
+class X { \u0061sync x() { await x } }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-class-method/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-class-method/options.json
new file mode 100644
index 000000000000..b81bee7fa2e4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-class-method/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:21)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-obj-method/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-obj-method/input.js
new file mode 100644
index 000000000000..0807ff125175
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-obj-method/input.js
@@ -0,0 +1 @@
+({ \u0061sync x() { await x } })
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-obj-method/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-obj-method/options.json
new file mode 100644
index 000000000000..f0907a448458
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-obj-method/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:14)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-static-class-method/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-static-class-method/input.js
new file mode 100644
index 000000000000..a5b20dfebcfe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-static-class-method/input.js
@@ -0,0 +1 @@
+class X { static \u0061sync x() { await x } }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-static-class-method/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-static-class-method/options.json
new file mode 100644
index 000000000000..f55830c1c373
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-async-static-class-method/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:28)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-await/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-await/input.js
new file mode 100644
index 000000000000..824b1c37725b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-await/input.js
@@ -0,0 +1 @@
+(async function() { aw\u0061it x })
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-await/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-await/options.json
new file mode 100644
index 000000000000..ac6c5914cec6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-await/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Can not use 'await' as identifier inside an async function (1:20)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-async-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-async-function/input.js
new file mode 100644
index 000000000000..0d2ad1b32309
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-async-function/input.js
@@ -0,0 +1 @@
+export \u0061sync function y() { await x }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-async-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-async-function/options.json
new file mode 100644
index 000000000000..9d60866b80c3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-async-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \"{\" (1:7)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-dflt-async-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-dflt-async-function/input.js
new file mode 100644
index 000000000000..d14f4188a0b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-dflt-async-function/input.js
@@ -0,0 +1 @@
+export default \u0061sync function y() { await x }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-dflt-async-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-dflt-async-function/options.json
new file mode 100644
index 000000000000..b0e5516212f3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-export-dflt-async-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:26)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow-list/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow-list/input.js
new file mode 100644
index 000000000000..55506a887224
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow-list/input.js
@@ -0,0 +1 @@
+(\u0061sync x => { await x })
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow-list/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow-list/options.json
new file mode 100644
index 000000000000..0cd822570731
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow-list/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow/input.js
new file mode 100644
index 000000000000..1989072f30de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow/input.js
@@ -0,0 +1 @@
+\u0061sync x => { await x }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow/options.json
new file mode 100644
index 000000000000..f6eb197b1dd8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-arrow/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function-list/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function-list/input.js
new file mode 100644
index 000000000000..978637393061
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function-list/input.js
@@ -0,0 +1 @@
+(\u0061sync function() { await x })
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function-list/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function-list/options.json
new file mode 100644
index 000000000000..0cd822570731
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function-list/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function/input.js
new file mode 100644
index 000000000000..a44cfbb62d1a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function/input.js
@@ -0,0 +1 @@
+\u0061sync function() { await x }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function/options.json
new file mode 100644
index 000000000000..f6eb197b1dd8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-escape-sequence-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-inside-loop/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-inside-loop/input.js
new file mode 100644
index 000000000000..c519d6ea261a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-inside-loop/input.js
@@ -0,0 +1 @@
+while (1) async function foo(){}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-inside-loop/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-inside-loop/options.json
new file mode 100644
index 000000000000..4bcd823e98be
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-inside-loop/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Async functions can only be declared at the top level or inside a block (1:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-newline-after-params/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-newline-after-params/input.js
new file mode 100644
index 000000000000..52a0795cf08a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-newline-after-params/input.js
@@ -0,0 +1,2 @@
+async (x)
+=> {}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-newline-after-params/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-newline-after-params/options.json
new file mode 100644
index 000000000000..0361d7c7d2b2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-newline-after-params/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (2:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-arrow/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-arrow/input.js
new file mode 100644
index 000000000000..33dbaaa09e00
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-arrow/input.js
@@ -0,0 +1 @@
+(async)(a) => {}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-arrow/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-arrow/options.json
new file mode 100644
index 000000000000..f6eb197b1dd8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-arrow/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-func/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-func/input.js
new file mode 100644
index 000000000000..0af564cef72b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-func/input.js
@@ -0,0 +1 @@
+(async) function x (a) {}
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-func/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-func/options.json
new file mode 100644
index 000000000000..c2fcdb08cf9f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/invalid-parens-async-func/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (1:8)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/newline-arrow/input.js b/packages/babel-parser/test/fixtures/es2017/async-functions/newline-arrow/input.js
new file mode 100644
index 000000000000..200a1447669b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/newline-arrow/input.js
@@ -0,0 +1,2 @@
+async
+x => x
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/newline-arrow/output.json b/packages/babel-parser/test/fixtures/es2017/async-functions/newline-arrow/output.json
new file mode 100644
index 000000000000..4c44c118638d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/newline-arrow/output.json
@@ -0,0 +1,136 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            },
+            "identifierName": "async"
+          },
+          "name": "async"
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 6,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 6,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 0
+                },
+                "end": {
+                  "line": 2,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "Identifier",
+            "start": 11,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 5
+              },
+              "end": {
+                "line": 2,
+                "column": 6
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/no-method-asi/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/no-method-asi/options.json
index f3c78ddb4f02..7348c12f9e90 100644
--- a/packages/babel-parser/test/fixtures/es2017/async-functions/no-method-asi/options.json
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/no-method-asi/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'classProperties' (3:2)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classProperties' (3:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/es2017/async-functions/params-invalid-rest-trailing-comma/options.json b/packages/babel-parser/test/fixtures/es2017/async-functions/params-invalid-rest-trailing-comma/options.json
index 52560b0a85b7..f686fb60b45e 100644
--- a/packages/babel-parser/test/fixtures/es2017/async-functions/params-invalid-rest-trailing-comma/options.json
+++ b/packages/babel-parser/test/fixtures/es2017/async-functions/params-invalid-rest-trailing-comma/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "A trailing comma is not permitted after the rest element (1:11)"
+  "throws": "Rest element must be last element (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/class-method-2/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/class-method-2/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/class-method-2/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/class-method-2/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/class-method-2/output.json b/packages/babel-parser/test/fixtures/es2018/async-generators/class-method-2/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/class-method-2/output.json
rename to packages/babel-parser/test/fixtures/es2018/async-generators/class-method-2/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/class-method-no-asi/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/class-method-no-asi/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/class-method-no-asi/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/class-method-no-asi/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/async-generators/class-method-no-asi/options.json b/packages/babel-parser/test/fixtures/es2018/async-generators/class-method-no-asi/options.json
new file mode 100644
index 000000000000..7348c12f9e90
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/async-generators/class-method-no-asi/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classProperties' (3:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/class-method/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/class-method/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/class-method/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/class-method/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/class-method/output.json b/packages/babel-parser/test/fixtures/es2018/async-generators/class-method/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/class-method/output.json
rename to packages/babel-parser/test/fixtures/es2018/async-generators/class-method/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-async-context/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-async-context/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await-async-context/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await-async-context/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-async-context/options.json b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-async-context/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await-async-context/options.json
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await-async-context/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-in/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-in/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-in/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-in/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-in/options.json b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-in/options.json
new file mode 100644
index 000000000000..f86bbd48e917
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-in/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (2:6)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-1/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-1/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-1/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-1/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-1/options.json b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-1/options.json
new file mode 100644
index 000000000000..9660494a29ea
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-1/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-2/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-2/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-2/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-2/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-2/options.json b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-2/options.json
new file mode 100644
index 000000000000..9660494a29ea
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-2/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-3/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-3/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-3/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-3/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-3/options.json b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-3/options.json
new file mode 100644
index 000000000000..9660494a29ea
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await-no-semi-3/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await/output.json b/packages/babel-parser/test/fixtures/es2018/async-generators/for-await/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/for-await/output.json
rename to packages/babel-parser/test/fixtures/es2018/async-generators/for-await/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/object-method/input.js b/packages/babel-parser/test/fixtures/es2018/async-generators/object-method/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/object-method/input.js
rename to packages/babel-parser/test/fixtures/es2018/async-generators/object-method/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/object-method/output.json b/packages/babel-parser/test/fixtures/es2018/async-generators/object-method/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/async-generators/object-method/output.json
rename to packages/babel-parser/test/fixtures/es2018/async-generators/object-method/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/1/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/1/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/1/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/1/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/1/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/1/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/1/output.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/1/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/10/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/10/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/10/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/10/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/10/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/10/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/10/output.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/10/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/11/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/11/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/11/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/11/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/11/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/11/options.json
new file mode 100644
index 000000000000..6dad74eebd16
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/11/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Identifier 'foo' has already been declared (2:23)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/12/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/12/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/12/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/12/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/12/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/12/options.json
new file mode 100644
index 000000000000..165223a448a3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/12/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Identifier 'bar' has already been declared (2:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/13/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/13/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/13/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/13/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/13/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/13/options.json
new file mode 100644
index 000000000000..68df28e41c41
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/13/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Identifier 'foo' has already been declared (2:30)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/14/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/14/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/14/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/14/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/14/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/14/options.json
new file mode 100644
index 000000000000..280073b140f0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/14/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Identifier 'foo' has already been declared (2:29)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/15/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/15/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/15/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/15/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/15/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/15/options.json
new file mode 100644
index 000000000000..68df28e41c41
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/15/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "Identifier 'foo' has already been declared (2:30)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/16/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/16/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/16/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/17/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/17/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0108/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0108/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/17/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/18/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/18/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/18/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/18/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/18/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/18/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/18/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/18/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/19/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/19/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/19/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/2/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/2/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/2/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/2/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/2/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/2/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/2/output.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/2/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/20/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/20/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/20/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/21/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/21/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/21/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/21/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/21/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/21/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/21/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/21/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/22/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/22/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/22/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/22/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/22/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/22/options.json
new file mode 100644
index 000000000000..08b79c43d6cd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/22/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/23/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/23/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/23/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/23/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/23/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/23/options.json
new file mode 100644
index 000000000000..81e7a97e3f7e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/23/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:20)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/24/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/24/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/24/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/24/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/24/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/24/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/24/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/24/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/25/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/25/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/options.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/25/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/26/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/26/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/26/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/26/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/26/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/26/options.json
new file mode 100644
index 000000000000..b8b06c3a03ba
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/26/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:18)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/3/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/3/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/3/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/3/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/3/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/3/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/3/output.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/3/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/4/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/4/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/4/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/4/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/4/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/4/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/4/output.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/4/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/5/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/5/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/5/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/5/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/5/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/5/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/5/output.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/5/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/6/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/6/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/6/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/6/input.js
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/6/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/6/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/6/output.json
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/6/output.json
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/7/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/7/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/7/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/7/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/7/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/7/options.json
new file mode 100644
index 000000000000..b86f80dc4a72
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/7/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (1:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/8/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/8/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/8/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/8/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/8/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/8/options.json
new file mode 100644
index 000000000000..c49db16e2821
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/8/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (1:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/9/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/9/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/9/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/9/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/9/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/9/options.json
new file mode 100644
index 000000000000..e9effa60cb30
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/9/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (1:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-rest/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-rest/input.js
new file mode 100644
index 000000000000..aef29a7f3bb7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-rest/input.js
@@ -0,0 +1 @@
+({...a,} = {});
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-rest/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-rest/options.json
new file mode 100644
index 000000000000..935d087d7ee5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-rest/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (1:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-spread/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-spread/input.js
new file mode 100644
index 000000000000..d8dd574f40cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-spread/input.js
@@ -0,0 +1 @@
+({...a,});
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-spread/output.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-spread/output.json
new file mode 100644
index 000000000000..ffb978345c27
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/comma-after-spread/output.json
@@ -0,0 +1,103 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "properties": [
+            {
+              "type": "SpreadElement",
+              "start": 2,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                }
+              },
+              "argument": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/expression-rest-not-last-invalid/input.js b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/expression-rest-not-last-invalid/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/object-rest-spread/expression-rest-not-last-invalid/input.js
rename to packages/babel-parser/test/fixtures/es2018/object-rest-spread/expression-rest-not-last-invalid/input.js
diff --git a/packages/babel-parser/test/fixtures/es2018/object-rest-spread/expression-rest-not-last-invalid/options.json b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/expression-rest-not-last-invalid/options.json
new file mode 100644
index 000000000000..b708967fd223
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2018/object-rest-spread/expression-rest-not-last-invalid/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Rest element must be last element (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/input.js b/packages/babel-parser/test/fixtures/es2019/json-strings/directive-line-separator/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/input.js
rename to packages/babel-parser/test/fixtures/es2019/json-strings/directive-line-separator/input.js
diff --git a/packages/babel-parser/test/fixtures/es2019/json-strings/directive-line-separator/output.json b/packages/babel-parser/test/fixtures/es2019/json-strings/directive-line-separator/output.json
new file mode 100644
index 000000000000..8bf9f02e8706
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2019/json-strings/directive-line-separator/output.json
@@ -0,0 +1,106 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 98,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 82
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 98,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 82
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "value": "before
after",
+          "extra": {
+            "raw": "\"before
after\"",
+            "rawValue": "before
after"
+          }
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": "     ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
+            "start": 16,
+            "end": 98,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 82
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "     ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
+      "start": 16,
+      "end": 98,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 0
+        },
+        "end": {
+          "line": 3,
+          "column": 82
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/input.js b/packages/babel-parser/test/fixtures/es2019/json-strings/directive-paragraph-separator/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/input.js
rename to packages/babel-parser/test/fixtures/es2019/json-strings/directive-paragraph-separator/input.js
diff --git a/packages/babel-parser/test/fixtures/es2019/json-strings/directive-paragraph-separator/output.json b/packages/babel-parser/test/fixtures/es2019/json-strings/directive-paragraph-separator/output.json
new file mode 100644
index 000000000000..f83d867447e7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2019/json-strings/directive-paragraph-separator/output.json
@@ -0,0 +1,106 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 103,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 87
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 103,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 87
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "value": "before
after",
+          "extra": {
+            "raw": "\"before
after\"",
+            "rawValue": "before
after"
+          }
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": "     ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
+            "start": 16,
+            "end": 103,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 87
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "     ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
+      "start": 16,
+      "end": 103,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 0
+        },
+        "end": {
+          "line": 3,
+          "column": 87
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/input.js b/packages/babel-parser/test/fixtures/es2019/json-strings/string-line-separator/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/input.js
rename to packages/babel-parser/test/fixtures/es2019/json-strings/string-line-separator/input.js
diff --git a/packages/babel-parser/test/fixtures/es2019/json-strings/string-line-separator/output.json b/packages/babel-parser/test/fixtures/es2019/json-strings/string-line-separator/output.json
new file mode 100644
index 000000000000..388733cc206a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2019/json-strings/string-line-separator/output.json
@@ -0,0 +1,108 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 101,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 83
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 101,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 83
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "StringLiteral",
+          "start": 1,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          },
+          "extra": {
+            "rawValue": "before
after",
+            "raw": "\"before
after\"",
+            "parenthesized": true,
+            "parenStart": 0
+          },
+          "value": "before
after"
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": "      ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
+            "start": 18,
+            "end": 101,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 83
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "      ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
+      "start": 18,
+      "end": 101,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 0
+        },
+        "end": {
+          "line": 3,
+          "column": 83
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/input.js b/packages/babel-parser/test/fixtures/es2019/json-strings/string-paragraph-separator/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/input.js
rename to packages/babel-parser/test/fixtures/es2019/json-strings/string-paragraph-separator/input.js
diff --git a/packages/babel-parser/test/fixtures/es2019/json-strings/string-paragraph-separator/output.json b/packages/babel-parser/test/fixtures/es2019/json-strings/string-paragraph-separator/output.json
new file mode 100644
index 000000000000..a482ccfb266a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2019/json-strings/string-paragraph-separator/output.json
@@ -0,0 +1,108 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 106,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 88
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 106,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 88
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "StringLiteral",
+          "start": 1,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          },
+          "extra": {
+            "rawValue": "before
after",
+            "raw": "\"before
after\"",
+            "parenthesized": true,
+            "parenStart": 0
+          },
+          "value": "before
after"
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": "      ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
+            "start": 18,
+            "end": 106,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 88
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "      ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
+      "start": 18,
+      "end": 106,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 0
+        },
+        "end": {
+          "line": 3,
+          "column": 88
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding-finally/input.js b/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding-finally/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding-finally/input.js
rename to packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding-finally/input.js
diff --git a/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding-finally/output.json b/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding-finally/output.json
new file mode 100644
index 000000000000..564ba035b454
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding-finally/output.json
@@ -0,0 +1,117 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 9,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 9,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 1
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 9,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 0
+            },
+            "end": {
+              "line": 6,
+              "column": 1
+            }
+          },
+          "param": null,
+          "body": {
+            "type": "BlockStatement",
+            "start": 15,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 6
+              },
+              "end": {
+                "line": 6,
+                "column": 1
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        },
+        "finalizer": {
+          "type": "BlockStatement",
+          "start": 28,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 7,
+              "column": 8
+            },
+            "end": {
+              "line": 9,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding/input.js b/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding/input.js
rename to packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding/input.js
diff --git a/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding/output.json b/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding/output.json
new file mode 100644
index 000000000000..0948185b8e4e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2019/optional-catch-binding/no-binding/output.json
@@ -0,0 +1,101 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 6,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 6,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 1
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 9,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 0
+            },
+            "end": {
+              "line": 6,
+              "column": 1
+            }
+          },
+          "param": null,
+          "body": {
+            "type": "BlockStatement",
+            "start": 15,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 6
+              },
+              "end": {
+                "line": 6,
+                "column": 1
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        },
+        "finalizer": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/declaration-function/dupe-param/options.json b/packages/babel-parser/test/fixtures/esprima/declaration-function/dupe-param/options.json
index e23388601bb0..8b20b9a7df36 100644
--- a/packages/babel-parser/test/fixtures/esprima/declaration-function/dupe-param/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/declaration-function/dupe-param/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:14)"
+  "throws": "Argument name clash (1:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-binding-pattern/invalid-dup-param/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-binding-pattern/invalid-dup-param/options.json
index 34197d2efee7..a4a6e207d28c 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-binding-pattern/invalid-dup-param/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-array-binding-pattern/invalid-dup-param/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:11)"
+  "throws": "Argument name clash (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-1/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-1/options.json
index d498cd8bd087..49e8d8e86314 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-1/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-1/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (2:14)"
+  "throws": "Argument name clash (2:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-2/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-2/options.json
index e3176a8e57eb..3829082a4878 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-2/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-2/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (2:17)"
+  "throws": "Argument name clash (2:17)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-3/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-3/options.json
index 2d74a95450d0..782073313a19 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-3/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/dupe-param-3/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (2:19)"
+  "throws": "Argument name clash (2:19)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/output.json
index 3074e479af9d..91b847669991 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/empty-pattern-catch-param/output.json
@@ -108,7 +108,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch-dupe/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch-dupe/input.js
deleted file mode 100644
index 417d6fc8492f..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch-dupe/input.js
+++ /dev/null
@@ -1 +0,0 @@
-try {} catch ([a,a]) {}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch-dupe/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch-dupe/options.json
deleted file mode 100644
index 7d5bec6e9b7b..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch-dupe/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Argument name clash in strict mode (1:17)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch/output.json
index 3dd5d0d3ca93..48dd0332f9cd 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/patterned-catch/output.json
@@ -476,7 +476,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/output.json
index 7a2f7e482fae..3ea9eda80fdc 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-array-pattern/with-default-catch-param/output.json
@@ -161,7 +161,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-rest/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-rest/options.json
index 2da83bcd6f69..daa827f45cc4 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-rest/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/arrow-with-multiple-rest/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \")\" (1:5)"
+  "throws": "Rest element must be last element (1:5)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/complex-rest-in-arrow-not-allowed/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/complex-rest-in-arrow-not-allowed/options.json
index 4ebe77e8fc2b..fd74c5228531 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/complex-rest-in-arrow-not-allowed/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/complex-rest-in-arrow-not-allowed/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:7)"
+  "throws": "Argument name clash (1:7)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-duplicated-params/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-duplicated-params/options.json
index 0590c2b7e6bf..368006ae58bd 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-duplicated-params/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-duplicated-params/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:4)"
+  "throws": "Argument name clash (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json
index e0027065afb7..2e6d7156cf57 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:0)"
-}
+  "throws": "Binding 'eval' in strict mode (1:0)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-01.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-01.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/output.json
new file mode 100644
index 000000000000..04622ffb5ea7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-01/output.json
@@ -0,0 +1,370 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 25
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 25
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 25
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 1,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 2,
+                  "end": 3,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 3
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 4,
+                  "end": 7,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 7
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 4,
+                    "end": 5,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 5
+                      },
+                      "identifierName": "b"
+                    },
+                    "name": "b"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "AssignmentPattern",
+                    "start": 4,
+                    "end": 7,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 7
+                      }
+                    },
+                    "left": {
+                      "type": "Identifier",
+                      "start": 4,
+                      "end": 5,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 5
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b"
+                    },
+                    "right": {
+                      "type": "Identifier",
+                      "start": 6,
+                      "end": 7,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 7
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b"
+                    }
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 8,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 9,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 9
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "identifierName": "c"
+                    },
+                    "name": "c"
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 12,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "method": false,
+                  "computed": true,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 13,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "shorthand": false,
+                  "value": {
+                    "type": "ArrayPattern",
+                    "start": 16,
+                    "end": 19,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 19
+                      }
+                    },
+                    "elements": [
+                      {
+                        "type": "Identifier",
+                        "start": 17,
+                        "end": 18,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 17
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "identifierName": "d"
+                        },
+                        "name": "d"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 23,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 23
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-empty.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/object-binding-pattern-empty.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/output.json
new file mode 100644
index 000000000000..6a745736a149
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-empty/output.json
@@ -0,0 +1,106 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 8,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 8,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 1,
+              "end": 3,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 3
+                }
+              },
+              "properties": []
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 6,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/options.json
new file mode 100644
index 000000000000..bf0f292caad2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-member-expr/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid left-hand side in object destructuring pattern (1:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/options.json
new file mode 100644
index 000000000000..559cc4e11a41
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-method-in-pattern/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Object pattern can't contain getter or setter (1:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/options.json
new file mode 100644
index 000000000000..30f209db8f07
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-nested-param/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid left-hand side in object destructuring pattern (1:24)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/options.json
new file mode 100644
index 000000000000..e24c4dce39b6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-pattern-without-parenthesis/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:3)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/output.json
new file mode 100644
index 000000000000..7061f23c0fb3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-invalid-rest-in-object-pattern/output.json
@@ -0,0 +1,194 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 1,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 2,
+                  "end": 3,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 3
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 2,
+                    "end": 3,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                },
+                {
+                  "type": "RestElement",
+                  "start": 4,
+                  "end": 8,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 8
+                    }
+                  },
+                  "argument": {
+                    "type": "Identifier",
+                    "start": 7,
+                    "end": 8,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 7
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "identifierName": "b"
+                    },
+                    "name": "b"
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 14,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 14
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/nested-cover-grammar.js b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/nested-cover-grammar.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/output.json
new file mode 100644
index 000000000000..81e10cda57c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern-nested-cover-grammar/output.json
@@ -0,0 +1,534 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 51,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 51
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 51,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 51
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 51,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 51
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 50,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 50
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ArrayPattern",
+              "start": 1,
+              "end": 46,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 46
+                }
+              },
+              "elements": [
+                {
+                  "type": "ArrayPattern",
+                  "start": 2,
+                  "end": 45,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 45
+                    }
+                  },
+                  "elements": [
+                    {
+                      "type": "ArrayPattern",
+                      "start": 3,
+                      "end": 44,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 3
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 44
+                        }
+                      },
+                      "elements": [
+                        {
+                          "type": "ArrayPattern",
+                          "start": 4,
+                          "end": 43,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 4
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 43
+                            }
+                          },
+                          "elements": [
+                            {
+                              "type": "ArrayPattern",
+                              "start": 5,
+                              "end": 42,
+                              "loc": {
+                                "start": {
+                                  "line": 1,
+                                  "column": 5
+                                },
+                                "end": {
+                                  "line": 1,
+                                  "column": 42
+                                }
+                              },
+                              "elements": [
+                                {
+                                  "type": "ArrayPattern",
+                                  "start": 6,
+                                  "end": 41,
+                                  "loc": {
+                                    "start": {
+                                      "line": 1,
+                                      "column": 6
+                                    },
+                                    "end": {
+                                      "line": 1,
+                                      "column": 41
+                                    }
+                                  },
+                                  "elements": [
+                                    {
+                                      "type": "ArrayPattern",
+                                      "start": 7,
+                                      "end": 40,
+                                      "loc": {
+                                        "start": {
+                                          "line": 1,
+                                          "column": 7
+                                        },
+                                        "end": {
+                                          "line": 1,
+                                          "column": 40
+                                        }
+                                      },
+                                      "elements": [
+                                        {
+                                          "type": "ArrayPattern",
+                                          "start": 8,
+                                          "end": 39,
+                                          "loc": {
+                                            "start": {
+                                              "line": 1,
+                                              "column": 8
+                                            },
+                                            "end": {
+                                              "line": 1,
+                                              "column": 39
+                                            }
+                                          },
+                                          "elements": [
+                                            {
+                                              "type": "ArrayPattern",
+                                              "start": 9,
+                                              "end": 38,
+                                              "loc": {
+                                                "start": {
+                                                  "line": 1,
+                                                  "column": 9
+                                                },
+                                                "end": {
+                                                  "line": 1,
+                                                  "column": 38
+                                                }
+                                              },
+                                              "elements": [
+                                                {
+                                                  "type": "ArrayPattern",
+                                                  "start": 10,
+                                                  "end": 37,
+                                                  "loc": {
+                                                    "start": {
+                                                      "line": 1,
+                                                      "column": 10
+                                                    },
+                                                    "end": {
+                                                      "line": 1,
+                                                      "column": 37
+                                                    }
+                                                  },
+                                                  "elements": [
+                                                    {
+                                                      "type": "ArrayPattern",
+                                                      "start": 11,
+                                                      "end": 36,
+                                                      "loc": {
+                                                        "start": {
+                                                          "line": 1,
+                                                          "column": 11
+                                                        },
+                                                        "end": {
+                                                          "line": 1,
+                                                          "column": 36
+                                                        }
+                                                      },
+                                                      "elements": [
+                                                        {
+                                                          "type": "ArrayPattern",
+                                                          "start": 12,
+                                                          "end": 35,
+                                                          "loc": {
+                                                            "start": {
+                                                              "line": 1,
+                                                              "column": 12
+                                                            },
+                                                            "end": {
+                                                              "line": 1,
+                                                              "column": 35
+                                                            }
+                                                          },
+                                                          "elements": [
+                                                            {
+                                                              "type": "ArrayPattern",
+                                                              "start": 13,
+                                                              "end": 34,
+                                                              "loc": {
+                                                                "start": {
+                                                                  "line": 1,
+                                                                  "column": 13
+                                                                },
+                                                                "end": {
+                                                                  "line": 1,
+                                                                  "column": 34
+                                                                }
+                                                              },
+                                                              "elements": [
+                                                                {
+                                                                  "type": "ArrayPattern",
+                                                                  "start": 14,
+                                                                  "end": 33,
+                                                                  "loc": {
+                                                                    "start": {
+                                                                      "line": 1,
+                                                                      "column": 14
+                                                                    },
+                                                                    "end": {
+                                                                      "line": 1,
+                                                                      "column": 33
+                                                                    }
+                                                                  },
+                                                                  "elements": [
+                                                                    {
+                                                                      "type": "ArrayPattern",
+                                                                      "start": 15,
+                                                                      "end": 32,
+                                                                      "loc": {
+                                                                        "start": {
+                                                                          "line": 1,
+                                                                          "column": 15
+                                                                        },
+                                                                        "end": {
+                                                                          "line": 1,
+                                                                          "column": 32
+                                                                        }
+                                                                      },
+                                                                      "elements": [
+                                                                        {
+                                                                          "type": "ArrayPattern",
+                                                                          "start": 16,
+                                                                          "end": 31,
+                                                                          "loc": {
+                                                                            "start": {
+                                                                              "line": 1,
+                                                                              "column": 16
+                                                                            },
+                                                                            "end": {
+                                                                              "line": 1,
+                                                                              "column": 31
+                                                                            }
+                                                                          },
+                                                                          "elements": [
+                                                                            {
+                                                                              "type": "ArrayPattern",
+                                                                              "start": 17,
+                                                                              "end": 30,
+                                                                              "loc": {
+                                                                                "start": {
+                                                                                  "line": 1,
+                                                                                  "column": 17
+                                                                                },
+                                                                                "end": {
+                                                                                  "line": 1,
+                                                                                  "column": 30
+                                                                                }
+                                                                              },
+                                                                              "elements": [
+                                                                                {
+                                                                                  "type": "ArrayPattern",
+                                                                                  "start": 18,
+                                                                                  "end": 29,
+                                                                                  "loc": {
+                                                                                    "start": {
+                                                                                      "line": 1,
+                                                                                      "column": 18
+                                                                                    },
+                                                                                    "end": {
+                                                                                      "line": 1,
+                                                                                      "column": 29
+                                                                                    }
+                                                                                  },
+                                                                                  "elements": [
+                                                                                    {
+                                                                                      "type": "ArrayPattern",
+                                                                                      "start": 19,
+                                                                                      "end": 28,
+                                                                                      "loc": {
+                                                                                        "start": {
+                                                                                          "line": 1,
+                                                                                          "column": 19
+                                                                                        },
+                                                                                        "end": {
+                                                                                          "line": 1,
+                                                                                          "column": 28
+                                                                                        }
+                                                                                      },
+                                                                                      "elements": [
+                                                                                        {
+                                                                                          "type": "ArrayPattern",
+                                                                                          "start": 20,
+                                                                                          "end": 27,
+                                                                                          "loc": {
+                                                                                            "start": {
+                                                                                              "line": 1,
+                                                                                              "column": 20
+                                                                                            },
+                                                                                            "end": {
+                                                                                              "line": 1,
+                                                                                              "column": 27
+                                                                                            }
+                                                                                          },
+                                                                                          "elements": [
+                                                                                            {
+                                                                                              "type": "ObjectPattern",
+                                                                                              "start": 21,
+                                                                                              "end": 26,
+                                                                                              "loc": {
+                                                                                                "start": {
+                                                                                                  "line": 1,
+                                                                                                  "column": 21
+                                                                                                },
+                                                                                                "end": {
+                                                                                                  "line": 1,
+                                                                                                  "column": 26
+                                                                                                }
+                                                                                              },
+                                                                                              "properties": [
+                                                                                                {
+                                                                                                  "type": "ObjectProperty",
+                                                                                                  "start": 22,
+                                                                                                  "end": 25,
+                                                                                                  "loc": {
+                                                                                                    "start": {
+                                                                                                      "line": 1,
+                                                                                                      "column": 22
+                                                                                                    },
+                                                                                                    "end": {
+                                                                                                      "line": 1,
+                                                                                                      "column": 25
+                                                                                                    }
+                                                                                                  },
+                                                                                                  "method": false,
+                                                                                                  "key": {
+                                                                                                    "type": "Identifier",
+                                                                                                    "start": 22,
+                                                                                                    "end": 23,
+                                                                                                    "loc": {
+                                                                                                      "start": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 22
+                                                                                                      },
+                                                                                                      "end": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 23
+                                                                                                      },
+                                                                                                      "identifierName": "a"
+                                                                                                    },
+                                                                                                    "name": "a"
+                                                                                                  },
+                                                                                                  "computed": false,
+                                                                                                  "shorthand": true,
+                                                                                                  "value": {
+                                                                                                    "type": "AssignmentPattern",
+                                                                                                    "start": 22,
+                                                                                                    "end": 25,
+                                                                                                    "loc": {
+                                                                                                      "start": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 22
+                                                                                                      },
+                                                                                                      "end": {
+                                                                                                        "line": 1,
+                                                                                                        "column": 25
+                                                                                                      }
+                                                                                                    },
+                                                                                                    "left": {
+                                                                                                      "type": "Identifier",
+                                                                                                      "start": 22,
+                                                                                                      "end": 23,
+                                                                                                      "loc": {
+                                                                                                        "start": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 22
+                                                                                                        },
+                                                                                                        "end": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 23
+                                                                                                        },
+                                                                                                        "identifierName": "a"
+                                                                                                      },
+                                                                                                      "name": "a"
+                                                                                                    },
+                                                                                                    "right": {
+                                                                                                      "type": "Identifier",
+                                                                                                      "start": 24,
+                                                                                                      "end": 25,
+                                                                                                      "loc": {
+                                                                                                        "start": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 24
+                                                                                                        },
+                                                                                                        "end": {
+                                                                                                          "line": 1,
+                                                                                                          "column": 25
+                                                                                                        },
+                                                                                                        "identifierName": "b"
+                                                                                                      },
+                                                                                                      "name": "b"
+                                                                                                    }
+                                                                                                  },
+                                                                                                  "extra": {
+                                                                                                    "shorthand": true
+                                                                                                  }
+                                                                                                }
+                                                                                              ]
+                                                                                            }
+                                                                                          ]
+                                                                                        }
+                                                                                      ]
+                                                                                    }
+                                                                                  ]
+                                                                                }
+                                                                              ]
+                                                                            }
+                                                                          ]
+                                                                        }
+                                                                      ]
+                                                                    }
+                                                                  ]
+                                                                }
+                                                              ]
+                                                            }
+                                                          ]
+                                                        }
+                                                      ]
+                                                    }
+                                                  ]
+                                                }
+                                              ]
+                                            }
+                                          ]
+                                        }
+                                      ]
+                                    }
+                                  ]
+                                }
+                              ]
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 49,
+            "end": 50,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 49
+              },
+              "end": {
+                "line": 1,
+                "column": 50
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.failure.json
deleted file mode 100755
index 8245542d3dc4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-member-expr.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":10,"lineNumber":1,"column":11,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.failure.json
deleted file mode 100755
index 030f8f3752df..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-method-in-pattern.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":14,"lineNumber":1,"column":15,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.failure.json
deleted file mode 100755
index 08ba5aca74a1..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-nested-param.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":50,"lineNumber":1,"column":51,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.failure.json
deleted file mode 100755
index b0c1b45f778c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-pattern-without-parenthesis.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":3,"lineNumber":1,"column":4,"message":"Error: Line 1: Unexpected token =>","description":"Unexpected token =>"}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.failure.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.failure.json
deleted file mode 100755
index 6551a4757991..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/invalid-rest-in-object-pattern.failure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"index":4,"lineNumber":1,"column":5,"message":"Error: Line 1: Unexpected token ...","description":"Unexpected token ..."}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-arrow-function/object-binding-pattern/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/input.js
index 5d32a24de0a9..974ab55e4371 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/input.js
@@ -1 +1,2 @@
 export {foo as default};
+var foo;
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/output.json
index c3d6819265c2..ab9dd47bd5f1 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-default/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 24,
+  "end": 33,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 24
+      "line": 2,
+      "column": 8
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 24,
+    "end": 33,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 24
+        "line": 2,
+        "column": 8
       }
     },
     "sourceType": "module",
@@ -43,7 +43,6 @@
             "column": 24
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
@@ -95,7 +94,59 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 25,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 29,
+            "end": 32,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 29,
+              "end": 32,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/input.js
index e7820a6f027c..1d873bf86024 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/input.js
@@ -1 +1,2 @@
+var foo, bar;
 export {foo as bar};
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/output.json
index e1652693b14f..0b8670ce2ef3 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifier/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 20,
+  "end": 34,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
+      "line": 2,
       "column": 20
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 20,
+    "end": 34,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
+        "line": 2,
         "column": 20
       }
     },
@@ -30,9 +30,9 @@
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "VariableDeclaration",
         "start": 0,
-        "end": 20,
+        "end": 13,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,119 @@
           },
           "end": {
             "line": 1,
+            "column": 13
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          },
+          {
+            "type": "VariableDeclarator",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 14,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
             "column": 20
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 8,
-            "end": 18,
+            "start": 22,
+            "end": 32,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 8
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 18
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 8,
-              "end": 11,
+              "start": 22,
+              "end": 25,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 8
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 11
                 },
                 "identifierName": "foo"
@@ -78,15 +161,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 15,
-              "end": 18,
+              "start": 29,
+              "end": 32,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 15
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 18
                 },
                 "identifierName": "bar"
@@ -95,7 +178,8 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/input.js
index ff57927839e8..f0218dfca8ab 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/input.js
@@ -1 +1,2 @@
 export {foo as default, bar};
+var foo, bar;
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/output.json
index 8114c32e2924..2a876f042ed1 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-as-specifiers/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 29,
+  "end": 43,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 29
+      "line": 2,
+      "column": 13
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 29,
+    "end": 43,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 29
+        "line": 2,
+        "column": 13
       }
     },
     "sourceType": "module",
@@ -43,7 +43,6 @@
             "column": 29
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
@@ -144,7 +143,92 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 30,
+        "end": 43,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 13
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 34,
+            "end": 37,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 34,
+              "end": 37,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          },
+          {
+            "type": "VariableDeclarator",
+            "start": 39,
+            "end": 42,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 12
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 39,
+              "end": 42,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 9
+                },
+                "end": {
+                  "line": 2,
+                  "column": 12
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/input.js
index df5f5e609e93..1c36f4346199 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/input.js
@@ -1 +1,2 @@
+let foo;
 export {foo};
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/output.json
index 49c37926ad3c..4faa60a28feb 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifier/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 13,
+  "end": 22,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
+      "line": 2,
       "column": 13
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 13,
+    "end": 22,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
+        "line": 2,
         "column": 13
       }
     },
@@ -30,9 +30,9 @@
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "VariableDeclaration",
         "start": 0,
-        "end": 13,
+        "end": 8,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,86 @@
           },
           "end": {
             "line": 1,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 9,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
             "column": 13
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 8,
-            "end": 11,
+            "start": 17,
+            "end": 20,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 8
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 11
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 8,
-              "end": 11,
+              "start": 17,
+              "end": 20,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 8
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 11
                 },
                 "identifierName": "foo"
@@ -78,15 +128,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 8,
-              "end": 11,
+              "start": 17,
+              "end": 20,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 8
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 11
                 },
                 "identifierName": "foo"
@@ -95,7 +145,8 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/input.js
index 61bc40fd77ea..12c55903d5e5 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/input.js
@@ -1 +1,3 @@
+var bar;
 export {foo, bar,};
+var foo;
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/output.json
index 0c439126a9ac..3616570c157d 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers-comma/output.json
@@ -1,38 +1,38 @@
 {
   "type": "File",
   "start": 0,
-  "end": 19,
+  "end": 37,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 19
+      "line": 3,
+      "column": 8
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 19,
+    "end": 37,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 19
+        "line": 3,
+        "column": 8
       }
     },
     "sourceType": "module",
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "VariableDeclaration",
         "start": 0,
-        "end": 19,
+        "end": 8,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,86 @@
           },
           "end": {
             "line": 1,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 9,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
             "column": 19
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 8,
-            "end": 11,
+            "start": 17,
+            "end": 20,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 8
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 11
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 8,
-              "end": 11,
+              "start": 17,
+              "end": 20,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 8
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 11
                 },
                 "identifierName": "foo"
@@ -78,15 +128,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 8,
-              "end": 11,
+              "start": 17,
+              "end": 20,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 8
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 11
                 },
                 "identifierName": "foo"
@@ -96,29 +146,29 @@
           },
           {
             "type": "ExportSpecifier",
-            "start": 13,
-            "end": 16,
+            "start": 22,
+            "end": 25,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 13
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 16
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 13,
-              "end": 16,
+              "start": 22,
+              "end": 25,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 13
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 16
                 },
                 "identifierName": "bar"
@@ -127,15 +177,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 13,
-              "end": 16,
+              "start": 22,
+              "end": 25,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 13
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 16
                 },
                 "identifierName": "bar"
@@ -144,7 +194,59 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 29,
+        "end": 37,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 33,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 4
+              },
+              "end": {
+                "line": 3,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 33,
+              "end": 36,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/input.js
index fdbc94275097..8e2977a9e757 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/input.js
@@ -1 +1,3 @@
+var foo;
 export {foo, bar};
+var bar;
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/output.json
index b28aaf0d65e4..51d2d56a1f4d 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/export-named-specifiers/output.json
@@ -1,38 +1,38 @@
 {
   "type": "File",
   "start": 0,
-  "end": 18,
+  "end": 36,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 18
+      "line": 3,
+      "column": 8
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 18,
+    "end": 36,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 18
+        "line": 3,
+        "column": 8
       }
     },
     "sourceType": "module",
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "VariableDeclaration",
         "start": 0,
-        "end": 18,
+        "end": 8,
         "loc": {
           "start": {
             "line": 1,
@@ -40,36 +40,86 @@
           },
           "end": {
             "line": 1,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 9,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
             "column": 18
           }
         },
-        "declaration": null,
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 8,
-            "end": 11,
+            "start": 17,
+            "end": 20,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 8
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 11
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 8,
-              "end": 11,
+              "start": 17,
+              "end": 20,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 8
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 11
                 },
                 "identifierName": "foo"
@@ -78,15 +128,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 8,
-              "end": 11,
+              "start": 17,
+              "end": 20,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 8
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 11
                 },
                 "identifierName": "foo"
@@ -96,29 +146,29 @@
           },
           {
             "type": "ExportSpecifier",
-            "start": 13,
-            "end": 16,
+            "start": 22,
+            "end": 25,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 13
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 16
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 13,
-              "end": 16,
+              "start": 22,
+              "end": 25,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 13
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 16
                 },
                 "identifierName": "bar"
@@ -127,15 +177,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 13,
-              "end": 16,
+              "start": 22,
+              "end": 25,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 13
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 16
                 },
                 "identifierName": "bar"
@@ -144,7 +194,59 @@
             }
           }
         ],
-        "source": null
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 28,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 32,
+            "end": 35,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 4
+              },
+              "end": {
+                "line": 3,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 32,
+              "end": 35,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 7
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json
index e806dd7b3a52..b6ce2c43af87 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json
@@ -1,3 +1,4 @@
 {
-  "throws": "Unexpected token (1:17)"
-}
+  "sourceType": "module",
+  "throws": "Unexpected token, expected \";\" (1:17)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json
index a477c8ff309f..689ff73f73f7 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json
index 4c07f39d1731..e03d273fdcd5 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json
@@ -1,3 +1,4 @@
 {
-  "throws": "Unexpected token (1:16)"
-}
+  "sourceType": "module",
+  "throws": "Unexpected keyword 'default' (1:8)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-const-init/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-const-init/options.json
index 85e8252d6fda..c145a86bc613 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-const-init/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-const-init/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:17)"
-}
+  "throws": "for-of loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-let-init/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-let-init/options.json
index a717ca0fa7e7..c145a86bc613 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-let-init/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-let-init/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:15)"
-}
+  "throws": "for-of loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-var-init/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-var-init/options.json
index a717ca0fa7e7..c145a86bc613 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-var-init/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-for-of/invalid-var-init/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:15)"
-}
+  "throws": "for-of loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js
index e66fe1911ad6..2c0ed701dcf9 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/.invalid_lone_surrogate/input.js
@@ -1 +1 @@
-var source = '\uD800!';
+\uD800!
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_expression_await/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_expression_await/options.json
index 1bc235c3d934..afbed324e92a 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_expression_await/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_expression_await/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "'import' and 'export' may appear only with 'sourceType: \"module\"' (1:0)"
+  "throws": "'import' and 'export' may appear only with 'sourceType: \"module\"' (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_var_await/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_var_await/options.json
index 1bc235c3d934..afbed324e92a 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_var_await/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-identifier/invalid_var_await/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "'import' and 'export' may appear only with 'sourceType: \"module\"' (1:0)"
+  "throws": "'import' and 'export' may appear only with 'sourceType: \"module\"' (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_const_forin/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_const_forin/options.json
index 85e8252d6fda..dd3b73e5d533 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_const_forin/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_const_forin/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:17)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_let_forin/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_let_forin/options.json
index a717ca0fa7e7..dd3b73e5d533 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_let_forin/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-lexical-declaration/invalid_let_forin/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \";\" (1:15)"
-}
+  "throws": "for-in loop variable declaration may not have an initializer (1:5)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/options.json
deleted file mode 100644
index 5c966843f4fa..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Redefinition of __proto__ property (1:20)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/options.json
deleted file mode 100644
index e19950ad14df..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Redefinition of __proto__ property (1:22)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/options.json
deleted file mode 100644
index a8b5ad2f5b20..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Redefinition of __proto__ property (1:14)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/options.json
deleted file mode 100644
index a8b5ad2f5b20..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Redefinition of __proto__ property (1:14)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/options.json
deleted file mode 100644
index a8b5ad2f5b20..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Redefinition of __proto__ property (1:14)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-shorthand/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/input.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-shorthand/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-shorthand/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-shorthand/output.json
new file mode 100644
index 000000000000..20867c4f1d25
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-identifier-shorthand/output.json
@@ -0,0 +1,176 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 31
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 3,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NullLiteral",
+                "start": 14,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                }
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 20,
+              "end": 29,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 20
+                },
+                "end": {
+                  "line": 1,
+                  "column": 29
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 20,
+                "end": 29,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 29
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": true,
+              "value": {
+                "type": "Identifier",
+                "start": 20,
+                "end": 29,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 29
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "extra": {
+                "shorthand": true
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-literal-shorthand/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/input.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-literal-shorthand/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-literal-shorthand/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-literal-shorthand/output.json
new file mode 100644
index 000000000000..43f28e81ab32
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-literal-shorthand/output.json
@@ -0,0 +1,179 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 33
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 3,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "StringLiteral",
+                "start": 3,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": "__proto__",
+                  "raw": "\"__proto__\""
+                },
+                "value": "__proto__"
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NullLiteral",
+                "start": 16,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                }
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 22,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 22,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": true,
+              "value": {
+                "type": "Identifier",
+                "start": 22,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "extra": {
+                "shorthand": true
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-identifier/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/input.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-identifier/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-identifier/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-identifier/output.json
new file mode 100644
index 000000000000..28fc9127cd03
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-identifier/output.json
@@ -0,0 +1,176 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 31
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 3,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": true,
+              "value": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "extra": {
+                "shorthand": true
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 14,
+              "end": 29,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 29
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 23
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NullLiteral",
+                "start": 25,
+                "end": 29,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 25
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 29
+                  }
+                }
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-literal/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/input.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-literal/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-literal/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-literal/output.json
new file mode 100644
index 000000000000..5bfefd1a3925
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthand-literal/output.json
@@ -0,0 +1,179 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 33
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 3,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": true,
+              "value": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "extra": {
+                "shorthand": true
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 14,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "StringLiteral",
+                "start": 14,
+                "end": 25,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 25
+                  }
+                },
+                "extra": {
+                  "rawValue": "__proto__",
+                  "raw": "\"__proto__\""
+                },
+                "value": "__proto__"
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NullLiteral",
+                "start": 27,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 27
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  }
+                }
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthands/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/input.js
rename to packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthands/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthands/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthands/output.json
new file mode 100644
index 000000000000..23f3d43707e1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-object-initialiser/proto-shorthands/output.json
@@ -0,0 +1,181 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 26,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 26
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 26,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 26
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 26,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 26
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 25
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 3,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": true,
+              "value": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "extra": {
+                "shorthand": true
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 14,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 23
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 23
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "computed": false,
+              "shorthand": true,
+              "value": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 23
+                  },
+                  "identifierName": "__proto__"
+                },
+                "name": "__proto__"
+              },
+              "extra": {
+                "shorthand": true
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/output.json
index 8cd3932ae874..528fb144b23c 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-object-pattern/empty-catch-param/output.json
@@ -108,7 +108,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js
index 2f6bc5fc687d..c0cf1cd90706 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/input.js
@@ -1 +1 @@
-var source = '`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`';
+`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json
index c18d75ba278e..27c7864d3380 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/escape-sequences/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 46,
+  "end": 30,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 46
+      "column": 30
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 46,
+    "end": 30,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,16 @@
       },
       "end": {
         "line": 1,
-        "column": 46
+        "column": 30
       }
     },
     "sourceType": "script",
     "interpreter": null,
     "body": [
       {
-        "type": "VariableDeclaration",
+        "type": "ExpressionStatement",
         "start": 0,
-        "end": 46,
+        "end": 30,
         "loc": {
           "start": {
             "line": 1,
@@ -40,64 +40,47 @@
           },
           "end": {
             "line": 1,
-            "column": 46
+            "column": 30
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 45,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 45
-              }
+        "expression": {
+          "type": "TemplateLiteral",
+          "start": 0,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 45,
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "expressions": [],
+          "quasis": [
+            {
+              "type": "TemplateElement",
+              "start": 1,
+              "end": 29,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 1
                 },
                 "end": {
                   "line": 1,
-                  "column": 45
+                  "column": 29
                 }
               },
-              "extra": {
-                "rawValue": "`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`",
-                "raw": "'`\\\\n\\\\r\\\\b\\\\v\\\\t\\\\f\\\\\\n\\\\\\r\\n`'"
+              "value": {
+                "raw": "\\\\n\\\\r\\\\b\\\\v\\\\t\\\\f\\\\\\n\\\\\\r\\n",
+                "cooked": "\\n\\r\\b\\v\\t\\f\\\n\\\r\n"
               },
-              "value": "`\\n\\r\\b\\v\\t\\f\\\n\\\r\n`"
+              "tail": true
             }
-          }
-        ],
-        "kind": "var"
+          ]
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js
index c5468af67d5c..b4cd5b9e3fe3 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/input.js
@@ -1 +1 @@
-var source = '`\n\r\n`';
+`\n\r\n`
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json
index 14e7c4f0b58a..3987e50bf77c 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/line-terminators/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 24,
+  "end": 8,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 24
+      "column": 8
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 24,
+    "end": 8,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,16 @@
       },
       "end": {
         "line": 1,
-        "column": 24
+        "column": 8
       }
     },
     "sourceType": "script",
     "interpreter": null,
     "body": [
       {
-        "type": "VariableDeclaration",
+        "type": "ExpressionStatement",
         "start": 0,
-        "end": 24,
+        "end": 8,
         "loc": {
           "start": {
             "line": 1,
@@ -40,64 +40,47 @@
           },
           "end": {
             "line": 1,
-            "column": 24
+            "column": 8
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 23,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 23
-              }
+        "expression": {
+          "type": "TemplateLiteral",
+          "start": 0,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 23,
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "expressions": [],
+          "quasis": [
+            {
+              "type": "TemplateElement",
+              "start": 1,
+              "end": 7,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 1
                 },
                 "end": {
                   "line": 1,
-                  "column": 23
+                  "column": 7
                 }
               },
-              "extra": {
-                "rawValue": "`\n\r\n`",
-                "raw": "'`\\n\\r\\n`'"
+              "value": {
+                "raw": "\\n\\r\\n",
+                "cooked": "\n\r\n"
               },
-              "value": "`\n\r\n`"
+              "tail": true
             }
-          }
-        ],
-        "kind": "var"
+          ]
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js
index f8f6e9a34efd..5e0285e4f5ef 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/input.js
@@ -1 +1 @@
-var source = '`\\u{000042}\\u0042\\x42\\u0\\A\\0`';
+`\\u{000042}\\u0042\\x42\\u0\\A\\0`
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json
index 05b8880ba5c8..5aa224c4dff5 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-template-literals/literal-escape-sequences/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 51,
+  "end": 35,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 51
+      "column": 35
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 51,
+    "end": 35,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,16 @@
       },
       "end": {
         "line": 1,
-        "column": 51
+        "column": 35
       }
     },
     "sourceType": "script",
     "interpreter": null,
     "body": [
       {
-        "type": "VariableDeclaration",
+        "type": "ExpressionStatement",
         "start": 0,
-        "end": 51,
+        "end": 35,
         "loc": {
           "start": {
             "line": 1,
@@ -40,64 +40,47 @@
           },
           "end": {
             "line": 1,
-            "column": 51
+            "column": 35
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 50,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 50
-              }
+        "expression": {
+          "type": "TemplateLiteral",
+          "start": 0,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 50,
+            "end": {
+              "line": 1,
+              "column": 35
+            }
+          },
+          "expressions": [],
+          "quasis": [
+            {
+              "type": "TemplateElement",
+              "start": 1,
+              "end": 34,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 13
+                  "column": 1
                 },
                 "end": {
                   "line": 1,
-                  "column": 50
+                  "column": 34
                 }
               },
-              "extra": {
-                "rawValue": "`\\u{000042}\\u0042\\x42\\u0\\A\\0`",
-                "raw": "'`\\\\u{000042}\\\\u0042\\\\x42\\\\u0\\\\A\\\\0`'"
+              "value": {
+                "raw": "\\\\u{000042}\\\\u0042\\\\x42\\\\u0\\\\A\\\\0",
+                "cooked": "\\u{000042}\\u0042\\x42\\u0\\A\\0"
               },
-              "value": "`\\u{000042}\\u0042\\x42\\u0\\A\\0`"
+              "tail": true
             }
-          }
-        ],
-        "kind": "var"
+          ]
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js
index 1d5ecf6f7c79..73c930d32dd2 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/input.js
@@ -1 +1 @@
-var source = '"\\u{714E}\\u{8336}"';
+"\\u{714E}\\u{8336}"
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json
index 65a14f7cbe7b..6cf40d966283 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0000/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 36,
+  "end": 20,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 36
+      "column": 20
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 36,
+    "end": 20,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,17 @@
       },
       "end": {
         "line": 1,
-        "column": 36
+        "column": 20
       }
     },
     "sourceType": "script",
     "interpreter": null,
-    "body": [
+    "body": [],
+    "directives": [
       {
-        "type": "VariableDeclaration",
+        "type": "Directive",
         "start": 0,
-        "end": 36,
+        "end": 20,
         "loc": {
           "start": {
             "line": 1,
@@ -40,66 +41,30 @@
           },
           "end": {
             "line": 1,
-            "column": 36
+            "column": 20
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 35,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 35
-              }
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 35,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 35
-                }
-              },
-              "extra": {
-                "rawValue": "\"\\u{714E}\\u{8336}\"",
-                "raw": "'\"\\\\u{714E}\\\\u{8336}\"'"
-              },
-              "value": "\"\\u{714E}\\u{8336}\""
+            "end": {
+              "line": 1,
+              "column": 20
             }
+          },
+          "value": "\\\\u{714E}\\\\u{8336}",
+          "extra": {
+            "raw": "\"\\\\u{714E}\\\\u{8336}\"",
+            "rawValue": "\\\\u{714E}\\\\u{8336}"
           }
-        ],
-        "kind": "var"
+        }
       }
-    ],
-    "directives": []
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js
index fd2a94179aac..38330ee5cadd 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/input.js
@@ -1 +1 @@
-var source = '"\\u{20BB7}\\u{91CE}\\u{5BB6}"';
+"\\u{20BB7}\\u{91CE}\\u{5BB6}"
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json
index 66ef7c611364..3f3b3439082c 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0001/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 46,
+  "end": 30,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 46
+      "column": 30
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 46,
+    "end": 30,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,17 @@
       },
       "end": {
         "line": 1,
-        "column": 46
+        "column": 30
       }
     },
     "sourceType": "script",
     "interpreter": null,
-    "body": [
+    "body": [],
+    "directives": [
       {
-        "type": "VariableDeclaration",
+        "type": "Directive",
         "start": 0,
-        "end": 46,
+        "end": 30,
         "loc": {
           "start": {
             "line": 1,
@@ -40,66 +41,30 @@
           },
           "end": {
             "line": 1,
-            "column": 46
+            "column": 30
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 45,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 45
-              }
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 45,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 45
-                }
-              },
-              "extra": {
-                "rawValue": "\"\\u{20BB7}\\u{91CE}\\u{5BB6}\"",
-                "raw": "'\"\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}\"'"
-              },
-              "value": "\"\\u{20BB7}\\u{91CE}\\u{5BB6}\""
+            "end": {
+              "line": 1,
+              "column": 30
             }
+          },
+          "value": "\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}",
+          "extra": {
+            "raw": "\"\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}\"",
+            "rawValue": "\\\\u{20BB7}\\\\u{91CE}\\\\u{5BB6}"
           }
-        ],
-        "kind": "var"
+        }
       }
-    ],
-    "directives": []
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js
index 582b9f3ab9a0..a7d9d668ad2d 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/input.js
@@ -1 +1 @@
-var source = '"\\u{00000000034}"';
+"\\u{00000000034}"
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json
index 9f9f834e880b..4331e2b8c367 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-unicode-code-point-escape-sequence/migrated_0002/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 34,
+  "end": 18,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 1,
-      "column": 34
+      "column": 18
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 34,
+    "end": 18,
     "loc": {
       "start": {
         "line": 1,
@@ -23,16 +23,17 @@
       },
       "end": {
         "line": 1,
-        "column": 34
+        "column": 18
       }
     },
     "sourceType": "script",
     "interpreter": null,
-    "body": [
+    "body": [],
+    "directives": [
       {
-        "type": "VariableDeclaration",
+        "type": "Directive",
         "start": 0,
-        "end": 34,
+        "end": 18,
         "loc": {
           "start": {
             "line": 1,
@@ -40,66 +41,30 @@
           },
           "end": {
             "line": 1,
-            "column": 34
+            "column": 18
           }
         },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 33,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 33
-              }
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
             },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 33,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 33
-                }
-              },
-              "extra": {
-                "rawValue": "\"\\u{00000000034}\"",
-                "raw": "'\"\\\\u{00000000034}\"'"
-              },
-              "value": "\"\\u{00000000034}\""
+            "end": {
+              "line": 1,
+              "column": 18
             }
+          },
+          "value": "\\\\u{00000000034}",
+          "extra": {
+            "raw": "\"\\\\u{00000000034}\"",
+            "rawValue": "\\\\u{00000000034}"
           }
-        ],
-        "kind": "var"
+        }
       }
-    ],
-    "directives": []
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-default/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-default/options.json
index 31d78f2e57b9..f81e206da65d 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-default/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-default/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (1:21)"
+  "throws": "Yield cannot be used as name inside a generator function (1:21)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameter/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameter/options.json
index 352b04da202c..efa8ac523c48 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameter/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameter/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (1:16)"
+  "throws": "Yield cannot be used as name inside a generator function (1:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameters/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameters/options.json
index 6d7cdbc432ee..185008241333 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameters/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-arrow-parameters/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (1:25)"
+  "throws": "Yield cannot be used as name inside a generator function (1:25)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-catch/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-catch/options.json
index f6b6c33f1a52..8c287a1d5b36 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-catch/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-catch/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:30)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:30)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-declaration/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-declaration/options.json
index afe3c715ca41..3ceff8546d37 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-declaration/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:26)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:26)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-export-default/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-export-default/options.json
index 1bc235c3d934..23a96f285fe4 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-export-default/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-export-default/options.json
@@ -1,4 +1,4 @@
 {
-  "throws":
-    "'import' and 'export' may appear only with 'sourceType: \"module\"' (1:0)"
+  "sourceType": "module",
+  "throws": "Unexpected reserved word 'yield' (1:25)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-name/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-name/options.json
index 5dcc4a89231c..c32eaf81f281 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-name/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-name/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:10)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:10)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-parameter/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-parameter/options.json
index 0db4ce4adca9..28b734910647 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-parameter/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-parameter/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:12)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:12)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-rest/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-rest/options.json
index c689509a341b..aef4d7f4f9a2 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-rest/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-expression-rest/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:18)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-function-declaration/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-function-declaration/options.json
index c6514361e1d4..6993832643f1 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-function-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-function-declaration/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:25)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:25)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-lexical-declaration/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-lexical-declaration/options.json
index f5e8c7d85f54..ad818f81f136 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-lexical-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-lexical-declaration/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:20)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:20)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-parameter/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-parameter/options.json
index 0db4ce4adca9..28b734910647 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-parameter/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-parameter/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:12)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:12)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-rest/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-rest/options.json
index 3d2ca09a6034..c811689d9abd 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-rest/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-rest/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:24)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:24)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-expression/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-expression/options.json
index 525575147202..865e081676d6 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-expression/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-expression/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:46)"
+  "throws": "Unexpected reserved word 'yield' (1:46)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-parameter/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-parameter/options.json
index 4fab5560e7dd..21348af52377 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-parameter/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-strict-function-parameter/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:47)"
+  "throws": "Unexpected reserved word 'yield' (1:47)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-variable-declaration/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-variable-declaration/options.json
index f5e8c7d85f54..ad818f81f136 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-variable-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-generator-variable-declaration/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word inside generator functions (1:20)"
+  "throws": "Can not use 'yield' as identifier inside a generator (1:20)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-array-pattern/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-array-pattern/options.json
index a2857a14add7..e817f30acb5c 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-array-pattern/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-array-pattern/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:16)"
+  "throws": "Unexpected reserved word 'yield' (1:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-default/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-default/options.json
index 1de2e87eff65..e80b46c31b86 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-default/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-default/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:19)"
+  "throws": "Unexpected reserved word 'yield' (1:19)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-name/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-name/options.json
index 05cab66d4e02..27b38d28f986 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-name/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-arrow-parameter-name/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:15)"
+  "throws": "Unexpected reserved word 'yield' (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-binding-element/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-binding-element/options.json
index 997d8d34daa8..5d111aab9319 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-binding-element/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-binding-element/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:23)"
+  "throws": "Unexpected reserved word 'yield' (1:23)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-catch-parameter/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-catch-parameter/options.json
index 84c444f0cd15..01aca4591cea 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-catch-parameter/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-catch-parameter/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:28)"
+  "throws": "Unexpected reserved word 'yield' (1:28)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-formal-parameter/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-formal-parameter/options.json
index eadb0124014d..a4a677fb3136 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-formal-parameter/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-formal-parameter/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:25)"
+  "throws": "Unexpected reserved word 'yield' (1:25)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-declaration/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-declaration/options.json
index cf06e871cca3..091e7958db52 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-declaration/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'yield' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-expression/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-expression/options.json
index c0b0db5cc9f9..1c3817f8e018 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-expression/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-function-expression/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:10)"
-}
+  "throws": "Binding 'yield' in strict mode (1:10)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-identifier/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-identifier/options.json
index 0fa96eb13cd8..412431249548 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-identifier/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-identifier/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:29)"
+  "throws": "Unexpected reserved word 'yield' (1:29)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-lexical-declaration/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-lexical-declaration/options.json
index 773a6f2a5d9c..53a8921cb309 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-lexical-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-lexical-declaration/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:18)"
+  "throws": "Unexpected reserved word 'yield' (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-rest-parameter/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-rest-parameter/options.json
index 84c444f0cd15..01aca4591cea 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-rest-parameter/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-rest-parameter/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:28)"
+  "throws": "Unexpected reserved word 'yield' (1:28)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-variable-declaration/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-variable-declaration/options.json
index 773a6f2a5d9c..53a8921cb309 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-variable-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/invalid-yield-strict-variable-declaration/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:18)"
+  "throws": "Unexpected reserved word 'yield' (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-catch-parameter/output.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-catch-parameter/output.json
index 310a6b5e033c..1fad434f6ac5 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-catch-parameter/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-catch-parameter/output.json
@@ -109,7 +109,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/options.json
index 31d78f2e57b9..f81e206da65d 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-yield/yield-generator-arrow-default/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "yield is not allowed in the parameters of an arrow function inside a generator (1:21)"
+  "throws": "Yield cannot be used as name inside a generator function (1:21)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/output.json
new file mode 100644
index 000000000000..9446cbbae1c5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0000/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/output.json
new file mode 100644
index 000000000000..138fcb2e6263
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0001/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/output.json
new file mode 100644
index 000000000000..ef826212c27b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0002/output.json
@@ -0,0 +1,120 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/output.json
new file mode 100644
index 000000000000..3f7e070ca3ac
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0003/output.json
@@ -0,0 +1,120 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/output.json
new file mode 100644
index 000000000000..b0025ea3388c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0004/output.json
@@ -0,0 +1,122 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 13
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "elements": [
+              null,
+              null,
+              {
+                "type": "NumericLiteral",
+                "start": 9,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0005.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0005.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/output.json
new file mode 100644
index 000000000000..573eda5bfa9f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0005/output.json
@@ -0,0 +1,160 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  }
+                },
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              },
+              {
+                "type": "NumericLiteral",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "extra": {
+                  "rawValue": 2,
+                  "raw": "2"
+                },
+                "value": 2
+              },
+              {
+                "type": "NumericLiteral",
+                "start": 12,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "extra": {
+                  "rawValue": 3,
+                  "raw": "3"
+                },
+                "value": 3
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/output.json
new file mode 100644
index 000000000000..34c8d7e15c8e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0006/output.json
@@ -0,0 +1,161 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 4,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "elements": [
+              {
+                "type": "NumericLiteral",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  }
+                },
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              },
+              {
+                "type": "NumericLiteral",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "extra": {
+                  "rawValue": 2,
+                  "raw": "2"
+                },
+                "value": 2
+              },
+              null,
+              {
+                "type": "NumericLiteral",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": 3,
+                  "raw": "3"
+                },
+                "value": 3
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/output.json
new file mode 100644
index 000000000000..4a76c9ff3935
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0007/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 8,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 8,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "日本語"
+            },
+            "name": "日本語"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 6,
+            "end": 8,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 8
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/input.js
new file mode 100755
index 000000000000..9d3bfbcfb224
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/input.js
@@ -0,0 +1 @@
+T\u203F = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/output.json
new file mode 100644
index 000000000000..5aa9eb08425a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0008/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              },
+              "identifierName": "T‿"
+            },
+            "name": "T‿"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 10,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/input.js
new file mode 100755
index 000000000000..ff386945cd53
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/input.js
@@ -0,0 +1 @@
+T\u200C = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/output.json
new file mode 100644
index 000000000000..d6c768be8953
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0009/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              },
+              "identifierName": "T‌"
+            },
+            "name": "T‌"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 10,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/input.js
new file mode 100755
index 000000000000..49b79b4d531b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/input.js
@@ -0,0 +1 @@
+T\u200D = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/output.json
new file mode 100644
index 000000000000..ff1dbdcfacbe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0010/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              },
+              "identifierName": "T‍"
+            },
+            "name": "T‍"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 10,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/input.js
new file mode 100755
index 000000000000..ae334de44745
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/input.js
@@ -0,0 +1 @@
+\u2163\u2161 = []
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/output.json
new file mode 100644
index 000000000000..d48fa35f8a00
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0011/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              },
+              "identifierName": "ⅣⅡ"
+            },
+            "name": "ⅣⅡ"
+          },
+          "right": {
+            "type": "ArrayExpression",
+            "start": 15,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "elements": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/input.js
new file mode 100755
index 000000000000..79581f8529b7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/input.js
@@ -0,0 +1 @@
+\u2163\u2161\u200A=\u2009[]
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/options.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/options.json
new file mode 100644
index 000000000000..abe9f835b84b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-array/migrated_0012/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/output.json
new file mode 100644
index 000000000000..3b0df6852fce
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0000/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/output.json
new file mode 100644
index 000000000000..20849b383b65
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0001/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 42,
+            "raw": "42"
+          },
+          "value": 42
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/output.json
new file mode 100644
index 000000000000..b21e99bf2e8a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0002/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          },
+          "extra": {
+            "rawValue": 3,
+            "raw": "3"
+          },
+          "value": 3
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/output.json
new file mode 100644
index 000000000000..a10e4151e34b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0003/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 1,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 1,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 1
+            }
+          },
+          "extra": {
+            "rawValue": 5,
+            "raw": "5"
+          },
+          "value": 5
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/output.json
new file mode 100644
index 000000000000..a5255d5fce90
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0004/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 3,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 3,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 3,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 0.14,
+            "raw": ".14"
+          },
+          "value": 0.14
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0005.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0005.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/output.json
new file mode 100644
index 000000000000..bcb0e150eda3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0005/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "extra": {
+            "rawValue": 3.14159,
+            "raw": "3.14159"
+          },
+          "value": 3.14159
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/output.json
new file mode 100644
index 000000000000..85fdb9eb27f1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0006/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "extra": {
+            "rawValue": 6.02214179e+23,
+            "raw": "6.02214179e+23"
+          },
+          "value": 6.02214179e+23
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/output.json
new file mode 100644
index 000000000000..570feb3f99a8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0007/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "extra": {
+            "rawValue": 1.49241783e-10,
+            "raw": "1.492417830e-10"
+          },
+          "value": 1.49241783e-10
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/output.json
new file mode 100644
index 000000000000..5dab1af37b3e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0008/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 3,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 3,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 3,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0x0"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/output.json
new file mode 100644
index 000000000000..2c80770e1150
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0009/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0x0"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/output.json
new file mode 100644
index 000000000000..4d36c6d5cebb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0010/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0e+100"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/output.json
new file mode 100644
index 000000000000..4d36c6d5cebb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0011/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0e+100"
+          },
+          "value": 0
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/output.json
new file mode 100644
index 000000000000..ffa4e3f03d34
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0012/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 2748,
+            "raw": "0xabc"
+          },
+          "value": 2748
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/output.json
new file mode 100644
index 000000000000..ca378cfb321e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0013/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 3567,
+            "raw": "0xdef"
+          },
+          "value": 3567
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0014.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0014.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/output.json
new file mode 100644
index 000000000000..e88d6a6431f2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0014/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 26,
+            "raw": "0X1A"
+          },
+          "value": 26
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0015.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0015.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/output.json
new file mode 100644
index 000000000000..da0f5a5a077e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0015/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 16,
+            "raw": "0x10"
+          },
+          "value": 16
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0016.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0016.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/output.json
new file mode 100644
index 000000000000..3aeb059890fd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0016/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 256,
+            "raw": "0x100"
+          },
+          "value": 256
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0017.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0017.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/output.json
new file mode 100644
index 000000000000..508faca10fbb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0017/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 4,
+            "raw": "0X04"
+          },
+          "value": 4
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0018.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0018.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/output.json
new file mode 100644
index 000000000000..32add9ef9dc3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0018/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 2,
+            "raw": "02"
+          },
+          "value": 2
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0019.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0019.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/output.json
new file mode 100644
index 000000000000..25cd08d3e7e6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0019/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 3,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 3,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 3,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "rawValue": 10,
+            "raw": "012"
+          },
+          "value": 10
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0020.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0020.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/output.json
new file mode 100644
index 000000000000..3c9b2c223f85
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0020/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 10,
+            "raw": "0012"
+          },
+          "value": 10
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0021.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0021.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/output.json
new file mode 100644
index 000000000000..877e589c1492
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0021/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 8,
+            "raw": "08"
+          },
+          "value": 8
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0022.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0022.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/output.json
new file mode 100644
index 000000000000..cb6c2286193c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0022/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 8,
+            "raw": "0008"
+          },
+          "value": 8
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0023.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0023.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/output.json
new file mode 100644
index 000000000000..22fa47db887b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0023/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 2,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 2,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 2,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 2
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 2,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 2
+            }
+          },
+          "extra": {
+            "rawValue": 9,
+            "raw": "09"
+          },
+          "value": 9
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0024.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0024/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/numeric/migrated_0024.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0024/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0024/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0024/output.json
new file mode 100644
index 000000000000..f48f7a786775
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-numeric/migrated_0024/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          },
+          "extra": {
+            "rawValue": 9.5,
+            "raw": "09.5"
+          },
+          "value": 9.5
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0005/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0005/input.js
new file mode 100755
index 000000000000..ceaf3d176e0d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0005/input.js
@@ -0,0 +1 @@
+var x = /[\\u{0000000000000061}-\\u{7A}]/u
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0006/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0006/input.js
new file mode 100755
index 000000000000..8bd61e18921e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.migrated_0006/input.js
@@ -0,0 +1 @@
+var x = /\\u{110000}/u
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-4-hex/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-4-hex/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-var-hex/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/.u-flag-invalid-range-var-hex/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/output.json
new file mode 100644
index 000000000000..a6d0d7facf75
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0000/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "RegExpLiteral",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            }
+          },
+          "extra": {
+            "raw": "/p/"
+          },
+          "pattern": "p",
+          "flags": ""
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/output.json
new file mode 100644
index 000000000000..118076195367
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0001/output.json
@@ -0,0 +1,87 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        },
+        "expression": {
+          "type": "ArrayExpression",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "elements": [
+            {
+              "type": "RegExpLiteral",
+              "start": 1,
+              "end": 4,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 4
+                }
+              },
+              "extra": {
+                "raw": "/q/"
+              },
+              "pattern": "q",
+              "flags": ""
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/output.json
new file mode 100644
index 000000000000..edf979f658a8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0002/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "extra": {
+                "raw": "/[a-z]/i"
+              },
+              "pattern": "[a-z]",
+              "flags": "i"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/output.json
new file mode 100644
index 000000000000..06f89a41d6c9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0003/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "extra": {
+                "raw": "/[a-z]/y"
+              },
+              "pattern": "[a-z]",
+              "flags": "y"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/output.json
new file mode 100644
index 000000000000..8c5d9482f12d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0004/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "extra": {
+                "raw": "/[a-z]/u"
+              },
+              "pattern": "[a-z]",
+              "flags": "u"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/output.json
new file mode 100644
index 000000000000..4ec3778aaff6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0007/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "extra": {
+                "raw": "/[x-z]/i"
+              },
+              "pattern": "[x-z]",
+              "flags": "i"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/output.json
new file mode 100644
index 000000000000..7c5bfd0d7d4b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0008/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "extra": {
+                "raw": "/[a-c]/i"
+              },
+              "pattern": "[a-c]",
+              "flags": "i"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/output.json
new file mode 100644
index 000000000000..c79985fcb2bb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0009/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "extra": {
+                "raw": "/[P QR]/i"
+              },
+              "pattern": "[P QR]",
+              "flags": "i"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/output.json
new file mode 100644
index 000000000000..bc5ceb3e0e4b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0010/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                }
+              },
+              "extra": {
+                "raw": "/[\\]/]/"
+              },
+              "pattern": "[\\]/]",
+              "flags": ""
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/output.json
new file mode 100644
index 000000000000..abec94d30ee3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0011/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "extra": {
+                "raw": "/foo\\/bar/"
+              },
+              "pattern": "foo\\/bar",
+              "flags": ""
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/output.json
new file mode 100644
index 000000000000..311090fd6ab9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0012/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                }
+              },
+              "extra": {
+                "raw": "/=([^=\\s])+/g"
+              },
+              "pattern": "=([^=\\s])+",
+              "flags": "g"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/output.json
new file mode 100644
index 000000000000..1dc2cf3956e3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/migrated_0013/output.json
@@ -0,0 +1,138 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "MemberExpression",
+              "start": 8,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "object": {
+                "type": "RegExpLiteral",
+                "start": 8,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "extra": {
+                  "raw": "/42/g"
+                },
+                "pattern": "42",
+                "flags": "g"
+              },
+              "property": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "identifierName": "test"
+                },
+                "name": "test"
+              },
+              "computed": false
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-surrogate-pair.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-surrogate-pair.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/output.json
new file mode 100644
index 000000000000..b94b022ea7c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-surrogate-pair/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 41,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 41
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 41,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 41
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 41
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 41,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 41
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 41,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 41
+                }
+              },
+              "extra": {
+                "raw": "/[\\uD834\\uDF06-\\uD834\\uDF08a-z]/u"
+              },
+              "pattern": "[\\uD834\\uDF06-\\uD834\\uDF08a-z]",
+              "flags": "u"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-valid-range.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-valid-range.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/output.json
new file mode 100644
index 000000000000..20d499776ad9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-regular-expression/u-flag-valid-range/output.json
@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 61,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 61
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 61,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 61
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 61,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 61
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 60,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 60
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "RegExpLiteral",
+              "start": 8,
+              "end": 60,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 60
+                }
+              },
+              "extra": {
+                "raw": "/[\\u{61}-b][\\u0061-b][a-\\u{62}][a-\\u0062]\\u{1ffff}/u"
+              },
+              "pattern": "[\\u{61}-b][\\u0061-b][a-\\u{62}][a-\\u0062]\\u{1ffff}",
+              "flags": "u"
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/output.json
new file mode 100644
index 000000000000..decc68148f95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0000/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "value": "Hello",
+          "extra": {
+            "raw": "\"Hello\"",
+            "rawValue": "Hello"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/output.json
new file mode 100644
index 000000000000..13ba3c4eb97c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0001/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 22
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "value": "\\n\\r\\t\\v\\b\\f\\\\\\'\\\"\\0",
+          "extra": {
+            "raw": "\"\\n\\r\\t\\v\\b\\f\\\\\\'\\\"\\0\"",
+            "rawValue": "\\n\\r\\t\\v\\b\\f\\\\\\'\\\"\\0"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/input.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/input.js
new file mode 100755
index 000000000000..3acde555b1ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/input.js
@@ -0,0 +1 @@
+"\\u0061"
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/output.json
new file mode 100644
index 000000000000..d9fbb2b999e5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0002/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 9,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 9
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 9,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 9
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 9,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 9
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            }
+          },
+          "value": "\\\\u0061",
+          "extra": {
+            "raw": "\"\\\\u0061\"",
+            "rawValue": "\\\\u0061"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/output.json
new file mode 100644
index 000000000000..2b81d94ea76b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0003/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "value": "\\x61",
+          "extra": {
+            "raw": "\"\\x61\"",
+            "rawValue": "\\x61"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/output.json
new file mode 100644
index 000000000000..166849449336
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0006/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "value": "Hello\\nworld",
+          "extra": {
+            "raw": "\"Hello\\nworld\"",
+            "rawValue": "Hello\\nworld"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/output.json
new file mode 100644
index 000000000000..69ff486c62d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0007/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            }
+          },
+          "value": "Hello\\\nworld",
+          "extra": {
+            "raw": "\"Hello\\\nworld\"",
+            "rawValue": "Hello\\\nworld"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/output.json
new file mode 100644
index 000000000000..f3046102c20f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0008/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "value": "Hello\\02World",
+          "extra": {
+            "raw": "\"Hello\\02World\"",
+            "rawValue": "Hello\\02World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/output.json
new file mode 100644
index 000000000000..5f31b1a576f3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0009/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\012World",
+          "extra": {
+            "raw": "\"Hello\\012World\"",
+            "rawValue": "Hello\\012World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/output.json
new file mode 100644
index 000000000000..9656f26c45a8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0010/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\122World",
+          "extra": {
+            "raw": "\"Hello\\122World\"",
+            "rawValue": "Hello\\122World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/output.json
new file mode 100644
index 000000000000..5a8ab1f21115
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0011/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "value": "Hello\\0122World",
+          "extra": {
+            "raw": "\"Hello\\0122World\"",
+            "rawValue": "Hello\\0122World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/output.json
new file mode 100644
index 000000000000..e3470fcb4ec5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0012/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\312World",
+          "extra": {
+            "raw": "\"Hello\\312World\"",
+            "rawValue": "Hello\\312World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/output.json
new file mode 100644
index 000000000000..04f8c8c1df7b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0013/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\412World",
+          "extra": {
+            "raw": "\"Hello\\412World\"",
+            "rawValue": "Hello\\412World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0015.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0015.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/output.json
new file mode 100644
index 000000000000..88a3f339c132
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0015/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "value": "Hello\\712World",
+          "extra": {
+            "raw": "\"Hello\\712World\"",
+            "rawValue": "Hello\\712World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0016.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0016.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/output.json
new file mode 100644
index 000000000000..d73cfa2bd010
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0016/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "value": "Hello\\0World",
+          "extra": {
+            "raw": "\"Hello\\0World\"",
+            "rawValue": "Hello\\0World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0017.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0017.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/output.json
new file mode 100644
index 000000000000..69ff486c62d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0017/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            }
+          },
+          "value": "Hello\\\nworld",
+          "extra": {
+            "raw": "\"Hello\\\nworld\"",
+            "rawValue": "Hello\\\nworld"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0018.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0018.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/output.json
new file mode 100644
index 000000000000..e95ac9779c07
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-literal-string/migrated_0018/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "value": "Hello\\1World",
+          "extra": {
+            "raw": "\"Hello\\1World\"",
+            "rawValue": "Hello\\1World"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/output.json
new file mode 100644
index 000000000000..ace60cd560f2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0000/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              }
+            },
+            "properties": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/output.json
new file mode 100644
index 000000000000..475c1afc13f2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0001/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "properties": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/output.json
new file mode 100644
index 000000000000..245feff142cc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0002/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "answer"
+                  },
+                  "name": "answer"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 14,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/output.json
new file mode 100644
index 000000000000..87c6c0164063
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0003/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 8,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "identifierName": "if"
+                  },
+                  "name": "if"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0004.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0004.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/output.json
new file mode 100644
index 000000000000..3a19ed468dc6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0004/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "identifierName": "true"
+                  },
+                  "name": "true"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 12,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0005.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0005.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/output.json
new file mode 100644
index 000000000000..dbb1747c7888
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0005/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "identifierName": "false"
+                  },
+                  "name": "false"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 13,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0006.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0006.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/output.json
new file mode 100644
index 000000000000..2918b16e85cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0006/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "identifierName": "null"
+                  },
+                  "name": "null"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 12,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0007.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0007.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/output.json
new file mode 100644
index 000000000000..367eac531099
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0007/output.json
@@ -0,0 +1,158 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 6,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "answer",
+                    "raw": "\"answer\""
+                  },
+                  "value": "answer"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 16,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0008.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0008.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/output.json
new file mode 100644
index 000000000000..81194dadc77a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0008/output.json
@@ -0,0 +1,210 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 7,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 9,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 10
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              },
+              {
+                "type": "ObjectProperty",
+                "start": 12,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 12,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 15,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0009.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0009.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/output.json
new file mode 100644
index 000000000000..ea4245152521
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0009/output.json
@@ -0,0 +1,189 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 38,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 38
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 38,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 38
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 38
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 38
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 38
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 36
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 36
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ReturnStatement",
+                      "start": 20,
+                      "end": 34,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 34
+                        }
+                      },
+                      "argument": {
+                        "type": "Identifier",
+                        "start": 27,
+                        "end": 34,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 27
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 34
+                          },
+                          "identifierName": "m_width"
+                        },
+                        "name": "m_width"
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0010.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0010.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/output.json
new file mode 100644
index 000000000000..9392a4586df7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0010/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 22
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 22
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "undef"
+                  },
+                  "name": "undef"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0011.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0011.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/output.json
new file mode 100644
index 000000000000..96fd3b7e93cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0011/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "if"
+                  },
+                  "name": "if"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 15,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0012.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0012.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/output.json
new file mode 100644
index 000000000000..b3ef7da7cabf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0012/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "true"
+                  },
+                  "name": "true"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 17,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0013.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0013.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/output.json
new file mode 100644
index 000000000000..e055a31d0008
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0013/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 22
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 22
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "false"
+                  },
+                  "name": "false"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0014.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0014.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/output.json
new file mode 100644
index 000000000000..2ba79ca36077
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0014/output.json
@@ -0,0 +1,156 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "null"
+                  },
+                  "name": "null"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 17,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0015.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0015.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/output.json
new file mode 100644
index 000000000000..ea3146a858b9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0015/output.json
@@ -0,0 +1,159 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 22
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 10,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "undef",
+                    "raw": "\"undef\""
+                  },
+                  "value": "undef"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 20,
+                  "end": 22,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 22
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0016.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0016.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/output.json
new file mode 100644
index 000000000000..c02bf897d3a7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0016/output.json
@@ -0,0 +1,159 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "NumericLiteral",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 15,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0017.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0017.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/output.json
new file mode 100644
index 000000000000..a15882b52dae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0017/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 16,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 19,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 19
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 21,
+                      "end": 32,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 32
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 21,
+                        "end": 32,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 32
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 21,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "m_width"
+                          },
+                          "name": "m_width"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 31,
+                          "end": 32,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 31
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 32
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0018.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0018.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/output.json
new file mode 100644
index 000000000000..d672770fbcdf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0018/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 30
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 30
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 30
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 28
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "if"
+                  },
+                  "name": "if"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 13,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 16,
+                  "end": 28,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 28
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 18,
+                      "end": 26,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 26
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 18,
+                        "end": 26,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 26
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 18,
+                          "end": 22,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 18
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 22
+                            },
+                            "identifierName": "m_if"
+                          },
+                          "name": "m_if"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 25,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 25
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0019.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0019.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/output.json
new file mode 100644
index 000000000000..3322d7a98a38
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0019/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 34
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 32
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "true"
+                  },
+                  "name": "true"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 32
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 20,
+                      "end": 30,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 30
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 20,
+                        "end": 30,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 30
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 20,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 20
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "m_true"
+                          },
+                          "name": "m_true"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 29,
+                          "end": 30,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 30
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0020.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0020.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/output.json
new file mode 100644
index 000000000000..a26b8b4009e1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0020/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "false"
+                  },
+                  "name": "false"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 16,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 19,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 19
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 21,
+                      "end": 32,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 32
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 21,
+                        "end": 32,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 32
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 21,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "m_false"
+                          },
+                          "name": "m_false"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 31,
+                          "end": 32,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 31
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 32
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0021.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0021.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/output.json
new file mode 100644
index 000000000000..96e1bccd5184
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0021/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 34
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 32
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "null"
+                  },
+                  "name": "null"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 32
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 20,
+                      "end": 30,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 30
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 20,
+                        "end": 30,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 30
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 20,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 20
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "m_null"
+                          },
+                          "name": "m_null"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 29,
+                          "end": 30,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 30
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0022.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0022.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/output.json
new file mode 100644
index 000000000000..2fa4b803dd1d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0022/output.json
@@ -0,0 +1,243 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 10,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "null",
+                    "raw": "\"null\""
+                  },
+                  "value": "null"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 17,
+                    "end": 18,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 18
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 20,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 22,
+                      "end": 32,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 22
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 32
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 22,
+                        "end": 32,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 22
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 32
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 22,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 22
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "m_null"
+                          },
+                          "name": "m_null"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 31,
+                          "end": 32,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 31
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 32
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0023.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0023.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/output.json
new file mode 100644
index 000000000000..21dd434a7ad0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0023/output.json
@@ -0,0 +1,243 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 32
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 32,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 32
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 30,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 30
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "NumericLiteral",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 13,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "w"
+                    },
+                    "name": "w"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 16,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 30
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 18,
+                      "end": 28,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 28
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 18,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 28
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 18,
+                          "end": 24,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 18
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 24
+                            },
+                            "identifierName": "m_null"
+                          },
+                          "name": "m_null"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 27,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 27
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "identifierName": "w"
+                          },
+                          "name": "w"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0024.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0024.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/output.json
new file mode 100644
index 000000000000..1a0a1b954720
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0024/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    },
+                    "identifierName": "get"
+                  },
+                  "name": "get"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 11,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 42,
+                    "raw": "42"
+                  },
+                  "value": 42
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0025.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0025.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/output.json
new file mode 100644
index 000000000000..8caddf6f2a1e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0025/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    },
+                    "identifierName": "set"
+                  },
+                  "name": "set"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 11,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 43,
+                    "raw": "43"
+                  },
+                  "value": 43
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0026.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0026.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/output.json
new file mode 100644
index 000000000000..52ea78d41c51
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0026/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 6,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "__proto__"
+                  },
+                  "name": "__proto__"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 17,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0027.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0027.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/output.json
new file mode 100644
index 000000000000..bf57bae53f88
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0027/output.json
@@ -0,0 +1,158 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 5,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "StringLiteral",
+                  "start": 5,
+                  "end": 16,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 16
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "__proto__",
+                    "raw": "\"__proto__\""
+                  },
+                  "value": "__proto__"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 18,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0028.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0028.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/output.json
new file mode 100644
index 000000000000..e68e602741d1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0028/output.json
@@ -0,0 +1,329 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 77,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 77
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 77,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 77
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 77,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 77
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 77,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 77
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 4,
+            "end": 77,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 77
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectMethod",
+                "start": 6,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 36
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 10,
+                  "end": 15,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "get",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 18,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 36
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ReturnStatement",
+                      "start": 20,
+                      "end": 34,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 34
+                        }
+                      },
+                      "argument": {
+                        "type": "Identifier",
+                        "start": 27,
+                        "end": 34,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 27
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 34
+                          },
+                          "identifierName": "m_width"
+                        },
+                        "name": "m_width"
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              },
+              {
+                "type": "ObjectMethod",
+                "start": 38,
+                "end": 75,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 38
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 75
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 42,
+                  "end": 47,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 42
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 47
+                    },
+                    "identifierName": "width"
+                  },
+                  "name": "width"
+                },
+                "computed": false,
+                "kind": "set",
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 48,
+                    "end": 53,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 48
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 53
+                      },
+                      "identifierName": "width"
+                    },
+                    "name": "width"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 55,
+                  "end": 75,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 55
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 75
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 57,
+                      "end": 73,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 57
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 73
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 57,
+                        "end": 72,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 57
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 72
+                          }
+                        },
+                        "operator": "=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 57,
+                          "end": 64,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 57
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 64
+                            },
+                            "identifierName": "m_width"
+                          },
+                          "name": "m_width"
+                        },
+                        "right": {
+                          "type": "Identifier",
+                          "start": 67,
+                          "end": 72,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 67
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 72
+                            },
+                            "identifierName": "width"
+                          },
+                          "name": "width"
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0029.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0029.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/output.json
new file mode 100644
index 000000000000..157cf63a8362
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0029/output.json
@@ -0,0 +1,182 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectMethod",
+              "start": 3,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 3
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 7,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "identifierName": "i"
+                },
+                "name": "i"
+              },
+              "computed": false,
+              "kind": "get",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 11,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 16,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 16
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 16,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "identifierName": "i"
+                },
+                "name": "i"
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 19,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 19
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 21
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0030.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0030.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/output.json
new file mode 100644
index 000000000000..9000ad963094
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0030/output.json
@@ -0,0 +1,246 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 13,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 13
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 13,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 13,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "right": {
+            "type": "ObjectExpression",
+            "start": 15,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 16,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 19
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 16,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "identifierName": "y"
+                  },
+                  "name": "y"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 18,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 19
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              },
+              {
+                "type": "ObjectProperty",
+                "start": 20,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 23
+                  }
+                },
+                "method": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 20,
+                  "end": 21,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 21
+                    },
+                    "identifierName": "y"
+                  },
+                  "name": "y"
+                },
+                "computed": false,
+                "shorthand": false,
+                "value": {
+                  "type": "NumericLiteral",
+                  "start": 22,
+                  "end": 23,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 22
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 23
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0031.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0031.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/output.json
new file mode 100644
index 000000000000..7754e9f31d1b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0031/output.json
@@ -0,0 +1,250 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 48,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 48
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 48,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 48
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 14,
+        "end": 48,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 14
+          },
+          "end": {
+            "line": 1,
+            "column": 48
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 18,
+            "end": 48,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 48
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 22,
+              "end": 48,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 48
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectMethod",
+                  "start": 24,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 28,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "get",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 32,
+                    "end": 34,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 32
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 34
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                },
+                {
+                  "type": "ObjectMethod",
+                  "start": 36,
+                  "end": 46,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 36
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 46
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 40,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 40
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 41
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "get",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 44,
+                    "end": 46,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 44
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 46
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0032.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0032.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/output.json
new file mode 100644
index 000000000000..d6a2610514cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0032/output.json
@@ -0,0 +1,249 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 43,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 43
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 43,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 43
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 14,
+        "end": 43,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 14
+          },
+          "end": {
+            "line": 1,
+            "column": 43
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 18,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 43
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 22,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 43
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 24,
+                  "end": 29,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 29
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 24,
+                    "end": 25,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 24
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 25
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "NumericLiteral",
+                    "start": 27,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 27
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 42,
+                      "raw": "42"
+                    },
+                    "value": 42
+                  }
+                },
+                {
+                  "type": "ObjectMethod",
+                  "start": 31,
+                  "end": 41,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 31
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 41
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 35,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 35
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 36
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "get",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 39,
+                    "end": 41,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 39
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 41
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0033.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0033.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/output.json
new file mode 100644
index 000000000000..93bb4ad6958e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0033/output.json
@@ -0,0 +1,267 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 44,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 44
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 44,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 44
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 14,
+        "end": 44,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 14
+          },
+          "end": {
+            "line": 1,
+            "column": 44
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 18,
+            "end": 44,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 44
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 22,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 44
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectMethod",
+                  "start": 24,
+                  "end": 35,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 35
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 28,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "kind": "set",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 30,
+                      "end": 31,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 31
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    }
+                  ],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 33,
+                    "end": 35,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 33
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 35
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 37,
+                  "end": 42,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 37
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 42
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 37,
+                    "end": 38,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 37
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 38
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "NumericLiteral",
+                    "start": 40,
+                    "end": 42,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 40
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 42
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 42,
+                      "raw": "42"
+                    },
+                    "value": 42
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "\"use strict\"",
+            "rawValue": "use strict"
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0034.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0034.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/output.json
new file mode 100644
index 000000000000..1dc5a28897fa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0034/output.json
@@ -0,0 +1,127 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectMethod",
+              "start": 2,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "method": true,
+              "computed": true,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 4,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              },
+              "kind": "method",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 7,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0035.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0035.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/output.json
new file mode 100644
index 000000000000..2b50d0f0aea2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0035/output.json
@@ -0,0 +1,142 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 2,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "method": false,
+              "computed": true,
+              "key": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 4,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              },
+              "shorthand": false,
+              "value": {
+                "type": "ArrowFunctionExpression",
+                "start": 6,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 10,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0036.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0036.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/output.json
new file mode 100644
index 000000000000..8ecd159198d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0036/output.json
@@ -0,0 +1,187 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 35
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 2,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "method": false,
+              "computed": true,
+              "key": {
+                "type": "StringLiteral",
+                "start": 3,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": "__proto__",
+                  "raw": "\"__proto__\""
+                },
+                "value": "__proto__"
+              },
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 16,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  }
+                },
+                "extra": {
+                  "rawValue": 0,
+                  "raw": "0"
+                },
+                "value": 0
+              }
+            },
+            {
+              "type": "ObjectProperty",
+              "start": 19,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 19
+                },
+                "end": {
+                  "line": 1,
+                  "column": 34
+                }
+              },
+              "method": false,
+              "computed": true,
+              "key": {
+                "type": "StringLiteral",
+                "start": 20,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  }
+                },
+                "extra": {
+                  "rawValue": "__proto__",
+                  "raw": "\"__proto__\""
+                },
+                "value": "__proto__"
+              },
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 33,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 33
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "extra": {
+                  "rawValue": 0,
+                  "raw": "0"
+                },
+                "value": 0
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0037.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0037.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/output.json
new file mode 100644
index 000000000000..5fcc5ff585f6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0037/output.json
@@ -0,0 +1,129 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectProperty",
+              "start": 2,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "StringLiteral",
+                "start": 2,
+                "end": 5,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 5
+                  }
+                },
+                "extra": {
+                  "rawValue": "[",
+                  "raw": "\"[\""
+                },
+                "value": "["
+              },
+              "computed": false,
+              "shorthand": false,
+              "value": {
+                "type": "NumericLiteral",
+                "start": 7,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "extra": {
+                  "rawValue": 42,
+                  "raw": "42"
+                },
+                "value": 42
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0038.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/object/migrated_0038.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/output.json
new file mode 100644
index 000000000000..925deed2a00b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-object/migrated_0038/output.json
@@ -0,0 +1,180 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 1,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 1
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectMethod",
+              "start": 2,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "method": false,
+              "key": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "computed": false,
+              "kind": "set",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "AssignmentPattern",
+                  "start": 8,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 9,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 9
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 0,
+                      "raw": "0"
+                    },
+                    "value": 0
+                  }
+                }
+              ],
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0000.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0000.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/output.json
new file mode 100644
index 000000000000..1cf6441fffc6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0000/output.json
@@ -0,0 +1,65 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "ThisExpression",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0001.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0001.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/output.json
new file mode 100644
index 000000000000..3d18314470cd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0001/output.json
@@ -0,0 +1,65 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 4,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 4,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 4
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "NullLiteral",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0002.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0002.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/output.json
new file mode 100644
index 000000000000..bf57e074ccea
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0002/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 5,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 4
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "NumericLiteral",
+          "start": 5,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 4
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            }
+          },
+          "extra": {
+            "rawValue": 42,
+            "raw": "42"
+          },
+          "value": 42
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0003.js b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/expression-primary/other/migrated_0003.js
rename to packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/output.json
new file mode 100644
index 000000000000..e05c37f12629
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/expression-primary-other/migrated_0003/output.json
@@ -0,0 +1,146 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "left": {
+            "type": "BinaryExpression",
+            "start": 1,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 1
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              }
+            },
+            "left": {
+              "type": "NumericLiteral",
+              "start": 1,
+              "end": 2,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 2
+                }
+              },
+              "extra": {
+                "rawValue": 1,
+                "raw": "1"
+              },
+              "value": 1
+            },
+            "operator": "+",
+            "right": {
+              "type": "NumericLiteral",
+              "start": 5,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                }
+              },
+              "extra": {
+                "rawValue": 2,
+                "raw": "2"
+              },
+              "value": 2
+            },
+            "extra": {
+              "parenthesized": true,
+              "parenStart": 0
+            }
+          },
+          "operator": "*",
+          "right": {
+            "type": "NumericLiteral",
+            "start": 11,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "extra": {
+              "rawValue": 3,
+              "raw": "3"
+            },
+            "value": 3
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0008.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0008.source.js
deleted file mode 100755
index f0f44705bf8d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0008.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'T\u203F = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0009.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0009.source.js
deleted file mode 100755
index e2eb52f9c7df..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0009.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'T\u200C = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0010.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0010.source.js
deleted file mode 100755
index bafe63b052e8..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0010.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'T\u200D = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0011.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0011.source.js
deleted file mode 100755
index 307b0667e7c1..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0011.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u2163\u2161 = []';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0012.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0012.source.js
deleted file mode 100755
index b24f8e1c8272..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/migrated_0012.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u2163\u2161\u200A=\u2009[]';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/array/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/array/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0005.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0005.source.js
deleted file mode 100755
index b2b646e23ee3..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0005.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[\\u{0000000000000061}-\\u{7A}]/u';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.failure.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.failure.json
deleted file mode 100755
index 55cbc7a399d2..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.failure.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "index": 21,
-    "lineNumber": 1,
-    "column": 22,
-    "message": "Error: Line 1: Invalid regular expression"
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.source.js
deleted file mode 100755
index 964850a64ee6..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/migrated_0006.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /\\u{110000}/u';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.failure.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.failure.json
deleted file mode 100755
index 9bfbe69a020a..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-4-hex.failure.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "index": 21,
-    "lineNumber": 1,
-    "column": 22,
-    "message": "Error: Line 1: Invalid regular expression"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.failure.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.failure.json
deleted file mode 100755
index 9bfbe69a020a..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/regular-expression/u-flag-invalid-range-var-hex.failure.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "index": 21,
-    "lineNumber": 1,
-    "column": 22,
-    "message": "Error: Line 1: Invalid regular expression"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0002.source.js b/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0002.source.js
deleted file mode 100755
index 0447afbd6fde..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/literal/string/migrated_0002.source.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u0061"';
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/object/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/object/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/output.json b/packages/babel-parser/test/fixtures/esprima/expression-primary/other/output.json
deleted file mode 100644
index 145f80b57b91..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/expression-primary/other/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/input.js
deleted file mode 100644
index 0faf8dc92a46..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0033/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'x\\u005c';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/input.js
deleted file mode 100644
index ac96b7835455..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0034/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'x\\u002a';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0035/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0035/options.json
index 3e2f5ee264d5..3c289784c021 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0035/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0035/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Error parsing regular expression: Invalid regular expression: /(s/: Unterminated group (1:9)"
+  "throws": "Error parsing regular expression: Invalid regular expression: /(s/: Unterminated group (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/input.js
deleted file mode 100644
index e7f145a8d03c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'a\\u';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/options.json
deleted file mode 100644
index 27a7b64d71d4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0036/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/input.js
deleted file mode 100644
index 5ced27a43a4e..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\\ua';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/options.json
deleted file mode 100644
index 27a7b64d71d4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0037/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/input.js
deleted file mode 100644
index 21543eba12eb..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0041/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[a-z]/\\ux';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/input.js
deleted file mode 100644
index a7b0d9a4656d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[a-z\n]/\\ux';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/options.json
deleted file mode 100644
index 98d712379010..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0042/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:15)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/input.js
deleted file mode 100644
index 42552d48074d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[a-z]/\\\\ux';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/options.json
deleted file mode 100644
index e806dd7b3a52..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0043/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:17)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/input.js
deleted file mode 100644
index eabe2cb40a69..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0044/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = 'var x = /[P QR]/\\\\u0067';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/input.js
deleted file mode 100644
index 32714507554e..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{110000}"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/options.json
deleted file mode 100644
index 9e093bfdcd96..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0048/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:12)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/input.js
deleted file mode 100644
index 1a2de200fe42..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{}"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/options.json
deleted file mode 100644
index 91b308200e05..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0049/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:5)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/input.js
deleted file mode 100644
index eac5bf2ce6e9..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{FFFF"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/options.json
deleted file mode 100644
index 89bfc2d73f8a..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0050/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:10)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/input.js
deleted file mode 100644
index b190f73e12b9..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u{FFZ}"';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/options.json
deleted file mode 100644
index 9ce9658f7dfa..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0051/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/options.json
deleted file mode 100644
index e3a1ba7e8296..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "setter should have exactly one param (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/input.js
deleted file mode 100644
index 93e2a300f15d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u203F = 10';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/options.json
deleted file mode 100644
index b5b75f41875c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0137/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:1)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/input.js
deleted file mode 100644
index cd1103629db1..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\\u005c';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/options.json
deleted file mode 100644
index c958665c03e2..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0163/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:7)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/input.js
deleted file mode 100644
index aa31feb7eccb..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\\u0000';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/options.json
deleted file mode 100644
index c958665c03e2..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0165/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:7)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/input.js
deleted file mode 100644
index 29a288bee4bb..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u200C = []';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/options.json
deleted file mode 100644
index b5b75f41875c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0166/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:1)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/input.js
deleted file mode 100644
index ec9a56e78cf0..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '\u200D = []';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/options.json
deleted file mode 100644
index b5b75f41875c..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0167/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:1)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/input.js
deleted file mode 100644
index 481ef9c80833..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var source = '"\\u';
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/options.json
deleted file mode 100644
index 27a7b64d71d4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0169/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/options.json
deleted file mode 100644
index 9e093bfdcd96..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:12)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/input.js
new file mode 100644
index 000000000000..fff580f2044f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/input.js
@@ -0,0 +1 @@
+x\\u005c
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/options.json
new file mode 100644
index 000000000000..18c53b997b56
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0033/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/input.js
new file mode 100644
index 000000000000..17112246786b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/input.js
@@ -0,0 +1 @@
+x\\u002a
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/options.json
new file mode 100644
index 000000000000..18c53b997b56
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0034/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/input.js
new file mode 100644
index 000000000000..3177052a225a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/input.js
@@ -0,0 +1 @@
+a\\u
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/options.json
new file mode 100644
index 000000000000..18c53b997b56
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0036/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/input.js
new file mode 100644
index 000000000000..d56d7c190d02
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/input.js
@@ -0,0 +1 @@
+\\ua
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0037/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/input.js
new file mode 100644
index 000000000000..9a2dc1767685
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/input.js
@@ -0,0 +1 @@
+var x = /[a-z]/\\ux
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/options.json
new file mode 100644
index 000000000000..adf556b0a352
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0041/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/input.js
new file mode 100644
index 000000000000..fdbf86f1d023
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/input.js
@@ -0,0 +1 @@
+var x = /[a-z\n]/\\ux
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/options.json
new file mode 100644
index 000000000000..eae3757f4451
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0042/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:18)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/input.js
new file mode 100644
index 000000000000..e2a2d371e229
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/input.js
@@ -0,0 +1 @@
+var x = /[a-z]/\\\\ux
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/options.json
new file mode 100644
index 000000000000..adf556b0a352
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0043/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/input.js
new file mode 100644
index 000000000000..fc48dffd74dc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/input.js
@@ -0,0 +1 @@
+var x = /[P QR]/\\\\u0067
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/options.json
new file mode 100644
index 000000000000..080cb0eaaa8a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0044/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid regular expression flag (1:17)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/input.js
new file mode 100644
index 000000000000..2bbf7ac4d47c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/input.js
@@ -0,0 +1 @@
+\\u{110000}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0048/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/input.js
new file mode 100644
index 000000000000..9943cc7906a5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/input.js
@@ -0,0 +1 @@
+\\u{}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0049/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/input.js
new file mode 100644
index 000000000000..5d4f24cb8271
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/input.js
@@ -0,0 +1 @@
+\\u{FFFF
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0050/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/input.js
new file mode 100644
index 000000000000..11e05c81c1e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/input.js
@@ -0,0 +1 @@
+\\u{FFZ}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0051/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0064/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0064/options.json
index 27a7b64d71d4..2b91be8d5115 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0064/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0064/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:4)"
+  "throws": "Unexpected keyword 'if' (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0075/input.js
rename to packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/options.json
new file mode 100644
index 000000000000..aa55ec4f840f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0075/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "setter must have exactly one formal parameter (1:3)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json
index f56e7311d854..02a0eafbbbbe 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json
index c5e6f0e62338..e4abe279ab29 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:14)"
-}
+  "throws": "Binding 'eval' in strict mode (1:14)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json
index 3168d40d55f8..c2a4aaec255e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:14)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:14)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json
index f56e7311d854..d93d5b2aa62e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json
index 0e1962195156..5d2dc563b16e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0092/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0092/options.json
index 0590c2b7e6bf..368006ae58bd 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0092/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0092/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:4)"
+  "throws": "Argument name clash (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0093/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0093/options.json
index 6d0445e20eb7..b99fd35222b1 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0093/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0093/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:18)"
+  "throws": "Argument name clash (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0094/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0094/options.json
index 0f2c1bee90b0..79a05e62290e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0094/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0094/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (1:21)"
+  "throws": "Legacy octal literals are not allowed in strict mode (1:21)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json
index f56e7311d854..d93d5b2aa62e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json
index 12e8741b8a16..224716db8070 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:1)"
-}
+  "throws": "Binding 'eval' in strict mode (1:1)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0104/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0104/input.js
deleted file mode 100644
index 9d44939080f0..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0104/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function t(if) { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0104/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0104/options.json
deleted file mode 100644
index cb6c66081ebf..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0104/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:11)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0105/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0105/input.js
deleted file mode 100644
index d7516ce611ed..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0105/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function t(true) { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0105/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0105/options.json
deleted file mode 100644
index cb6c66081ebf..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0105/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:11)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0106/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0106/input.js
deleted file mode 100644
index e8edce823989..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0106/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function t(false) { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0106/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0106/options.json
deleted file mode 100644
index cb6c66081ebf..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0106/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:11)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0107/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0107/input.js
deleted file mode 100644
index 86c3d224d014..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0107/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function t(null) { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0107/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0107/options.json
deleted file mode 100644
index cb6c66081ebf..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0107/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:11)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0108/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0108/input.js
deleted file mode 100644
index 6cafc792756d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0108/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function null() { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0109/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0109/input.js
deleted file mode 100644
index bc1d04c212e3..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0109/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function true() { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0109/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0109/options.json
deleted file mode 100644
index 2a28555f76db..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0109/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:9)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0110/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0110/input.js
deleted file mode 100644
index 4480e07b7d5d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0110/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function false() { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0110/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0110/options.json
deleted file mode 100644
index 2a28555f76db..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0110/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:9)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0111/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0111/input.js
deleted file mode 100644
index df1aa5f56166..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0111/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function if() { }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0111/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0111/options.json
deleted file mode 100644
index 2a28555f76db..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0111/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:9)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/input.js
new file mode 100644
index 000000000000..a63b2d2bdd7e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/input.js
@@ -0,0 +1 @@
+\u203F = 10
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/options.json
new file mode 100644
index 000000000000..82bcfe621c49
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0137/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0141/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0141/options.json
index 2a28555f76db..a74ca2305e84 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0141/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0141/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Unexpected token, expected \";\" (1:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0142/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0142/options.json
index 2a28555f76db..97818d2eea7e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0142/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0142/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:9)"
+  "throws": "Lexical declaration cannot appear in a single-statement context (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/input.js
new file mode 100644
index 000000000000..b9e12b2eff54
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/input.js
@@ -0,0 +1 @@
+\\u005c
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0163/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/input.js
new file mode 100644
index 000000000000..a6e819ccd18b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/input.js
@@ -0,0 +1 @@
+\\u0000
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0165/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/input.js
new file mode 100644
index 000000000000..7884927364d5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/input.js
@@ -0,0 +1 @@
+\u200C = []
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/options.json
new file mode 100644
index 000000000000..82bcfe621c49
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0166/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/input.js
new file mode 100644
index 000000000000..ade8012e1e92
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/input.js
@@ -0,0 +1 @@
+\u200D = []
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/options.json
new file mode 100644
index 000000000000..82bcfe621c49
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0167/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Invalid Unicode escape (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/input.js
new file mode 100644
index 000000000000..2775e915bb92
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/input.js
@@ -0,0 +1 @@
+"\\u
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/options.json
new file mode 100644
index 000000000000..d732a1630991
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0169/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unterminated string constant (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json
index 28f88106148b..b463f315f9eb 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:36)"
-}
+  "throws": "Binding 'eval' in strict mode (1:36)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json
index 913c7bb59f38..9e9f875dfbb5 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:36)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:36)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json
index 0306783e6eef..b5fd79ff5ff1 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:47)"
-}
+  "throws": "Binding 'eval' in strict mode (1:47)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json
index d1ae2825366a..15b7ac855374 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:47)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:47)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json
index 3bcd668ab1b1..95f470aed511 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json
index 04db3a217825..ef45890ab53f 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json
index 48fd4ff41936..2783b68b3d58 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json
index 48fd4ff41936..2783b68b3d58 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json
index d579a92e2358..fe2654496fc9 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json
index d579a92e2358..fe2654496fc9 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:34)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:34)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json
index 3bcd668ab1b1..95f470aed511 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json
index 3bcd668ab1b1..95f470aed511 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'eval' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json
index 04db3a217825..ef45890ab53f 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json
index 04db3a217825..ef45890ab53f 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:32)"
-}
+  "throws": "Assigning to 'arguments' in strict mode (1:32)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json
index 71bbcc0b9c1c..6db4ae7bf008 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:41)"
-}
+  "throws": "Binding 'eval' in strict mode (1:41)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json
index 544d28f50291..b02fb725c767 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:41)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:41)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json
index bf851387b4c6..a7490f9321d4 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'eval' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json
index e4d477b8e4ec..80b8b2d85caa 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json
index f6c8eea4b0d3..706ba8380c70 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:42)"
-}
+  "throws": "Binding 'eval' in strict mode (1:42)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json
index d26216e0a364..d0e461af3911 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:42)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:42)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json
index 69e4925a3ffd..ee2e7d7c7745 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:10)"
-}
+  "throws": "Binding 'eval' in strict mode (1:10)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json
index fbdc57cfc8fa..bb4b812bab32 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:10)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:10)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json
index 0306783e6eef..b5fd79ff5ff1 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:47)"
-}
+  "throws": "Binding 'eval' in strict mode (1:47)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json
index c2d1e1a69b41..ff90f09173c4 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:10)"
-}
+  "throws": "Binding 'package' in strict mode (1:10)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json
index 92828dc4f1c9..b8f97ca4fe56 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:48)"
-}
+  "throws": "Binding 'eval' in strict mode (1:48)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json
index 71bbcc0b9c1c..6db4ae7bf008 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:41)"
-}
+  "throws": "Binding 'eval' in strict mode (1:41)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json
index 241eccc1bf6d..e80a856d48a0 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:49)"
-}
+  "throws": "Binding 'eval' in strict mode (1:49)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json
index f56e7311d854..d93d5b2aa62e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'eval' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json
index 0e1962195156..5d2dc563b16e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json
index 92828dc4f1c9..b8f97ca4fe56 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:48)"
-}
+  "throws": "Binding 'eval' in strict mode (1:48)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json
index e9f6bf4d32ff..ab7000409bab 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:48)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:48)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0218/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0218/options.json
index ec4ea95dc9cb..45ca229c1e8e 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0218/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0218/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (1:33)"
+  "throws": "Legacy octal literals are not allowed in strict mode (1:33)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0220/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0220/options.json
index dd200e16e5bf..8f6c8218f747 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0220/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0220/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Invalid number (1:36)"
+  "throws": "Legacy octal literals are not allowed in strict mode (1:36)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json
index 2748b9f03d9e..0641de45e29a 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "implements is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'implements' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json
index 6efaf057ca5c..859238d0423f 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "interface is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'interface' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json
index 61578ad8f860..344c7075f4bf 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'package' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json
index da502d0daa6a..9fb9deaf9cba 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "private is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'private' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json
index 6fd44c0e1ba5..292fb56f1cf3 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "protected is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'protected' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json
index 3a41c740eaac..d5f48446906a 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "public is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'public' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json
index 764205122e0f..0f41ff2e6f24 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'static' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0231/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0231/options.json
index b31373dfb730..6ab197f35dc9 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0231/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0231/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "yield is a reserved word in strict mode (1:37)"
+  "throws": "Unexpected reserved word 'yield' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0232/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0232/options.json
index 9fa1302689e1..d2f3cbc2e116 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0232/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0232/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:37)"
+  "throws": "Unexpected reserved word 'let' (1:37)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json
index e316c4fc64fd..fff472344fd7 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:15)"
-}
+  "throws": "Binding 'static' in strict mode (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json
index 9b6fddd2ebba..d4d0a96bfb64 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'static' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json
index bf851387b4c6..a7490f9321d4 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'eval' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json
index e4d477b8e4ec..80b8b2d85caa 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "arguments is a reserved word in strict mode (1:9)"
-}
+  "throws": "Binding 'arguments' in strict mode (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0238/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0238/input.js
deleted file mode 100644
index c87b8eaaf43d..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0238/input.js
+++ /dev/null
@@ -1 +0,0 @@
-var let
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0238/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0238/options.json
deleted file mode 100644
index 27a7b64d71d4..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0238/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json
index a2eac88ba69d..91bc36d3f360 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:23)"
+  "throws": "Unexpected reserved word 'static' (1:23)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0240/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0240/options.json
index e23388601bb0..8b20b9a7df36 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0240/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0240/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:14)"
+  "throws": "Argument name clash (1:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json
index 0bb96c96d88e..e227bd1a6b74 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:11)"
-}
+  "throws": "Binding 'eval' in strict mode (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json
index 7551a61b9e0b..8e1f9af4ec47 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:11)"
-}
+  "throws": "Binding 'package' in strict mode (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0243/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0243/options.json
index 660e54ca2a82..9d2a58081596 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0243/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0243/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:43)"
+  "throws": "Argument name clash (1:43)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0244/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0244/options.json
index 28545ded1456..61c3bbb5abe0 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0244/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0244/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:15)"
+  "throws": "Argument name clash (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0245/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0245/options.json
index 0f592c74a35b..ae469fbd59da 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0245/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0245/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:44)"
+  "throws": "Argument name clash (1:44)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json
index b52d2d2e1520..3c24c608c88a 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "eval is a reserved word in strict mode (1:12)"
-}
+  "throws": "Binding 'eval' in strict mode (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json
index 7b80f0e455ce..96d524816cc9 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "package is a reserved word in strict mode (1:12)"
-}
+  "throws": "Binding 'package' in strict mode (1:12)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0249/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0249/options.json
index 172760cf2cf6..505798d5a203 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0249/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0249/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Argument name clash in strict mode (1:36)"
+  "throws": "Argument name clash (1:36)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0253/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0253/input.js
deleted file mode 100644
index 564a1caa1ce5..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0253/input.js
+++ /dev/null
@@ -1 +0,0 @@
-let
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0253/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0253/options.json
deleted file mode 100644
index 05dbd26b33ce..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0253/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:3)"
-}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0258/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0258/options.json
index 570ef651fb67..2e1b1cc3aa43 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0258/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0258/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \")\" (1:18)"
+  "throws": "Rest element must be last element (1:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/input.js b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/esprima/invalid-syntax/.migrated_0277/input.js
rename to packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/input.js
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/options.json
new file mode 100644
index 000000000000..aef7f56007e9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0277/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected reserved word 'enum' (1:11)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json
index a07e958c4de0..757b207f0ef2 100644
--- a/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "static is a reserved word in strict mode (1:17)"
+  "throws": "Unexpected reserved word 'static' (1:17)"
 }
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js
index 389d74582517..acd373a4ae35 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/input.js
@@ -1 +1 @@
-var source = '\\u0061';
+\\u0061
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/output.json
deleted file mode 100644
index 0fb9d2b43217..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0002/output.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 23,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 23
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 23,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 23
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "VariableDeclaration",
-        "start": 0,
-        "end": 23,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 23
-          }
-        },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 22,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 22
-              }
-            },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 22,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 22
-                }
-              },
-              "extra": {
-                "rawValue": "\\u0061",
-                "raw": "'\\\\u0061'"
-              },
-              "value": "\\u0061"
-            }
-          }
-        ],
-        "kind": "var"
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js
index 6524a1c4cfd2..97f921cd1e29 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/input.js
@@ -1 +1 @@
-var source = 'a\\u0061';
+a\\u0061
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/options.json
new file mode 100644
index 000000000000..18c53b997b56
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/output.json
deleted file mode 100644
index cc312ab67a75..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0003/output.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 24,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 24
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 24,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 24
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "VariableDeclaration",
-        "start": 0,
-        "end": 24,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 24
-          }
-        },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 23,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 23
-              }
-            },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 23,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 23
-                }
-              },
-              "extra": {
-                "rawValue": "a\\u0061",
-                "raw": "'a\\\\u0061'"
-              },
-              "value": "a\\u0061"
-            }
-          }
-        ],
-        "kind": "var"
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js
index d4941e9313e9..b57febcb64d5 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/input.js
@@ -1 +1 @@
-var source = '\\u0061a';
+\\u0061a
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/output.json
deleted file mode 100644
index 01650ee4aa69..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0004/output.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 24,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 24
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 24,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 24
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "VariableDeclaration",
-        "start": 0,
-        "end": 24,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 24
-          }
-        },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 23,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 23
-              }
-            },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 23,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 23
-                }
-              },
-              "extra": {
-                "rawValue": "\\u0061a",
-                "raw": "'\\\\u0061a'"
-              },
-              "value": "\\u0061a"
-            }
-          }
-        ],
-        "kind": "var"
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js
index 8e5a088c93c2..bf2962a6a9ec 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/input.js
@@ -1 +1 @@
-var source = '\\u0061a ';
+\\u0061a 
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/options.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/options.json
new file mode 100644
index 000000000000..381fd12ce2d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Expecting Unicode escape sequence \\uXXXX (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/output.json
deleted file mode 100644
index 5c72b8a79068..000000000000
--- a/packages/babel-parser/test/fixtures/esprima/statement-expression/migrated_0005/output.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 25,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 25
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 25,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 25
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "VariableDeclaration",
-        "start": 0,
-        "end": 25,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 25
-          }
-        },
-        "declarations": [
-          {
-            "type": "VariableDeclarator",
-            "start": 4,
-            "end": 24,
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 4
-              },
-              "end": {
-                "line": 1,
-                "column": 24
-              }
-            },
-            "id": {
-              "type": "Identifier",
-              "start": 4,
-              "end": 10,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 4
-                },
-                "end": {
-                  "line": 1,
-                  "column": 10
-                },
-                "identifierName": "source"
-              },
-              "name": "source"
-            },
-            "init": {
-              "type": "StringLiteral",
-              "start": 13,
-              "end": 24,
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 13
-                },
-                "end": {
-                  "line": 1,
-                  "column": 24
-                }
-              },
-              "extra": {
-                "rawValue": "\\u0061a ",
-                "raw": "'\\\\u0061a '"
-              },
-              "value": "\\u0061a "
-            }
-          }
-        ],
-        "kind": "var"
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0000/output.json b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0000/output.json
index d363a5d4cc63..7124a7ba6fff 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0000/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0000/output.json
@@ -109,7 +109,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0001/output.json b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0001/output.json
index 80dde4eca487..0f104da5ae82 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0001/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0001/output.json
@@ -109,7 +109,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0002/output.json b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0002/output.json
index 4b11f881deec..8721f9d98403 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0002/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0002/output.json
@@ -109,7 +109,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0003/output.json b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0003/output.json
index fbcb70be2667..49094bb0e6bd 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0003/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0003/output.json
@@ -176,7 +176,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0004/output.json b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0004/output.json
index ea48a4030059..b1589f69dcee 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0004/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0004/output.json
@@ -61,7 +61,6 @@
           "directives": []
         },
         "handler": null,
-        "guardedHandlers": [],
         "finalizer": {
           "type": "BlockStatement",
           "start": 16,
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0005/output.json b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0005/output.json
index bc19c5698fbf..7bb5acfbedbb 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0005/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0005/output.json
@@ -225,7 +225,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": null
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0006/output.json b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0006/output.json
index dc667d97efc5..91b008540089 100644
--- a/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0006/output.json
+++ b/packages/babel-parser/test/fixtures/esprima/statement-try/migrated_0006/output.json
@@ -225,7 +225,6 @@
             "directives": []
           }
         },
-        "guardedHandlers": [],
         "finalizer": {
           "type": "BlockStatement",
           "start": 47,
diff --git a/packages/babel-parser/test/fixtures/estree/class-method/typescript/input.js b/packages/babel-parser/test/fixtures/estree/class-method/typescript/input.js
new file mode 100644
index 000000000000..06058b566778
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/class-method/typescript/input.js
@@ -0,0 +1,3 @@
+abstract class TSAbstractClass {
+  abstract foo(name: string): boolean;
+}
diff --git a/packages/babel-parser/test/fixtures/estree/class-method/typescript/options.json b/packages/babel-parser/test/fixtures/estree/class-method/typescript/options.json
new file mode 100644
index 000000000000..d69381825ce5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/class-method/typescript/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["typescript", "estree"]
+}
diff --git a/packages/babel-parser/test/fixtures/estree/class-method/typescript/output.json b/packages/babel-parser/test/fixtures/estree/class-method/typescript/output.json
new file mode 100644
index 000000000000..83a633725788
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/class-method/typescript/output.json
@@ -0,0 +1,219 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 73,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 73,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 73,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "abstract": true,
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 30
+            },
+            "identifierName": "TSAbstractClass"
+          },
+          "name": "TSAbstractClass"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 31,
+          "end": 73,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 31
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "MethodDefinition",
+              "start": 35,
+              "end": 71,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 38
+                }
+              },
+              "abstract": true,
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 44,
+                "end": 47,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 14
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "computed": false,
+              "kind": "method",
+              "value": {
+                "type": "FunctionExpression",
+                "start": 47,
+                "end": 71,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 38
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "expression": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 48,
+                    "end": 60,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 27
+                      },
+                      "identifierName": "name"
+                    },
+                    "name": "name",
+                    "typeAnnotation": {
+                      "type": "TSTypeAnnotation",
+                      "start": 52,
+                      "end": 60,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 19
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 27
+                        }
+                      },
+                      "typeAnnotation": {
+                        "type": "TSStringKeyword",
+                        "start": 54,
+                        "end": 60,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 27
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "returnType": {
+                  "type": "TSTypeAnnotation",
+                  "start": 61,
+                  "end": 70,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 28
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 37
+                    }
+                  },
+                  "typeAnnotation": {
+                    "type": "TSBooleanKeyword",
+                    "start": 63,
+                    "end": 70,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 30
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 37
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/enum/input.js b/packages/babel-parser/test/fixtures/estree/typescript/enum/input.js
new file mode 100644
index 000000000000..cf0b94467025
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/enum/input.js
@@ -0,0 +1,4 @@
+enum A {
+  a,
+  "r"
+}
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/enum/output.json b/packages/babel-parser/test/fixtures/estree/typescript/enum/output.json
new file mode 100644
index 000000000000..7a0e9a0cbb8d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/enum/output.json
@@ -0,0 +1,132 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSEnumDeclaration",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "members": [
+          {
+            "type": "TSEnumMember",
+            "start": 11,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 2
+              },
+              "end": {
+                "line": 2,
+                "column": 3
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 11,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 3
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            }
+          },
+          {
+            "type": "TSEnumMember",
+            "start": 16,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 2
+              },
+              "end": {
+                "line": 3,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Literal",
+              "start": 16,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 2
+                },
+                "end": {
+                  "line": 3,
+                  "column": 5
+                }
+              },
+              "value": "r",
+              "raw": "\"r\""
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/import-require/input.js b/packages/babel-parser/test/fixtures/estree/typescript/import-require/input.js
new file mode 100644
index 000000000000..6801238e6ff4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/import-require/input.js
@@ -0,0 +1 @@
+import x = require ("asdfasdf");
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/import-require/options.json b/packages/babel-parser/test/fixtures/estree/typescript/import-require/options.json
new file mode 100644
index 000000000000..2104ca43283f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/import-require/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "module"
+}
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/import-require/output.json b/packages/babel-parser/test/fixtures/estree/typescript/import-require/output.json
new file mode 100644
index 000000000000..65361fdc837c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/import-require/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSImportEqualsDeclaration",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "isExport": false,
+        "id": {
+          "type": "Identifier",
+          "start": 7,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            },
+            "identifierName": "x"
+          },
+          "name": "x"
+        },
+        "moduleReference": {
+          "type": "TSExternalModuleReference",
+          "start": 11,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 11
+            },
+            "end": {
+              "line": 1,
+              "column": 31
+            }
+          },
+          "expression": {
+            "type": "Literal",
+            "start": 20,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 20
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              }
+            },
+            "value": "asdfasdf",
+            "raw": "\"asdfasdf\""
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/import/input.js b/packages/babel-parser/test/fixtures/estree/typescript/import/input.js
new file mode 100644
index 000000000000..7bae7e8301b3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/import/input.js
@@ -0,0 +1,3 @@
+let x: typeof import('./x');
+let Y: import('./y').Y;
+let z: import("/z").foo.bar<string>;
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/import/output.json b/packages/babel-parser/test/fixtures/estree/typescript/import/output.json
new file mode 100644
index 000000000000..48ff04ded091
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/import/output.json
@@ -0,0 +1,441 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 89,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 89,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 28
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 5,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 27
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTypeQuery",
+                  "start": 7,
+                  "end": 27,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 27
+                    }
+                  },
+                  "exprName": {
+                    "type": "TSImportType",
+                    "start": 14,
+                    "end": 27,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 27
+                      }
+                    },
+                    "argument": {
+                      "type": "Literal",
+                      "start": 21,
+                      "end": 26,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 26
+                        }
+                      },
+                      "value": "./x",
+                      "raw": "'./x'"
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 29,
+        "end": 52,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 23
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 33,
+            "end": 51,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 22
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 33,
+              "end": 51,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 22
+                },
+                "identifierName": "Y"
+              },
+              "name": "Y",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 34,
+                "end": 51,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 22
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSImportType",
+                  "start": 36,
+                  "end": 51,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 22
+                    }
+                  },
+                  "argument": {
+                    "type": "Literal",
+                    "start": 43,
+                    "end": 48,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 19
+                      }
+                    },
+                    "value": "./y",
+                    "raw": "'./y'"
+                  },
+                  "qualifier": {
+                    "type": "Identifier",
+                    "start": 50,
+                    "end": 51,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 21
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 22
+                      },
+                      "identifierName": "Y"
+                    },
+                    "name": "Y"
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 53,
+        "end": 89,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 36
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 57,
+            "end": 88,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 4
+              },
+              "end": {
+                "line": 3,
+                "column": 35
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 57,
+              "end": 88,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 35
+                },
+                "identifierName": "z"
+              },
+              "name": "z",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 58,
+                "end": 88,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 35
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSImportType",
+                  "start": 60,
+                  "end": 88,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 35
+                    }
+                  },
+                  "argument": {
+                    "type": "Literal",
+                    "start": 67,
+                    "end": 71,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 18
+                      }
+                    },
+                    "value": "/z",
+                    "raw": "\"/z\""
+                  },
+                  "qualifier": {
+                    "type": "TSQualifiedName",
+                    "start": 73,
+                    "end": 80,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 20
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 27
+                      }
+                    },
+                    "left": {
+                      "type": "Identifier",
+                      "start": 73,
+                      "end": 76,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 23
+                        },
+                        "identifierName": "foo"
+                      },
+                      "name": "foo"
+                    },
+                    "right": {
+                      "type": "Identifier",
+                      "start": 77,
+                      "end": 80,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 24
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 27
+                        },
+                        "identifierName": "bar"
+                      },
+                      "name": "bar"
+                    }
+                  },
+                  "typeParameters": {
+                    "type": "TSTypeParameterInstantiation",
+                    "start": 80,
+                    "end": 88,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 27
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 35
+                      }
+                    },
+                    "params": [
+                      {
+                        "type": "TSStringKeyword",
+                        "start": 81,
+                        "end": 87,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 28
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 34
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/literals/input.js b/packages/babel-parser/test/fixtures/estree/typescript/literals/input.js
new file mode 100644
index 000000000000..ba1ece47de5d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/literals/input.js
@@ -0,0 +1,7 @@
+type Foo = false;
+type Foo2 = true;
+type Foo3 = "string";
+type Foo4 = 123;
+type Foo5 = 123.4;
+type Foo6 = -123;
+type Foo7 = -123.5;
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/literals/output.json b/packages/babel-parser/test/fixtures/estree/typescript/literals/output.json
new file mode 100644
index 000000000000..e08c9b31db6d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/literals/output.json
@@ -0,0 +1,516 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 131,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 7,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 131,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 7,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "typeAnnotation": {
+          "type": "TSLiteralType",
+          "start": 11,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 11
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "literal": {
+            "type": "Literal",
+            "start": 11,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "value": false,
+            "raw": "false"
+          }
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 18,
+        "end": 35,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 17
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 23,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 9
+            },
+            "identifierName": "Foo2"
+          },
+          "name": "Foo2"
+        },
+        "typeAnnotation": {
+          "type": "TSLiteralType",
+          "start": 30,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 16
+            }
+          },
+          "literal": {
+            "type": "Literal",
+            "start": 30,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 12
+              },
+              "end": {
+                "line": 2,
+                "column": 16
+              }
+            },
+            "value": true,
+            "raw": "true"
+          }
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 36,
+        "end": 57,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 21
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 41,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 5
+            },
+            "end": {
+              "line": 3,
+              "column": 9
+            },
+            "identifierName": "Foo3"
+          },
+          "name": "Foo3"
+        },
+        "typeAnnotation": {
+          "type": "TSLiteralType",
+          "start": 48,
+          "end": 56,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 12
+            },
+            "end": {
+              "line": 3,
+              "column": 20
+            }
+          },
+          "literal": {
+            "type": "Literal",
+            "start": 48,
+            "end": 56,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 12
+              },
+              "end": {
+                "line": 3,
+                "column": 20
+              }
+            },
+            "value": "string",
+            "raw": "\"string\""
+          }
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 58,
+        "end": 74,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 63,
+          "end": 67,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 5
+            },
+            "end": {
+              "line": 4,
+              "column": 9
+            },
+            "identifierName": "Foo4"
+          },
+          "name": "Foo4"
+        },
+        "typeAnnotation": {
+          "type": "TSLiteralType",
+          "start": 70,
+          "end": 73,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 12
+            },
+            "end": {
+              "line": 4,
+              "column": 15
+            }
+          },
+          "literal": {
+            "type": "Literal",
+            "start": 70,
+            "end": 73,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 12
+              },
+              "end": {
+                "line": 4,
+                "column": 15
+              }
+            },
+            "value": 123,
+            "raw": "123"
+          }
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 75,
+        "end": 93,
+        "loc": {
+          "start": {
+            "line": 5,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 18
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 80,
+          "end": 84,
+          "loc": {
+            "start": {
+              "line": 5,
+              "column": 5
+            },
+            "end": {
+              "line": 5,
+              "column": 9
+            },
+            "identifierName": "Foo5"
+          },
+          "name": "Foo5"
+        },
+        "typeAnnotation": {
+          "type": "TSLiteralType",
+          "start": 87,
+          "end": 92,
+          "loc": {
+            "start": {
+              "line": 5,
+              "column": 12
+            },
+            "end": {
+              "line": 5,
+              "column": 17
+            }
+          },
+          "literal": {
+            "type": "Literal",
+            "start": 87,
+            "end": 92,
+            "loc": {
+              "start": {
+                "line": 5,
+                "column": 12
+              },
+              "end": {
+                "line": 5,
+                "column": 17
+              }
+            },
+            "value": 123.4,
+            "raw": "123.4"
+          }
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 94,
+        "end": 111,
+        "loc": {
+          "start": {
+            "line": 6,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 17
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 99,
+          "end": 103,
+          "loc": {
+            "start": {
+              "line": 6,
+              "column": 5
+            },
+            "end": {
+              "line": 6,
+              "column": 9
+            },
+            "identifierName": "Foo6"
+          },
+          "name": "Foo6"
+        },
+        "typeAnnotation": {
+          "type": "TSLiteralType",
+          "start": 106,
+          "end": 110,
+          "loc": {
+            "start": {
+              "line": 6,
+              "column": 12
+            },
+            "end": {
+              "line": 6,
+              "column": 16
+            }
+          },
+          "literal": {
+            "type": "UnaryExpression",
+            "start": 106,
+            "end": 110,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 12
+              },
+              "end": {
+                "line": 6,
+                "column": 16
+              }
+            },
+            "operator": "-",
+            "prefix": true,
+            "argument": {
+              "type": "Literal",
+              "start": 107,
+              "end": 110,
+              "loc": {
+                "start": {
+                  "line": 6,
+                  "column": 13
+                },
+                "end": {
+                  "line": 6,
+                  "column": 16
+                }
+              },
+              "value": 123,
+              "raw": "123"
+            }
+          }
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 112,
+        "end": 131,
+        "loc": {
+          "start": {
+            "line": 7,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 19
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 117,
+          "end": 121,
+          "loc": {
+            "start": {
+              "line": 7,
+              "column": 5
+            },
+            "end": {
+              "line": 7,
+              "column": 9
+            },
+            "identifierName": "Foo7"
+          },
+          "name": "Foo7"
+        },
+        "typeAnnotation": {
+          "type": "TSLiteralType",
+          "start": 124,
+          "end": 130,
+          "loc": {
+            "start": {
+              "line": 7,
+              "column": 12
+            },
+            "end": {
+              "line": 7,
+              "column": 18
+            }
+          },
+          "literal": {
+            "type": "UnaryExpression",
+            "start": 124,
+            "end": 130,
+            "loc": {
+              "start": {
+                "line": 7,
+                "column": 12
+              },
+              "end": {
+                "line": 7,
+                "column": 18
+              }
+            },
+            "operator": "-",
+            "prefix": true,
+            "argument": {
+              "type": "Literal",
+              "start": 125,
+              "end": 130,
+              "loc": {
+                "start": {
+                  "line": 7,
+                  "column": 13
+                },
+                "end": {
+                  "line": 7,
+                  "column": 18
+                }
+              },
+              "value": 123.5,
+              "raw": "123.5"
+            }
+          }
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/estree/typescript/options.json b/packages/babel-parser/test/fixtures/estree/typescript/options.json
new file mode 100644
index 000000000000..d69381825ce5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/estree/typescript/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["typescript", "estree"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/.bigint/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/.bigint/options.json
index 20096726d620..8e44fabed2f5 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/.bigint/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/.bigint/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'bigInt' (1:1)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'bigInt' (1:1)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/.class-private-properties/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/.class-private-properties/options.json
index 16521eb656b1..85d7fee65f66 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/.class-private-properties/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/.class-private-properties/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'classPrivateProperties' (2:3)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classPrivateProperties' (2:3)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/.numeric-separator/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/.numeric-separator/options.json
index 06642e156345..6996ba6f1573 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/.numeric-separator/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/.numeric-separator/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'numericSeparator' (1:17)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'numericSeparator' (1:17)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/async-generators/input.js b/packages/babel-parser/test/fixtures/experimental/_no-plugin/async-generators/input.js
deleted file mode 100644
index 6d06ef263a91..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/async-generators/input.js
+++ /dev/null
@@ -1 +0,0 @@
-async function * f () {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/async-generators/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/async-generators/options.json
deleted file mode 100644
index e55164203df2..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/async-generators/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'asyncGenerators' (1:15)",
-  "plugins": []
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/options.json
index 6dc7d63208aa..a4e85bf033a7 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer-and-type/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": ["flow"],
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'classProperties' (2:14)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classProperties' (2:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/options.json
index 44726ea60083..aaa6e8068648 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-with-initializer/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'classProperties' (2:6)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classProperties' (2:6)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/options.json
index 4d708dc64434..bbec0b1850ba 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/class-properties-without-initializer/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'classProperties' (2:5)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classProperties' (2:5)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/decorators/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/decorators/options.json
index b8382f9c0850..11f94afa3b7a 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/decorators/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/decorators/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling one of the following parser plugin(s): 'decorators-legacy, decorators' (1:0)",
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'decorators-legacy, decorators' (1:0)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/do-expressions/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/do-expressions/options.json
index b7fe32fb80f0..0aaae18db824 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/do-expressions/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/do-expressions/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'doExpressions' (1:1)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'doExpressions' (1:1)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/dynamic-import/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/dynamic-import/options.json
index ee35343694f9..90bbfd5623c9 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/dynamic-import/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/dynamic-import/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'dynamicImport' (1:8)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'dynamicImport' (1:8)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-default/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-default/options.json
index 7d30825d8387..e306a4f34cbf 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-default/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-default/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-namespace/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-namespace/options.json
index ff150bf97657..b8b7c829daad 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-namespace/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/export-namespace/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'exportNamespaceFrom' (1:9)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportNamespaceFrom' (1:9)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-meta/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-meta/options.json
index ae56b0d5e7fe..48ce55a15d05 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-meta/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-meta/options.json
@@ -1,6 +1,5 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'importMeta' (1:17)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'importMeta' (1:17)",
   "sourceType": "module",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/object-rest-spread/input.js b/packages/babel-parser/test/fixtures/experimental/_no-plugin/object-rest-spread/input.js
deleted file mode 100644
index 93e64fb4cac9..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/object-rest-spread/input.js
+++ /dev/null
@@ -1 +0,0 @@
-({...x})
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/object-rest-spread/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/object-rest-spread/options.json
deleted file mode 100644
index e56fe7d7df85..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/object-rest-spread/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'objectRestSpread' (1:2)",
-  "plugins": []
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/optional-chaining/options.json b/packages/babel-parser/test/fixtures/experimental/_no-plugin/optional-chaining/options.json
index 9a205fc1d32e..b8e170c94adb 100644
--- a/packages/babel-parser/test/fixtures/experimental/_no-plugin/optional-chaining/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/_no-plugin/optional-chaining/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'optionalChaining' (1:1)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'optionalChaining' (1:1)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/class-method-no-asi/options.json b/packages/babel-parser/test/fixtures/experimental/async-generators/class-method-no-asi/options.json
deleted file mode 100644
index f3c78ddb4f02..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/async-generators/class-method-no-asi/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'classProperties' (3:2)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-in/options.json b/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-in/options.json
deleted file mode 100644
index f8dd5c55d98e..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-in/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (2:19)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-1/options.json b/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-1/options.json
deleted file mode 100644
index f45f06d72ed4..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-1/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (2:13)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-2/options.json b/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-2/options.json
deleted file mode 100644
index c2c8f56374f4..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-2/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (2:22)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-3/options.json b/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-3/options.json
deleted file mode 100644
index ae405ee221c3..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/async-generators/for-await-no-semi-3/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (2:18)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/async-generators/options.json b/packages/babel-parser/test/fixtures/experimental/async-generators/options.json
deleted file mode 100644
index eea8c9d9d384..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/async-generators/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["asyncGenerators"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/options.json b/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/options.json
index 4b249f0aaaaa..8d265ec66c23 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["classPrivateMethods", "asyncGenerators"]
+  "plugins": ["classPrivateMethods"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/output.json b/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/output.json
index 2ec8a62bd6d2..15456d810c09 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-methods/async-generator/output.json
@@ -523,7 +523,6 @@
                       "directives": []
                     },
                     "handler": null,
-                    "guardedHandlers": [],
                     "finalizer": {
                       "type": "BlockStatement",
                       "start": 173,
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-no-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-no-plugin/options.json
index 568c1237e9d6..15cf5cc8d413 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-no-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-no-plugin/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'classPrivateMethods' (3:2)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'classPrivateMethods' (3:2)",
   "plugins": ["classPrivateProperties"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-spaces/input.js b/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-spaces/input.js
new file mode 100644
index 000000000000..b49e1327f4c0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-spaces/input.js
@@ -0,0 +1,5 @@
+class Spaces {
+  #  wrongSpaces() {
+    return fail();
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-spaces/options.json b/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-spaces/options.json
new file mode 100644
index 000000000000..9914950b66fe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-methods/failure-spaces/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "Unexpected space between # and identifier (2:3)",
+  "plugins": ["classPrivateMethods"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-literal/options.json b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-literal/options.json
index 714877566f00..2ba960820f02 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-literal/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-literal/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "Unexpected token (2:3)",
+  "throws": "Unexpected digit after hash token (2:2)",
   "plugins": ["classPrivateProperties"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-start-identifier/options.json b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-start-identifier/options.json
index c1de1d488c13..2ba960820f02 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-start-identifier/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-numeric-start-identifier/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "Identifier directly after number (2:4)",
+  "throws": "Unexpected digit after hash token (2:2)",
   "plugins": ["classPrivateProperties"]
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-spaces/input.js b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-spaces/input.js
new file mode 100644
index 000000000000..023684c53e80
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-spaces/input.js
@@ -0,0 +1,3 @@
+class Spaces {
+  #  wrongSpaces;
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-spaces/options.json b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-spaces/options.json
new file mode 100644
index 000000000000..9914950b66fe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-properties/failure-spaces/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "Unexpected space between # and identifier (2:3)",
+  "plugins": ["classPrivateMethods"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/class-private-properties/super-call/options.json b/packages/babel-parser/test/fixtures/experimental/class-private-properties/super-call/options.json
index c4e5a9947939..2154c844bfd7 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-private-properties/super-call/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-private-properties/super-call/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": ["classPrivateProperties"],
-  "throws":
-    "super() is only valid inside a class constructor. Make sure the method name is spelled exactly as 'constructor'. (4:13)"
+  "throws": "super() is only valid inside a class constructor of a subclass. Maybe a typo in the method name ('constructor') or not extending another class? (4:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/input.js b/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/input.js
index 2e57778bbb21..91a95beaa1f9 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/input.js
+++ b/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/input.js
@@ -3,7 +3,7 @@ class Foo {
   y
 }
 
-class Foo {
+class Foo2 {
   p
   [m] () {}
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/output.json b/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/output.json
index 6f798008cbcf..1b75f5865de8 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-properties/asi-success/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 52,
+  "end": 53,
   "loc": {
     "start": {
       "line": 1,
@@ -15,7 +15,7 @@
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 52,
+    "end": 53,
     "loc": {
       "start": {
         "line": 1,
@@ -152,7 +152,7 @@
       {
         "type": "ClassDeclaration",
         "start": 23,
-        "end": 52,
+        "end": 53,
         "loc": {
           "start": {
             "line": 6,
@@ -166,7 +166,7 @@
         "id": {
           "type": "Identifier",
           "start": 29,
-          "end": 32,
+          "end": 33,
           "loc": {
             "start": {
               "line": 6,
@@ -174,21 +174,21 @@
             },
             "end": {
               "line": 6,
-              "column": 9
+              "column": 10
             },
-            "identifierName": "Foo"
+            "identifierName": "Foo2"
           },
-          "name": "Foo"
+          "name": "Foo2"
         },
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 33,
-          "end": 52,
+          "start": 34,
+          "end": 53,
           "loc": {
             "start": {
               "line": 6,
-              "column": 10
+              "column": 11
             },
             "end": {
               "line": 9,
@@ -198,8 +198,8 @@
           "body": [
             {
               "type": "ClassProperty",
-              "start": 37,
-              "end": 38,
+              "start": 38,
+              "end": 39,
               "loc": {
                 "start": {
                   "line": 7,
@@ -213,8 +213,8 @@
               "static": false,
               "key": {
                 "type": "Identifier",
-                "start": 37,
-                "end": 38,
+                "start": 38,
+                "end": 39,
                 "loc": {
                   "start": {
                     "line": 7,
@@ -233,8 +233,8 @@
             },
             {
               "type": "ClassMethod",
-              "start": 41,
-              "end": 50,
+              "start": 42,
+              "end": 51,
               "loc": {
                 "start": {
                   "line": 8,
@@ -249,8 +249,8 @@
               "computed": true,
               "key": {
                 "type": "Identifier",
-                "start": 42,
-                "end": 43,
+                "start": 43,
+                "end": 44,
                 "loc": {
                   "start": {
                     "line": 8,
@@ -271,8 +271,8 @@
               "params": [],
               "body": {
                 "type": "BlockStatement",
-                "start": 48,
-                "end": 50,
+                "start": 49,
+                "end": 51,
                 "loc": {
                   "start": {
                     "line": 8,
diff --git a/packages/babel-parser/test/fixtures/experimental/class-properties/computed/input.js b/packages/babel-parser/test/fixtures/experimental/class-properties/computed/input.js
index d3bc5e5d6fc6..a712d16ba66e 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-properties/computed/input.js
+++ b/packages/babel-parser/test/fixtures/experimental/class-properties/computed/input.js
@@ -3,7 +3,7 @@ class Foo {
   ['y']
 }
 
-class Foo {
+class Foo2 {
   [p]
   [m] () {}
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-properties/computed/output.json b/packages/babel-parser/test/fixtures/experimental/class-properties/computed/output.json
index 4b12933c424c..40771337a35f 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-properties/computed/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-properties/computed/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 60,
+  "end": 61,
   "loc": {
     "start": {
       "line": 1,
@@ -15,7 +15,7 @@
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 60,
+    "end": 61,
     "loc": {
       "start": {
         "line": 1,
@@ -155,7 +155,7 @@
       {
         "type": "ClassDeclaration",
         "start": 29,
-        "end": 60,
+        "end": 61,
         "loc": {
           "start": {
             "line": 6,
@@ -169,7 +169,7 @@
         "id": {
           "type": "Identifier",
           "start": 35,
-          "end": 38,
+          "end": 39,
           "loc": {
             "start": {
               "line": 6,
@@ -177,21 +177,21 @@
             },
             "end": {
               "line": 6,
-              "column": 9
+              "column": 10
             },
-            "identifierName": "Foo"
+            "identifierName": "Foo2"
           },
-          "name": "Foo"
+          "name": "Foo2"
         },
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 39,
-          "end": 60,
+          "start": 40,
+          "end": 61,
           "loc": {
             "start": {
               "line": 6,
-              "column": 10
+              "column": 11
             },
             "end": {
               "line": 9,
@@ -201,8 +201,8 @@
           "body": [
             {
               "type": "ClassProperty",
-              "start": 43,
-              "end": 46,
+              "start": 44,
+              "end": 47,
               "loc": {
                 "start": {
                   "line": 7,
@@ -217,8 +217,8 @@
               "computed": true,
               "key": {
                 "type": "Identifier",
-                "start": 44,
-                "end": 45,
+                "start": 45,
+                "end": 46,
                 "loc": {
                   "start": {
                     "line": 7,
@@ -236,8 +236,8 @@
             },
             {
               "type": "ClassMethod",
-              "start": 49,
-              "end": 58,
+              "start": 50,
+              "end": 59,
               "loc": {
                 "start": {
                   "line": 8,
@@ -252,8 +252,8 @@
               "computed": true,
               "key": {
                 "type": "Identifier",
-                "start": 50,
-                "end": 51,
+                "start": 51,
+                "end": 52,
                 "loc": {
                   "start": {
                     "line": 8,
@@ -274,8 +274,8 @@
               "params": [],
               "body": {
                 "type": "BlockStatement",
-                "start": 56,
-                "end": 58,
+                "start": 57,
+                "end": 59,
                 "loc": {
                   "start": {
                     "line": 8,
diff --git a/packages/babel-parser/test/fixtures/experimental/class-properties/super-call/options.json b/packages/babel-parser/test/fixtures/experimental/class-properties/super-call/options.json
index 615953e7b7bb..e8d509e27740 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-properties/super-call/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-properties/super-call/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": ["classProperties"],
-  "throws":
-    "super() is only valid inside a class constructor. Make sure the method name is spelled exactly as 'constructor'. (4:12)"
+  "throws": "super() is only valid inside a class constructor of a subclass. Maybe a typo in the method name ('constructor') or not extending another class? (4:12)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/input.js b/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/input.js
index 6cc3a4087ca6..bcbcd17cdb47 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/input.js
+++ b/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/input.js
@@ -1,3 +1,3 @@
-class A {
+class A extends B {
   foo = () => super.x();
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/output.json b/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/output.json
index bf0e39a95089..d411c6ff6e6f 100644
--- a/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/class-properties/super-inside-arrow-function/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 36,
+  "end": 46,
   "loc": {
     "start": {
       "line": 1,
@@ -15,7 +15,7 @@
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 36,
+    "end": 46,
     "loc": {
       "start": {
         "line": 1,
@@ -32,7 +32,7 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 36,
+        "end": 46,
         "loc": {
           "start": {
             "line": 1,
@@ -60,15 +60,31 @@
           },
           "name": "A"
         },
-        "superClass": null,
+        "superClass": {
+          "type": "Identifier",
+          "start": 16,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            },
+            "identifierName": "B"
+          },
+          "name": "B"
+        },
         "body": {
           "type": "ClassBody",
-          "start": 8,
-          "end": 36,
+          "start": 18,
+          "end": 46,
           "loc": {
             "start": {
               "line": 1,
-              "column": 8
+              "column": 18
             },
             "end": {
               "line": 3,
@@ -78,8 +94,8 @@
           "body": [
             {
               "type": "ClassProperty",
-              "start": 12,
-              "end": 34,
+              "start": 22,
+              "end": 44,
               "loc": {
                 "start": {
                   "line": 2,
@@ -93,8 +109,8 @@
               "static": false,
               "key": {
                 "type": "Identifier",
-                "start": 12,
-                "end": 15,
+                "start": 22,
+                "end": 25,
                 "loc": {
                   "start": {
                     "line": 2,
@@ -111,8 +127,8 @@
               "computed": false,
               "value": {
                 "type": "ArrowFunctionExpression",
-                "start": 18,
-                "end": 33,
+                "start": 28,
+                "end": 43,
                 "loc": {
                   "start": {
                     "line": 2,
@@ -129,8 +145,8 @@
                 "params": [],
                 "body": {
                   "type": "CallExpression",
-                  "start": 24,
-                  "end": 33,
+                  "start": 34,
+                  "end": 43,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -143,8 +159,8 @@
                   },
                   "callee": {
                     "type": "MemberExpression",
-                    "start": 24,
-                    "end": 31,
+                    "start": 34,
+                    "end": 41,
                     "loc": {
                       "start": {
                         "line": 2,
@@ -157,8 +173,8 @@
                     },
                     "object": {
                       "type": "Super",
-                      "start": 24,
-                      "end": 29,
+                      "start": 34,
+                      "end": 39,
                       "loc": {
                         "start": {
                           "line": 2,
@@ -172,8 +188,8 @@
                     },
                     "property": {
                       "type": "Identifier",
-                      "start": 30,
-                      "end": 31,
+                      "start": 40,
+                      "end": 41,
                       "loc": {
                         "start": {
                           "line": 2,
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-export-default-decorated-expression-without-parens/options.json b/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-export-default-decorated-expression-without-parens/options.json
index 2228d3b663d8..39592e4eb294 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-export-default-decorated-expression-without-parens/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-export-default-decorated-expression-without-parens/options.json
@@ -1,6 +1,5 @@
 {
   "sourceType": "module",
   "plugins": [["decorators", { "decoratorsBeforeExport": true }]],
-  "throws":
-    "Decorators must be placed *before* the 'export' keyword. You can set the 'decoratorsBeforeExport' option to false to use the 'export @decorator class {}' syntax (1:15)"
+  "throws": "Decorators must be placed *before* the 'export' keyword. You can set the 'decoratorsBeforeExport' option to false to use the 'export @decorator class {}' syntax (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-required/options.json b/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-required/options.json
index d4ebe6ec4190..3a1e80661a8f 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-required/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-required/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": ["decorators"],
-  "throws":
-    "The 'decorators' plugin requires a 'decoratorsBeforeExport' option, whose value must be a boolean. If you are migrating from Babylon/Babel 6 or want to use the old decorators proposal, you should use the 'decorators-legacy' plugin instead of 'decorators'."
+  "throws": "The 'decorators' plugin requires a 'decoratorsBeforeExport' option, whose value must be a boolean. If you are migrating from Babylon/Babel 6 or want to use the old decorators proposal, you should use the 'decorators-legacy' plugin instead of 'decorators'."
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-true-decorator-after-export/options.json b/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-true-decorator-after-export/options.json
index bf5b0882589b..8fc06b1b8c69 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-true-decorator-after-export/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-2/decoratorsBeforeExport-true-decorator-after-export/options.json
@@ -1,6 +1,5 @@
 {
   "sourceType": "module",
   "plugins": [["decorators", { "decoratorsBeforeExport": true }]],
-  "throws":
-    "Decorators must be placed *before* the 'export' keyword. You can set the 'decoratorsBeforeExport' option to false to use the 'export @decorator class {}' syntax (1:7)"
+  "throws": "Decorators must be placed *before* the 'export' keyword. You can set the 'decoratorsBeforeExport' option to false to use the 'export @decorator class {}' syntax (1:7)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-2/export-decorated-class-without-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/decorators-2/export-decorated-class-without-plugin/options.json
index c3ea9d200b1b..5a8bd1e83883 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-2/export-decorated-class-without-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-2/export-decorated-class-without-plugin/options.json
@@ -1,6 +1,5 @@
 {
   "sourceType": "module",
-  "throws":
-    "This experimental syntax requires enabling one of the following parser plugin(s): 'decorators, decorators-legacy' (1:7)",
+  "throws": "This experimental syntax requires enabling one of the following parser plugin(s): 'decorators, decorators-legacy' (1:7)",
   "plugins": null
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-2/no-export-decorators-on-class/options.json b/packages/babel-parser/test/fixtures/experimental/decorators-2/no-export-decorators-on-class/options.json
index ddf4b1f47c8b..cb54fc794402 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-2/no-export-decorators-on-class/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-2/no-export-decorators-on-class/options.json
@@ -1,5 +1,4 @@
 {
   "sourceType": "module",
-  "throws":
-    "Using the export keyword between a decorator and a class is not allowed. Please use `export @dec class` instead. (2:0)"
+  "throws": "Using the export keyword between a decorator and a class is not allowed. Please use `export @dec class` instead. (2:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators-2/no-object-methods/options.json b/packages/babel-parser/test/fixtures/experimental/decorators-2/no-object-methods/options.json
index e885f2c0176d..7dd4ed9e2837 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators-2/no-object-methods/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators-2/no-object-methods/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Stage 2 decorators disallow object literal property decorators (2:2)"
+  "throws": "Stage 2 decorators disallow object literal property decorators (2:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/method-generator-decorator/input.js b/packages/babel-parser/test/fixtures/experimental/decorators/method-generator-decorator/input.js
new file mode 100644
index 000000000000..fe45bb8682d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/decorators/method-generator-decorator/input.js
@@ -0,0 +1,4 @@
+class Foo {
+  @deco
+  *generatorMethod() {}
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/method-generator-decorator/output.json b/packages/babel-parser/test/fixtures/experimental/decorators/method-generator-decorator/output.json
new file mode 100644
index 000000000000..8fb4c84a2e60
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/decorators/method-generator-decorator/output.json
@@ -0,0 +1,175 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 45,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 45,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 45,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 10,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassMethod",
+              "start": 14,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 3,
+                  "column": 23
+                }
+              },
+              "decorators": [
+                {
+                  "type": "Decorator",
+                  "start": 14,
+                  "end": 19,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 7
+                    }
+                  },
+                  "expression": {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 19,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 3
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      },
+                      "identifierName": "deco"
+                    },
+                    "name": "deco"
+                  }
+                }
+              ],
+              "static": false,
+              "kind": "method",
+              "key": {
+                "type": "Identifier",
+                "start": 23,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 18
+                  },
+                  "identifierName": "generatorMethod"
+                },
+                "name": "generatorMethod"
+              },
+              "computed": false,
+              "id": null,
+              "generator": true,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 41,
+                "end": 43,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 23
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-without-class/options.json b/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-without-class/options.json
index bf5a1cc8a75a..61c2c23daaae 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-without-class/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators-without-class/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "You can only use decorators on an export when exporting a class (2:0)",
+  "throws": "You can only use decorators on an export when exporting a class (2:0)",
   "sourceType": "module"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators/options.json b/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators/options.json
index bf5a1cc8a75a..61c2c23daaae 100644
--- a/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/decorators/no-export-decorators/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "You can only use decorators on an export when exporting a class (2:0)",
+  "throws": "You can only use decorators on an export when exporting a class (2:0)",
   "sourceType": "module"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/input.js b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/input.js
new file mode 100644
index 000000000000..eb88f1a997e4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/input.js
@@ -0,0 +1 @@
+new import("foo");
diff --git a/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/options.json b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/options.json
new file mode 100644
index 000000000000..26e64ffc5d96
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-new/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Cannot use new with import(...) (1:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/input.js b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/input.js
new file mode 100644
index 000000000000..6596802add47
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/input.js
@@ -0,0 +1 @@
+import("foo",);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/options.json b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/options.json
new file mode 100644
index 000000000000..770750c7f91f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/dynamic-import/invalid-trailing-comma/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Trailing comma is disallowed inside import(...) arguments (1:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/dynamic-import/no-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/dynamic-import/no-plugin/options.json
index 09561b2d687e..8036724beed2 100644
--- a/packages/babel-parser/test/fixtures/experimental/dynamic-import/no-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/dynamic-import/no-plugin/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'dynamicImport' (1:0)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'dynamicImport' (1:0)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/export-extensions/default-and-named/output.json b/packages/babel-parser/test/fixtures/experimental/export-extensions/default-and-named/output.json
index e4c389eba105..e65a50b154b0 100644
--- a/packages/babel-parser/test/fixtures/experimental/export-extensions/default-and-named/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/export-extensions/default-and-named/output.json
@@ -145,7 +145,8 @@
             "raw": "\"bar\""
           },
           "value": "bar"
-        }
+        },
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/experimental/export-extensions/export-with-ts/output.json b/packages/babel-parser/test/fixtures/experimental/export-extensions/export-with-ts/output.json
index 1c9388e7c02b..912eb1b41745 100644
--- a/packages/babel-parser/test/fixtures/experimental/export-extensions/export-with-ts/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/export-extensions/export-with-ts/output.json
@@ -114,12 +114,12 @@
         "source": null,
         "declaration": {
           "type": "TSInterfaceDeclaration",
-          "start": 42,
+          "start": 34,
           "end": 56,
           "loc": {
             "start": {
               "line": 2,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 2,
diff --git a/packages/babel-parser/test/fixtures/experimental/export-extensions/ns-and-named/output.json b/packages/babel-parser/test/fixtures/experimental/export-extensions/ns-and-named/output.json
index 0cdcb04cb459..0c6d34007629 100644
--- a/packages/babel-parser/test/fixtures/experimental/export-extensions/ns-and-named/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/export-extensions/ns-and-named/output.json
@@ -145,7 +145,8 @@
             "raw": "\"bar\""
           },
           "value": "bar"
-        }
+        },
+        "declaration": null
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-declaration/options.json b/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-declaration/options.json
index 51cc8d68ea3f..991da279e599 100644
--- a/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-declaration/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-declaration/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'functionSent' (2:11)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'functionSent' (2:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-expression/options.json b/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-expression/options.json
index ec48aeabce6b..eee5abbf1f93 100644
--- a/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-expression/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-function-keyword-expression/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'functionSent' (2:12)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'functionSent' (2:12)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-inside-generator/options.json b/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-inside-generator/options.json
index 3cb65d1733f1..9ce89a133dca 100644
--- a/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-inside-generator/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/function-sent/disabled-inside-generator/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'functionSent' (2:18)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'functionSent' (2:18)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/options.json
index f53f788ae5ce..5956ed25f3dd 100644
--- a/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/import-meta/without-plugin/options.json
@@ -1,5 +1,4 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'importMeta' (1:7)",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'importMeta' (1:7)",
   "plugins": []
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/output.json b/packages/babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/output.json
deleted file mode 100644
index 0a597e806399..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/output.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 98,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 2,
-      "column": 82
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 98,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 82
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": [
-      {
-        "type": "Directive",
-        "start": 0,
-        "end": 15,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 15
-          }
-        },
-        "value": {
-          "type": "DirectiveLiteral",
-          "start": 0,
-          "end": 14,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 0
-            },
-            "end": {
-              "line": 1,
-              "column": 14
-            }
-          },
-          "value": "before
after",
-          "extra": {
-            "raw": "\"before
after\"",
-            "rawValue": "before
after"
-          }
-        },
-        "trailingComments": [
-          {
-            "type": "CommentLine",
-            "value": "     ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
-            "start": 16,
-            "end": 98,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 0
-              },
-              "end": {
-                "line": 2,
-                "column": 82
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "comments": [
-    {
-      "type": "CommentLine",
-      "value": "     ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
-      "start": 16,
-      "end": 98,
-      "loc": {
-        "start": {
-          "line": 2,
-          "column": 0
-        },
-        "end": {
-          "line": 2,
-          "column": 82
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/output.json b/packages/babel-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/output.json
deleted file mode 100644
index ad5a48a14c37..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/output.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 103,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 2,
-      "column": 87
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 103,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 87
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [],
-    "directives": [
-      {
-        "type": "Directive",
-        "start": 0,
-        "end": 15,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 15
-          }
-        },
-        "value": {
-          "type": "DirectiveLiteral",
-          "start": 0,
-          "end": 14,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 0
-            },
-            "end": {
-              "line": 1,
-              "column": 14
-            }
-          },
-          "value": "before
after",
-          "extra": {
-            "raw": "\"before
after\"",
-            "rawValue": "before
after"
-          }
-        },
-        "trailingComments": [
-          {
-            "type": "CommentLine",
-            "value": "     ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
-            "start": 16,
-            "end": 103,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 0
-              },
-              "end": {
-                "line": 2,
-                "column": 87
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "comments": [
-    {
-      "type": "CommentLine",
-      "value": "     ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
-      "start": 16,
-      "end": 103,
-      "loc": {
-        "start": {
-          "line": 2,
-          "column": 0
-        },
-        "end": {
-          "line": 2,
-          "column": 87
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/options.json b/packages/babel-parser/test/fixtures/experimental/json-strings/options.json
deleted file mode 100644
index 81996860335a..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/json-strings/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["jsonStrings"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/output.json b/packages/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/output.json
deleted file mode 100644
index 7dde2fc8ab29..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/output.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 101,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 2,
-      "column": 83
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 101,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 83
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "ExpressionStatement",
-        "start": 0,
-        "end": 17,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 17
-          }
-        },
-        "expression": {
-          "type": "StringLiteral",
-          "start": 1,
-          "end": 15,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 1
-            },
-            "end": {
-              "line": 1,
-              "column": 15
-            }
-          },
-          "extra": {
-            "rawValue": "before
after",
-            "raw": "\"before
after\"",
-            "parenthesized": true,
-            "parenStart": 0
-          },
-          "value": "before
after"
-        },
-        "trailingComments": [
-          {
-            "type": "CommentLine",
-            "value": "      ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
-            "start": 18,
-            "end": 101,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 0
-              },
-              "end": {
-                "line": 2,
-                "column": 83
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "directives": []
-  },
-  "comments": [
-    {
-      "type": "CommentLine",
-      "value": "      ^ That's a U+2028 LINE SEPARATOR UTF-16 char (between 'before' and 'after')",
-      "start": 18,
-      "end": 101,
-      "loc": {
-        "start": {
-          "line": 2,
-          "column": 0
-        },
-        "end": {
-          "line": 2,
-          "column": 83
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/output.json b/packages/babel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/output.json
deleted file mode 100644
index d7dab40405e9..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/output.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 106,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 2,
-      "column": 88
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 106,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 88
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "ExpressionStatement",
-        "start": 0,
-        "end": 17,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 17
-          }
-        },
-        "expression": {
-          "type": "StringLiteral",
-          "start": 1,
-          "end": 15,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 1
-            },
-            "end": {
-              "line": 1,
-              "column": 15
-            }
-          },
-          "extra": {
-            "rawValue": "before
after",
-            "raw": "\"before
after\"",
-            "parenthesized": true,
-            "parenStart": 0
-          },
-          "value": "before
after"
-        },
-        "trailingComments": [
-          {
-            "type": "CommentLine",
-            "value": "      ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
-            "start": 18,
-            "end": 106,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 0
-              },
-              "end": {
-                "line": 2,
-                "column": 88
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "directives": []
-  },
-  "comments": [
-    {
-      "type": "CommentLine",
-      "value": "      ^ That's a U+2029 PARAGRAPH SEPARATOR UTF-16 char (between 'before' and 'after')",
-      "start": 18,
-      "end": 106,
-      "loc": {
-        "start": {
-          "line": 2,
-          "column": 0
-        },
-        "end": {
-          "line": 2,
-          "column": 88
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/and-and-equals-no-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/and-and-equals-no-plugin/options.json
index dca714007eba..5b674fdee42e 100644
--- a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/and-and-equals-no-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/and-and-equals-no-plugin/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [],
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'logicalAssignment' (1:2)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'logicalAssignment' (1:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/mallet-no-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/mallet-no-plugin/options.json
index dca714007eba..5b674fdee42e 100644
--- a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/mallet-no-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/mallet-no-plugin/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [],
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'logicalAssignment' (1:2)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'logicalAssignment' (1:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/options.json
index 4aab2b254ee7..3cb238ee4af0 100644
--- a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-null-coalesce-plugin/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": ["logicalAssignment"],
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'nullishCoalescingOperator' (1:2)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'nullishCoalescingOperator' (1:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-plugin/options.json
index a1cf5c9fda7c..f5e977775daf 100644
--- a/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/logical-assignment-operator/qq-equals-no-plugin/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": ["nullishCoalescingOperator"],
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'logicalAssignment' (1:2)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'logicalAssignment' (1:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/options.json b/packages/babel-parser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/options.json
index 0904e05d8c5e..9ae9a3d8a5d1 100644
--- a/packages/babel-parser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/nullish-coalescing-operator/no-plugin-error/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'nullishCoalescingOperator' (1:4)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'nullishCoalescingOperator' (1:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/11/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/11/options.json
deleted file mode 100644
index 7c9cd8106fd9..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/11/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sourceType": "module",
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:23)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/12/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/12/options.json
deleted file mode 100644
index 566d19621890..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/12/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sourceType": "module",
-  "throws":
-    "`bar` has already been exported. Exported identifiers must be unique. (2:13)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/13/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/13/options.json
deleted file mode 100644
index eef913e6fd20..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/13/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sourceType": "module",
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:30)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/14/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/14/options.json
deleted file mode 100644
index 2c69619f7140..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/14/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sourceType": "module",
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:29)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/15/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/15/options.json
deleted file mode 100644
index eef913e6fd20..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/15/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sourceType": "module",
-  "throws":
-    "`foo` has already been exported. Exported identifiers must be unique. (2:30)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/16/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/16/options.json
deleted file mode 100644
index f65c23001ff1..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/16/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/17/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/17/options.json
deleted file mode 100644
index bf0116a7b09f..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/17/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:9)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/19/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/19/options.json
deleted file mode 100644
index 6a9895dd9d8c..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/19/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:18)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/20/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/20/options.json
deleted file mode 100644
index 6a9895dd9d8c..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/20/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:18)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/22/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/22/options.json
deleted file mode 100644
index f65c23001ff1..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/22/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/23/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/23/options.json
deleted file mode 100644
index 6a9895dd9d8c..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/23/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:18)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/25/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/25/options.json
deleted file mode 100644
index f65c23001ff1..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/25/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/26/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/26/options.json
deleted file mode 100644
index 6a9895dd9d8c..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/26/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Invalid rest operator's argument (1:18)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/7/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/7/options.json
deleted file mode 100644
index eef8a7af3839..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/7/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "throws":
-    "The rest element has to be the last element when destructuring (1:10)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/8/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/8/options.json
deleted file mode 100644
index 4a97ac85eafa..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/8/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "A trailing comma is not permitted after the rest element (1:16)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/9/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/9/options.json
deleted file mode 100644
index 03ba1e37e899..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/9/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Cannot have multiple rest elements when destructuring (1:13)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/expression-rest-not-last-invalid/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/expression-rest-not-last-invalid/options.json
deleted file mode 100644
index 87b6e1b20fed..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/expression-rest-not-last-invalid/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "throws":
-    "The rest element has to be the last element when destructuring (1:2)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/options.json b/packages/babel-parser/test/fixtures/experimental/object-rest-spread/options.json
deleted file mode 100644
index 4de042a69733..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/object-rest-spread/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["objectRestSpread"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding-finally/options.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding-finally/options.json
deleted file mode 100644
index e89b07f66d80..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding-finally/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'optionalCatchBinding' (4:6)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding/options.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding/options.json
deleted file mode 100644
index e89b07f66d80..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-no-binding/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'optionalCatchBinding' (4:6)"
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding-finally/input.js b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding-finally/input.js
deleted file mode 100644
index e0a74b86fa60..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding-finally/input.js
+++ /dev/null
@@ -1,4 +0,0 @@
-try {
-} catch (err) {
-} finally {
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding-finally/output.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding-finally/output.json
deleted file mode 100644
index c8261f6ba30f..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding-finally/output.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 35,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 4,
-      "column": 1
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 35,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 4,
-        "column": 1
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "TryStatement",
-        "start": 0,
-        "end": 35,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 4,
-            "column": 1
-          }
-        },
-        "block": {
-          "type": "BlockStatement",
-          "start": 4,
-          "end": 7,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 4
-            },
-            "end": {
-              "line": 2,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        },
-        "handler": {
-          "type": "CatchClause",
-          "start": 8,
-          "end": 23,
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 2
-            },
-            "end": {
-              "line": 3,
-              "column": 1
-            }
-          },
-          "param": {
-            "type": "Identifier",
-            "start": 15,
-            "end": 18,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 9
-              },
-              "end": {
-                "line": 2,
-                "column": 12
-              },
-              "identifierName": "err"
-            },
-            "name": "err"
-          },
-          "body": {
-            "type": "BlockStatement",
-            "start": 20,
-            "end": 23,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 14
-              },
-              "end": {
-                "line": 3,
-                "column": 1
-              }
-            },
-            "body": [],
-            "directives": []
-          }
-        },
-        "guardedHandlers": [],
-        "finalizer": {
-          "type": "BlockStatement",
-          "start": 32,
-          "end": 35,
-          "loc": {
-            "start": {
-              "line": 3,
-              "column": 10
-            },
-            "end": {
-              "line": 4,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding/input.js b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding/input.js
deleted file mode 100644
index c68ec0293881..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding/input.js
+++ /dev/null
@@ -1,2 +0,0 @@
-try {
-} catch (err) {}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding/output.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding/output.json
deleted file mode 100644
index f99c9541a456..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/no-plugin-yes-binding/output.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 22,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 2,
-      "column": 16
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 22,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 16
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "TryStatement",
-        "start": 0,
-        "end": 22,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 2,
-            "column": 16
-          }
-        },
-        "block": {
-          "type": "BlockStatement",
-          "start": 4,
-          "end": 7,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 4
-            },
-            "end": {
-              "line": 2,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        },
-        "handler": {
-          "type": "CatchClause",
-          "start": 8,
-          "end": 22,
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 2
-            },
-            "end": {
-              "line": 2,
-              "column": 16
-            }
-          },
-          "param": {
-            "type": "Identifier",
-            "start": 15,
-            "end": 18,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 9
-              },
-              "end": {
-                "line": 2,
-                "column": 12
-              },
-              "identifierName": "err"
-            },
-            "name": "err"
-          },
-          "body": {
-            "type": "BlockStatement",
-            "start": 20,
-            "end": 22,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 14
-              },
-              "end": {
-                "line": 2,
-                "column": 16
-              }
-            },
-            "body": [],
-            "directives": []
-          }
-        },
-        "guardedHandlers": [],
-        "finalizer": null
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/input.js b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/input.js
deleted file mode 100644
index 9faba4b001dc..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/input.js
+++ /dev/null
@@ -1,9 +0,0 @@
-try {
-
-}
-catch {
-
-}
-finally {
-  
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/options.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/options.json
deleted file mode 100644
index b937a8bb5d2f..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["optionalCatchBinding"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/output.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/output.json
deleted file mode 100644
index 4ebb1d0cb5c5..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding-finally/output.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 34,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 9,
-      "column": 1
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 34,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 9,
-        "column": 1
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "TryStatement",
-        "start": 0,
-        "end": 34,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 9,
-            "column": 1
-          }
-        },
-        "block": {
-          "type": "BlockStatement",
-          "start": 4,
-          "end": 8,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 4
-            },
-            "end": {
-              "line": 3,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        },
-        "handler": {
-          "type": "CatchClause",
-          "start": 9,
-          "end": 19,
-          "loc": {
-            "start": {
-              "line": 4,
-              "column": 0
-            },
-            "end": {
-              "line": 6,
-              "column": 1
-            }
-          },
-          "param": null,
-          "body": {
-            "type": "BlockStatement",
-            "start": 15,
-            "end": 19,
-            "loc": {
-              "start": {
-                "line": 4,
-                "column": 6
-              },
-              "end": {
-                "line": 6,
-                "column": 1
-              }
-            },
-            "body": [],
-            "directives": []
-          }
-        },
-        "guardedHandlers": [],
-        "finalizer": {
-          "type": "BlockStatement",
-          "start": 28,
-          "end": 34,
-          "loc": {
-            "start": {
-              "line": 7,
-              "column": 8
-            },
-            "end": {
-              "line": 9,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/input.js b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/input.js
deleted file mode 100644
index 2550d2c262b7..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-try {
-
-}
-catch {
-  
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/options.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/options.json
deleted file mode 100644
index b937a8bb5d2f..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["optionalCatchBinding"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/output.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/output.json
deleted file mode 100644
index 5124fdabae39..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-no-binding/output.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 21,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 6,
-      "column": 1
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 21,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 6,
-        "column": 1
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "TryStatement",
-        "start": 0,
-        "end": 21,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 6,
-            "column": 1
-          }
-        },
-        "block": {
-          "type": "BlockStatement",
-          "start": 4,
-          "end": 8,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 4
-            },
-            "end": {
-              "line": 3,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        },
-        "handler": {
-          "type": "CatchClause",
-          "start": 9,
-          "end": 21,
-          "loc": {
-            "start": {
-              "line": 4,
-              "column": 0
-            },
-            "end": {
-              "line": 6,
-              "column": 1
-            }
-          },
-          "param": null,
-          "body": {
-            "type": "BlockStatement",
-            "start": 15,
-            "end": 21,
-            "loc": {
-              "start": {
-                "line": 4,
-                "column": 6
-              },
-              "end": {
-                "line": 6,
-                "column": 1
-              }
-            },
-            "body": [],
-            "directives": []
-          }
-        },
-        "guardedHandlers": [],
-        "finalizer": null
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/input.js b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/input.js
deleted file mode 100644
index e0a74b86fa60..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/input.js
+++ /dev/null
@@ -1,4 +0,0 @@
-try {
-} catch (err) {
-} finally {
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/options.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/options.json
deleted file mode 100644
index b937a8bb5d2f..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["optionalCatchBinding"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/output.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/output.json
deleted file mode 100644
index c8261f6ba30f..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding-finally/output.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 35,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 4,
-      "column": 1
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 35,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 4,
-        "column": 1
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "TryStatement",
-        "start": 0,
-        "end": 35,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 4,
-            "column": 1
-          }
-        },
-        "block": {
-          "type": "BlockStatement",
-          "start": 4,
-          "end": 7,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 4
-            },
-            "end": {
-              "line": 2,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        },
-        "handler": {
-          "type": "CatchClause",
-          "start": 8,
-          "end": 23,
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 2
-            },
-            "end": {
-              "line": 3,
-              "column": 1
-            }
-          },
-          "param": {
-            "type": "Identifier",
-            "start": 15,
-            "end": 18,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 9
-              },
-              "end": {
-                "line": 2,
-                "column": 12
-              },
-              "identifierName": "err"
-            },
-            "name": "err"
-          },
-          "body": {
-            "type": "BlockStatement",
-            "start": 20,
-            "end": 23,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 14
-              },
-              "end": {
-                "line": 3,
-                "column": 1
-              }
-            },
-            "body": [],
-            "directives": []
-          }
-        },
-        "guardedHandlers": [],
-        "finalizer": {
-          "type": "BlockStatement",
-          "start": 32,
-          "end": 35,
-          "loc": {
-            "start": {
-              "line": 3,
-              "column": 10
-            },
-            "end": {
-              "line": 4,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        }
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/input.js b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/input.js
deleted file mode 100644
index c68ec0293881..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/input.js
+++ /dev/null
@@ -1,2 +0,0 @@
-try {
-} catch (err) {}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/options.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/options.json
deleted file mode 100644
index b937a8bb5d2f..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": ["optionalCatchBinding"]
-}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/output.json b/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/output.json
deleted file mode 100644
index f99c9541a456..000000000000
--- a/packages/babel-parser/test/fixtures/experimental/optional-catch-binding/yes-plugin-yes-binding/output.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 22,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 2,
-      "column": 16
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 22,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 16
-      }
-    },
-    "sourceType": "script",
-    "interpreter": null,
-    "body": [
-      {
-        "type": "TryStatement",
-        "start": 0,
-        "end": 22,
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 2,
-            "column": 16
-          }
-        },
-        "block": {
-          "type": "BlockStatement",
-          "start": 4,
-          "end": 7,
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 4
-            },
-            "end": {
-              "line": 2,
-              "column": 1
-            }
-          },
-          "body": [],
-          "directives": []
-        },
-        "handler": {
-          "type": "CatchClause",
-          "start": 8,
-          "end": 22,
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 2
-            },
-            "end": {
-              "line": 2,
-              "column": 16
-            }
-          },
-          "param": {
-            "type": "Identifier",
-            "start": 15,
-            "end": 18,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 9
-              },
-              "end": {
-                "line": 2,
-                "column": 12
-              },
-              "identifierName": "err"
-            },
-            "name": "err"
-          },
-          "body": {
-            "type": "BlockStatement",
-            "start": 20,
-            "end": 22,
-            "loc": {
-              "start": {
-                "line": 2,
-                "column": 14
-              },
-              "end": {
-                "line": 2,
-                "column": 16
-              }
-            },
-            "body": [],
-            "directives": []
-          }
-        },
-        "guardedHandlers": [],
-        "finalizer": null
-      }
-    ],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/input.js b/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/input.js
index 31dcb716ca78..c3fc230296b4 100644
--- a/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/input.js
+++ b/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/input.js
@@ -1,5 +1,5 @@
-class A{
+class A extends B {
     constructor(){
         super()?.b;
     }
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/output.json b/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/output.json
index 877e7f493a3e..890c6f2248d6 100644
--- a/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/output.json
+++ b/packages/babel-parser/test/fixtures/experimental/optional-chaining/super-method-class/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 55,
+  "end": 66,
   "loc": {
     "start": {
       "line": 1,
@@ -15,7 +15,7 @@
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 55,
+    "end": 66,
     "loc": {
       "start": {
         "line": 1,
@@ -32,7 +32,7 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 55,
+        "end": 66,
         "loc": {
           "start": {
             "line": 1,
@@ -60,15 +60,31 @@
           },
           "name": "A"
         },
-        "superClass": null,
+        "superClass": {
+          "type": "Identifier",
+          "start": 16,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            },
+            "identifierName": "B"
+          },
+          "name": "B"
+        },
         "body": {
           "type": "ClassBody",
-          "start": 7,
-          "end": 55,
+          "start": 18,
+          "end": 66,
           "loc": {
             "start": {
               "line": 1,
-              "column": 7
+              "column": 18
             },
             "end": {
               "line": 5,
@@ -78,8 +94,8 @@
           "body": [
             {
               "type": "ClassMethod",
-              "start": 13,
-              "end": 53,
+              "start": 24,
+              "end": 64,
               "loc": {
                 "start": {
                   "line": 2,
@@ -93,8 +109,8 @@
               "static": false,
               "key": {
                 "type": "Identifier",
-                "start": 13,
-                "end": 24,
+                "start": 24,
+                "end": 35,
                 "loc": {
                   "start": {
                     "line": 2,
@@ -116,8 +132,8 @@
               "params": [],
               "body": {
                 "type": "BlockStatement",
-                "start": 26,
-                "end": 53,
+                "start": 37,
+                "end": 64,
                 "loc": {
                   "start": {
                     "line": 2,
@@ -131,8 +147,8 @@
                 "body": [
                   {
                     "type": "ExpressionStatement",
-                    "start": 36,
-                    "end": 47,
+                    "start": 47,
+                    "end": 58,
                     "loc": {
                       "start": {
                         "line": 3,
@@ -145,8 +161,8 @@
                     },
                     "expression": {
                       "type": "OptionalMemberExpression",
-                      "start": 36,
-                      "end": 46,
+                      "start": 47,
+                      "end": 57,
                       "loc": {
                         "start": {
                           "line": 3,
@@ -159,8 +175,8 @@
                       },
                       "object": {
                         "type": "CallExpression",
-                        "start": 36,
-                        "end": 43,
+                        "start": 47,
+                        "end": 54,
                         "loc": {
                           "start": {
                             "line": 3,
@@ -173,8 +189,8 @@
                         },
                         "callee": {
                           "type": "Super",
-                          "start": 36,
-                          "end": 41,
+                          "start": 47,
+                          "end": 52,
                           "loc": {
                             "start": {
                               "line": 3,
@@ -190,8 +206,8 @@
                       },
                       "property": {
                         "type": "Identifier",
-                        "start": 45,
-                        "end": 46,
+                        "start": 56,
+                        "end": 57,
                         "loc": {
                           "start": {
                             "line": 3,
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/input.js
new file mode 100644
index 000000000000..74512f8aace5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/input.js
@@ -0,0 +1 @@
+foo(?)
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/options.json
new file mode 100644
index 000000000000..87414aef43de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["partialApplication"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/output.json b/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/output.json
new file mode 100644
index 000000000000..ac7ce3111be1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/call-expr/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "arguments": [
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                }
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/input.js
new file mode 100644
index 000000000000..ed9915fb3ccb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/input.js
@@ -0,0 +1,5 @@
+class foo {
+    constructor() {
+        baz(this, () => super.bar(?));
+    }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/options.json
new file mode 100644
index 000000000000..87414aef43de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["partialApplication"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/output.json b/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/output.json
new file mode 100644
index 000000000000..39bdbf743956
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/call-on-SuperProperty/output.json
@@ -0,0 +1,305 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 78,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 78,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 78,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 10,
+          "end": 78,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassMethod",
+              "start": 16,
+              "end": 76,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 4,
+                  "column": 5
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 16,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 15
+                  },
+                  "identifierName": "constructor"
+                },
+                "name": "constructor"
+              },
+              "computed": false,
+              "kind": "constructor",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 30,
+                "end": 76,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 5
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ExpressionStatement",
+                    "start": 40,
+                    "end": 70,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 38
+                      }
+                    },
+                    "expression": {
+                      "type": "CallExpression",
+                      "start": 40,
+                      "end": 69,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 37
+                        }
+                      },
+                      "callee": {
+                        "type": "Identifier",
+                        "start": 40,
+                        "end": 43,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 8
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 11
+                          },
+                          "identifierName": "baz"
+                        },
+                        "name": "baz"
+                      },
+                      "arguments": [
+                        {
+                          "type": "ThisExpression",
+                          "start": 44,
+                          "end": 48,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 12
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 16
+                            }
+                          }
+                        },
+                        {
+                          "type": "ArrowFunctionExpression",
+                          "start": 50,
+                          "end": 68,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 18
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 36
+                            }
+                          },
+                          "id": null,
+                          "generator": false,
+                          "async": false,
+                          "params": [],
+                          "body": {
+                            "type": "CallExpression",
+                            "start": 56,
+                            "end": 68,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 24
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 36
+                              }
+                            },
+                            "callee": {
+                              "type": "MemberExpression",
+                              "start": 56,
+                              "end": 65,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 24
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 33
+                                }
+                              },
+                              "object": {
+                                "type": "Super",
+                                "start": 56,
+                                "end": 61,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 24
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 29
+                                  }
+                                }
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 62,
+                                "end": 65,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 30
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 33
+                                  },
+                                  "identifierName": "bar"
+                                },
+                                "name": "bar"
+                              },
+                              "computed": false
+                            },
+                            "arguments": [
+                              {
+                                "type": "ArgumentPlaceholder",
+                                "start": 66,
+                                "end": 67,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 34
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 35
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/input.js
new file mode 100644
index 000000000000..58db6e91a913
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/input.js
@@ -0,0 +1,3 @@
+foo(?,x,?)
+
+bar.foo(?, x, ?)
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/options.json
new file mode 100644
index 000000000000..87414aef43de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["partialApplication"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/output.json b/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/output.json
new file mode 100644
index 000000000000..61338f165056
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/for-any-arg/output.json
@@ -0,0 +1,260 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 0,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "arguments": [
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                }
+              }
+            },
+            {
+              "type": "Identifier",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 8,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 12,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 12,
+          "end": 28,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 16
+            }
+          },
+          "callee": {
+            "type": "MemberExpression",
+            "start": 12,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 7
+              }
+            },
+            "object": {
+              "type": "Identifier",
+              "start": 12,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 0
+                },
+                "end": {
+                  "line": 3,
+                  "column": 3
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "property": {
+              "type": "Identifier",
+              "start": 16,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "computed": false
+          },
+          "arguments": [
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 20,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 8
+                },
+                "end": {
+                  "line": 3,
+                  "column": 9
+                }
+              }
+            },
+            {
+              "type": "Identifier",
+              "start": 23,
+              "end": 24,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 11
+                },
+                "end": {
+                  "line": 3,
+                  "column": 12
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 26,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 14
+                },
+                "end": {
+                  "line": 3,
+                  "column": 15
+                }
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/input.js
new file mode 100644
index 000000000000..c689537246d2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/input.js
@@ -0,0 +1,3 @@
+foo(x,?)
+
+bar.foo(x,?)
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/options.json
new file mode 100644
index 000000000000..87414aef43de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["partialApplication"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/output.json b/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/output.json
new file mode 100644
index 000000000000..59529de050d1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/from-left/output.json
@@ -0,0 +1,230 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 0,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "arguments": [
+            {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 10,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 10,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 12
+            }
+          },
+          "callee": {
+            "type": "MemberExpression",
+            "start": 10,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 7
+              }
+            },
+            "object": {
+              "type": "Identifier",
+              "start": 10,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 0
+                },
+                "end": {
+                  "line": 3,
+                  "column": 3
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "property": {
+              "type": "Identifier",
+              "start": 14,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "computed": false
+          },
+          "arguments": [
+            {
+              "type": "Identifier",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 8
+                },
+                "end": {
+                  "line": 3,
+                  "column": 9
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 20,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 10
+                },
+                "end": {
+                  "line": 3,
+                  "column": 11
+                }
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/input.js
new file mode 100644
index 000000000000..b566c1df5b1b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/input.js
@@ -0,0 +1,3 @@
+foo(?,x)
+
+bar.foo(?,x)
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/options.json
new file mode 100644
index 000000000000..87414aef43de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["partialApplication"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/output.json b/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/output.json
new file mode 100644
index 000000000000..3b558a170e5d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/from-right/output.json
@@ -0,0 +1,230 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 0,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "arguments": [
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                }
+              }
+            },
+            {
+              "type": "Identifier",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ]
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 10,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 10,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 12
+            }
+          },
+          "callee": {
+            "type": "MemberExpression",
+            "start": 10,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 7
+              }
+            },
+            "object": {
+              "type": "Identifier",
+              "start": 10,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 0
+                },
+                "end": {
+                  "line": 3,
+                  "column": 3
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "property": {
+              "type": "Identifier",
+              "start": 14,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "computed": false
+          },
+          "arguments": [
+            {
+              "type": "ArgumentPlaceholder",
+              "start": 18,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 8
+                },
+                "end": {
+                  "line": 3,
+                  "column": 9
+                }
+              }
+            },
+            {
+              "type": "Identifier",
+              "start": 20,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 10
+                },
+                "end": {
+                  "line": 3,
+                  "column": 11
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/in-SuperCall/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/in-SuperCall/input.js
new file mode 100644
index 000000000000..eac2ab9cb775
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/in-SuperCall/input.js
@@ -0,0 +1,6 @@
+class Foo extends Bar {
+  constructor(x){
+    super(x, 1, ?, ?);
+    this.x = x;
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/in-SuperCall/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/in-SuperCall/options.json
new file mode 100644
index 000000000000..58192a87fd99
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/in-SuperCall/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["partialApplication"],
+  "throws": "Unexpected argument placeholder (3:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/in-new/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/in-new/input.js
new file mode 100644
index 000000000000..36314ea52964
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/in-new/input.js
@@ -0,0 +1 @@
+new bar(x, ?, 2, ?)
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/in-new/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/in-new/options.json
new file mode 100644
index 000000000000..3b09c84c03eb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/in-new/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["partialApplication"],
+  "throws": "Unexpected argument placeholder (1:11)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-binary-expression/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-binary-expression/input.js
new file mode 100644
index 000000000000..a511c8bf7d89
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-binary-expression/input.js
@@ -0,0 +1 @@
+? + x
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-binary-expression/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-binary-expression/options.json
new file mode 100644
index 000000000000..8abbd078986f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-binary-expression/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["partialApplication"],
+  "throws": "Unexpected token (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-method-call/input.js b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-method-call/input.js
new file mode 100644
index 000000000000..3308d8780855
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-method-call/input.js
@@ -0,0 +1 @@
+?.f()
diff --git a/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-method-call/options.json b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-method-call/options.json
new file mode 100644
index 000000000000..8abbd078986f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/partial-application/top-level-argument-method-call/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["partialApplication"],
+  "throws": "Unexpected token (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/invalid-proposal/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/invalid-proposal/options.json
index b6e4db397e22..d8fca74323cf 100644
--- a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/invalid-proposal/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/invalid-proposal/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [["pipelineOperator", { "proposal": "invalid" }]],
-  "throws":
-    "'pipelineOperator' requires 'proposal' option whose value should be one of: minimal"
+  "throws": "'pipelineOperator' requires 'proposal' option whose value should be one of: 'minimal', 'smart', 'fsharp'"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/no-plugin/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/no-plugin/options.json
index aaaa3350b6fe..5d8a6bb1204c 100644
--- a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/no-plugin/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/no-plugin/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'pipelineOperator' (1:2)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'pipelineOperator' (1:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/input.js
new file mode 100644
index 000000000000..f06c47069191
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/input.js
@@ -0,0 +1 @@
+x => x |> [y => y + 1 |> z => z * 2]
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/output.json
new file mode 100644
index 000000000000..0ed567f15eea
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body-with-operator/output.json
@@ -0,0 +1,333 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 5,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrayExpression",
+              "start": 10,
+              "end": 36,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 36
+                }
+              },
+              "elements": [
+                {
+                  "type": "ArrowFunctionExpression",
+                  "start": 11,
+                  "end": 35,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 35
+                    }
+                  },
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 11,
+                      "end": 12,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 12
+                        },
+                        "identifierName": "y"
+                      },
+                      "name": "y"
+                    }
+                  ],
+                  "body": {
+                    "type": "BinaryExpression",
+                    "start": 16,
+                    "end": 35,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 35
+                      }
+                    },
+                    "left": {
+                      "type": "BinaryExpression",
+                      "start": 16,
+                      "end": 21,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 21
+                        }
+                      },
+                      "left": {
+                        "type": "Identifier",
+                        "start": 16,
+                        "end": 17,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 17
+                          },
+                          "identifierName": "y"
+                        },
+                        "name": "y"
+                      },
+                      "operator": "+",
+                      "right": {
+                        "type": "NumericLiteral",
+                        "start": 20,
+                        "end": 21,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 21
+                          }
+                        },
+                        "extra": {
+                          "rawValue": 1,
+                          "raw": "1"
+                        },
+                        "value": 1
+                      }
+                    },
+                    "operator": "|>",
+                    "right": {
+                      "type": "ArrowFunctionExpression",
+                      "start": 25,
+                      "end": 35,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 25
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 35
+                        }
+                      },
+                      "id": null,
+                      "generator": false,
+                      "async": false,
+                      "params": [
+                        {
+                          "type": "Identifier",
+                          "start": 25,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 25
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "z"
+                          },
+                          "name": "z"
+                        }
+                      ],
+                      "body": {
+                        "type": "BinaryExpression",
+                        "start": 30,
+                        "end": 35,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 30
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 35
+                          }
+                        },
+                        "left": {
+                          "type": "Identifier",
+                          "start": 30,
+                          "end": 31,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 30
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 31
+                            },
+                            "identifierName": "z"
+                          },
+                          "name": "z"
+                        },
+                        "operator": "*",
+                        "right": {
+                          "type": "NumericLiteral",
+                          "start": 34,
+                          "end": 35,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 34
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 35
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 2,
+                            "raw": "2"
+                          },
+                          "value": 2
+                        }
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/input.js
new file mode 100644
index 000000000000..a61aacfe0129
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/input.js
@@ -0,0 +1 @@
+x => x |> [y => y + 1] |> z => z * 2
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/output.json
new file mode 100644
index 000000000000..ef37548ee98f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-array-in-body/output.json
@@ -0,0 +1,333 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 36,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 36,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 36
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 36,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 36
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 36,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 36
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 22,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 22
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "ArrayExpression",
+                "start": 10,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 22
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "ArrowFunctionExpression",
+                    "start": 11,
+                    "end": 21,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 21
+                      }
+                    },
+                    "id": null,
+                    "generator": false,
+                    "async": false,
+                    "params": [
+                      {
+                        "type": "Identifier",
+                        "start": 11,
+                        "end": 12,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 11
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 12
+                          },
+                          "identifierName": "y"
+                        },
+                        "name": "y"
+                      }
+                    ],
+                    "body": {
+                      "type": "BinaryExpression",
+                      "start": 16,
+                      "end": 21,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 21
+                        }
+                      },
+                      "left": {
+                        "type": "Identifier",
+                        "start": 16,
+                        "end": 17,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 17
+                          },
+                          "identifierName": "y"
+                        },
+                        "name": "y"
+                      },
+                      "operator": "+",
+                      "right": {
+                        "type": "NumericLiteral",
+                        "start": 20,
+                        "end": 21,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 21
+                          }
+                        },
+                        "extra": {
+                          "rawValue": 1,
+                          "raw": "1"
+                        },
+                        "value": 1
+                      }
+                    }
+                  }
+                ]
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrowFunctionExpression",
+              "start": 26,
+              "end": 36,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 26
+                },
+                "end": {
+                  "line": 1,
+                  "column": 36
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 26,
+                  "end": 27,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 26
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 27
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 31,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 31
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 36
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 31,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 31
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 32
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                },
+                "operator": "*",
+                "right": {
+                  "type": "NumericLiteral",
+                  "start": 35,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 35
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 36
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/input.js
new file mode 100644
index 000000000000..a760dc479126
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/input.js
@@ -0,0 +1 @@
+x => x |> foo(x = 1 |> foo);
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/output.json
new file mode 100644
index 000000000000..5f2e34747dfa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-assignment-in-body/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 28
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 28
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 28
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 27
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 5,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "operator": "|>",
+            "right": {
+              "type": "CallExpression",
+              "start": 10,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 10,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "arguments": [
+                {
+                  "type": "AssignmentExpression",
+                  "start": 14,
+                  "end": 26,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 26
+                    }
+                  },
+                  "operator": "=",
+                  "left": {
+                    "type": "Identifier",
+                    "start": 14,
+                    "end": 15,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "right": {
+                    "type": "BinaryExpression",
+                    "start": 18,
+                    "end": 26,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 26
+                      }
+                    },
+                    "left": {
+                      "type": "NumericLiteral",
+                      "start": 18,
+                      "end": 19,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 19
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 1,
+                        "raw": "1"
+                      },
+                      "value": 1
+                    },
+                    "operator": "|>",
+                    "right": {
+                      "type": "Identifier",
+                      "start": 23,
+                      "end": 26,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 26
+                        },
+                        "identifierName": "foo"
+                      },
+                      "name": "foo"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/input.js
new file mode 100644
index 000000000000..bf7747377ff1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/input.js
@@ -0,0 +1 @@
+x => x |> { method: y => y + 1 |> z => z * 2 }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/output.json
new file mode 100644
index 000000000000..de8143714401
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body-with-operator/output.json
@@ -0,0 +1,368 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 46
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 46
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 46
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 46,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 46
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 46,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 46
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 5,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ObjectExpression",
+              "start": 10,
+              "end": 46,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 46
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 12,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 44
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 12,
+                    "end": 18,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 18
+                      },
+                      "identifierName": "method"
+                    },
+                    "name": "method"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "ArrowFunctionExpression",
+                    "start": 20,
+                    "end": 44,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 20
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 44
+                      }
+                    },
+                    "id": null,
+                    "generator": false,
+                    "async": false,
+                    "params": [
+                      {
+                        "type": "Identifier",
+                        "start": 20,
+                        "end": 21,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 20
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "identifierName": "y"
+                        },
+                        "name": "y"
+                      }
+                    ],
+                    "body": {
+                      "type": "BinaryExpression",
+                      "start": 25,
+                      "end": 44,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 25
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 44
+                        }
+                      },
+                      "left": {
+                        "type": "BinaryExpression",
+                        "start": 25,
+                        "end": 30,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 25
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 30
+                          }
+                        },
+                        "left": {
+                          "type": "Identifier",
+                          "start": 25,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 25
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "y"
+                          },
+                          "name": "y"
+                        },
+                        "operator": "+",
+                        "right": {
+                          "type": "NumericLiteral",
+                          "start": 29,
+                          "end": 30,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 30
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 1,
+                            "raw": "1"
+                          },
+                          "value": 1
+                        }
+                      },
+                      "operator": "|>",
+                      "right": {
+                        "type": "ArrowFunctionExpression",
+                        "start": 34,
+                        "end": 44,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 34
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 44
+                          }
+                        },
+                        "id": null,
+                        "generator": false,
+                        "async": false,
+                        "params": [
+                          {
+                            "type": "Identifier",
+                            "start": 34,
+                            "end": 35,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 34
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 35
+                              },
+                              "identifierName": "z"
+                            },
+                            "name": "z"
+                          }
+                        ],
+                        "body": {
+                          "type": "BinaryExpression",
+                          "start": 39,
+                          "end": 44,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 39
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 44
+                            }
+                          },
+                          "left": {
+                            "type": "Identifier",
+                            "start": 39,
+                            "end": 40,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 39
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 40
+                              },
+                              "identifierName": "z"
+                            },
+                            "name": "z"
+                          },
+                          "operator": "*",
+                          "right": {
+                            "type": "NumericLiteral",
+                            "start": 43,
+                            "end": 44,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 43
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 44
+                              }
+                            },
+                            "extra": {
+                              "rawValue": 2,
+                              "raw": "2"
+                            },
+                            "value": 2
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/input.js
new file mode 100644
index 000000000000..e797fb636228
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/input.js
@@ -0,0 +1 @@
+x => x |> { method: y => y + 1 } |> z => z * 2
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/output.json
new file mode 100644
index 000000000000..d1e39e6ccea4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-and-object-in-body/output.json
@@ -0,0 +1,368 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 46
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 46
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 46
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 46,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 46
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 46,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 46
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 32,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 32
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "ObjectExpression",
+                "start": 10,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 32
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 12,
+                    "end": 30,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 30
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 12,
+                      "end": 18,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "identifierName": "method"
+                      },
+                      "name": "method"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "ArrowFunctionExpression",
+                      "start": 20,
+                      "end": 30,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 30
+                        }
+                      },
+                      "id": null,
+                      "generator": false,
+                      "async": false,
+                      "params": [
+                        {
+                          "type": "Identifier",
+                          "start": 20,
+                          "end": 21,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 20
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 21
+                            },
+                            "identifierName": "y"
+                          },
+                          "name": "y"
+                        }
+                      ],
+                      "body": {
+                        "type": "BinaryExpression",
+                        "start": 25,
+                        "end": 30,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 25
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 30
+                          }
+                        },
+                        "left": {
+                          "type": "Identifier",
+                          "start": 25,
+                          "end": 26,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 25
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "identifierName": "y"
+                          },
+                          "name": "y"
+                        },
+                        "operator": "+",
+                        "right": {
+                          "type": "NumericLiteral",
+                          "start": 29,
+                          "end": 30,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 30
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 1,
+                            "raw": "1"
+                          },
+                          "value": 1
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrowFunctionExpression",
+              "start": 36,
+              "end": 46,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 36
+                },
+                "end": {
+                  "line": 1,
+                  "column": 46
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 36,
+                  "end": 37,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 36
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 37
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 41,
+                "end": 46,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 41
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 46
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 41,
+                  "end": 42,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 41
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 42
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                },
+                "operator": "*",
+                "right": {
+                  "type": "NumericLiteral",
+                  "start": 45,
+                  "end": 46,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 45
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 46
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/input.js
new file mode 100644
index 000000000000..894495272a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/input.js
@@ -0,0 +1 @@
+x => x |> inc |> double
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/output.json
new file mode 100644
index 000000000000..4f7a815237e6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head-indented/output.json
@@ -0,0 +1,170 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 23
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 23
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 23
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 23
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "Identifier",
+                "start": 10,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "identifierName": "inc"
+                },
+                "name": "inc"
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "Identifier",
+              "start": 17,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 23
+                },
+                "identifierName": "double"
+              },
+              "name": "double"
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/input.js
new file mode 100644
index 000000000000..894495272a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/input.js
@@ -0,0 +1 @@
+x => x |> inc |> double
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/output.json
new file mode 100644
index 000000000000..4f7a815237e6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-at-head/output.json
@@ -0,0 +1,170 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 23
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 23
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 23
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 23
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "Identifier",
+                "start": 10,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "identifierName": "inc"
+                },
+                "name": "inc"
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "Identifier",
+              "start": 17,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 23
+                },
+                "identifierName": "double"
+              },
+              "name": "double"
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/input.js
new file mode 100644
index 000000000000..dcac94775c2f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/input.js
@@ -0,0 +1 @@
+x => x |> (y => y + 3 |> (b => y + b))
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/output.json
new file mode 100644
index 000000000000..fee1e93abafb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-alt-parens/output.json
@@ -0,0 +1,321 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 38,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 38
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 38,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 38
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 38
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 38
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 38
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 5,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrowFunctionExpression",
+              "start": 11,
+              "end": 37,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 11
+                },
+                "end": {
+                  "line": 1,
+                  "column": 37
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 11,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "y"
+                  },
+                  "name": "y"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 16,
+                "end": 37,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 37
+                  }
+                },
+                "left": {
+                  "type": "BinaryExpression",
+                  "start": 16,
+                  "end": 21,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 21
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 16,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 20,
+                    "end": 21,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 20
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 21
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 3,
+                      "raw": "3"
+                    },
+                    "value": 3
+                  }
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "ArrowFunctionExpression",
+                  "start": 26,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 26
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 36
+                    }
+                  },
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 26,
+                      "end": 27,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 26
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 27
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b"
+                    }
+                  ],
+                  "body": {
+                    "type": "BinaryExpression",
+                    "start": 31,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 31
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 36
+                      }
+                    },
+                    "left": {
+                      "type": "Identifier",
+                      "start": 31,
+                      "end": 32,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 31
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 32
+                        },
+                        "identifierName": "y"
+                      },
+                      "name": "y"
+                    },
+                    "operator": "+",
+                    "right": {
+                      "type": "Identifier",
+                      "start": 35,
+                      "end": 36,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 35
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 36
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b"
+                    }
+                  },
+                  "extra": {
+                    "parenthesized": true,
+                    "parenStart": 25
+                  }
+                }
+              },
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 10
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/input.js
new file mode 100644
index 000000000000..f0867e85b19c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/input.js
@@ -0,0 +1,3 @@
+(x) => x
+  |> (y) => y + 1
+  |> (z) => z * 2
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/output.json
new file mode 100644
index 000000000000..313e3fa4b8cc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented-with-arg-parens/output.json
@@ -0,0 +1,316 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 44,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 44,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 44,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 17
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 44,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 17
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 1,
+              "end": 2,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 2
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 7,
+            "end": 44,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 3,
+                "column": 17
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 7,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 2,
+                  "column": 17
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 7,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "ArrowFunctionExpression",
+                "start": 14,
+                "end": 26,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 17
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  }
+                ],
+                "body": {
+                  "type": "BinaryExpression",
+                  "start": 21,
+                  "end": 26,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 17
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 21,
+                    "end": 22,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 13
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 25,
+                    "end": 26,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 17
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  }
+                }
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrowFunctionExpression",
+              "start": 32,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 5
+                },
+                "end": {
+                  "line": 3,
+                  "column": 17
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 33,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 7
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 39,
+                "end": 44,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 17
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 39,
+                  "end": 40,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 13
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                },
+                "operator": "*",
+                "right": {
+                  "type": "NumericLiteral",
+                  "start": 43,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 17
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/input.js
new file mode 100644
index 000000000000..8e08f24df1fd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/input.js
@@ -0,0 +1,3 @@
+x => x
+  |> y => y + 1
+  |> z => z * 2
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/output.json
new file mode 100644
index 000000000000..cf3c546e748d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-indented/output.json
@@ -0,0 +1,316 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 38,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 38,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 15
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 15
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 3,
+                "column": 15
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 22,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 2,
+                  "column": 15
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "ArrowFunctionExpression",
+                "start": 12,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 15
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 12,
+                    "end": 13,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 6
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  }
+                ],
+                "body": {
+                  "type": "BinaryExpression",
+                  "start": 17,
+                  "end": 22,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 15
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 17,
+                    "end": 18,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 11
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 21,
+                    "end": 22,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 15
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  }
+                }
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrowFunctionExpression",
+              "start": 28,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 5
+                },
+                "end": {
+                  "line": 3,
+                  "column": 15
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 28,
+                  "end": 29,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 6
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 33,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 15
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 33,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 11
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                },
+                "operator": "*",
+                "right": {
+                  "type": "NumericLiteral",
+                  "start": 37,
+                  "end": 38,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 15
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/input.js
new file mode 100644
index 000000000000..dc05467170af
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/input.js
@@ -0,0 +1 @@
+(x) => x |> (y) => y + 1 |> (z) => z * 2
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/output.json
new file mode 100644
index 000000000000..06ac009ecf09
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens-with-arg-parens/output.json
@@ -0,0 +1,316 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 40
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 40
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 40
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 40
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 1,
+              "end": 2,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 2
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 7,
+            "end": 40,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 40
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 7,
+              "end": 24,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 24
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 7,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "ArrowFunctionExpression",
+                "start": 12,
+                "end": 24,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 24
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 13,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  }
+                ],
+                "body": {
+                  "type": "BinaryExpression",
+                  "start": 19,
+                  "end": 24,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 19
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 24
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 19,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 19
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 20
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 23,
+                    "end": 24,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 24
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  }
+                }
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrowFunctionExpression",
+              "start": 28,
+              "end": 40,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 28
+                },
+                "end": {
+                  "line": 1,
+                  "column": 40
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 29,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 29
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 30
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 35,
+                "end": 40,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 35
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 40
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 35,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 35
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 36
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                },
+                "operator": "*",
+                "right": {
+                  "type": "NumericLiteral",
+                  "start": 39,
+                  "end": 40,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 39
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 40
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/input.js
new file mode 100644
index 000000000000..010117c93787
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/input.js
@@ -0,0 +1 @@
+x => x |> y => y + 1 |> z => z * 2
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/output.json
new file mode 100644
index 000000000000..31cd9f27dc38
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-arrow-in-body-no-parens/output.json
@@ -0,0 +1,316 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 34
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "ArrowFunctionExpression",
+                "start": 10,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 10,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  }
+                ],
+                "body": {
+                  "type": "BinaryExpression",
+                  "start": 15,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 15,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  },
+                  "operator": "+",
+                  "right": {
+                    "type": "NumericLiteral",
+                    "start": 19,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 19
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 20
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  }
+                }
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "ArrowFunctionExpression",
+              "start": 24,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 24
+                },
+                "end": {
+                  "line": 1,
+                  "column": 34
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 24,
+                  "end": 25,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 25
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 29,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 29
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 34
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 29,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 29
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 30
+                    },
+                    "identifierName": "z"
+                  },
+                  "name": "z"
+                },
+                "operator": "*",
+                "right": {
+                  "type": "NumericLiteral",
+                  "start": 33,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 33
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 34
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/input.js
new file mode 100644
index 000000000000..75e12145a31d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/input.js
@@ -0,0 +1,3 @@
+async function test () {
+  return x |> await;
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/output.json
new file mode 100644
index 000000000000..49c1e410dc02
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await-end/output.json
@@ -0,0 +1,151 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 47,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 47,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 47,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            },
+            "identifierName": "test"
+          },
+          "name": "test"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 23,
+          "end": 47,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 23
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ReturnStatement",
+              "start": 27,
+              "end": 45,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 20
+                }
+              },
+              "argument": {
+                "type": "BinaryExpression",
+                "start": 34,
+                "end": 44,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 19
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 34,
+                  "end": 35,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 10
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "AwaitExpression",
+                  "start": 39,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 19
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/input.js
new file mode 100644
index 000000000000..fb50c9400ea6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/input.js
@@ -0,0 +1,3 @@
+async function test () {
+  return x |> await |> f;
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/output.json
new file mode 100644
index 000000000000..fa743ed7e4ad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-await/output.json
@@ -0,0 +1,184 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 52,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 52,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 52,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            },
+            "identifierName": "test"
+          },
+          "name": "test"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 23,
+          "end": 52,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 23
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ReturnStatement",
+              "start": 27,
+              "end": 50,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 25
+                }
+              },
+              "argument": {
+                "type": "BinaryExpression",
+                "start": 34,
+                "end": 49,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 24
+                  }
+                },
+                "left": {
+                  "type": "BinaryExpression",
+                  "start": 34,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 19
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 34,
+                    "end": 35,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 9
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 10
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "operator": "|>",
+                  "right": {
+                    "type": "AwaitExpression",
+                    "start": 39,
+                    "end": 44,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 19
+                      }
+                    }
+                  }
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "Identifier",
+                  "start": 48,
+                  "end": 49,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 23
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 24
+                    },
+                    "identifierName": "f"
+                  },
+                  "name": "f"
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-ban-await-f/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-ban-await-f/input.js
new file mode 100644
index 000000000000..380040513fd5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-ban-await-f/input.js
@@ -0,0 +1,3 @@
+async function test () {
+  return x |> await f;
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-ban-await-f/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-ban-await-f/options.json
new file mode 100644
index 000000000000..b743604f7e0f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-ban-await-f/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]],
+  "throws": "Unexpected token, expected \";\" (2:20)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/input.js
new file mode 100644
index 000000000000..cf3443941ff0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/input.js
@@ -0,0 +1 @@
+a |> b
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/output.json
new file mode 100644
index 000000000000..fbf187592a3e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-base/output.json
@@ -0,0 +1,100 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 6,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 6,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 6
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "a"
+            },
+            "name": "a"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "Identifier",
+            "start": 5,
+            "end": 6,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 6
+              },
+              "identifierName": "b"
+            },
+            "name": "b"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/input.js
new file mode 100644
index 000000000000..0d1e8411dd06
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/input.js
@@ -0,0 +1 @@
+x |> inc |> double
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/options.json
new file mode 100644
index 000000000000..f95ecc7d6c23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "fsharp" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/output.json
new file mode 100644
index 000000000000..797dec673387
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-fsharp-chain/output.json
@@ -0,0 +1,133 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "left": {
+            "type": "BinaryExpression",
+            "start": 0,
+            "end": 8,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 8
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "operator": "|>",
+            "right": {
+              "type": "Identifier",
+              "start": 5,
+              "end": 8,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 8
+                },
+                "identifierName": "inc"
+              },
+              "name": "inc"
+            }
+          },
+          "operator": "|>",
+          "right": {
+            "type": "Identifier",
+            "start": 12,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 12
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              },
+              "identifierName": "double"
+            },
+            "name": "double"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await-f/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await-f/options.json
index 7f92d28237e0..98b0d71d084e 100644
--- a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await-f/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await-f/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [["pipelineOperator", { "proposal": "minimal" }]],
-  "throws":
-    "Unexpected \"await\" after pipeline body; await must have parentheses in minimal proposal (2:14)"
+  "throws": "Unexpected \"await\" after pipeline body; await must have parentheses in minimal proposal (2:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await/options.json
index 7f92d28237e0..98b0d71d084e 100644
--- a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-minimal-ban-await/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [["pipelineOperator", { "proposal": "minimal" }]],
-  "throws":
-    "Unexpected \"await\" after pipeline body; await must have parentheses in minimal proposal (2:14)"
+  "throws": "Unexpected \"await\" after pipeline body; await must have parentheses in minimal proposal (2:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/input.js
new file mode 100644
index 000000000000..49a8129b058f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/input.js
@@ -0,0 +1,4 @@
+let result = "hello"
+|> doubleSay
+|> text.capitalize
+|> a.b.exclaim;
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/output.json
new file mode 100644
index 000000000000..889bb7a69b62
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-multiline/output.json
@@ -0,0 +1,348 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 68,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 68,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 68,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 15
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 67,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 4,
+                "column": 14
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "result"
+              },
+              "name": "result"
+            },
+            "init": {
+              "type": "BinaryExpression",
+              "start": 13,
+              "end": 67,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 13
+                },
+                "end": {
+                  "line": 4,
+                  "column": 14
+                }
+              },
+              "left": {
+                "type": "BinaryExpression",
+                "start": 13,
+                "end": 52,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 18
+                  }
+                },
+                "left": {
+                  "type": "BinaryExpression",
+                  "start": 13,
+                  "end": 33,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 12
+                    }
+                  },
+                  "left": {
+                    "type": "StringLiteral",
+                    "start": 13,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 20
+                      }
+                    },
+                    "extra": {
+                      "rawValue": "hello",
+                      "raw": "\"hello\""
+                    },
+                    "value": "hello"
+                  },
+                  "operator": "|>",
+                  "right": {
+                    "type": "PipelineBareFunction",
+                    "start": 24,
+                    "end": 33,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 3
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 12
+                      }
+                    },
+                    "callee": {
+                      "type": "Identifier",
+                      "start": 24,
+                      "end": 33,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 3
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 12
+                        },
+                        "identifierName": "doubleSay"
+                      },
+                      "name": "doubleSay"
+                    }
+                  }
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "PipelineBareFunction",
+                  "start": 37,
+                  "end": 52,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 18
+                    }
+                  },
+                  "callee": {
+                    "type": "MemberExpression",
+                    "start": 37,
+                    "end": 52,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 3
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 18
+                      }
+                    },
+                    "object": {
+                      "type": "Identifier",
+                      "start": 37,
+                      "end": 41,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 3
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 7
+                        },
+                        "identifierName": "text"
+                      },
+                      "name": "text"
+                    },
+                    "property": {
+                      "type": "Identifier",
+                      "start": 42,
+                      "end": 52,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 18
+                        },
+                        "identifierName": "capitalize"
+                      },
+                      "name": "capitalize"
+                    },
+                    "computed": false
+                  }
+                }
+              },
+              "operator": "|>",
+              "right": {
+                "type": "PipelineBareFunction",
+                "start": 56,
+                "end": 67,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 14
+                  }
+                },
+                "callee": {
+                  "type": "MemberExpression",
+                  "start": 56,
+                  "end": 67,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 14
+                    }
+                  },
+                  "object": {
+                    "type": "MemberExpression",
+                    "start": 56,
+                    "end": 59,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 3
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 6
+                      }
+                    },
+                    "object": {
+                      "type": "Identifier",
+                      "start": 56,
+                      "end": 57,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 3
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 4
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "property": {
+                      "type": "Identifier",
+                      "start": 58,
+                      "end": 59,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 6
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b"
+                    },
+                    "computed": false
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 60,
+                    "end": 67,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 7
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 14
+                      },
+                      "identifierName": "exclaim"
+                    },
+                    "name": "exclaim"
+                  },
+                  "computed": false
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/input.js
new file mode 100644
index 000000000000..253a8fdfddf9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/input.js
@@ -0,0 +1 @@
+x => x |> number.inc |> double
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/output.json
new file mode 100644
index 000000000000..71953d9db9ce
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-chained,-single-line-arrow-function/output.json
@@ -0,0 +1,233 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 30
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 30
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 30
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 0,
+              "end": 1,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 1
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          ],
+          "body": {
+            "type": "BinaryExpression",
+            "start": 5,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              }
+            },
+            "left": {
+              "type": "BinaryExpression",
+              "start": 5,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 5
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 5,
+                "end": 6,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "operator": "|>",
+              "right": {
+                "type": "PipelineBareFunction",
+                "start": 10,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "callee": {
+                  "type": "MemberExpression",
+                  "start": 10,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 10,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "identifierName": "number"
+                    },
+                    "name": "number"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 17,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 20
+                      },
+                      "identifierName": "inc"
+                    },
+                    "name": "inc"
+                  },
+                  "computed": false
+                }
+              }
+            },
+            "operator": "|>",
+            "right": {
+              "type": "PipelineBareFunction",
+              "start": 24,
+              "end": 30,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 24
+                },
+                "end": {
+                  "line": 1,
+                  "column": 30
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 24,
+                "end": 30,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 30
+                  },
+                  "identifierName": "double"
+                },
+                "name": "double"
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/input.js
new file mode 100644
index 000000000000..15a3d7657b9c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/input.js
@@ -0,0 +1 @@
+value |> f
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/output.json
new file mode 100644
index 000000000000..0aef90100fb5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-identifier/output.json
@@ -0,0 +1,115 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineBareFunction",
+            "start": 9,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "callee": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "f"
+              },
+              "name": "f"
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/input.js
new file mode 100644
index 000000000000..9f9ac30d8f48
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/input.js
@@ -0,0 +1 @@
+value |> a.b.c.f
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/output.json
new file mode 100644
index 000000000000..0fbd40308b71
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-bare-style,-function-calls,-single,-property/output.json
@@ -0,0 +1,214 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineBareFunction",
+            "start": 9,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 16
+              }
+            },
+            "callee": {
+              "type": "MemberExpression",
+              "start": 9,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "object": {
+                "type": "MemberExpression",
+                "start": 9,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "object": {
+                  "type": "MemberExpression",
+                  "start": 9,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "object": {
+                    "type": "Identifier",
+                    "start": 9,
+                    "end": 10,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 9
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 10
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a"
+                  },
+                  "property": {
+                    "type": "Identifier",
+                    "start": 11,
+                    "end": 12,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 12
+                      },
+                      "identifierName": "b"
+                    },
+                    "name": "b"
+                  },
+                  "computed": false
+                },
+                "property": {
+                  "type": "Identifier",
+                  "start": 13,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    },
+                    "identifierName": "c"
+                  },
+                  "name": "c"
+                },
+                "computed": false
+              },
+              "property": {
+                "type": "Identifier",
+                "start": 15,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "f"
+                },
+                "name": "f"
+              },
+              "computed": false
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-bare-style,-head-with-topic-reference-pair/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-bare-style,-head-with-topic-reference-pair/input.js
new file mode 100644
index 000000000000..a93aa77bbd74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-bare-style,-head-with-topic-reference-pair/input.js
@@ -0,0 +1 @@
+(1, 2) |> f;
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-bare-style,-head-with-topic-reference-pair/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-bare-style,-head-with-topic-reference-pair/options.json
new file mode 100644
index 000000000000..cc2c16a778e7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-bare-style,-head-with-topic-reference-pair/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline head should not be a comma-separated sequence expression (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-invalid-hash-token,-followed-by-digit/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-invalid-hash-token,-followed-by-digit/input.js
new file mode 100644
index 000000000000..b18a6404b537
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-invalid-hash-token,-followed-by-digit/input.js
@@ -0,0 +1 @@
+x |> #42;
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-invalid-hash-token,-followed-by-digit/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-invalid-hash-token,-followed-by-digit/options.json
new file mode 100644
index 000000000000..a2f6f625f90c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-invalid-hash-token,-followed-by-digit/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Unexpected digit after hash token (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-bare-style,-no-outer-topic-reference/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-bare-style,-no-outer-topic-reference/input.js
new file mode 100644
index 000000000000..194b4e64ed1f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-bare-style,-no-outer-topic-reference/input.js
@@ -0,0 +1 @@
+x |> ($ => $ |> f)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-bare-style,-no-outer-topic-reference/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-bare-style,-no-outer-topic-reference/options.json
new file mode 100644
index 000000000000..d2b32f77521a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-bare-style,-no-outer-topic-reference/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-inner-topic-reference/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-inner-topic-reference/input.js
new file mode 100644
index 000000000000..98e99a4493f1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-inner-topic-reference/input.js
@@ -0,0 +1 @@
+x |> ($ => # |> $ + 1)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-inner-topic-reference/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-inner-topic-reference/options.json
new file mode 100644
index 000000000000..e9eab6b46fe9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-inner-topic-reference/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-outer-topic-reference/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-outer-topic-reference/input.js
new file mode 100644
index 000000000000..a4723737f3b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-outer-topic-reference/input.js
@@ -0,0 +1 @@
+x |> ($ => $ |> #)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-outer-topic-reference/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-outer-topic-reference/options.json
new file mode 100644
index 000000000000..d2b32f77521a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-arrow-function-with-topic-style,-no-outer-topic-reference/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-inner-topic-reference/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-inner-topic-reference/input.js
new file mode 100644
index 000000000000..50b90bb9adf9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-inner-topic-reference/input.js
@@ -0,0 +1 @@
+x |> (# |> f())
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-inner-topic-reference/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-inner-topic-reference/options.json
new file mode 100644
index 000000000000..bdf0547df8f9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-inner-topic-reference/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:11)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-outer-topic-reference/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-outer-topic-reference/input.js
new file mode 100644
index 000000000000..9d00837048ed
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-outer-topic-reference/input.js
@@ -0,0 +1 @@
+x |> ($ |> f)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-outer-topic-reference/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-outer-topic-reference/options.json
new file mode 100644
index 000000000000..d2b32f77521a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-nested-pipelines,-topic-style-with-inner-topic-style,-no-outer-topic-reference/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-followed-by-bare-style-pipeline-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-followed-by-bare-style-pipeline-body/input.js
new file mode 100644
index 000000000000..a6146afadab6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-followed-by-bare-style-pipeline-body/input.js
@@ -0,0 +1 @@
+10 |> (#, #) |> h;
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-followed-by-bare-style-pipeline-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-followed-by-bare-style-pipeline-body/options.json
new file mode 100644
index 000000000000..fe3873ecc67f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-followed-by-bare-style-pipeline-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline body may not be a comma-separated sequence expression (1:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-then-end/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-then-end/input.js
new file mode 100644
index 000000000000..7da42e013c11
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-then-end/input.js
@@ -0,0 +1 @@
+10 |> (#, #);
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-then-end/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-then-end/options.json
new file mode 100644
index 000000000000..fe3873ecc67f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-sequence-style,-body-with-topic-reference-pair-then-end/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline body may not be a comma-separated sequence expression (1:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-computed,-no-topic-reference/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-computed,-no-topic-reference/input.js
new file mode 100644
index 000000000000..5a02dee8ec60
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-computed,-no-topic-reference/input.js
@@ -0,0 +1 @@
+value |> a[b]
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-computed,-no-topic-reference/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-computed,-no-topic-reference/options.json
new file mode 100644
index 000000000000..7a4451381c91
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-computed,-no-topic-reference/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-addition/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-addition/input.js
new file mode 100644
index 000000000000..e952adac15fd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-addition/input.js
@@ -0,0 +1 @@
+value |> a + b
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-addition/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-addition/options.json
new file mode 100644
index 000000000000..7a4451381c91
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-addition/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-class-expression/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-class-expression/input.js
new file mode 100644
index 000000000000..6ccb6ca13351
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-class-expression/input.js
@@ -0,0 +1 @@
+value |> class { }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-class-expression/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-class-expression/options.json
new file mode 100644
index 000000000000..7a4451381c91
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-class-expression/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-function-expression/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-function-expression/input.js
new file mode 100644
index 000000000000..faf09879d637
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-function-expression/input.js
@@ -0,0 +1 @@
+value |> function (x) { return; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-function-expression/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-function-expression/options.json
new file mode 100644
index 000000000000..7a4451381c91
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-no-topic-reference,-function-expression/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Pipeline is in topic style but does not use topic reference (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-body/input.js
new file mode 100644
index 000000000000..c1005576b7d5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-body/input.js
@@ -0,0 +1 @@
+value |> do { do x += # while (x < 50); }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-body/options.json
new file mode 100644
index 000000000000..3b7a52d71cf7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:22)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-body/input.js
new file mode 100644
index 000000000000..261f95e4c7d2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-body/input.js
@@ -0,0 +1,3 @@
+async function af () {
+  value |> do { for await (const e of sequence) #; }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-body/options.json
new file mode 100644
index 000000000000..d117d235099d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-body/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    ["pipelineOperator", { "proposal": "smart" }],
+    "doExpressions",
+    "asyncGenerators"
+  ],
+  "throws": "Topic reference was used in a lexical context without topic binding (2:48)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-body/input.js
new file mode 100644
index 000000000000..e0eb815c73fb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-body/input.js
@@ -0,0 +1 @@
+value |> do { for (let i = 0; i < n; i += 1) #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-body/options.json
new file mode 100644
index 000000000000..35e8658a93da
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:45)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-body/input.js
new file mode 100644
index 000000000000..f6ebfaf94818
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-body/input.js
@@ -0,0 +1 @@
+value |> do { for (e in object) #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-body/options.json
new file mode 100644
index 000000000000..6e8b4a6f0d95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:32)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-body/input.js
new file mode 100644
index 000000000000..b3350a5ad5e0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-body/input.js
@@ -0,0 +1 @@
+value |> do { for (e of sequence) #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-body/options.json
new file mode 100644
index 000000000000..a3707cc91710
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:34)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-try-statement,-outer-topic-reference-in-catch-clause/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-try-statement,-outer-topic-reference-in-catch-clause/input.js
new file mode 100644
index 000000000000..bd64c4dd8768
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-try-statement,-outer-topic-reference-in-catch-clause/input.js
@@ -0,0 +1,4 @@
+value |> do {
+  try { JSON.parse(#); }
+  catch (error) { console.error(#); }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-try-statement,-outer-topic-reference-in-catch-clause/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-try-statement,-outer-topic-reference-in-catch-clause/options.json
new file mode 100644
index 000000000000..0f40a90d2204
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-try-statement,-outer-topic-reference-in-catch-clause/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"],
+  "throws": "Topic reference was used in a lexical context without topic binding (3:32)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-while-loop,-outer-topic-reference-in-loop-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-while-loop,-outer-topic-reference-in-loop-body/input.js
new file mode 100644
index 000000000000..06cfc1f2bed0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-while-loop,-outer-topic-reference-in-loop-body/input.js
@@ -0,0 +1 @@
+value |> do { while (x < 50) x += #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-while-loop,-outer-topic-reference-in-loop-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-while-loop,-outer-topic-reference-in-loop-body/options.json
new file mode 100644
index 000000000000..a3707cc91710
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-while-loop,-outer-topic-reference-in-loop-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:34)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-with-statement,-outer-topic-reference-in-with-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-with-statement,-outer-topic-reference-in-with-body/input.js
new file mode 100644
index 000000000000..4872290c9926
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-with-statement,-outer-topic-reference-in-with-body/input.js
@@ -0,0 +1 @@
+value |> do { with ({}) #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-with-statement,-outer-topic-reference-in-with-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-with-statement,-outer-topic-reference-in-with-body/options.json
new file mode 100644
index 000000000000..fee1ffebc044
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unbound-topic,-do-expression,-with-statement,-outer-topic-reference-in-with-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:24)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unparenthesized-arrow-function-with-bare-parameter-and-bare-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unparenthesized-arrow-function-with-bare-parameter-and-bare-body/input.js
new file mode 100644
index 000000000000..00d1c2320d2f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unparenthesized-arrow-function-with-bare-parameter-and-bare-body/input.js
@@ -0,0 +1 @@
+10 |> x => x + #;
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unparenthesized-arrow-function-with-bare-parameter-and-bare-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unparenthesized-arrow-function-with-bare-parameter-and-bare-body/options.json
new file mode 100644
index 000000000000..a684795fbfb9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-topic-style,-unparenthesized-arrow-function-with-bare-parameter-and-bare-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Unexpected arrow \"=>\" after pipeline body; arrow function in pipeline body must be parenthesized (1:8)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-class-in-pipeline-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-class-in-pipeline-body/input.js
new file mode 100644
index 000000000000..a905d1b71159
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-class-in-pipeline-body/input.js
@@ -0,0 +1 @@
+x |> class { constructor () { this.x = #; } }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-class-in-pipeline-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-class-in-pipeline-body/options.json
new file mode 100644
index 000000000000..6401af97db12
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-class-in-pipeline-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:39)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-function-in-pipeline-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-function-in-pipeline-body/input.js
new file mode 100644
index 000000000000..8af92dbefe4a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-function-in-pipeline-body/input.js
@@ -0,0 +1 @@
+x |> function () { # }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-function-in-pipeline-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-function-in-pipeline-body/options.json
new file mode 100644
index 000000000000..e6731253189f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-inner-function-in-pipeline-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:19)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-pipeline-head-in-inner-function-in-pipeline-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-pipeline-head-in-inner-function-in-pipeline-body/input.js
new file mode 100644
index 000000000000..818748040ed7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-pipeline-head-in-inner-function-in-pipeline-body/input.js
@@ -0,0 +1 @@
+x |> function () { # |> # }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-pipeline-head-in-inner-function-in-pipeline-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-pipeline-head-in-inner-function-in-pipeline-body/options.json
new file mode 100644
index 000000000000..e6731253189f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-pipeline-head-in-inner-function-in-pipeline-body/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Topic reference was used in a lexical context without topic binding (1:19)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-simple/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-simple/input.js
new file mode 100644
index 000000000000..2d07bd7883dc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-simple/input.js
@@ -0,0 +1 @@
+1 + #
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-simple/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-simple/options.json
new file mode 100644
index 000000000000..736cde0e101d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-error,-unbound-topic,-simple/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]],
+  "throws": "Unexpected token (1:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/input.js
new file mode 100644
index 000000000000..a5a21763a8eb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/input.js
@@ -0,0 +1 @@
+x |> (() => # |> f)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/output.json
new file mode 100644
index 000000000000..20fef485fd61
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-bare-style/output.json
@@ -0,0 +1,184 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 5,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "expression": {
+              "type": "ArrowFunctionExpression",
+              "start": 6,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 12,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "left": {
+                  "type": "PipelinePrimaryTopicReference",
+                  "start": 12,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    }
+                  }
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "PipelineBareFunction",
+                  "start": 17,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "callee": {
+                    "type": "Identifier",
+                    "start": 17,
+                    "end": 18,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 18
+                      },
+                      "identifierName": "f"
+                    },
+                    "name": "f"
+                  }
+                }
+              },
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 5
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/input.js
new file mode 100644
index 000000000000..e8fc8e430b8e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/input.js
@@ -0,0 +1 @@
+x |> ($ => # |> f(#, $))
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/output.json
new file mode 100644
index 000000000000..ae7bef130c84
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-arrow-function-with-topic-style/output.json
@@ -0,0 +1,251 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 5,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "expression": {
+              "type": "ArrowFunctionExpression",
+              "start": 6,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 23
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "Identifier",
+                  "start": 6,
+                  "end": 7,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "identifierName": "$"
+                  },
+                  "name": "$"
+                }
+              ],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 11,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 23
+                  }
+                },
+                "left": {
+                  "type": "PipelinePrimaryTopicReference",
+                  "start": 11,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  }
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "PipelineTopicExpression",
+                  "start": 16,
+                  "end": 23,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 23
+                    }
+                  },
+                  "expression": {
+                    "type": "CallExpression",
+                    "start": 16,
+                    "end": 23,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 23
+                      }
+                    },
+                    "callee": {
+                      "type": "Identifier",
+                      "start": 16,
+                      "end": 17,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 17
+                        },
+                        "identifierName": "f"
+                      },
+                      "name": "f"
+                    },
+                    "arguments": [
+                      {
+                        "type": "PipelinePrimaryTopicReference",
+                        "start": 18,
+                        "end": 19,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 19
+                          }
+                        }
+                      },
+                      {
+                        "type": "Identifier",
+                        "start": 21,
+                        "end": 22,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 22
+                          },
+                          "identifierName": "$"
+                        },
+                        "name": "$"
+                      }
+                    ]
+                  }
+                }
+              },
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 5
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/input.js
new file mode 100644
index 000000000000..a462b80cbbd8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/input.js
@@ -0,0 +1 @@
+x |> (# |> f)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/output.json
new file mode 100644
index 000000000000..51d79d3318da
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-bare-style/output.json
@@ -0,0 +1,165 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 13
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 5,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "expression": {
+              "type": "BinaryExpression",
+              "start": 6,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "left": {
+                "type": "PipelinePrimaryTopicReference",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  }
+                }
+              },
+              "operator": "|>",
+              "right": {
+                "type": "PipelineBareFunction",
+                "start": 11,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "callee": {
+                  "type": "Identifier",
+                  "start": 11,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "identifierName": "f"
+                  },
+                  "name": "f"
+                }
+              },
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 5
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/input.js
new file mode 100644
index 000000000000..2668daa465d1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/input.js
@@ -0,0 +1 @@
+x |> (# |> f(#, x))
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/output.json
new file mode 100644
index 000000000000..7b38baf9008c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-nested-pipelines,-topic-style-with-inner-topic-style/output.json
@@ -0,0 +1,214 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 1,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 1
+              },
+              "identifierName": "x"
+            },
+            "name": "x"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 5,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "expression": {
+              "type": "BinaryExpression",
+              "start": 6,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "left": {
+                "type": "PipelinePrimaryTopicReference",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  }
+                }
+              },
+              "operator": "|>",
+              "right": {
+                "type": "PipelineTopicExpression",
+                "start": 11,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "expression": {
+                  "type": "CallExpression",
+                  "start": 11,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 18
+                    }
+                  },
+                  "callee": {
+                    "type": "Identifier",
+                    "start": 11,
+                    "end": 12,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 12
+                      },
+                      "identifierName": "f"
+                    },
+                    "name": "f"
+                  },
+                  "arguments": [
+                    {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 13,
+                      "end": 14,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 14
+                        }
+                      }
+                    },
+                    {
+                      "type": "Identifier",
+                      "start": 16,
+                      "end": 17,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 17
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    }
+                  ]
+                }
+              },
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 5
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/input.js
new file mode 100644
index 000000000000..9d3fa9212120
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/input.js
@@ -0,0 +1 @@
+value |> # + 1
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/output.json
new file mode 100644
index 000000000000..195e3bb795f5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-first/output.json
@@ -0,0 +1,149 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              }
+            },
+            "expression": {
+              "type": "BinaryExpression",
+              "start": 9,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "left": {
+                "type": "PipelinePrimaryTopicReference",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                }
+              },
+              "operator": "+",
+              "right": {
+                "type": "NumericLiteral",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/input.js
new file mode 100644
index 000000000000..64ea7f0bcd1e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/input.js
@@ -0,0 +1 @@
+value |> 1 + #
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/output.json
new file mode 100644
index 000000000000..3a206964c2bd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-addition,-single-line-arrow-function,-topic-reference-last/output.json
@@ -0,0 +1,149 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              }
+            },
+            "expression": {
+              "type": "BinaryExpression",
+              "start": 9,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "left": {
+                "type": "NumericLiteral",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  }
+                },
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              },
+              "operator": "+",
+              "right": {
+                "type": "PipelinePrimaryTopicReference",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/input.js
new file mode 100644
index 000000000000..ea421c59a0f3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/input.js
@@ -0,0 +1,3 @@
+async function f () {
+  return x |> await #;
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/output.json
new file mode 100644
index 000000000000..9337eb29bf60
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-async-await/output.json
@@ -0,0 +1,181 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 20,
+          "end": 46,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 20
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ReturnStatement",
+              "start": 24,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 22
+                }
+              },
+              "argument": {
+                "type": "BinaryExpression",
+                "start": 31,
+                "end": 43,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 21
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 31,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 10
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "PipelineTopicExpression",
+                  "start": 36,
+                  "end": 43,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 21
+                    }
+                  },
+                  "expression": {
+                    "type": "AwaitExpression",
+                    "start": 36,
+                    "end": 43,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 21
+                      }
+                    },
+                    "argument": {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 42,
+                      "end": 43,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 21
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/input.js
new file mode 100644
index 000000000000..e5917937bc70
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/input.js
@@ -0,0 +1 @@
+value |> do { do x += 1; while (x < #); }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/output.json
new file mode 100644
index 000000000000..18b3068859d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-do-while-loop,-outer-topic-reference-in-loop-head/output.json
@@ -0,0 +1,262 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 41,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 41
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 41,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 41
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 41
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 41
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 41,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 41
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 41,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 41
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 41,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 41
+                  }
+                },
+                "body": [
+                  {
+                    "type": "DoWhileStatement",
+                    "start": 14,
+                    "end": 39,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 39
+                      }
+                    },
+                    "body": {
+                      "type": "ExpressionStatement",
+                      "start": 17,
+                      "end": 24,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 17
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 24
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 17,
+                        "end": 23,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 17
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 23
+                          }
+                        },
+                        "operator": "+=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 17,
+                          "end": 18,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 17
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 18
+                            },
+                            "identifierName": "x"
+                          },
+                          "name": "x"
+                        },
+                        "right": {
+                          "type": "NumericLiteral",
+                          "start": 22,
+                          "end": 23,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 22
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 23
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 1,
+                            "raw": "1"
+                          },
+                          "value": 1
+                        }
+                      }
+                    },
+                    "test": {
+                      "type": "BinaryExpression",
+                      "start": 32,
+                      "end": 37,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 32
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 37
+                        }
+                      },
+                      "left": {
+                        "type": "Identifier",
+                        "start": 32,
+                        "end": 33,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 32
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 33
+                          },
+                          "identifierName": "x"
+                        },
+                        "name": "x"
+                      },
+                      "operator": "<",
+                      "right": {
+                        "type": "PipelinePrimaryTopicReference",
+                        "start": 36,
+                        "end": 37,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 36
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 37
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/input.js
new file mode 100644
index 000000000000..197761dcd742
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/input.js
@@ -0,0 +1,3 @@
+async function af () {
+  value |> do { for await (const e of #) e; }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/options.json
new file mode 100644
index 000000000000..680f780892b7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    ["pipelineOperator", { "proposal": "smart" }],
+    "doExpressions",
+    "asyncGenerators"
+  ]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/output.json
new file mode 100644
index 000000000000..15b7a61ce7ba
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-await-of-loop,-outer-topic-reference-in-loop-head/output.json
@@ -0,0 +1,298 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 70,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 70,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 70,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            },
+            "identifierName": "af"
+          },
+          "name": "af"
+        },
+        "generator": false,
+        "async": true,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 21,
+          "end": 70,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 21
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 25,
+              "end": 68,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 45
+                }
+              },
+              "expression": {
+                "type": "BinaryExpression",
+                "start": 25,
+                "end": 68,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 45
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 25,
+                  "end": 30,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 7
+                    },
+                    "identifierName": "value"
+                  },
+                  "name": "value"
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "PipelineTopicExpression",
+                  "start": 34,
+                  "end": 68,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 45
+                    }
+                  },
+                  "expression": {
+                    "type": "DoExpression",
+                    "start": 34,
+                    "end": 68,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 45
+                      }
+                    },
+                    "body": {
+                      "type": "BlockStatement",
+                      "start": 37,
+                      "end": 68,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 45
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ForOfStatement",
+                          "start": 39,
+                          "end": 66,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 16
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 43
+                            }
+                          },
+                          "await": true,
+                          "left": {
+                            "type": "VariableDeclaration",
+                            "start": 50,
+                            "end": 57,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 27
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 34
+                              }
+                            },
+                            "declarations": [
+                              {
+                                "type": "VariableDeclarator",
+                                "start": 56,
+                                "end": 57,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 33
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 34
+                                  }
+                                },
+                                "id": {
+                                  "type": "Identifier",
+                                  "start": 56,
+                                  "end": 57,
+                                  "loc": {
+                                    "start": {
+                                      "line": 2,
+                                      "column": 33
+                                    },
+                                    "end": {
+                                      "line": 2,
+                                      "column": 34
+                                    },
+                                    "identifierName": "e"
+                                  },
+                                  "name": "e"
+                                },
+                                "init": null
+                              }
+                            ],
+                            "kind": "const"
+                          },
+                          "right": {
+                            "type": "PipelinePrimaryTopicReference",
+                            "start": 61,
+                            "end": 62,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 38
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 39
+                              }
+                            }
+                          },
+                          "body": {
+                            "type": "ExpressionStatement",
+                            "start": 64,
+                            "end": 66,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 41
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 43
+                              }
+                            },
+                            "expression": {
+                              "type": "Identifier",
+                              "start": 64,
+                              "end": 65,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 41
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 42
+                                },
+                                "identifierName": "e"
+                              },
+                              "name": "e"
+                            }
+                          }
+                        }
+                      ],
+                      "directives": []
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/input.js
new file mode 100644
index 000000000000..1e14a50cda84
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/input.js
@@ -0,0 +1 @@
+value |> do { for (let i = #; predicate(i, #); i += #) i; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/output.json
new file mode 100644
index 000000000000..2fb6945eeb76
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-classic-loop,-outer-topic-reference-in-loop-head/output.json
@@ -0,0 +1,357 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 59,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 59
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 59,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 59
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 59,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 59
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 59,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 59
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 59,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 59
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 59,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 59
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 59,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 59
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ForStatement",
+                    "start": 14,
+                    "end": 57,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 57
+                      }
+                    },
+                    "init": {
+                      "type": "VariableDeclaration",
+                      "start": 19,
+                      "end": 28,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 19
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 28
+                        }
+                      },
+                      "declarations": [
+                        {
+                          "type": "VariableDeclarator",
+                          "start": 23,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 23
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 28
+                            }
+                          },
+                          "id": {
+                            "type": "Identifier",
+                            "start": 23,
+                            "end": 24,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 23
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 24
+                              },
+                              "identifierName": "i"
+                            },
+                            "name": "i"
+                          },
+                          "init": {
+                            "type": "PipelinePrimaryTopicReference",
+                            "start": 27,
+                            "end": 28,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 27
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 28
+                              }
+                            }
+                          }
+                        }
+                      ],
+                      "kind": "let"
+                    },
+                    "test": {
+                      "type": "CallExpression",
+                      "start": 30,
+                      "end": 45,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 45
+                        }
+                      },
+                      "callee": {
+                        "type": "Identifier",
+                        "start": 30,
+                        "end": 39,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 30
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 39
+                          },
+                          "identifierName": "predicate"
+                        },
+                        "name": "predicate"
+                      },
+                      "arguments": [
+                        {
+                          "type": "Identifier",
+                          "start": 40,
+                          "end": 41,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 40
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 41
+                            },
+                            "identifierName": "i"
+                          },
+                          "name": "i"
+                        },
+                        {
+                          "type": "PipelinePrimaryTopicReference",
+                          "start": 43,
+                          "end": 44,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 43
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 44
+                            }
+                          }
+                        }
+                      ]
+                    },
+                    "update": {
+                      "type": "AssignmentExpression",
+                      "start": 47,
+                      "end": 53,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 47
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 53
+                        }
+                      },
+                      "operator": "+=",
+                      "left": {
+                        "type": "Identifier",
+                        "start": 47,
+                        "end": 48,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 47
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 48
+                          },
+                          "identifierName": "i"
+                        },
+                        "name": "i"
+                      },
+                      "right": {
+                        "type": "PipelinePrimaryTopicReference",
+                        "start": 52,
+                        "end": 53,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 52
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 53
+                          }
+                        }
+                      }
+                    },
+                    "body": {
+                      "type": "ExpressionStatement",
+                      "start": 55,
+                      "end": 57,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 55
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 57
+                        }
+                      },
+                      "expression": {
+                        "type": "Identifier",
+                        "start": 55,
+                        "end": 56,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 55
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 56
+                          },
+                          "identifierName": "i"
+                        },
+                        "name": "i"
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/input.js
new file mode 100644
index 000000000000..096c359535e5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/input.js
@@ -0,0 +1 @@
+value |> do { for (e in #) e; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/output.json
new file mode 100644
index 000000000000..4571a8f3b91e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-in-loop,-outer-topic-reference-in-loop-head/output.json
@@ -0,0 +1,210 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 31,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 31
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 31,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 31
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 31,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 31
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 31
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 31
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ForInStatement",
+                    "start": 14,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      }
+                    },
+                    "left": {
+                      "type": "Identifier",
+                      "start": 19,
+                      "end": 20,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 19
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "identifierName": "e"
+                      },
+                      "name": "e"
+                    },
+                    "right": {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 24,
+                      "end": 25,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 24
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 25
+                        }
+                      }
+                    },
+                    "body": {
+                      "type": "ExpressionStatement",
+                      "start": 27,
+                      "end": 29,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 27
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 29
+                        }
+                      },
+                      "expression": {
+                        "type": "Identifier",
+                        "start": 27,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 27
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 28
+                          },
+                          "identifierName": "e"
+                        },
+                        "name": "e"
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/input.js
new file mode 100644
index 000000000000..b3e5f40ef7fd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/input.js
@@ -0,0 +1 @@
+value |> do { for (e of #) e; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/output.json
new file mode 100644
index 000000000000..25757328ebef
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-for-of-loop,-outer-topic-reference-in-loop-head/output.json
@@ -0,0 +1,211 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 31,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 31
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 31,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 31
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 31,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 31
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 31
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 31
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ForOfStatement",
+                    "start": 14,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      }
+                    },
+                    "await": false,
+                    "left": {
+                      "type": "Identifier",
+                      "start": 19,
+                      "end": 20,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 19
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 20
+                        },
+                        "identifierName": "e"
+                      },
+                      "name": "e"
+                    },
+                    "right": {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 24,
+                      "end": 25,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 24
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 25
+                        }
+                      }
+                    },
+                    "body": {
+                      "type": "ExpressionStatement",
+                      "start": 27,
+                      "end": 29,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 27
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 29
+                        }
+                      },
+                      "expression": {
+                        "type": "Identifier",
+                        "start": 27,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 27
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 28
+                          },
+                          "identifierName": "e"
+                        },
+                        "name": "e"
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/input.js
new file mode 100644
index 000000000000..f78ceb724f12
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/input.js
@@ -0,0 +1 @@
+value |> do { #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/output.json
new file mode 100644
index 000000000000..d0c29a3cc724
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-identity/output.json
@@ -0,0 +1,161 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 18
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 18
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ExpressionStatement",
+                    "start": 14,
+                    "end": 16,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 16
+                      }
+                    },
+                    "expression": {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 14,
+                      "end": 15,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 15
+                        }
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/input.js
new file mode 100644
index 000000000000..b4c8778046ed
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/input.js
@@ -0,0 +1 @@
+value |> do { if (yes) null; else if (no) #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/output.json
new file mode 100644
index 000000000000..be74d493c27c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-body/output.json
@@ -0,0 +1,256 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 46
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 46
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 46
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 46,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 46
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 46,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 46
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 46,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 46
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 46,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 46
+                  }
+                },
+                "body": [
+                  {
+                    "type": "IfStatement",
+                    "start": 14,
+                    "end": 44,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 44
+                      }
+                    },
+                    "test": {
+                      "type": "Identifier",
+                      "start": 18,
+                      "end": 21,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "identifierName": "yes"
+                      },
+                      "name": "yes"
+                    },
+                    "consequent": {
+                      "type": "ExpressionStatement",
+                      "start": 23,
+                      "end": 28,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 28
+                        }
+                      },
+                      "expression": {
+                        "type": "NullLiteral",
+                        "start": 23,
+                        "end": 27,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 23
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 27
+                          }
+                        }
+                      }
+                    },
+                    "alternate": {
+                      "type": "IfStatement",
+                      "start": 34,
+                      "end": 44,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 34
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 44
+                        }
+                      },
+                      "test": {
+                        "type": "Identifier",
+                        "start": 38,
+                        "end": 40,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 40
+                          },
+                          "identifierName": "no"
+                        },
+                        "name": "no"
+                      },
+                      "consequent": {
+                        "type": "ExpressionStatement",
+                        "start": 42,
+                        "end": 44,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 42
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 44
+                          }
+                        },
+                        "expression": {
+                          "type": "PipelinePrimaryTopicReference",
+                          "start": 42,
+                          "end": 43,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 42
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 43
+                            }
+                          }
+                        }
+                      },
+                      "alternate": null
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/input.js
new file mode 100644
index 000000000000..0b1fd66aaa3c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/input.js
@@ -0,0 +1 @@
+value |> do { if (yes) null; else #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/output.json
new file mode 100644
index 000000000000..eb53ce59a775
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-else-if-body/output.json
@@ -0,0 +1,223 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 38,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 38
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 38,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 38
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 38,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 38
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 38
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 38
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 38
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 38
+                  }
+                },
+                "body": [
+                  {
+                    "type": "IfStatement",
+                    "start": 14,
+                    "end": 36,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 36
+                      }
+                    },
+                    "test": {
+                      "type": "Identifier",
+                      "start": 18,
+                      "end": 21,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "identifierName": "yes"
+                      },
+                      "name": "yes"
+                    },
+                    "consequent": {
+                      "type": "ExpressionStatement",
+                      "start": 23,
+                      "end": 28,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 28
+                        }
+                      },
+                      "expression": {
+                        "type": "NullLiteral",
+                        "start": 23,
+                        "end": 27,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 23
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 27
+                          }
+                        }
+                      }
+                    },
+                    "alternate": {
+                      "type": "ExpressionStatement",
+                      "start": 34,
+                      "end": 36,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 34
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 36
+                        }
+                      },
+                      "expression": {
+                        "type": "PipelinePrimaryTopicReference",
+                        "start": 34,
+                        "end": 35,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 34
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 35
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/input.js
new file mode 100644
index 000000000000..bd64bfb5b763
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/input.js
@@ -0,0 +1 @@
+value |> do { if (yes) #; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/output.json
new file mode 100644
index 000000000000..501bbac6fa08
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-body/output.json
@@ -0,0 +1,194 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 27,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 27
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 27,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 27
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 27
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 27
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 27
+                  }
+                },
+                "body": [
+                  {
+                    "type": "IfStatement",
+                    "start": 14,
+                    "end": 25,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 25
+                      }
+                    },
+                    "test": {
+                      "type": "Identifier",
+                      "start": 18,
+                      "end": 21,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "identifierName": "yes"
+                      },
+                      "name": "yes"
+                    },
+                    "consequent": {
+                      "type": "ExpressionStatement",
+                      "start": 23,
+                      "end": 25,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 25
+                        }
+                      },
+                      "expression": {
+                        "type": "PipelinePrimaryTopicReference",
+                        "start": 23,
+                        "end": 24,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 23
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 24
+                          }
+                        }
+                      }
+                    },
+                    "alternate": null
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/input.js
new file mode 100644
index 000000000000..8457c4e57f71
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/input.js
@@ -0,0 +1 @@
+value |> do { if (#) 1; else 0; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/output.json
new file mode 100644
index 000000000000..e2fb435ec82b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-if-statement,-outer-topic-reference-in-if-head/output.json
@@ -0,0 +1,231 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 33
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 33
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 33
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 33,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 33
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 33,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 33
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 33,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 33
+                  }
+                },
+                "body": [
+                  {
+                    "type": "IfStatement",
+                    "start": 14,
+                    "end": 31,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 31
+                      }
+                    },
+                    "test": {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 18,
+                      "end": 19,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 19
+                        }
+                      }
+                    },
+                    "consequent": {
+                      "type": "ExpressionStatement",
+                      "start": 21,
+                      "end": 23,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 23
+                        }
+                      },
+                      "expression": {
+                        "type": "NumericLiteral",
+                        "start": 21,
+                        "end": 22,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 22
+                          }
+                        },
+                        "extra": {
+                          "rawValue": 1,
+                          "raw": "1"
+                        },
+                        "value": 1
+                      }
+                    },
+                    "alternate": {
+                      "type": "ExpressionStatement",
+                      "start": 29,
+                      "end": 31,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 29
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 31
+                        }
+                      },
+                      "expression": {
+                        "type": "NumericLiteral",
+                        "start": 29,
+                        "end": 30,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 29
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 30
+                          }
+                        },
+                        "extra": {
+                          "rawValue": 0,
+                          "raw": "0"
+                        },
+                        "value": 0
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/input.js
new file mode 100644
index 000000000000..c9562d43181c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/input.js
@@ -0,0 +1,7 @@
+value |> do {
+  switch (number) {
+    case 0: #;
+    case 1: # + 1;
+    default: # + 10;
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/output.json
new file mode 100644
index 000000000000..7ab18f8fbcfc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-body/output.json
@@ -0,0 +1,419 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 94,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 7,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 94,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 7,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 94,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 94,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 7,
+              "column": 1
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 94,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 7,
+                "column": 1
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 94,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 7,
+                  "column": 1
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 94,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 7,
+                    "column": 1
+                  }
+                },
+                "body": [
+                  {
+                    "type": "SwitchStatement",
+                    "start": 16,
+                    "end": 92,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 3
+                      }
+                    },
+                    "discriminant": {
+                      "type": "Identifier",
+                      "start": 24,
+                      "end": 30,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 16
+                        },
+                        "identifierName": "number"
+                      },
+                      "name": "number"
+                    },
+                    "cases": [
+                      {
+                        "type": "SwitchCase",
+                        "start": 38,
+                        "end": 48,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 14
+                          }
+                        },
+                        "consequent": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 46,
+                            "end": 48,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 12
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 14
+                              }
+                            },
+                            "expression": {
+                              "type": "PipelinePrimaryTopicReference",
+                              "start": 46,
+                              "end": 47,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 12
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 13
+                                }
+                              }
+                            }
+                          }
+                        ],
+                        "test": {
+                          "type": "NumericLiteral",
+                          "start": 43,
+                          "end": 44,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 10
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 0,
+                            "raw": "0"
+                          },
+                          "value": 0
+                        }
+                      },
+                      {
+                        "type": "SwitchCase",
+                        "start": 53,
+                        "end": 67,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 18
+                          }
+                        },
+                        "consequent": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 61,
+                            "end": 67,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 12
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 18
+                              }
+                            },
+                            "expression": {
+                              "type": "BinaryExpression",
+                              "start": 61,
+                              "end": 66,
+                              "loc": {
+                                "start": {
+                                  "line": 4,
+                                  "column": 12
+                                },
+                                "end": {
+                                  "line": 4,
+                                  "column": 17
+                                }
+                              },
+                              "left": {
+                                "type": "PipelinePrimaryTopicReference",
+                                "start": 61,
+                                "end": 62,
+                                "loc": {
+                                  "start": {
+                                    "line": 4,
+                                    "column": 12
+                                  },
+                                  "end": {
+                                    "line": 4,
+                                    "column": 13
+                                  }
+                                }
+                              },
+                              "operator": "+",
+                              "right": {
+                                "type": "NumericLiteral",
+                                "start": 65,
+                                "end": 66,
+                                "loc": {
+                                  "start": {
+                                    "line": 4,
+                                    "column": 16
+                                  },
+                                  "end": {
+                                    "line": 4,
+                                    "column": 17
+                                  }
+                                },
+                                "extra": {
+                                  "rawValue": 1,
+                                  "raw": "1"
+                                },
+                                "value": 1
+                              }
+                            }
+                          }
+                        ],
+                        "test": {
+                          "type": "NumericLiteral",
+                          "start": 58,
+                          "end": 59,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 10
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 1,
+                            "raw": "1"
+                          },
+                          "value": 1
+                        }
+                      },
+                      {
+                        "type": "SwitchCase",
+                        "start": 72,
+                        "end": 88,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 20
+                          }
+                        },
+                        "consequent": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 81,
+                            "end": 88,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 13
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 20
+                              }
+                            },
+                            "expression": {
+                              "type": "BinaryExpression",
+                              "start": 81,
+                              "end": 87,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 13
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 19
+                                }
+                              },
+                              "left": {
+                                "type": "PipelinePrimaryTopicReference",
+                                "start": 81,
+                                "end": 82,
+                                "loc": {
+                                  "start": {
+                                    "line": 5,
+                                    "column": 13
+                                  },
+                                  "end": {
+                                    "line": 5,
+                                    "column": 14
+                                  }
+                                }
+                              },
+                              "operator": "+",
+                              "right": {
+                                "type": "NumericLiteral",
+                                "start": 85,
+                                "end": 87,
+                                "loc": {
+                                  "start": {
+                                    "line": 5,
+                                    "column": 17
+                                  },
+                                  "end": {
+                                    "line": 5,
+                                    "column": 19
+                                  }
+                                },
+                                "extra": {
+                                  "rawValue": 10,
+                                  "raw": "10"
+                                },
+                                "value": 10
+                              }
+                            }
+                          }
+                        ],
+                        "test": null
+                      }
+                    ]
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/input.js
new file mode 100644
index 000000000000..77e4a2ddcf2f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/input.js
@@ -0,0 +1,7 @@
+value |> do {
+  switch (#) {
+    case 0: 50;
+    case 1: 60;
+    default: 70;
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/output.json
new file mode 100644
index 000000000000..75c247866713
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-switch-statement,-outer-topic-reference-in-switch-head/output.json
@@ -0,0 +1,360 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 83,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 7,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 83,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 7,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 83,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 83,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 7,
+              "column": 1
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 83,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 7,
+                "column": 1
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 83,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 7,
+                  "column": 1
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 83,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 7,
+                    "column": 1
+                  }
+                },
+                "body": [
+                  {
+                    "type": "SwitchStatement",
+                    "start": 16,
+                    "end": 81,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 3
+                      }
+                    },
+                    "discriminant": {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 24,
+                      "end": 25,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 11
+                        }
+                      }
+                    },
+                    "cases": [
+                      {
+                        "type": "SwitchCase",
+                        "start": 33,
+                        "end": 44,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 15
+                          }
+                        },
+                        "consequent": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 41,
+                            "end": 44,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 12
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 15
+                              }
+                            },
+                            "expression": {
+                              "type": "NumericLiteral",
+                              "start": 41,
+                              "end": 43,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 12
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 14
+                                }
+                              },
+                              "extra": {
+                                "rawValue": 50,
+                                "raw": "50"
+                              },
+                              "value": 50
+                            }
+                          }
+                        ],
+                        "test": {
+                          "type": "NumericLiteral",
+                          "start": 38,
+                          "end": 39,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 10
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 0,
+                            "raw": "0"
+                          },
+                          "value": 0
+                        }
+                      },
+                      {
+                        "type": "SwitchCase",
+                        "start": 49,
+                        "end": 60,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 15
+                          }
+                        },
+                        "consequent": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 57,
+                            "end": 60,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 12
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 15
+                              }
+                            },
+                            "expression": {
+                              "type": "NumericLiteral",
+                              "start": 57,
+                              "end": 59,
+                              "loc": {
+                                "start": {
+                                  "line": 4,
+                                  "column": 12
+                                },
+                                "end": {
+                                  "line": 4,
+                                  "column": 14
+                                }
+                              },
+                              "extra": {
+                                "rawValue": 60,
+                                "raw": "60"
+                              },
+                              "value": 60
+                            }
+                          }
+                        ],
+                        "test": {
+                          "type": "NumericLiteral",
+                          "start": 54,
+                          "end": 55,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 10
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 1,
+                            "raw": "1"
+                          },
+                          "value": 1
+                        }
+                      },
+                      {
+                        "type": "SwitchCase",
+                        "start": 65,
+                        "end": 77,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 16
+                          }
+                        },
+                        "consequent": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 74,
+                            "end": 77,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 13
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 16
+                              }
+                            },
+                            "expression": {
+                              "type": "NumericLiteral",
+                              "start": 74,
+                              "end": 76,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 13
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 15
+                                }
+                              },
+                              "extra": {
+                                "rawValue": 70,
+                                "raw": "70"
+                              },
+                              "value": 70
+                            }
+                          }
+                        ],
+                        "test": null
+                      }
+                    ]
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/input.js
new file mode 100644
index 000000000000..46ec28c2e777
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/input.js
@@ -0,0 +1,5 @@
+value |> do {
+  try { JSON.parse(whatever); }
+  catch (error) { console.error(error); }
+  finally { something(#); }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/output.json
new file mode 100644
index 000000000000..a2feff08dcac
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-finally-clause-with-catch-and-finally/output.json
@@ -0,0 +1,494 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 117,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 117,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 117,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 117,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 117,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 5,
+                "column": 1
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 117,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 5,
+                  "column": 1
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 117,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 1
+                  }
+                },
+                "body": [
+                  {
+                    "type": "TryStatement",
+                    "start": 16,
+                    "end": 115,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 27
+                      }
+                    },
+                    "block": {
+                      "type": "BlockStatement",
+                      "start": 20,
+                      "end": 45,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 31
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ExpressionStatement",
+                          "start": 22,
+                          "end": 43,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 8
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 29
+                            }
+                          },
+                          "expression": {
+                            "type": "CallExpression",
+                            "start": 22,
+                            "end": 42,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 8
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 28
+                              }
+                            },
+                            "callee": {
+                              "type": "MemberExpression",
+                              "start": 22,
+                              "end": 32,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 8
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 18
+                                }
+                              },
+                              "object": {
+                                "type": "Identifier",
+                                "start": 22,
+                                "end": 26,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 8
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 12
+                                  },
+                                  "identifierName": "JSON"
+                                },
+                                "name": "JSON"
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 27,
+                                "end": 32,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 13
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 18
+                                  },
+                                  "identifierName": "parse"
+                                },
+                                "name": "parse"
+                              },
+                              "computed": false
+                            },
+                            "arguments": [
+                              {
+                                "type": "Identifier",
+                                "start": 33,
+                                "end": 41,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 19
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 27
+                                  },
+                                  "identifierName": "whatever"
+                                },
+                                "name": "whatever"
+                              }
+                            ]
+                          }
+                        }
+                      ],
+                      "directives": []
+                    },
+                    "handler": {
+                      "type": "CatchClause",
+                      "start": 48,
+                      "end": 87,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 2
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 41
+                        }
+                      },
+                      "param": {
+                        "type": "Identifier",
+                        "start": 55,
+                        "end": 60,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 9
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 14
+                          },
+                          "identifierName": "error"
+                        },
+                        "name": "error"
+                      },
+                      "body": {
+                        "type": "BlockStatement",
+                        "start": 62,
+                        "end": 87,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 41
+                          }
+                        },
+                        "body": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 64,
+                            "end": 85,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 18
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 39
+                              }
+                            },
+                            "expression": {
+                              "type": "CallExpression",
+                              "start": 64,
+                              "end": 84,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 18
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 38
+                                }
+                              },
+                              "callee": {
+                                "type": "MemberExpression",
+                                "start": 64,
+                                "end": 77,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 18
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 31
+                                  }
+                                },
+                                "object": {
+                                  "type": "Identifier",
+                                  "start": 64,
+                                  "end": 71,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 18
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 25
+                                    },
+                                    "identifierName": "console"
+                                  },
+                                  "name": "console"
+                                },
+                                "property": {
+                                  "type": "Identifier",
+                                  "start": 72,
+                                  "end": 77,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 26
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 31
+                                    },
+                                    "identifierName": "error"
+                                  },
+                                  "name": "error"
+                                },
+                                "computed": false
+                              },
+                              "arguments": [
+                                {
+                                  "type": "Identifier",
+                                  "start": 78,
+                                  "end": 83,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 32
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 37
+                                    },
+                                    "identifierName": "error"
+                                  },
+                                  "name": "error"
+                                }
+                              ]
+                            }
+                          }
+                        ],
+                        "directives": []
+                      }
+                    },
+                    "finalizer": {
+                      "type": "BlockStatement",
+                      "start": 98,
+                      "end": 115,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 27
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ExpressionStatement",
+                          "start": 100,
+                          "end": 113,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 12
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 25
+                            }
+                          },
+                          "expression": {
+                            "type": "CallExpression",
+                            "start": 100,
+                            "end": 112,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 12
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 24
+                              }
+                            },
+                            "callee": {
+                              "type": "Identifier",
+                              "start": 100,
+                              "end": 109,
+                              "loc": {
+                                "start": {
+                                  "line": 4,
+                                  "column": 12
+                                },
+                                "end": {
+                                  "line": 4,
+                                  "column": 21
+                                },
+                                "identifierName": "something"
+                              },
+                              "name": "something"
+                            },
+                            "arguments": [
+                              {
+                                "type": "PipelinePrimaryTopicReference",
+                                "start": 110,
+                                "end": 111,
+                                "loc": {
+                                  "start": {
+                                    "line": 4,
+                                    "column": 22
+                                  },
+                                  "end": {
+                                    "line": 4,
+                                    "column": 23
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ],
+                      "directives": []
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/input.js
new file mode 100644
index 000000000000..dd034b608161
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/input.js
@@ -0,0 +1,5 @@
+value |> do {
+  try { JSON.parse(#); }
+  catch (error) { console.error(error); }
+  finally { something(); }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/output.json
new file mode 100644
index 000000000000..95c03c8c90e3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch-and-finally/output.json
@@ -0,0 +1,476 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 109,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 109,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 109,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 109,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 109,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 5,
+                "column": 1
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 109,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 5,
+                  "column": 1
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 109,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 1
+                  }
+                },
+                "body": [
+                  {
+                    "type": "TryStatement",
+                    "start": 16,
+                    "end": 107,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 26
+                      }
+                    },
+                    "block": {
+                      "type": "BlockStatement",
+                      "start": 20,
+                      "end": 38,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 24
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ExpressionStatement",
+                          "start": 22,
+                          "end": 36,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 8
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 22
+                            }
+                          },
+                          "expression": {
+                            "type": "CallExpression",
+                            "start": 22,
+                            "end": 35,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 8
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 21
+                              }
+                            },
+                            "callee": {
+                              "type": "MemberExpression",
+                              "start": 22,
+                              "end": 32,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 8
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 18
+                                }
+                              },
+                              "object": {
+                                "type": "Identifier",
+                                "start": 22,
+                                "end": 26,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 8
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 12
+                                  },
+                                  "identifierName": "JSON"
+                                },
+                                "name": "JSON"
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 27,
+                                "end": 32,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 13
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 18
+                                  },
+                                  "identifierName": "parse"
+                                },
+                                "name": "parse"
+                              },
+                              "computed": false
+                            },
+                            "arguments": [
+                              {
+                                "type": "PipelinePrimaryTopicReference",
+                                "start": 33,
+                                "end": 34,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 19
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 20
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ],
+                      "directives": []
+                    },
+                    "handler": {
+                      "type": "CatchClause",
+                      "start": 41,
+                      "end": 80,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 2
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 41
+                        }
+                      },
+                      "param": {
+                        "type": "Identifier",
+                        "start": 48,
+                        "end": 53,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 9
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 14
+                          },
+                          "identifierName": "error"
+                        },
+                        "name": "error"
+                      },
+                      "body": {
+                        "type": "BlockStatement",
+                        "start": 55,
+                        "end": 80,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 41
+                          }
+                        },
+                        "body": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 57,
+                            "end": 78,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 18
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 39
+                              }
+                            },
+                            "expression": {
+                              "type": "CallExpression",
+                              "start": 57,
+                              "end": 77,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 18
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 38
+                                }
+                              },
+                              "callee": {
+                                "type": "MemberExpression",
+                                "start": 57,
+                                "end": 70,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 18
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 31
+                                  }
+                                },
+                                "object": {
+                                  "type": "Identifier",
+                                  "start": 57,
+                                  "end": 64,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 18
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 25
+                                    },
+                                    "identifierName": "console"
+                                  },
+                                  "name": "console"
+                                },
+                                "property": {
+                                  "type": "Identifier",
+                                  "start": 65,
+                                  "end": 70,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 26
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 31
+                                    },
+                                    "identifierName": "error"
+                                  },
+                                  "name": "error"
+                                },
+                                "computed": false
+                              },
+                              "arguments": [
+                                {
+                                  "type": "Identifier",
+                                  "start": 71,
+                                  "end": 76,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 32
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 37
+                                    },
+                                    "identifierName": "error"
+                                  },
+                                  "name": "error"
+                                }
+                              ]
+                            }
+                          }
+                        ],
+                        "directives": []
+                      }
+                    },
+                    "finalizer": {
+                      "type": "BlockStatement",
+                      "start": 91,
+                      "end": 107,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 26
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ExpressionStatement",
+                          "start": 93,
+                          "end": 105,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 12
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 24
+                            }
+                          },
+                          "expression": {
+                            "type": "CallExpression",
+                            "start": 93,
+                            "end": 104,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 12
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 23
+                              }
+                            },
+                            "callee": {
+                              "type": "Identifier",
+                              "start": 93,
+                              "end": 102,
+                              "loc": {
+                                "start": {
+                                  "line": 4,
+                                  "column": 12
+                                },
+                                "end": {
+                                  "line": 4,
+                                  "column": 21
+                                },
+                                "identifierName": "something"
+                              },
+                              "name": "something"
+                            },
+                            "arguments": []
+                          }
+                        }
+                      ],
+                      "directives": []
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/input.js
new file mode 100644
index 000000000000..70eb5263f217
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/input.js
@@ -0,0 +1,4 @@
+value |> do {
+  try { JSON.parse(#); }
+  catch (error) { console.error(error); }
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/output.json
new file mode 100644
index 000000000000..cf2f95415e23
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-try-statement,-outer-topic-reference-in-try-clause-with-catch/output.json
@@ -0,0 +1,411 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 82,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 82,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 82,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 82,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 82,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 4,
+                "column": 1
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 82,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 4,
+                  "column": 1
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 82,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 1
+                  }
+                },
+                "body": [
+                  {
+                    "type": "TryStatement",
+                    "start": 16,
+                    "end": 80,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 41
+                      }
+                    },
+                    "block": {
+                      "type": "BlockStatement",
+                      "start": 20,
+                      "end": 38,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 24
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ExpressionStatement",
+                          "start": 22,
+                          "end": 36,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 8
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 22
+                            }
+                          },
+                          "expression": {
+                            "type": "CallExpression",
+                            "start": 22,
+                            "end": 35,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 8
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 21
+                              }
+                            },
+                            "callee": {
+                              "type": "MemberExpression",
+                              "start": 22,
+                              "end": 32,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 8
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 18
+                                }
+                              },
+                              "object": {
+                                "type": "Identifier",
+                                "start": 22,
+                                "end": 26,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 8
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 12
+                                  },
+                                  "identifierName": "JSON"
+                                },
+                                "name": "JSON"
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 27,
+                                "end": 32,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 13
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 18
+                                  },
+                                  "identifierName": "parse"
+                                },
+                                "name": "parse"
+                              },
+                              "computed": false
+                            },
+                            "arguments": [
+                              {
+                                "type": "PipelinePrimaryTopicReference",
+                                "start": 33,
+                                "end": 34,
+                                "loc": {
+                                  "start": {
+                                    "line": 2,
+                                    "column": 19
+                                  },
+                                  "end": {
+                                    "line": 2,
+                                    "column": 20
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ],
+                      "directives": []
+                    },
+                    "handler": {
+                      "type": "CatchClause",
+                      "start": 41,
+                      "end": 80,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 2
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 41
+                        }
+                      },
+                      "param": {
+                        "type": "Identifier",
+                        "start": 48,
+                        "end": 53,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 9
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 14
+                          },
+                          "identifierName": "error"
+                        },
+                        "name": "error"
+                      },
+                      "body": {
+                        "type": "BlockStatement",
+                        "start": 55,
+                        "end": 80,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 41
+                          }
+                        },
+                        "body": [
+                          {
+                            "type": "ExpressionStatement",
+                            "start": 57,
+                            "end": 78,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 18
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 39
+                              }
+                            },
+                            "expression": {
+                              "type": "CallExpression",
+                              "start": 57,
+                              "end": 77,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 18
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 38
+                                }
+                              },
+                              "callee": {
+                                "type": "MemberExpression",
+                                "start": 57,
+                                "end": 70,
+                                "loc": {
+                                  "start": {
+                                    "line": 3,
+                                    "column": 18
+                                  },
+                                  "end": {
+                                    "line": 3,
+                                    "column": 31
+                                  }
+                                },
+                                "object": {
+                                  "type": "Identifier",
+                                  "start": 57,
+                                  "end": 64,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 18
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 25
+                                    },
+                                    "identifierName": "console"
+                                  },
+                                  "name": "console"
+                                },
+                                "property": {
+                                  "type": "Identifier",
+                                  "start": 65,
+                                  "end": 70,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 26
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 31
+                                    },
+                                    "identifierName": "error"
+                                  },
+                                  "name": "error"
+                                },
+                                "computed": false
+                              },
+                              "arguments": [
+                                {
+                                  "type": "Identifier",
+                                  "start": 71,
+                                  "end": 76,
+                                  "loc": {
+                                    "start": {
+                                      "line": 3,
+                                      "column": 32
+                                    },
+                                    "end": {
+                                      "line": 3,
+                                      "column": 37
+                                    },
+                                    "identifierName": "error"
+                                  },
+                                  "name": "error"
+                                }
+                              ]
+                            }
+                          }
+                        ],
+                        "directives": []
+                      }
+                    },
+                    "finalizer": null
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/input.js
new file mode 100644
index 000000000000..be802107159e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/input.js
@@ -0,0 +1 @@
+value |> do { while (x < #) x += 1; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/options.json
new file mode 100644
index 000000000000..edb7679c6a74
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "doExpressions"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/output.json
new file mode 100644
index 000000000000..e3714c89c3b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-do-expression,-while-loop,-outer-topic-reference-in-loop-head/output.json
@@ -0,0 +1,262 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 37,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 37
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 37,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 37
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 37,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 37
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 37,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 37
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 37,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 37
+              }
+            },
+            "expression": {
+              "type": "DoExpression",
+              "start": 9,
+              "end": 37,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 37
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 12,
+                "end": 37,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 37
+                  }
+                },
+                "body": [
+                  {
+                    "type": "WhileStatement",
+                    "start": 14,
+                    "end": 35,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 35
+                      }
+                    },
+                    "test": {
+                      "type": "BinaryExpression",
+                      "start": 21,
+                      "end": 26,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 26
+                        }
+                      },
+                      "left": {
+                        "type": "Identifier",
+                        "start": 21,
+                        "end": 22,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 21
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 22
+                          },
+                          "identifierName": "x"
+                        },
+                        "name": "x"
+                      },
+                      "operator": "<",
+                      "right": {
+                        "type": "PipelinePrimaryTopicReference",
+                        "start": 25,
+                        "end": 26,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 25
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 26
+                          }
+                        }
+                      }
+                    },
+                    "body": {
+                      "type": "ExpressionStatement",
+                      "start": 28,
+                      "end": 35,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 28
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 35
+                        }
+                      },
+                      "expression": {
+                        "type": "AssignmentExpression",
+                        "start": 28,
+                        "end": 34,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 28
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 34
+                          }
+                        },
+                        "operator": "+=",
+                        "left": {
+                          "type": "Identifier",
+                          "start": 28,
+                          "end": 29,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 28
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 29
+                            },
+                            "identifierName": "x"
+                          },
+                          "name": "x"
+                        },
+                        "right": {
+                          "type": "NumericLiteral",
+                          "start": 33,
+                          "end": 34,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 33
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 34
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 1,
+                            "raw": "1"
+                          },
+                          "value": 1
+                        }
+                      }
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/input.js
new file mode 100644
index 000000000000..e8678f6a2bb1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/input.js
@@ -0,0 +1 @@
+value |> f(#)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/output.json
new file mode 100644
index 000000000000..3ee59b9da5c3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-call,-identifier-with-topic-reference/output.json
@@ -0,0 +1,147 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 13
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "expression": {
+              "type": "CallExpression",
+              "start": 9,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "identifierName": "f"
+                },
+                "name": "f"
+              },
+              "arguments": [
+                {
+                  "type": "PipelinePrimaryTopicReference",
+                  "start": 11,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/input.js
new file mode 100644
index 000000000000..432d1c9ed8c7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/input.js
@@ -0,0 +1 @@
+value |> function (x = #) { return x; }
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/output.json
new file mode 100644
index 000000000000..c5ba3fb13a9c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-function-definition,-outer-topic-reference-in-default-parameter-expression/output.json
@@ -0,0 +1,215 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 39,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 39
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 39,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 39
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 39,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 39
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 39,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 39
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 39,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 39
+              }
+            },
+            "expression": {
+              "type": "FunctionExpression",
+              "start": 9,
+              "end": 39,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 39
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [
+                {
+                  "type": "AssignmentPattern",
+                  "start": 19,
+                  "end": 24,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 19
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 24
+                    }
+                  },
+                  "left": {
+                    "type": "Identifier",
+                    "start": 19,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 19
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 20
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "right": {
+                    "type": "PipelinePrimaryTopicReference",
+                    "start": 23,
+                    "end": 24,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 24
+                      }
+                    }
+                  }
+                }
+              ],
+              "body": {
+                "type": "BlockStatement",
+                "start": 26,
+                "end": 39,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 26
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 39
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ReturnStatement",
+                    "start": 28,
+                    "end": 37,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 28
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 37
+                      }
+                    },
+                    "argument": {
+                      "type": "Identifier",
+                      "start": 35,
+                      "end": 36,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 35
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 36
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    }
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/input.js
new file mode 100644
index 000000000000..c35ae3c9db32
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/input.js
@@ -0,0 +1,3 @@
+function * f () {
+  return x |> (yield #);
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/output.json
new file mode 100644
index 000000000000..ad59accc2de2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-generator-yield/output.json
@@ -0,0 +1,186 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 44,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 44,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 44,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 11,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 11
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": true,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 16,
+          "end": 44,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ReturnStatement",
+              "start": 20,
+              "end": 42,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 24
+                }
+              },
+              "argument": {
+                "type": "BinaryExpression",
+                "start": 27,
+                "end": 41,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 23
+                  }
+                },
+                "left": {
+                  "type": "Identifier",
+                  "start": 27,
+                  "end": 28,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 10
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "operator": "|>",
+                "right": {
+                  "type": "PipelineTopicExpression",
+                  "start": 32,
+                  "end": 41,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 23
+                    }
+                  },
+                  "expression": {
+                    "type": "YieldExpression",
+                    "start": 33,
+                    "end": 40,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 15
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 22
+                      }
+                    },
+                    "delegate": false,
+                    "argument": {
+                      "type": "PipelinePrimaryTopicReference",
+                      "start": 39,
+                      "end": 40,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 22
+                        }
+                      }
+                    },
+                    "extra": {
+                      "parenthesized": true,
+                      "parenStart": 32
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/input.js
new file mode 100644
index 000000000000..a7abc2dc18f7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/input.js
@@ -0,0 +1 @@
+value |> (#)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/output.json
new file mode 100644
index 000000000000..3d951c7dcb90
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-parenthesized/output.json
@@ -0,0 +1,117 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 12,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 12,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 12
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 12,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 12
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "expression": {
+              "type": "PipelinePrimaryTopicReference",
+              "start": 10,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 9
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/input.js
new file mode 100644
index 000000000000..a18cbd0f1bb2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/input.js
@@ -0,0 +1 @@
+value |> #
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/output.json
new file mode 100644
index 000000000000..147e066345a3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-identity,-unparenthesized/output.json
@@ -0,0 +1,113 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "expression": {
+              "type": "PipelinePrimaryTopicReference",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/input.js
new file mode 100644
index 000000000000..a18cbd0f1bb2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/input.js
@@ -0,0 +1 @@
+value |> #
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/options.json
new file mode 100644
index 000000000000..887155e27e68
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }], "pipelineOperator"]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/output.json
new file mode 100644
index 000000000000..147e066345a3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-mixed-pipeline-plugins/output.json
@@ -0,0 +1,113 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "expression": {
+              "type": "PipelinePrimaryTopicReference",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/input.js b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/input.js
new file mode 100644
index 000000000000..7f3f814efd71
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/input.js
@@ -0,0 +1 @@
+value |> (() => # + 1)
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/options.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/options.json
new file mode 100644
index 000000000000..17e4e327bbad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["pipelineOperator", { "proposal": "smart" }]]
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/output.json b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/output.json
new file mode 100644
index 000000000000..23ba6b6a9dd4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/experimental/pipeline-operator/proposal-smart-topic-style,-parenthesized-single-line-arrow-function,-with-empty-parameter-list-and-bare-addition-body/output.json
@@ -0,0 +1,172 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 22
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "value"
+            },
+            "name": "value"
+          },
+          "operator": "|>",
+          "right": {
+            "type": "PipelineTopicExpression",
+            "start": 9,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 22
+              }
+            },
+            "expression": {
+              "type": "ArrowFunctionExpression",
+              "start": 10,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BinaryExpression",
+                "start": 16,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 21
+                  }
+                },
+                "left": {
+                  "type": "PipelinePrimaryTopicReference",
+                  "start": 16,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  }
+                },
+                "operator": "+",
+                "right": {
+                  "type": "NumericLiteral",
+                  "start": 20,
+                  "end": 21,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 21
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                }
+              },
+              "extra": {
+                "parenthesized": true,
+                "parenStart": 9
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/experimental/throw-expression/not-enabled/options.json b/packages/babel-parser/test/fixtures/experimental/throw-expression/not-enabled/options.json
index 9b86aff45968..47934f708223 100644
--- a/packages/babel-parser/test/fixtures/experimental/throw-expression/not-enabled/options.json
+++ b/packages/babel-parser/test/fixtures/experimental/throw-expression/not-enabled/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "This experimental syntax requires enabling the parser plugin: 'throwExpressions' (2:3)"
+  "throws": "This experimental syntax requires enabling the parser plugin: 'throwExpressions' (2:3)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/input.js b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/input.js
new file mode 100644
index 000000000000..7d3fa382c436
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/input.js
@@ -0,0 +1 @@
+type T = Array<(string) => number>
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/output.json b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/output.json
new file mode 100644
index 000000000000..3b566aaa7fc0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_14/output.json
@@ -0,0 +1,183 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TypeAlias",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "T"
+          },
+          "name": "T"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "GenericTypeAnnotation",
+          "start": 9,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "typeParameters": {
+            "type": "TypeParameterInstantiation",
+            "start": 14,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 14
+              },
+              "end": {
+                "line": 1,
+                "column": 34
+              }
+            },
+            "params": [
+              {
+                "type": "FunctionTypeAnnotation",
+                "start": 15,
+                "end": 33,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 33
+                  }
+                },
+                "params": [
+                  {
+                    "type": "FunctionTypeParam",
+                    "start": 16,
+                    "end": 22,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 22
+                      }
+                    },
+                    "name": null,
+                    "optional": false,
+                    "typeAnnotation": {
+                      "type": "StringTypeAnnotation",
+                      "start": 16,
+                      "end": 22,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 22
+                        }
+                      }
+                    }
+                  }
+                ],
+                "rest": null,
+                "returnType": {
+                  "type": "NumberTypeAnnotation",
+                  "start": 27,
+                  "end": 33,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 27
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 33
+                    }
+                  }
+                },
+                "typeParameters": null
+              }
+            ]
+          },
+          "id": {
+            "type": "Identifier",
+            "start": 9,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              },
+              "identifierName": "Array"
+            },
+            "name": "Array"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/input.js b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/input.js
new file mode 100644
index 000000000000..f27573896521
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/input.js
@@ -0,0 +1 @@
+let x = (): Array<(string) => number> => []
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/output.json b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/output.json
new file mode 100644
index 000000000000..fb3eb337bc92
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/anonymous-function-no-parens-types/good_15/output.json
@@ -0,0 +1,251 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 43,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 43
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 43,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 43
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 43,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 43
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 43
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": {
+              "type": "ArrowFunctionExpression",
+              "start": 8,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 43
+                }
+              },
+              "predicate": null,
+              "returnType": {
+                "type": "TypeAnnotation",
+                "start": 10,
+                "end": 37,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 37
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "GenericTypeAnnotation",
+                  "start": 12,
+                  "end": 37,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 37
+                    }
+                  },
+                  "typeParameters": {
+                    "type": "TypeParameterInstantiation",
+                    "start": 17,
+                    "end": 37,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 37
+                      }
+                    },
+                    "params": [
+                      {
+                        "type": "FunctionTypeAnnotation",
+                        "start": 18,
+                        "end": 36,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 36
+                          }
+                        },
+                        "params": [
+                          {
+                            "type": "FunctionTypeParam",
+                            "start": 19,
+                            "end": 25,
+                            "loc": {
+                              "start": {
+                                "line": 1,
+                                "column": 19
+                              },
+                              "end": {
+                                "line": 1,
+                                "column": 25
+                              }
+                            },
+                            "name": null,
+                            "optional": false,
+                            "typeAnnotation": {
+                              "type": "StringTypeAnnotation",
+                              "start": 19,
+                              "end": 25,
+                              "loc": {
+                                "start": {
+                                  "line": 1,
+                                  "column": 19
+                                },
+                                "end": {
+                                  "line": 1,
+                                  "column": 25
+                                }
+                              }
+                            }
+                          }
+                        ],
+                        "rest": null,
+                        "returnType": {
+                          "type": "NumberTypeAnnotation",
+                          "start": 30,
+                          "end": 36,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 30
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 36
+                            }
+                          }
+                        },
+                        "typeParameters": null
+                      }
+                    ]
+                  },
+                  "id": {
+                    "type": "Identifier",
+                    "start": 12,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "Array"
+                    },
+                    "name": "Array"
+                  }
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "ArrayExpression",
+                "start": 41,
+                "end": 43,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 41
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 43
+                  }
+                },
+                "elements": []
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/call-properties/1/output.json b/packages/babel-parser/test/fixtures/flow/call-properties/1/output.json
index f106eb4dc399..41dbc2be1068 100644
--- a/packages/babel-parser/test/fixtures/flow/call-properties/1/output.json
+++ b/packages/babel-parser/test/fixtures/flow/call-properties/1/output.json
@@ -156,7 +156,8 @@
                   "properties": [],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/call-properties/2/output.json b/packages/babel-parser/test/fixtures/flow/call-properties/2/output.json
index bdd238b2985d..9b2e1c34ab13 100644
--- a/packages/babel-parser/test/fixtures/flow/call-properties/2/output.json
+++ b/packages/babel-parser/test/fixtures/flow/call-properties/2/output.json
@@ -156,7 +156,8 @@
                   "properties": [],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/call-properties/3/output.json b/packages/babel-parser/test/fixtures/flow/call-properties/3/output.json
index b37fa6335539..edb622d15e0c 100644
--- a/packages/babel-parser/test/fixtures/flow/call-properties/3/output.json
+++ b/packages/babel-parser/test/fixtures/flow/call-properties/3/output.json
@@ -308,7 +308,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/call-properties/4/output.json b/packages/babel-parser/test/fixtures/flow/call-properties/4/output.json
index 6f1b515556c4..718dab31950f 100644
--- a/packages/babel-parser/test/fixtures/flow/call-properties/4/output.json
+++ b/packages/babel-parser/test/fixtures/flow/call-properties/4/output.json
@@ -256,7 +256,8 @@
                   "properties": [],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/class-properties/invalid-named-static/output.json b/packages/babel-parser/test/fixtures/flow/class-properties/invalid-named-static/output.json
deleted file mode 100644
index 3a2bf08816ad..000000000000
--- a/packages/babel-parser/test/fixtures/flow/class-properties/invalid-named-static/output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "type": "File",
-  "start": 0,
-  "end": 0,
-  "loc": {
-    "start": {
-      "line": 1,
-      "column": 0
-    },
-    "end": {
-      "line": 1,
-      "column": 0
-    }
-  },
-  "program": {
-    "type": "Program",
-    "start": 0,
-    "end": 0,
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 0
-      }
-    },
-    "sourceType": "module",
-    "interpreter": null,
-    "body": [],
-    "directives": []
-  }
-}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/input.js b/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/input.js
index b42988128e04..0d7178b7b682 100644
--- a/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/input.js
@@ -1,3 +1,4 @@
 class MyClass {
   /*:: prop: string; */
+  /*    :: foo: number; */
 }
diff --git a/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/output.json b/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/output.json
index 618209f10c9a..42033b969ac4 100644
--- a/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/output.json
+++ b/packages/babel-parser/test/fixtures/flow/comment-disabled/01-type-include/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 41,
+  "end": 68,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 3,
+      "line": 4,
       "column": 1
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 41,
+    "end": 68,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 3,
+        "line": 4,
         "column": 1
       }
     },
@@ -32,14 +32,14 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 41,
+        "end": 68,
         "loc": {
           "start": {
             "line": 1,
             "column": 0
           },
           "end": {
-            "line": 3,
+            "line": 4,
             "column": 1
           }
         },
@@ -64,14 +64,14 @@
         "body": {
           "type": "ClassBody",
           "start": 14,
-          "end": 41,
+          "end": 68,
           "loc": {
             "start": {
               "line": 1,
               "column": 14
             },
             "end": {
-              "line": 3,
+              "line": 4,
               "column": 1
             }
           },
@@ -92,6 +92,22 @@
                   "column": 23
                 }
               }
+            },
+            {
+              "type": "CommentBlock",
+              "value": "    :: foo: number; ",
+              "start": 42,
+              "end": 66,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 2
+                },
+                "end": {
+                  "line": 3,
+                  "column": 26
+                }
+              }
             }
           ]
         }
@@ -115,6 +131,22 @@
           "column": 23
         }
       }
+    },
+    {
+      "type": "CommentBlock",
+      "value": "    :: foo: number; ",
+      "start": 42,
+      "end": 66,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 2
+        },
+        "end": {
+          "line": 3,
+          "column": 26
+        }
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/input.js b/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/input.js
index d1644a305b88..5391c499ba5f 100644
--- a/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/input.js
@@ -1,4 +1,4 @@
-/*flow-include
+/* flow-include
 type Foo = {
   foo: number,
   bar: boolean,
diff --git a/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/output.json b/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/output.json
index ed5a0e7b58b3..39c844aa9f01 100644
--- a/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/output.json
+++ b/packages/babel-parser/test/fixtures/flow/comment-disabled/03-type-flow-include/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 78,
+  "end": 79,
   "loc": {
     "start": {
       "line": 1,
@@ -15,7 +15,7 @@
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 78,
+    "end": 79,
     "loc": {
       "start": {
         "line": 1,
@@ -33,9 +33,9 @@
     "innerComments": [
       {
         "type": "CommentBlock",
-        "value": "flow-include\ntype Foo = {\n  foo: number,\n  bar: boolean,\n  baz: string\n};\n",
+        "value": " flow-include\ntype Foo = {\n  foo: number,\n  bar: boolean,\n  baz: string\n};\n",
         "start": 0,
-        "end": 78,
+        "end": 79,
         "loc": {
           "start": {
             "line": 1,
@@ -52,9 +52,9 @@
   "comments": [
     {
       "type": "CommentBlock",
-      "value": "flow-include\ntype Foo = {\n  foo: number,\n  bar: boolean,\n  baz: string\n};\n",
+      "value": " flow-include\ntype Foo = {\n  foo: number,\n  bar: boolean,\n  baz: string\n};\n",
       "start": 0,
-      "end": 78,
+      "end": 79,
       "loc": {
         "start": {
           "line": 1,
diff --git a/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/input.js b/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/input.js
index 6dc6ca809bfa..0e2022bb2d59 100644
--- a/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/input.js
@@ -1,3 +1,4 @@
 class MyClass {
   /*flow-include prop: string; */
+  /*      flow-include foo: number; */
 }
diff --git a/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/output.json b/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/output.json
index fb2a67dd8393..8c2727c7eb82 100644
--- a/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/output.json
+++ b/packages/babel-parser/test/fixtures/flow/comment-disabled/04-type-flow-include/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 51,
+  "end": 90,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 3,
+      "line": 4,
       "column": 1
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 51,
+    "end": 90,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 3,
+        "line": 4,
         "column": 1
       }
     },
@@ -32,14 +32,14 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 51,
+        "end": 90,
         "loc": {
           "start": {
             "line": 1,
             "column": 0
           },
           "end": {
-            "line": 3,
+            "line": 4,
             "column": 1
           }
         },
@@ -64,14 +64,14 @@
         "body": {
           "type": "ClassBody",
           "start": 14,
-          "end": 51,
+          "end": 90,
           "loc": {
             "start": {
               "line": 1,
               "column": 14
             },
             "end": {
-              "line": 3,
+              "line": 4,
               "column": 1
             }
           },
@@ -92,6 +92,22 @@
                   "column": 33
                 }
               }
+            },
+            {
+              "type": "CommentBlock",
+              "value": "      flow-include foo: number; ",
+              "start": 52,
+              "end": 88,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 2
+                },
+                "end": {
+                  "line": 3,
+                  "column": 38
+                }
+              }
             }
           ]
         }
@@ -115,6 +131,22 @@
           "column": 33
         }
       }
+    },
+    {
+      "type": "CommentBlock",
+      "value": "      flow-include foo: number; ",
+      "start": 52,
+      "end": 88,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 2
+        },
+        "end": {
+          "line": 3,
+          "column": 38
+        }
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/comment/01-type-include/input.js b/packages/babel-parser/test/fixtures/flow/comment/01-type-include/input.js
index b42988128e04..cca6b81303bf 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/01-type-include/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment/01-type-include/input.js
@@ -1,3 +1,4 @@
 class MyClass {
-  /*:: prop: string; */
+  /*   :: prop: string; */
+    /*   :: prop2: number; */
 }
diff --git a/packages/babel-parser/test/fixtures/flow/comment/01-type-include/output.json b/packages/babel-parser/test/fixtures/flow/comment/01-type-include/output.json
index 4f80907e1de9..b31ea80c63cf 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/01-type-include/output.json
+++ b/packages/babel-parser/test/fixtures/flow/comment/01-type-include/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 41,
+  "end": 74,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 3,
+      "line": 4,
       "column": 1
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 41,
+    "end": 74,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 3,
+        "line": 4,
         "column": 1
       }
     },
@@ -32,14 +32,14 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 41,
+        "end": 74,
         "loc": {
           "start": {
             "line": 1,
             "column": 0
           },
           "end": {
-            "line": 3,
+            "line": 4,
             "column": 1
           }
         },
@@ -64,45 +64,45 @@
         "body": {
           "type": "ClassBody",
           "start": 14,
-          "end": 41,
+          "end": 74,
           "loc": {
             "start": {
               "line": 1,
               "column": 14
             },
             "end": {
-              "line": 3,
+              "line": 4,
               "column": 1
             }
           },
           "body": [
             {
               "type": "ClassProperty",
-              "start": 23,
-              "end": 36,
+              "start": 26,
+              "end": 39,
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 7
+                  "column": 10
                 },
                 "end": {
                   "line": 2,
-                  "column": 20
+                  "column": 23
                 }
               },
               "static": false,
               "key": {
                 "type": "Identifier",
-                "start": 23,
-                "end": 27,
+                "start": 26,
+                "end": 30,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 7
+                    "column": 10
                   },
                   "end": {
                     "line": 2,
-                    "column": 11
+                    "column": 14
                   },
                   "identifierName": "prop"
                 },
@@ -112,30 +112,96 @@
               "variance": null,
               "typeAnnotation": {
                 "type": "TypeAnnotation",
-                "start": 27,
-                "end": 35,
+                "start": 30,
+                "end": 38,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 11
+                    "column": 14
                   },
                   "end": {
                     "line": 2,
-                    "column": 19
+                    "column": 22
                   }
                 },
                 "typeAnnotation": {
                   "type": "StringTypeAnnotation",
-                  "start": 29,
-                  "end": 35,
+                  "start": 32,
+                  "end": 38,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 13
+                      "column": 16
                     },
                     "end": {
                       "line": 2,
+                      "column": 22
+                    }
+                  }
+                }
+              },
+              "value": null
+            },
+            {
+              "type": "ClassProperty",
+              "start": 55,
+              "end": 69,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 12
+                },
+                "end": {
+                  "line": 3,
+                  "column": 26
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 55,
+                "end": 60,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 17
+                  },
+                  "identifierName": "prop2"
+                },
+                "name": "prop2"
+              },
+              "computed": false,
+              "variance": null,
+              "typeAnnotation": {
+                "type": "TypeAnnotation",
+                "start": 60,
+                "end": 68,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 25
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "NumberTypeAnnotation",
+                  "start": 62,
+                  "end": 68,
+                  "loc": {
+                    "start": {
+                      "line": 3,
                       "column": 19
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 25
                     }
                   }
                 }
diff --git a/packages/babel-parser/test/fixtures/flow/comment/02-type-include/output.json b/packages/babel-parser/test/fixtures/flow/comment/02-type-include/output.json
index 81661e9066f7..0eb104082d54 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/02-type-include/output.json
+++ b/packages/babel-parser/test/fixtures/flow/comment/02-type-include/output.json
@@ -239,7 +239,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/input.js b/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/input.js
index d1644a305b88..5391c499ba5f 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/input.js
@@ -1,4 +1,4 @@
-/*flow-include
+/* flow-include
 type Foo = {
   foo: number,
   bar: boolean,
diff --git a/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/output.json b/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/output.json
index 3a740e6c1c30..567f48a615b3 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/output.json
+++ b/packages/babel-parser/test/fixtures/flow/comment/03-type-flow-include/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 78,
+  "end": 79,
   "loc": {
     "start": {
       "line": 1,
@@ -15,7 +15,7 @@
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 78,
+    "end": 79,
     "loc": {
       "start": {
         "line": 1,
@@ -31,8 +31,8 @@
     "body": [
       {
         "type": "TypeAlias",
-        "start": 15,
-        "end": 75,
+        "start": 16,
+        "end": 76,
         "loc": {
           "start": {
             "line": 2,
@@ -45,8 +45,8 @@
         },
         "id": {
           "type": "Identifier",
-          "start": 20,
-          "end": 23,
+          "start": 21,
+          "end": 24,
           "loc": {
             "start": {
               "line": 2,
@@ -63,8 +63,8 @@
         "typeParameters": null,
         "right": {
           "type": "ObjectTypeAnnotation",
-          "start": 26,
-          "end": 74,
+          "start": 27,
+          "end": 75,
           "loc": {
             "start": {
               "line": 2,
@@ -79,8 +79,8 @@
           "properties": [
             {
               "type": "ObjectTypeProperty",
-              "start": 30,
-              "end": 41,
+              "start": 31,
+              "end": 42,
               "loc": {
                 "start": {
                   "line": 3,
@@ -93,8 +93,8 @@
               },
               "key": {
                 "type": "Identifier",
-                "start": 30,
-                "end": 33,
+                "start": 31,
+                "end": 34,
                 "loc": {
                   "start": {
                     "line": 3,
@@ -114,8 +114,8 @@
               "method": false,
               "value": {
                 "type": "NumberTypeAnnotation",
-                "start": 35,
-                "end": 41,
+                "start": 36,
+                "end": 42,
                 "loc": {
                   "start": {
                     "line": 3,
@@ -132,8 +132,8 @@
             },
             {
               "type": "ObjectTypeProperty",
-              "start": 45,
-              "end": 57,
+              "start": 46,
+              "end": 58,
               "loc": {
                 "start": {
                   "line": 4,
@@ -146,8 +146,8 @@
               },
               "key": {
                 "type": "Identifier",
-                "start": 45,
-                "end": 48,
+                "start": 46,
+                "end": 49,
                 "loc": {
                   "start": {
                     "line": 4,
@@ -167,8 +167,8 @@
               "method": false,
               "value": {
                 "type": "BooleanTypeAnnotation",
-                "start": 50,
-                "end": 57,
+                "start": 51,
+                "end": 58,
                 "loc": {
                   "start": {
                     "line": 4,
@@ -185,8 +185,8 @@
             },
             {
               "type": "ObjectTypeProperty",
-              "start": 61,
-              "end": 72,
+              "start": 62,
+              "end": 73,
               "loc": {
                 "start": {
                   "line": 5,
@@ -199,8 +199,8 @@
               },
               "key": {
                 "type": "Identifier",
-                "start": 61,
-                "end": 64,
+                "start": 62,
+                "end": 65,
                 "loc": {
                   "start": {
                     "line": 5,
@@ -220,8 +220,8 @@
               "method": false,
               "value": {
                 "type": "StringTypeAnnotation",
-                "start": 66,
-                "end": 72,
+                "start": 67,
+                "end": 73,
                 "loc": {
                   "start": {
                     "line": 5,
@@ -239,7 +239,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/input.js b/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/input.js
index 6dc6ca809bfa..7c3c07ea0945 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/input.js
@@ -1,3 +1,4 @@
 class MyClass {
-  /*flow-include prop: string; */
+  /*      flow-include prop: string; */
+      /*   flow-include prop2: number; */
 }
diff --git a/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/output.json b/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/output.json
index fb2a67dd8393..908bfa823b79 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/output.json
+++ b/packages/babel-parser/test/fixtures/flow/comment/04-type-flow-include/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 51,
+  "end": 99,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 3,
+      "line": 4,
       "column": 1
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 51,
+    "end": 99,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 3,
+        "line": 4,
         "column": 1
       }
     },
@@ -32,14 +32,14 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 51,
+        "end": 99,
         "loc": {
           "start": {
             "line": 1,
             "column": 0
           },
           "end": {
-            "line": 3,
+            "line": 4,
             "column": 1
           }
         },
@@ -64,57 +64,154 @@
         "body": {
           "type": "ClassBody",
           "start": 14,
-          "end": 51,
+          "end": 99,
           "loc": {
             "start": {
               "line": 1,
               "column": 14
             },
             "end": {
-              "line": 3,
+              "line": 4,
               "column": 1
             }
           },
-          "body": [],
-          "innerComments": [
+          "body": [
             {
-              "type": "CommentBlock",
-              "value": "flow-include prop: string; ",
-              "start": 18,
-              "end": 49,
+              "type": "ClassProperty",
+              "start": 39,
+              "end": 52,
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 2
+                  "column": 23
                 },
                 "end": {
                   "line": 2,
-                  "column": 33
+                  "column": 36
                 }
-              }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 39,
+                "end": 43,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 23
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 27
+                  },
+                  "identifierName": "prop"
+                },
+                "name": "prop"
+              },
+              "computed": false,
+              "variance": null,
+              "typeAnnotation": {
+                "type": "TypeAnnotation",
+                "start": 43,
+                "end": 51,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 27
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 35
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "StringTypeAnnotation",
+                  "start": 45,
+                  "end": 51,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 29
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 35
+                    }
+                  }
+                }
+              },
+              "value": null
+            },
+            {
+              "type": "ClassProperty",
+              "start": 80,
+              "end": 94,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 24
+                },
+                "end": {
+                  "line": 3,
+                  "column": 38
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 80,
+                "end": 85,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 29
+                  },
+                  "identifierName": "prop2"
+                },
+                "name": "prop2"
+              },
+              "computed": false,
+              "variance": null,
+              "typeAnnotation": {
+                "type": "TypeAnnotation",
+                "start": 85,
+                "end": 93,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 29
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 37
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "NumberTypeAnnotation",
+                  "start": 87,
+                  "end": 93,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 31
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 37
+                    }
+                  }
+                }
+              },
+              "value": null
             }
           ]
         }
       }
     ],
     "directives": []
-  },
-  "comments": [
-    {
-      "type": "CommentBlock",
-      "value": "flow-include prop: string; ",
-      "start": 18,
-      "end": 49,
-      "loc": {
-        "start": {
-          "line": 2,
-          "column": 2
-        },
-        "end": {
-          "line": 2,
-          "column": 33
-        }
-      }
-    }
-  ]
+  }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/comment/06-type-include-error/input.js b/packages/babel-parser/test/fixtures/flow/comment/06-type-include-error/input.js
index 24b92dba6ee5..38ca508e980d 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/06-type-include-error/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment/06-type-include-error/input.js
@@ -1,3 +1,3 @@
 class MyClass {
-  /*:: prop: string;
+  /* :: prop: string;
 }
diff --git a/packages/babel-parser/test/fixtures/flow/comment/08-type-flow-include-error/input.js b/packages/babel-parser/test/fixtures/flow/comment/08-type-flow-include-error/input.js
index 495661d6a0ac..e876bde46b18 100644
--- a/packages/babel-parser/test/fixtures/flow/comment/08-type-flow-include-error/input.js
+++ b/packages/babel-parser/test/fixtures/flow/comment/08-type-flow-include-error/input.js
@@ -1,4 +1,4 @@
-/*flow-include
+/* flow-include
 type Foo = {
   foo: number,
   bar: boolean,
diff --git a/packages/babel-parser/test/fixtures/flow/comment/11-nested-comments-invalid/input.js b/packages/babel-parser/test/fixtures/flow/comment/11-nested-comments-invalid/input.js
new file mode 100644
index 000000000000..6af1c10d91fe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/comment/11-nested-comments-invalid/input.js
@@ -0,0 +1 @@
+/*:: /*asd */
diff --git a/packages/babel-parser/test/fixtures/flow/comment/11-nested-comments-invalid/options.json b/packages/babel-parser/test/fixtures/flow/comment/11-nested-comments-invalid/options.json
new file mode 100644
index 000000000000..8b8fde928397
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/comment/11-nested-comments-invalid/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unterminated comment (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/comment/12-line-comment-nested-invalid/input.js b/packages/babel-parser/test/fixtures/flow/comment/12-line-comment-nested-invalid/input.js
new file mode 100644
index 000000000000..127da20d59af
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/comment/12-line-comment-nested-invalid/input.js
@@ -0,0 +1 @@
+/*:: //asd */
diff --git a/packages/babel-parser/test/fixtures/flow/comment/12-line-comment-nested-invalid/options.json b/packages/babel-parser/test/fixtures/flow/comment/12-line-comment-nested-invalid/options.json
new file mode 100644
index 000000000000..9a7e0e3402af
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/comment/12-line-comment-nested-invalid/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unterminated flow-comment (1:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/comment/13-nested-flow-comments-invalid/input.js b/packages/babel-parser/test/fixtures/flow/comment/13-nested-flow-comments-invalid/input.js
new file mode 100644
index 000000000000..e5ec97f06ed7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/comment/13-nested-flow-comments-invalid/input.js
@@ -0,0 +1 @@
+/*:: /*flow-include */
diff --git a/packages/babel-parser/test/fixtures/flow/comment/13-nested-flow-comments-invalid/options.json b/packages/babel-parser/test/fixtures/flow/comment/13-nested-flow-comments-invalid/options.json
new file mode 100644
index 000000000000..fb8fdf85eed0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/comment/13-nested-flow-comments-invalid/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Cannot have a flow comment inside another flow comment (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/input.js b/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/input.js
index 6a25a1836566..9c00baefd079 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/input.js
+++ b/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/input.js
@@ -1 +1,2 @@
 declare module "foo" { declare export {a,}; }
+var a;
diff --git a/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/output.json b/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/output.json
index dda5b894d12c..c3b63e8c2365 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/output.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-export/export-named-pattern/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 45,
+  "end": 52,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 45
+      "line": 2,
+      "column": 6
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 45,
+    "end": 52,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 45
+        "line": 2,
+        "column": 6
       }
     },
     "sourceType": "module",
@@ -92,7 +92,6 @@
                   "column": 43
                 }
               },
-              "declaration": null,
               "specifiers": [
                 {
                   "type": "ExportSpecifier",
@@ -145,11 +144,63 @@
                 }
               ],
               "source": null,
+              "declaration": null,
               "default": false
             }
           ]
         },
         "kind": "ES"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 46,
+        "end": 52,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 50,
+            "end": 51,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 50,
+              "end": 51,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "a"
+              },
+              "name": "a"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-declare-export-type/options.json b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-declare-export-type/options.json
index 9201b1e54299..2f2a34e73580 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-declare-export-type/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-declare-export-type/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`declare export type` is not supported. Use `export type` instead (1:15)"
+  "throws": "`declare export type` is not supported. Use `export type` instead (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-const/options.json b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-const/options.json
index a0f1f54296d1..8466e2ca853c 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-const/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-const/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`declare export const` is not supported. Use `declare export var` instead (1:15)"
+  "throws": "`declare export const` is not supported. Use `declare export var` instead (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-default-var/options.json b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-default-var/options.json
index 562afcef4837..bdbbf5a8eefd 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-default-var/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-default-var/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token (1:23)"
+  "throws": "Unexpected token, expected \";\" (1:27)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-interface/options.json b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-interface/options.json
index 7dfccf9590eb..3977f3c48054 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-interface/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-interface/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`declare export interface` is not supported. Use `export interface` instead (1:15)"
+  "throws": "`declare export interface` is not supported. Use `export interface` instead (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-let/options.json b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-let/options.json
index 22611154f158..745a711f1178 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-let/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-export/invalid-export-let/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`declare export let` is not supported. Use `declare export var` instead (1:15)"
+  "throws": "`declare export let` is not supported. Use `declare export var` instead (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/10/output.json b/packages/babel-parser/test/fixtures/flow/declare-module/10/output.json
index 563b25f29e43..84347d7d5618 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/10/output.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/10/output.json
@@ -146,7 +146,8 @@
             ],
             "indexers": [],
             "internalSlots": [],
-            "exact": false
+            "exact": false,
+            "inexact": false
           }
         }
       }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/6/output.json b/packages/babel-parser/test/fixtures/flow/declare-module/6/output.json
index 33f1898db552..e2a2f288cbb5 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/6/output.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/6/output.json
@@ -192,7 +192,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/8/options.json b/packages/babel-parser/test/fixtures/flow/declare-module/8/options.json
index 774cdb5a2ce4..32826163f102 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/8/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/8/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Only declares and type imports are allowed inside declare module (2:2)"
+  "throws": "Only declares and type imports are allowed inside declare module (2:2)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/import/input.js b/packages/babel-parser/test/fixtures/flow/declare-module/import/input.js
index 58b33359229d..2ea3d918132d 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/import/input.js
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/import/input.js
@@ -1 +1,4 @@
-declare module "M" { import type T from "TM"; }
+declare module "M" {
+  import type T from "TM";
+  import typeof U from "UM";
+}
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/import/output.json b/packages/babel-parser/test/fixtures/flow/declare-module/import/output.json
index 0cfbb39aac09..f7bb57172e32 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/import/output.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/import/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 47,
+  "end": 78,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 47
+      "line": 4,
+      "column": 1
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 47,
+    "end": 78,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 47
+        "line": 4,
+        "column": 1
       }
     },
     "sourceType": "module",
@@ -32,15 +32,15 @@
       {
         "type": "DeclareModule",
         "start": 0,
-        "end": 47,
+        "end": 78,
         "loc": {
           "start": {
             "line": 1,
             "column": 0
           },
           "end": {
-            "line": 1,
-            "column": 47
+            "line": 4,
+            "column": 1
           }
         },
         "id": {
@@ -66,59 +66,59 @@
         "body": {
           "type": "BlockStatement",
           "start": 19,
-          "end": 47,
+          "end": 78,
           "loc": {
             "start": {
               "line": 1,
               "column": 19
             },
             "end": {
-              "line": 1,
-              "column": 47
+              "line": 4,
+              "column": 1
             }
           },
           "body": [
             {
               "type": "ImportDeclaration",
-              "start": 21,
-              "end": 45,
+              "start": 23,
+              "end": 47,
               "loc": {
                 "start": {
-                  "line": 1,
-                  "column": 21
+                  "line": 2,
+                  "column": 2
                 },
                 "end": {
-                  "line": 1,
-                  "column": 45
+                  "line": 2,
+                  "column": 26
                 }
               },
               "specifiers": [
                 {
                   "type": "ImportDefaultSpecifier",
-                  "start": 33,
-                  "end": 34,
+                  "start": 35,
+                  "end": 36,
                   "loc": {
                     "start": {
-                      "line": 1,
-                      "column": 33
+                      "line": 2,
+                      "column": 14
                     },
                     "end": {
-                      "line": 1,
-                      "column": 34
+                      "line": 2,
+                      "column": 15
                     }
                   },
                   "local": {
                     "type": "Identifier",
-                    "start": 33,
-                    "end": 34,
+                    "start": 35,
+                    "end": 36,
                     "loc": {
                       "start": {
-                        "line": 1,
-                        "column": 33
+                        "line": 2,
+                        "column": 14
                       },
                       "end": {
-                        "line": 1,
-                        "column": 34
+                        "line": 2,
+                        "column": 15
                       },
                       "identifierName": "T"
                     },
@@ -129,16 +129,16 @@
               "importKind": "type",
               "source": {
                 "type": "StringLiteral",
-                "start": 40,
-                "end": 44,
+                "start": 42,
+                "end": 46,
                 "loc": {
                   "start": {
-                    "line": 1,
-                    "column": 40
+                    "line": 2,
+                    "column": 21
                   },
                   "end": {
-                    "line": 1,
-                    "column": 44
+                    "line": 2,
+                    "column": 25
                   }
                 },
                 "extra": {
@@ -147,6 +147,76 @@
                 },
                 "value": "TM"
               }
+            },
+            {
+              "type": "ImportDeclaration",
+              "start": 50,
+              "end": 76,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 2
+                },
+                "end": {
+                  "line": 3,
+                  "column": 28
+                }
+              },
+              "specifiers": [
+                {
+                  "type": "ImportDefaultSpecifier",
+                  "start": 64,
+                  "end": 65,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 17
+                    }
+                  },
+                  "local": {
+                    "type": "Identifier",
+                    "start": 64,
+                    "end": 65,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 17
+                      },
+                      "identifierName": "U"
+                    },
+                    "name": "U"
+                  }
+                }
+              ],
+              "importKind": "typeof",
+              "source": {
+                "type": "StringLiteral",
+                "start": 71,
+                "end": 75,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 23
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 27
+                  }
+                },
+                "extra": {
+                  "rawValue": "UM",
+                  "raw": "\"UM\""
+                },
+                "value": "UM"
+              }
             }
           ]
         },
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-commonjs-module/options.json b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-commonjs-module/options.json
index 0d61c152b68d..adfde3236356 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-commonjs-module/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-commonjs-module/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Found both `declare module.exports` and `declare export` in the same module. Modules can only have 1 since they are either an ES module or they are a CommonJS module (1:55)"
+  "throws": "Found both `declare module.exports` and `declare export` in the same module. Modules can only have 1 since they are either an ES module or they are a CommonJS module (1:55)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-es-module/options.json b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-es-module/options.json
index bf1bde22fcbf..b40239a5609c 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-es-module/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-es-module/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Found both `declare module.exports` and `declare export` in the same module. Modules can only have 1 since they are either an ES module or they are a CommonJS module (1:53)"
+  "throws": "Found both `declare module.exports` and `declare export` in the same module. Modules can only have 1 since they are either an ES module or they are a CommonJS module (1:53)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-import/options.json b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-import/options.json
index ffd120e2cdfe..c237bb99a73b 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-import/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-import/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Imports within a `declare module` body must always be `import type` or `import typeof` (1:21)"
+  "throws": "Imports within a `declare module` body must always be `import type` or `import typeof` (1:21)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-module-in-module/options.json b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-module-in-module/options.json
index ecaf35fa621a..cd823bd7c4e0 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-module/invalid-module-in-module/options.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-module/invalid-module-in-module/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`declare module` cannot be used inside another `declare module` (1:27)"
+  "throws": "`declare module` cannot be used inside another `declare module` (1:27)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-statements/14/output.json b/packages/babel-parser/test/fixtures/flow/declare-statements/14/output.json
index b34f2531a1a7..a7b76763db42 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-statements/14/output.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-statements/14/output.json
@@ -243,7 +243,8 @@
             }
           ],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/declare-statements/15/input.js b/packages/babel-parser/test/fixtures/flow/declare-statements/15/input.js
index e5d2353e55bd..63a4ecdb5b7e 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-statements/15/input.js
+++ b/packages/babel-parser/test/fixtures/flow/declare-statements/15/input.js
@@ -1,2 +1,2 @@
 declare interface I { foo: string }
-declare interface I<T> { foo: T }
+declare interface I2<T> { foo: T }
diff --git a/packages/babel-parser/test/fixtures/flow/declare-statements/15/output.json b/packages/babel-parser/test/fixtures/flow/declare-statements/15/output.json
index 6af031abc60f..619a44a76feb 100644
--- a/packages/babel-parser/test/fixtures/flow/declare-statements/15/output.json
+++ b/packages/babel-parser/test/fixtures/flow/declare-statements/15/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 69,
+  "end": 70,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 2,
-      "column": 33
+      "column": 34
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 69,
+    "end": 70,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 2,
-        "column": 33
+        "column": 34
       }
     },
     "sourceType": "module",
@@ -142,7 +142,7 @@
       {
         "type": "DeclareInterface",
         "start": 36,
-        "end": 69,
+        "end": 70,
         "loc": {
           "start": {
             "line": 2,
@@ -150,13 +150,13 @@
           },
           "end": {
             "line": 2,
-            "column": 33
+            "column": 34
           }
         },
         "id": {
           "type": "Identifier",
           "start": 54,
-          "end": 55,
+          "end": 56,
           "loc": {
             "start": {
               "line": 2,
@@ -164,39 +164,39 @@
             },
             "end": {
               "line": 2,
-              "column": 19
+              "column": 20
             },
-            "identifierName": "I"
+            "identifierName": "I2"
           },
-          "name": "I"
+          "name": "I2"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 55,
-          "end": 58,
+          "start": 56,
+          "end": 59,
           "loc": {
             "start": {
               "line": 2,
-              "column": 19
+              "column": 20
             },
             "end": {
               "line": 2,
-              "column": 22
+              "column": 23
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 56,
-              "end": 57,
+              "start": 57,
+              "end": 58,
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 20
+                  "column": 21
                 },
                 "end": {
                   "line": 2,
-                  "column": 21
+                  "column": 22
                 }
               },
               "name": "T",
@@ -209,46 +209,46 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 59,
-          "end": 69,
+          "start": 60,
+          "end": 70,
           "loc": {
             "start": {
               "line": 2,
-              "column": 23
+              "column": 24
             },
             "end": {
               "line": 2,
-              "column": 33
+              "column": 34
             }
           },
           "callProperties": [],
           "properties": [
             {
               "type": "ObjectTypeProperty",
-              "start": 61,
-              "end": 67,
+              "start": 62,
+              "end": 68,
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 25
+                  "column": 26
                 },
                 "end": {
                   "line": 2,
-                  "column": 31
+                  "column": 32
                 }
               },
               "key": {
                 "type": "Identifier",
-                "start": 61,
-                "end": 64,
+                "start": 62,
+                "end": 65,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 25
+                    "column": 26
                   },
                   "end": {
                     "line": 2,
-                    "column": 28
+                    "column": 29
                   },
                   "identifierName": "foo"
                 },
@@ -260,31 +260,31 @@
               "method": false,
               "value": {
                 "type": "GenericTypeAnnotation",
-                "start": 66,
-                "end": 67,
+                "start": 67,
+                "end": 68,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 30
+                    "column": 31
                   },
                   "end": {
                     "line": 2,
-                    "column": 31
+                    "column": 32
                   }
                 },
                 "typeParameters": null,
                 "id": {
                   "type": "Identifier",
-                  "start": 66,
-                  "end": 67,
+                  "start": 67,
+                  "end": 68,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 30
+                      "column": 31
                     },
                     "end": {
                       "line": 2,
-                      "column": 31
+                      "column": 32
                     },
                     "identifierName": "T"
                   },
diff --git a/packages/babel-parser/test/fixtures/flow/def-site-variance/1/output.json b/packages/babel-parser/test/fixtures/flow/def-site-variance/1/output.json
index 8455526f655d..938196ebcdb6 100644
--- a/packages/babel-parser/test/fixtures/flow/def-site-variance/1/output.json
+++ b/packages/babel-parser/test/fixtures/flow/def-site-variance/1/output.json
@@ -422,7 +422,8 @@
           "properties": [],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/input.js
new file mode 100644
index 000000000000..c3ef0ff53256
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/input.js
@@ -0,0 +1,4 @@
+//@flow
+declare class A {
+  ...;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/options.json
new file mode 100644
index 000000000000..c9188366d4e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects1/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (3:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/input.js
new file mode 100644
index 000000000000..fcc33d36c05b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/input.js
@@ -0,0 +1,5 @@
+//@flow
+declare class B {
+  foo: number;
+  ...;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/options.json
new file mode 100644
index 000000000000..658f8c434773
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects2/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/input.js
new file mode 100644
index 000000000000..1f5df6b39ff9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/input.js
@@ -0,0 +1,5 @@
+//@flow
+declare class C {
+  ...;
+  foo: number;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/options.json
new file mode 100644
index 000000000000..c9188366d4e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects3/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (3:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/input.js
new file mode 100644
index 000000000000..7d0e44fc00c2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/input.js
@@ -0,0 +1,6 @@
+//@flow
+declare class D {
+  foo: number;
+  ...;
+  bar: number;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/options.json
new file mode 100644
index 000000000000..658f8c434773
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects4/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/input.js
new file mode 100644
index 000000000000..938efa8b5797
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/input.js
@@ -0,0 +1,5 @@
+//@flow
+interface F {
+  foo: number;
+  ...;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/options.json
new file mode 100644
index 000000000000..658f8c434773
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects5/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/input.js
new file mode 100644
index 000000000000..59c4a399c358
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/input.js
@@ -0,0 +1,5 @@
+//@flow
+interface G {
+  ...;
+  foo: number;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/options.json
new file mode 100644
index 000000000000..c9188366d4e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects6/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (3:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/input.js
new file mode 100644
index 000000000000..4dde1fd3b04e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/input.js
@@ -0,0 +1,6 @@
+//@flow
+interface H {
+  foo: number;
+  ...;
+  bar: number;
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/options.json
new file mode 100644
index 000000000000..658f8c434773
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_disallowed_in_non_objects7/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Spread operator cannot appear in class or interface definitions (4:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/input.js
new file mode 100644
index 000000000000..289513d4e480
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/input.js
@@ -0,0 +1,2 @@
+//@flow
+type T = {| foo: number, ... |}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/options.json
new file mode 100644
index 000000000000..49936ac94990
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_forbidden_in_exact/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Explicit inexact syntax cannot appear inside an explicit exact object type (2:29)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/input.js
new file mode 100644
index 000000000000..93c854cac282
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/input.js
@@ -0,0 +1,2 @@
+//@flow
+type T = {..., foo: number};
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/options.json
new file mode 100644
index 000000000000..ebb74417a527
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_must_appear_last/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Explicit inexact syntax must appear at the end of an inexact object (2:15)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object/input.js
new file mode 100644
index 000000000000..2fb3e7249593
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object/input.js
@@ -0,0 +1,4 @@
+//@flow
+type T = {...};
+type U = {x: number, ...};
+type V = {x: number, ...V, ...U};
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object/output.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object/output.json
new file mode 100644
index 000000000000..7e32ace8159d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object/output.json
@@ -0,0 +1,437 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 84,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 84,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 33
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TypeAlias",
+        "start": 8,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 13,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            },
+            "identifierName": "T"
+          },
+          "name": "T"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "ObjectTypeAnnotation",
+          "start": 17,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "callProperties": [],
+          "properties": [],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false,
+          "inexact": true
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": "@flow",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "TypeAlias",
+        "start": 24,
+        "end": 50,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 26
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 29,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 5
+            },
+            "end": {
+              "line": 3,
+              "column": 6
+            },
+            "identifierName": "U"
+          },
+          "name": "U"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "ObjectTypeAnnotation",
+          "start": 33,
+          "end": 49,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 9
+            },
+            "end": {
+              "line": 3,
+              "column": 25
+            }
+          },
+          "callProperties": [],
+          "properties": [
+            {
+              "type": "ObjectTypeProperty",
+              "start": 34,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 10
+                },
+                "end": {
+                  "line": 3,
+                  "column": 19
+                }
+              },
+              "key": {
+                "type": "Identifier",
+                "start": 34,
+                "end": 35,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 11
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "static": false,
+              "proto": false,
+              "kind": "init",
+              "method": false,
+              "value": {
+                "type": "NumberTypeAnnotation",
+                "start": 37,
+                "end": 43,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 19
+                  }
+                }
+              },
+              "variance": null,
+              "optional": false
+            }
+          ],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false,
+          "inexact": true
+        }
+      },
+      {
+        "type": "TypeAlias",
+        "start": 51,
+        "end": 84,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 33
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 56,
+          "end": 57,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 5
+            },
+            "end": {
+              "line": 4,
+              "column": 6
+            },
+            "identifierName": "V"
+          },
+          "name": "V"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "ObjectTypeAnnotation",
+          "start": 60,
+          "end": 83,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 9
+            },
+            "end": {
+              "line": 4,
+              "column": 32
+            }
+          },
+          "callProperties": [],
+          "properties": [
+            {
+              "type": "ObjectTypeProperty",
+              "start": 61,
+              "end": 70,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 10
+                },
+                "end": {
+                  "line": 4,
+                  "column": 19
+                }
+              },
+              "key": {
+                "type": "Identifier",
+                "start": 61,
+                "end": 62,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 11
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "static": false,
+              "proto": false,
+              "kind": "init",
+              "method": false,
+              "value": {
+                "type": "NumberTypeAnnotation",
+                "start": 64,
+                "end": 70,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 19
+                  }
+                }
+              },
+              "variance": null,
+              "optional": false
+            },
+            {
+              "type": "ObjectTypeSpreadProperty",
+              "start": 72,
+              "end": 76,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 21
+                },
+                "end": {
+                  "line": 4,
+                  "column": 25
+                }
+              },
+              "argument": {
+                "type": "GenericTypeAnnotation",
+                "start": 75,
+                "end": 76,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 25
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 75,
+                  "end": 76,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 25
+                    },
+                    "identifierName": "V"
+                  },
+                  "name": "V"
+                }
+              }
+            },
+            {
+              "type": "ObjectTypeSpreadProperty",
+              "start": 78,
+              "end": 82,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 27
+                },
+                "end": {
+                  "line": 4,
+                  "column": 31
+                }
+              },
+              "argument": {
+                "type": "GenericTypeAnnotation",
+                "start": 81,
+                "end": 82,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 30
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 31
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 81,
+                  "end": 82,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 30
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 31
+                    },
+                    "identifierName": "U"
+                  },
+                  "name": "U"
+                }
+              }
+            }
+          ],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false,
+          "inexact": false
+        }
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "@flow",
+      "start": 0,
+      "end": 7,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 7
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid1/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid1/input.js
new file mode 100644
index 000000000000..84742c465959
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid1/input.js
@@ -0,0 +1,2 @@
+//@flow
+type T = {x: number, ..., y: number};
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid1/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid1/options.json
new file mode 100644
index 000000000000..6d703769bf61
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid1/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Explicit inexact syntax must appear at the end of an inexact object (2:26)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid2/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid2/input.js
new file mode 100644
index 000000000000..15e4d01a74e6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid2/input.js
@@ -0,0 +1,2 @@
+//@flow
+type U = {x: number, ..., ...};
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid2/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid2/options.json
new file mode 100644
index 000000000000..6d703769bf61
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid2/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Explicit inexact syntax must appear at the end of an inexact object (2:26)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid3/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid3/input.js
new file mode 100644
index 000000000000..d9037ecf24a3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid3/input.js
@@ -0,0 +1,2 @@
+//@flow
+type V = {x: number, ..., ...X};
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid3/options.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid3/options.json
new file mode 100644
index 000000000000..6d703769bf61
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_object_invalid3/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Explicit inexact syntax must appear at the end of an inexact object (2:26)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_trailing_comma/input.js b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_trailing_comma/input.js
new file mode 100644
index 000000000000..2b439cf934f8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_trailing_comma/input.js
@@ -0,0 +1,11 @@
+//@flow
+type T = { ..., };
+type U = { ...; };
+type V = {
+  x: number,
+  ...,
+};
+type W = {
+  x: number;
+  ...;
+};
diff --git a/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_trailing_comma/output.json b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_trailing_comma/output.json
new file mode 100644
index 000000000000..3c39bdc107f5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/explicit-inexact-object/explicit_inexact_trailing_comma/output.json
@@ -0,0 +1,395 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 113,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 11,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 113,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 11,
+        "column": 2
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TypeAlias",
+        "start": 8,
+        "end": 26,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 18
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 13,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            },
+            "identifierName": "T"
+          },
+          "name": "T"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "ObjectTypeAnnotation",
+          "start": 17,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 17
+            }
+          },
+          "callProperties": [],
+          "properties": [],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false,
+          "inexact": true
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": "@flow",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "TypeAlias",
+        "start": 27,
+        "end": 45,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 18
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 32,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 5
+            },
+            "end": {
+              "line": 3,
+              "column": 6
+            },
+            "identifierName": "U"
+          },
+          "name": "U"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "ObjectTypeAnnotation",
+          "start": 36,
+          "end": 44,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 9
+            },
+            "end": {
+              "line": 3,
+              "column": 17
+            }
+          },
+          "callProperties": [],
+          "properties": [],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false,
+          "inexact": true
+        }
+      },
+      {
+        "type": "TypeAlias",
+        "start": 46,
+        "end": 79,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 2
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 51,
+          "end": 52,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 5
+            },
+            "end": {
+              "line": 4,
+              "column": 6
+            },
+            "identifierName": "V"
+          },
+          "name": "V"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "ObjectTypeAnnotation",
+          "start": 55,
+          "end": 78,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 9
+            },
+            "end": {
+              "line": 7,
+              "column": 1
+            }
+          },
+          "callProperties": [],
+          "properties": [
+            {
+              "type": "ObjectTypeProperty",
+              "start": 59,
+              "end": 68,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 2
+                },
+                "end": {
+                  "line": 5,
+                  "column": 11
+                }
+              },
+              "key": {
+                "type": "Identifier",
+                "start": 59,
+                "end": 60,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 3
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "static": false,
+              "proto": false,
+              "kind": "init",
+              "method": false,
+              "value": {
+                "type": "NumberTypeAnnotation",
+                "start": 62,
+                "end": 68,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 11
+                  }
+                }
+              },
+              "variance": null,
+              "optional": false
+            }
+          ],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false,
+          "inexact": true
+        }
+      },
+      {
+        "type": "TypeAlias",
+        "start": 80,
+        "end": 113,
+        "loc": {
+          "start": {
+            "line": 8,
+            "column": 0
+          },
+          "end": {
+            "line": 11,
+            "column": 2
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 85,
+          "end": 86,
+          "loc": {
+            "start": {
+              "line": 8,
+              "column": 5
+            },
+            "end": {
+              "line": 8,
+              "column": 6
+            },
+            "identifierName": "W"
+          },
+          "name": "W"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "ObjectTypeAnnotation",
+          "start": 89,
+          "end": 112,
+          "loc": {
+            "start": {
+              "line": 8,
+              "column": 9
+            },
+            "end": {
+              "line": 11,
+              "column": 1
+            }
+          },
+          "callProperties": [],
+          "properties": [
+            {
+              "type": "ObjectTypeProperty",
+              "start": 93,
+              "end": 102,
+              "loc": {
+                "start": {
+                  "line": 9,
+                  "column": 2
+                },
+                "end": {
+                  "line": 9,
+                  "column": 11
+                }
+              },
+              "key": {
+                "type": "Identifier",
+                "start": 93,
+                "end": 94,
+                "loc": {
+                  "start": {
+                    "line": 9,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 9,
+                    "column": 3
+                  },
+                  "identifierName": "x"
+                },
+                "name": "x"
+              },
+              "static": false,
+              "proto": false,
+              "kind": "init",
+              "method": false,
+              "value": {
+                "type": "NumberTypeAnnotation",
+                "start": 96,
+                "end": 102,
+                "loc": {
+                  "start": {
+                    "line": 9,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 9,
+                    "column": 11
+                  }
+                }
+              },
+              "variance": null,
+              "optional": false
+            }
+          ],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false,
+          "inexact": true
+        }
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "@flow",
+      "start": 0,
+      "end": 7,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 7
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json
index b67b9224d4c0..b945b9a0a123 100644
--- a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json
+++ b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/id-reserved-type-invalid/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:10)"
+  "throws": "Cannot overwrite reserved type string (1:10)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json
index 3eddc82b13a2..7aecee1ff0ae 100644
--- a/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json
+++ b/packages/babel-parser/test/fixtures/flow/interfaces-module-and-script/implements-reserved-type-invalid/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:21)"
+  "throws": "Cannot overwrite reserved type string (1:21)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/internal-slot/object-method/output.json b/packages/babel-parser/test/fixtures/flow/internal-slot/object-method/output.json
index 2be1cc35f8ee..b42f9eacce91 100644
--- a/packages/babel-parser/test/fixtures/flow/internal-slot/object-method/output.json
+++ b/packages/babel-parser/test/fixtures/flow/internal-slot/object-method/output.json
@@ -166,7 +166,8 @@
               }
             }
           ],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/internal-slot/object-optional/output.json b/packages/babel-parser/test/fixtures/flow/internal-slot/object-optional/output.json
index 9a422ace0dab..605db54c850a 100644
--- a/packages/babel-parser/test/fixtures/flow/internal-slot/object-optional/output.json
+++ b/packages/babel-parser/test/fixtures/flow/internal-slot/object-optional/output.json
@@ -148,7 +148,8 @@
               }
             }
           ],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/internal-slot/object/output.json b/packages/babel-parser/test/fixtures/flow/internal-slot/object/output.json
index dd474f9d3903..6ff31113bc57 100644
--- a/packages/babel-parser/test/fixtures/flow/internal-slot/object/output.json
+++ b/packages/babel-parser/test/fixtures/flow/internal-slot/object/output.json
@@ -147,7 +147,8 @@
               }
             }
           ],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/iterator/12/output.json b/packages/babel-parser/test/fixtures/flow/iterator/12/output.json
index 523dd9f5cbe4..865bb503288f 100644
--- a/packages/babel-parser/test/fixtures/flow/iterator/12/output.json
+++ b/packages/babel-parser/test/fixtures/flow/iterator/12/output.json
@@ -168,7 +168,8 @@
             ],
             "indexers": [],
             "internalSlots": [],
-            "exact": false
+            "exact": false,
+            "inexact": false
           }
         },
         "body": {
diff --git a/packages/babel-parser/test/fixtures/flow/iterator/13/output.json b/packages/babel-parser/test/fixtures/flow/iterator/13/output.json
index 7162d07e7f7e..a21fcad31e10 100644
--- a/packages/babel-parser/test/fixtures/flow/iterator/13/output.json
+++ b/packages/babel-parser/test/fixtures/flow/iterator/13/output.json
@@ -168,7 +168,8 @@
             ],
             "indexers": [],
             "internalSlots": [],
-            "exact": false
+            "exact": false,
+            "inexact": false
           }
         },
         "body": {
diff --git a/packages/babel-parser/test/fixtures/flow/literal-types/invalid-number-negative/options.json b/packages/babel-parser/test/fixtures/flow/literal-types/invalid-number-negative/options.json
index 5667a8ffb0c0..d4fadede72f8 100644
--- a/packages/babel-parser/test/fixtures/flow/literal-types/invalid-number-negative/options.json
+++ b/packages/babel-parser/test/fixtures/flow/literal-types/invalid-number-negative/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Unexpected token, expected \"number\" (1:8)"
+  "throws": "Unexpected token, expected \"number\" or \"bigint\" (1:8)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/object-types/complex-param-types/output.json b/packages/babel-parser/test/fixtures/flow/object-types/complex-param-types/output.json
index 4bd3e696e5d6..c6357989dc29 100644
--- a/packages/babel-parser/test/fixtures/flow/object-types/complex-param-types/output.json
+++ b/packages/babel-parser/test/fixtures/flow/object-types/complex-param-types/output.json
@@ -233,7 +233,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json b/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json
index 6bf62df4a991..0c2cdd4d777c 100644
--- a/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json
+++ b/packages/babel-parser/test/fixtures/flow/opaque-type-alias/reserved-type-invalid/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:12)"
+  "throws": "Cannot overwrite reserved type string (1:12)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/optional-type/1/output.json b/packages/babel-parser/test/fixtures/flow/optional-type/1/output.json
index 49478ac47acf..75f31bbbe6bd 100644
--- a/packages/babel-parser/test/fixtures/flow/optional-type/1/output.json
+++ b/packages/babel-parser/test/fixtures/flow/optional-type/1/output.json
@@ -96,7 +96,7 @@
                 {
                   "type": "Identifier",
                   "start": 11,
-                  "end": 12,
+                  "end": 13,
                   "loc": {
                     "start": {
                       "line": 1,
@@ -104,7 +104,7 @@
                     },
                     "end": {
                       "line": 1,
-                      "column": 12
+                      "column": 13
                     },
                     "identifierName": "x"
                   },
diff --git a/packages/babel-parser/test/fixtures/flow/optional-type/3/output.json b/packages/babel-parser/test/fixtures/flow/optional-type/3/output.json
index ebf35e7fd7db..38e2cb2fb8cd 100644
--- a/packages/babel-parser/test/fixtures/flow/optional-type/3/output.json
+++ b/packages/babel-parser/test/fixtures/flow/optional-type/3/output.json
@@ -96,7 +96,7 @@
                 {
                   "type": "Identifier",
                   "start": 11,
-                  "end": 12,
+                  "end": 13,
                   "loc": {
                     "start": {
                       "line": 1,
@@ -104,7 +104,7 @@
                     },
                     "end": {
                       "line": 1,
-                      "column": 12
+                      "column": 13
                     },
                     "identifierName": "x"
                   },
diff --git a/packages/babel-parser/test/fixtures/flow/optional-type/4/output.json b/packages/babel-parser/test/fixtures/flow/optional-type/4/output.json
index 550ba7b633d7..61dd29778966 100644
--- a/packages/babel-parser/test/fixtures/flow/optional-type/4/output.json
+++ b/packages/babel-parser/test/fixtures/flow/optional-type/4/output.json
@@ -96,7 +96,7 @@
                 {
                   "type": "RestElement",
                   "start": 11,
-                  "end": 15,
+                  "end": 16,
                   "loc": {
                     "start": {
                       "line": 1,
@@ -104,7 +104,7 @@
                     },
                     "end": {
                       "line": 1,
-                      "column": 15
+                      "column": 16
                     }
                   },
                   "argument": {
diff --git a/packages/babel-parser/test/fixtures/flow/optional-type/6/options.json b/packages/babel-parser/test/fixtures/flow/optional-type/6/options.json
index fd783ce26e13..fb2831d6188b 100644
--- a/packages/babel-parser/test/fixtures/flow/optional-type/6/options.json
+++ b/packages/babel-parser/test/fixtures/flow/optional-type/6/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "A binding pattern parameter cannot be optional in an implementation signature. (1:11)"
+  "throws": "A binding pattern parameter cannot be optional in an implementation signature. (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/1/input.js b/packages/babel-parser/test/fixtures/flow/pragma/1/input.js
new file mode 100644
index 000000000000..f8d6e7e30a24
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/1/input.js
@@ -0,0 +1,3 @@
+foo<x>(y);
+// @flow
+foo<x>(y);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/1/output.json b/packages/babel-parser/test/fixtures/flow/pragma/1/output.json
new file mode 100644
index 000000000000..f74bc34124e4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/1/output.json
@@ -0,0 +1,293 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            }
+          },
+          "left": {
+            "type": "BinaryExpression",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 0,
+              "end": 3,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 3
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "operator": "<",
+            "right": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          },
+          "operator": ">",
+          "right": {
+            "type": "Identifier",
+            "start": 7,
+            "end": 8,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 8
+              },
+              "identifierName": "y"
+            },
+            "name": "y",
+            "extra": {
+              "parenthesized": true,
+              "parenStart": 6
+            }
+          }
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 11,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 20,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 20,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 9
+            }
+          },
+          "left": {
+            "type": "BinaryExpression",
+            "start": 20,
+            "end": 25,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 5
+              }
+            },
+            "left": {
+              "type": "Identifier",
+              "start": 20,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 0
+                },
+                "end": {
+                  "line": 3,
+                  "column": 3
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "operator": "<",
+            "right": {
+              "type": "Identifier",
+              "start": 24,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            }
+          },
+          "operator": ">",
+          "right": {
+            "type": "Identifier",
+            "start": 27,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 7
+              },
+              "end": {
+                "line": 3,
+                "column": 8
+              },
+              "identifierName": "y"
+            },
+            "name": "y",
+            "extra": {
+              "parenthesized": true,
+              "parenStart": 26
+            }
+          }
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 11,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " @flow",
+      "start": 11,
+      "end": 19,
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 0
+        },
+        "end": {
+          "line": 2,
+          "column": 8
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/2/input.js b/packages/babel-parser/test/fixtures/flow/pragma/2/input.js
new file mode 100644
index 000000000000..df8b2dd733fb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/2/input.js
@@ -0,0 +1,3 @@
+'use strict';
+// @flow
+foo<x>(y);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/2/output.json b/packages/babel-parser/test/fixtures/flow/pragma/2/output.json
new file mode 100644
index 000000000000..d97623a0a101
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/2/output.json
@@ -0,0 +1,241 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 23,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 23,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 9
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 23,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 26,
+            "end": 29,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 3
+              },
+              "end": {
+                "line": 3,
+                "column": 6
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 27,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 5
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 27,
+                  "end": 28,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 5
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                }
+              }
+            ]
+          },
+          "arguments": [
+            {
+              "type": "Identifier",
+              "start": 30,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 7
+                },
+                "end": {
+                  "line": 3,
+                  "column": 8
+                },
+                "identifierName": "y"
+              },
+              "name": "y"
+            }
+          ]
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 14,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "'use strict'",
+            "rawValue": "use strict"
+          }
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 14,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " @flow",
+      "start": 14,
+      "end": 22,
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 0
+        },
+        "end": {
+          "line": 2,
+          "column": 8
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/3/input.js b/packages/babel-parser/test/fixtures/flow/pragma/3/input.js
new file mode 100644
index 000000000000..cf49c8b96de4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/3/input.js
@@ -0,0 +1,3 @@
+// arbitrary comment
+// @flow
+foo<x>(y);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/3/output.json b/packages/babel-parser/test/fixtures/flow/pragma/3/output.json
new file mode 100644
index 000000000000..5baf19ddf253
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/3/output.json
@@ -0,0 +1,219 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 30,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 30,
+          "end": 39,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 9
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 30,
+            "end": 33,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 33,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 3
+              },
+              "end": {
+                "line": 3,
+                "column": 6
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 34,
+                "end": 35,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 5
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 34,
+                  "end": 35,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 5
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                }
+              }
+            ]
+          },
+          "arguments": [
+            {
+              "type": "Identifier",
+              "start": 37,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 7
+                },
+                "end": {
+                  "line": 3,
+                  "column": 8
+                },
+                "identifierName": "y"
+              },
+              "name": "y"
+            }
+          ]
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " arbitrary comment",
+            "start": 0,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            }
+          },
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 21,
+            "end": 29,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " arbitrary comment",
+      "start": 0,
+      "end": 20,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 20
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " @flow",
+      "start": 21,
+      "end": 29,
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 0
+        },
+        "end": {
+          "line": 2,
+          "column": 8
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/4/input.js b/packages/babel-parser/test/fixtures/flow/pragma/4/input.js
new file mode 100644
index 000000000000..458f7c2b9460
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/4/input.js
@@ -0,0 +1,4 @@
+'use strict';
+// arbitrary comment
+// @flow
+foo<x>(y);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/4/output.json b/packages/babel-parser/test/fixtures/flow/pragma/4/output.json
new file mode 100644
index 000000000000..46325d1919a8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/4/output.json
@@ -0,0 +1,289 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 54,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 54,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 44,
+        "end": 54,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 44,
+          "end": 53,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 0
+            },
+            "end": {
+              "line": 4,
+              "column": 9
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 44,
+            "end": 47,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 0
+              },
+              "end": {
+                "line": 4,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 47,
+            "end": 50,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 3
+              },
+              "end": {
+                "line": 4,
+                "column": 6
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 48,
+                "end": 49,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 5
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 48,
+                  "end": 49,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 5
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                }
+              }
+            ]
+          },
+          "arguments": [
+            {
+              "type": "Identifier",
+              "start": 51,
+              "end": 52,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 7
+                },
+                "end": {
+                  "line": 4,
+                  "column": 8
+                },
+                "identifierName": "y"
+              },
+              "name": "y"
+            }
+          ]
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " arbitrary comment",
+            "start": 14,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 20
+              }
+            }
+          },
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 35,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 0,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "'use strict'",
+            "rawValue": "use strict"
+          }
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": " arbitrary comment",
+            "start": 14,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 20
+              }
+            }
+          },
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 35,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " arbitrary comment",
+      "start": 14,
+      "end": 34,
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 0
+        },
+        "end": {
+          "line": 2,
+          "column": 20
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " @flow",
+      "start": 35,
+      "end": 43,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 0
+        },
+        "end": {
+          "line": 3,
+          "column": 8
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/5/input.js b/packages/babel-parser/test/fixtures/flow/pragma/5/input.js
new file mode 100644
index 000000000000..e2ee3d87b6ef
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/5/input.js
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+'use strict';
+// arbitrary comment
+// @flow
+foo<x>(y);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/pragma/5/output.json b/packages/babel-parser/test/fixtures/flow/pragma/5/output.json
new file mode 100644
index 000000000000..c59fb12c869d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/pragma/5/output.json
@@ -0,0 +1,304 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 74,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 74,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": {
+      "type": "InterpreterDirective",
+      "start": 0,
+      "end": 19,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 19
+        }
+      },
+      "value": "/usr/bin/env node"
+    },
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 64,
+        "end": 74,
+        "loc": {
+          "start": {
+            "line": 5,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 64,
+          "end": 73,
+          "loc": {
+            "start": {
+              "line": 5,
+              "column": 0
+            },
+            "end": {
+              "line": 5,
+              "column": 9
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 64,
+            "end": 67,
+            "loc": {
+              "start": {
+                "line": 5,
+                "column": 0
+              },
+              "end": {
+                "line": 5,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 67,
+            "end": 70,
+            "loc": {
+              "start": {
+                "line": 5,
+                "column": 3
+              },
+              "end": {
+                "line": 5,
+                "column": 6
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 68,
+                "end": 69,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 5
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 68,
+                  "end": 69,
+                  "loc": {
+                    "start": {
+                      "line": 5,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 5,
+                      "column": 5
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                }
+              }
+            ]
+          },
+          "arguments": [
+            {
+              "type": "Identifier",
+              "start": 71,
+              "end": 72,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 7
+                },
+                "end": {
+                  "line": 5,
+                  "column": 8
+                },
+                "identifierName": "y"
+              },
+              "name": "y"
+            }
+          ]
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " arbitrary comment",
+            "start": 34,
+            "end": 54,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 20
+              }
+            }
+          },
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 55,
+            "end": 63,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 0
+              },
+              "end": {
+                "line": 4,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": [
+      {
+        "type": "Directive",
+        "start": 20,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 13
+          }
+        },
+        "value": {
+          "type": "DirectiveLiteral",
+          "start": 20,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 12
+            }
+          },
+          "value": "use strict",
+          "extra": {
+            "raw": "'use strict'",
+            "rawValue": "use strict"
+          }
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": " arbitrary comment",
+            "start": 34,
+            "end": 54,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 0
+              },
+              "end": {
+                "line": 3,
+                "column": 20
+              }
+            }
+          },
+          {
+            "type": "CommentLine",
+            "value": " @flow",
+            "start": 55,
+            "end": 63,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 0
+              },
+              "end": {
+                "line": 4,
+                "column": 8
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " arbitrary comment",
+      "start": 34,
+      "end": 54,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 0
+        },
+        "end": {
+          "line": 3,
+          "column": 20
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " @flow",
+      "start": 55,
+      "end": 63,
+      "loc": {
+        "start": {
+          "line": 4,
+          "column": 0
+        },
+        "end": {
+          "line": 4,
+          "column": 8
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/regression/arrow-function-with-newline/input.js b/packages/babel-parser/test/fixtures/flow/regression/arrow-function-with-newline/input.js
new file mode 100644
index 000000000000..5868c4e2feda
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/regression/arrow-function-with-newline/input.js
@@ -0,0 +1,2 @@
+async (f)
+: t => { }
diff --git a/packages/babel-parser/test/fixtures/flow/regression/arrow-function-with-newline/output.json b/packages/babel-parser/test/fixtures/flow/regression/arrow-function-with-newline/output.json
new file mode 100644
index 000000000000..acc286d064ad
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/regression/arrow-function-with-newline/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            }
+          },
+          "returnType": {
+            "type": "TypeAnnotation",
+            "start": 10,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 3
+              }
+            },
+            "typeAnnotation": {
+              "type": "GenericTypeAnnotation",
+              "start": 12,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 3
+                }
+              },
+              "typeParameters": null,
+              "id": {
+                "type": "Identifier",
+                "start": 12,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 3
+                  },
+                  "identifierName": "t"
+                },
+                "name": "t"
+              }
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": true,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 7,
+              "end": 8,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 8
+                },
+                "identifierName": "f"
+              },
+              "name": "f"
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 17,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 7
+              },
+              "end": {
+                "line": 2,
+                "column": 10
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/regression/issue-321/input.js b/packages/babel-parser/test/fixtures/flow/regression/issue-321/input.js
index c4d6e74d8452..42132cbb00d6 100644
--- a/packages/babel-parser/test/fixtures/flow/regression/issue-321/input.js
+++ b/packages/babel-parser/test/fixtures/flow/regression/issue-321/input.js
@@ -1,2 +1,2 @@
 const fn: ( Object, ?Object ) => void = ( o1, o2 ) => o1;
-const fn: ( Object, ?Object, ) => void = ( o1, o2, ) => o1;
+const fn2: ( Object, ?Object, ) => void = ( o1, o2, ) => o1;
diff --git a/packages/babel-parser/test/fixtures/flow/regression/issue-321/output.json b/packages/babel-parser/test/fixtures/flow/regression/issue-321/output.json
index 8d458c08f4f8..1af4cfcdc000 100644
--- a/packages/babel-parser/test/fixtures/flow/regression/issue-321/output.json
+++ b/packages/babel-parser/test/fixtures/flow/regression/issue-321/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 117,
+  "end": 118,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 2,
-      "column": 59
+      "column": 60
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 117,
+    "end": 118,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 2,
-        "column": 59
+        "column": 60
       }
     },
     "sourceType": "module",
@@ -317,7 +317,7 @@
       {
         "type": "VariableDeclaration",
         "start": 58,
-        "end": 117,
+        "end": 118,
         "loc": {
           "start": {
             "line": 2,
@@ -325,14 +325,14 @@
           },
           "end": {
             "line": 2,
-            "column": 59
+            "column": 60
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 64,
-            "end": 116,
+            "end": 117,
             "loc": {
               "start": {
                 "line": 2,
@@ -340,13 +340,13 @@
               },
               "end": {
                 "line": 2,
-                "column": 58
+                "column": 59
               }
             },
             "id": {
               "type": "Identifier",
               "start": 64,
-              "end": 96,
+              "end": 97,
               "loc": {
                 "start": {
                   "line": 2,
@@ -354,83 +354,83 @@
                 },
                 "end": {
                   "line": 2,
-                  "column": 38
+                  "column": 39
                 },
-                "identifierName": "fn"
+                "identifierName": "fn2"
               },
-              "name": "fn",
+              "name": "fn2",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
-                "start": 66,
-                "end": 96,
+                "start": 67,
+                "end": 97,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 8
+                    "column": 9
                   },
                   "end": {
                     "line": 2,
-                    "column": 38
+                    "column": 39
                   }
                 },
                 "typeAnnotation": {
                   "type": "FunctionTypeAnnotation",
-                  "start": 68,
-                  "end": 96,
+                  "start": 69,
+                  "end": 97,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 10
+                      "column": 11
                     },
                     "end": {
                       "line": 2,
-                      "column": 38
+                      "column": 39
                     }
                   },
                   "params": [
                     {
                       "type": "FunctionTypeParam",
-                      "start": 70,
-                      "end": 77,
+                      "start": 71,
+                      "end": 78,
                       "loc": {
                         "start": {
                           "line": 2,
-                          "column": 12
+                          "column": 13
                         },
                         "end": {
                           "line": 2,
-                          "column": 19
+                          "column": 20
                         }
                       },
                       "name": null,
                       "optional": false,
                       "typeAnnotation": {
                         "type": "GenericTypeAnnotation",
-                        "start": 70,
-                        "end": 76,
+                        "start": 71,
+                        "end": 77,
                         "loc": {
                           "start": {
                             "line": 2,
-                            "column": 12
+                            "column": 13
                           },
                           "end": {
                             "line": 2,
-                            "column": 18
+                            "column": 19
                           }
                         },
                         "typeParameters": null,
                         "id": {
                           "type": "Identifier",
-                          "start": 70,
-                          "end": 76,
+                          "start": 71,
+                          "end": 77,
                           "loc": {
                             "start": {
                               "line": 2,
-                              "column": 12
+                              "column": 13
                             },
                             "end": {
                               "line": 2,
-                              "column": 18
+                              "column": 19
                             },
                             "identifierName": "Object"
                           },
@@ -440,61 +440,61 @@
                     },
                     {
                       "type": "FunctionTypeParam",
-                      "start": 78,
-                      "end": 85,
+                      "start": 79,
+                      "end": 86,
                       "loc": {
                         "start": {
                           "line": 2,
-                          "column": 20
+                          "column": 21
                         },
                         "end": {
                           "line": 2,
-                          "column": 27
+                          "column": 28
                         }
                       },
                       "name": null,
                       "optional": false,
                       "typeAnnotation": {
                         "type": "NullableTypeAnnotation",
-                        "start": 78,
-                        "end": 85,
+                        "start": 79,
+                        "end": 86,
                         "loc": {
                           "start": {
                             "line": 2,
-                            "column": 20
+                            "column": 21
                           },
                           "end": {
                             "line": 2,
-                            "column": 27
+                            "column": 28
                           }
                         },
                         "typeAnnotation": {
                           "type": "GenericTypeAnnotation",
-                          "start": 79,
-                          "end": 85,
+                          "start": 80,
+                          "end": 86,
                           "loc": {
                             "start": {
                               "line": 2,
-                              "column": 21
+                              "column": 22
                             },
                             "end": {
                               "line": 2,
-                              "column": 27
+                              "column": 28
                             }
                           },
                           "typeParameters": null,
                           "id": {
                             "type": "Identifier",
-                            "start": 79,
-                            "end": 85,
+                            "start": 80,
+                            "end": 86,
                             "loc": {
                               "start": {
                                 "line": 2,
-                                "column": 21
+                                "column": 22
                               },
                               "end": {
                                 "line": 2,
-                                "column": 27
+                                "column": 28
                               },
                               "identifierName": "Object"
                             },
@@ -507,16 +507,16 @@
                   "rest": null,
                   "returnType": {
                     "type": "VoidTypeAnnotation",
-                    "start": 92,
-                    "end": 96,
+                    "start": 93,
+                    "end": 97,
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 34
+                        "column": 35
                       },
                       "end": {
                         "line": 2,
-                        "column": 38
+                        "column": 39
                       }
                     }
                   },
@@ -526,16 +526,16 @@
             },
             "init": {
               "type": "ArrowFunctionExpression",
-              "start": 99,
-              "end": 116,
+              "start": 100,
+              "end": 117,
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 41
+                  "column": 42
                 },
                 "end": {
                   "line": 2,
-                  "column": 58
+                  "column": 59
                 }
               },
               "id": null,
@@ -544,16 +544,16 @@
               "params": [
                 {
                   "type": "Identifier",
-                  "start": 101,
-                  "end": 103,
+                  "start": 102,
+                  "end": 104,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 43
+                      "column": 44
                     },
                     "end": {
                       "line": 2,
-                      "column": 45
+                      "column": 46
                     },
                     "identifierName": "o1"
                   },
@@ -561,16 +561,16 @@
                 },
                 {
                   "type": "Identifier",
-                  "start": 105,
-                  "end": 107,
+                  "start": 106,
+                  "end": 108,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 47
+                      "column": 48
                     },
                     "end": {
                       "line": 2,
-                      "column": 49
+                      "column": 50
                     },
                     "identifierName": "o2"
                   },
@@ -579,16 +579,16 @@
               ],
               "body": {
                 "type": "Identifier",
-                "start": 114,
-                "end": 116,
+                "start": 115,
+                "end": 117,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 56
+                    "column": 57
                   },
                   "end": {
                     "line": 2,
-                    "column": 58
+                    "column": 59
                   },
                   "identifierName": "o1"
                 },
diff --git a/packages/babel-parser/test/fixtures/flow/regression/issue-58-ambiguous/options.json b/packages/babel-parser/test/fixtures/flow/regression/issue-58-ambiguous/options.json
index 59a47050c4df..49dc6c3d5a6a 100644
--- a/packages/babel-parser/test/fixtures/flow/regression/issue-58-ambiguous/options.json
+++ b/packages/babel-parser/test/fixtures/flow/regression/issue-58-ambiguous/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Ambiguous expression: wrap the arrow functions in parentheses to disambiguate. (4:4)"
+  "throws": "Ambiguous expression: wrap the arrow functions in parentheses to disambiguate. (4:4)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-class/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-class/input.js
new file mode 100644
index 000000000000..6165683a9167
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-class/input.js
@@ -0,0 +1,2 @@
+const A = 1;
+declare class A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-class/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-class/options.json
new file mode 100644
index 000000000000..4a1b4e5c5cd4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:14)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-interface/input.js
new file mode 100644
index 000000000000..c432acb46b72
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-interface/input.js
@@ -0,0 +1,2 @@
+const A = 1;
+declare interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-interface/options.json
new file mode 100644
index 000000000000..187fea591b95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-declare-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:18)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-interface/input.js
new file mode 100644
index 000000000000..a03017e55c99
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-interface/input.js
@@ -0,0 +1,2 @@
+const A = 1;
+interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-interface/options.json
new file mode 100644
index 000000000000..04242bd1565b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-const-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-class/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-class/input.js
new file mode 100644
index 000000000000..32acf9e66e25
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-class/input.js
@@ -0,0 +1,2 @@
+declare class A {}
+declare class A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-interface/input.js
new file mode 100644
index 000000000000..99bf15306148
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-interface/input.js
@@ -0,0 +1,2 @@
+declare class A {}
+declare interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-interface/options.json
new file mode 100644
index 000000000000..187fea591b95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-class-declare-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:18)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-func/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-func/input.js
new file mode 100644
index 000000000000..c3a6f63af3b3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-func/input.js
@@ -0,0 +1,2 @@
+declare function A(): void;
+declare function A(): void;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-func/output.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-func/output.json
new file mode 100644
index 000000000000..c4c86f1991cd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-func/output.json
@@ -0,0 +1,197 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 55,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 27
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 55,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 27
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "DeclareFunction",
+        "start": 0,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 27
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 26,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 1,
+              "column": 26
+            },
+            "identifierName": "A"
+          },
+          "name": "A",
+          "typeAnnotation": {
+            "type": "TypeAnnotation",
+            "start": 18,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 26
+              }
+            },
+            "typeAnnotation": {
+              "type": "FunctionTypeAnnotation",
+              "start": 18,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 26
+                }
+              },
+              "typeParameters": null,
+              "params": [],
+              "rest": null,
+              "returnType": {
+                "type": "VoidTypeAnnotation",
+                "start": 22,
+                "end": 26,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 26
+                  }
+                }
+              }
+            }
+          }
+        },
+        "predicate": null
+      },
+      {
+        "type": "DeclareFunction",
+        "start": 28,
+        "end": 55,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 27
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 45,
+          "end": 54,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 17
+            },
+            "end": {
+              "line": 2,
+              "column": 26
+            },
+            "identifierName": "A"
+          },
+          "name": "A",
+          "typeAnnotation": {
+            "type": "TypeAnnotation",
+            "start": 46,
+            "end": 54,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 18
+              },
+              "end": {
+                "line": 2,
+                "column": 26
+              }
+            },
+            "typeAnnotation": {
+              "type": "FunctionTypeAnnotation",
+              "start": 46,
+              "end": 54,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 18
+                },
+                "end": {
+                  "line": 2,
+                  "column": 26
+                }
+              },
+              "typeParameters": null,
+              "params": [],
+              "rest": null,
+              "returnType": {
+                "type": "VoidTypeAnnotation",
+                "start": 50,
+                "end": 54,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 26
+                  }
+                }
+              }
+            }
+          }
+        },
+        "predicate": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-var/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-var/input.js
new file mode 100644
index 000000000000..e1e2e647fa89
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-var/input.js
@@ -0,0 +1,2 @@
+declare function A(): void;
+declare var A: number;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-var/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-var/options.json
new file mode 100644
index 000000000000..81dc2c90799f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-declare-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-func/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-func/input.js
new file mode 100644
index 000000000000..ccce4b510933
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-func/input.js
@@ -0,0 +1,2 @@
+declare function A(): void;
+function A() {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-func/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-func/options.json
new file mode 100644
index 000000000000..5f6027f8dd3b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-func/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-let/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-let/input.js
new file mode 100644
index 000000000000..58df0295d818
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-let/input.js
@@ -0,0 +1,2 @@
+declare function A(): number;
+let A;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-let/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-let/options.json
new file mode 100644
index 000000000000..b6ff3a4b0987
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-func-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-interface-declare-class/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-interface-declare-class/input.js
new file mode 100644
index 000000000000..ab4fe6e51ff7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-interface-declare-class/input.js
@@ -0,0 +1,2 @@
+declare interface A {}
+declare class A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-interface-declare-class/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-interface-declare-class/options.json
new file mode 100644
index 000000000000..4a1b4e5c5cd4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-interface-declare-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:14)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-declare-var/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-declare-var/input.js
new file mode 100644
index 000000000000..7e5419c9a6c5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-declare-var/input.js
@@ -0,0 +1,2 @@
+declare var A: number;
+declare var A: number;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-declare-var/output.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-declare-var/output.json
new file mode 100644
index 000000000000..532ca8848c0b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-declare-var/output.json
@@ -0,0 +1,159 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 45,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 22
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 45,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 22
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "DeclareVariable",
+        "start": 0,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 22
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 12,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            },
+            "identifierName": "A"
+          },
+          "name": "A",
+          "typeAnnotation": {
+            "type": "TypeAnnotation",
+            "start": 13,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              }
+            },
+            "typeAnnotation": {
+              "type": "NumberTypeAnnotation",
+              "start": 15,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 15
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                }
+              }
+            }
+          }
+        }
+      },
+      {
+        "type": "DeclareVariable",
+        "start": 23,
+        "end": 45,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 22
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 35,
+          "end": 44,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 21
+            },
+            "identifierName": "A"
+          },
+          "name": "A",
+          "typeAnnotation": {
+            "type": "TypeAnnotation",
+            "start": 36,
+            "end": 44,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 13
+              },
+              "end": {
+                "line": 2,
+                "column": 21
+              }
+            },
+            "typeAnnotation": {
+              "type": "NumberTypeAnnotation",
+              "start": 38,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 15
+                },
+                "end": {
+                  "line": 2,
+                  "column": 21
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-let/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-let/input.js
new file mode 100644
index 000000000000..8e7279314635
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-let/input.js
@@ -0,0 +1,2 @@
+declare var A: number;
+let A;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-let/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-let/options.json
new file mode 100644
index 000000000000..b6ff3a4b0987
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-declare-var-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-interface-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-interface-interface/input.js
new file mode 100644
index 000000000000..5f780ecff9a5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-interface-interface/input.js
@@ -0,0 +1,2 @@
+interface A {}
+interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-interface-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-interface-interface/options.json
new file mode 100644
index 000000000000..04242bd1565b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-interface-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-class/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-class/input.js
new file mode 100644
index 000000000000..61596821e374
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-class/input.js
@@ -0,0 +1,2 @@
+let A = 1;
+declare class A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-class/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-class/options.json
new file mode 100644
index 000000000000..4a1b4e5c5cd4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:14)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-interface/input.js
new file mode 100644
index 000000000000..97428603f0e4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-interface/input.js
@@ -0,0 +1,2 @@
+let A = 1;
+declare interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-interface/options.json
new file mode 100644
index 000000000000..187fea591b95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-declare-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:18)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-interface/input.js
new file mode 100644
index 000000000000..2e575bbc693d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-interface/input.js
@@ -0,0 +1,2 @@
+let A = 1;
+interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-interface/options.json
new file mode 100644
index 000000000000..04242bd1565b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-let-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-type-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-type-interface/input.js
new file mode 100644
index 000000000000..38b60058911b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-type-interface/input.js
@@ -0,0 +1,2 @@
+type A = number;
+interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-type-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-type-interface/options.json
new file mode 100644
index 000000000000..04242bd1565b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-type-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-class/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-class/input.js
new file mode 100644
index 000000000000..c534e4739b49
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-class/input.js
@@ -0,0 +1,2 @@
+var A = 1;
+declare class A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-class/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-class/options.json
new file mode 100644
index 000000000000..4a1b4e5c5cd4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:14)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-interface/input.js
new file mode 100644
index 000000000000..07a1fa47aab2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-interface/input.js
@@ -0,0 +1,2 @@
+var A = 1;
+declare interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-interface/options.json
new file mode 100644
index 000000000000..187fea591b95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-declare-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:18)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-interface/input.js b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-interface/input.js
new file mode 100644
index 000000000000..70f7e73cc0ae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-interface/input.js
@@ -0,0 +1,2 @@
+var A = 1;
+interface A {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-interface/options.json b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-interface/options.json
new file mode 100644
index 000000000000..04242bd1565b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/.dupl-decl-var-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/abcdef/input.js b/packages/babel-parser/test/fixtures/flow/scope/abcdef/input.js
new file mode 100644
index 000000000000..10c5350cb9b2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/abcdef/input.js
@@ -0,0 +1,5 @@
+function f() {
+  const g = true ? foo => {}: null;
+
+  const foo = 'foo'
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/abcdef/output.json b/packages/babel-parser/test/fixtures/flow/scope/abcdef/output.json
new file mode 100644
index 000000000000..e743dd0477a6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/abcdef/output.json
@@ -0,0 +1,308 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 73,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 73,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 73,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 13,
+          "end": 73,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "VariableDeclaration",
+              "start": 17,
+              "end": 50,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 35
+                }
+              },
+              "declarations": [
+                {
+                  "type": "VariableDeclarator",
+                  "start": 23,
+                  "end": 49,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 34
+                    }
+                  },
+                  "id": {
+                    "type": "Identifier",
+                    "start": 23,
+                    "end": 24,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 9
+                      },
+                      "identifierName": "g"
+                    },
+                    "name": "g"
+                  },
+                  "init": {
+                    "type": "ConditionalExpression",
+                    "start": 27,
+                    "end": 49,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 34
+                      }
+                    },
+                    "test": {
+                      "type": "BooleanLiteral",
+                      "start": 27,
+                      "end": 31,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 16
+                        }
+                      },
+                      "value": true
+                    },
+                    "consequent": {
+                      "type": "ArrowFunctionExpression",
+                      "start": 34,
+                      "end": 43,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 19
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 28
+                        }
+                      },
+                      "id": null,
+                      "generator": false,
+                      "async": false,
+                      "params": [
+                        {
+                          "type": "Identifier",
+                          "start": 34,
+                          "end": 37,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 19
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 22
+                            },
+                            "identifierName": "foo"
+                          },
+                          "name": "foo"
+                        }
+                      ],
+                      "body": {
+                        "type": "BlockStatement",
+                        "start": 41,
+                        "end": 43,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 26
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 28
+                          }
+                        },
+                        "body": [],
+                        "directives": []
+                      }
+                    },
+                    "alternate": {
+                      "type": "NullLiteral",
+                      "start": 45,
+                      "end": 49,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 30
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 34
+                        }
+                      }
+                    }
+                  }
+                }
+              ],
+              "kind": "const"
+            },
+            {
+              "type": "VariableDeclaration",
+              "start": 54,
+              "end": 71,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 2
+                },
+                "end": {
+                  "line": 4,
+                  "column": 19
+                }
+              },
+              "declarations": [
+                {
+                  "type": "VariableDeclarator",
+                  "start": 60,
+                  "end": 71,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 19
+                    }
+                  },
+                  "id": {
+                    "type": "Identifier",
+                    "start": 60,
+                    "end": 63,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 11
+                      },
+                      "identifierName": "foo"
+                    },
+                    "name": "foo"
+                  },
+                  "init": {
+                    "type": "StringLiteral",
+                    "start": 66,
+                    "end": 71,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 19
+                      }
+                    },
+                    "extra": {
+                      "rawValue": "foo",
+                      "raw": "'foo'"
+                    },
+                    "value": "foo"
+                  }
+                }
+              ],
+              "kind": "const"
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/scope/declare-module/input.js b/packages/babel-parser/test/fixtures/flow/scope/declare-module/input.js
new file mode 100644
index 000000000000..3b25537ffca6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/declare-module/input.js
@@ -0,0 +1,5 @@
+declare module A {
+  declare class X {}
+}
+
+class X {}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/declare-module/output.json b/packages/babel-parser/test/fixtures/flow/scope/declare-module/output.json
new file mode 100644
index 000000000000..672f98d0ad8c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/declare-module/output.json
@@ -0,0 +1,190 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 53,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 53,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "DeclareModule",
+        "start": 0,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start": 17,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "DeclareClass",
+              "start": 21,
+              "end": 39,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 20
+                }
+              },
+              "id": {
+                "type": "Identifier",
+                "start": 35,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 17
+                  },
+                  "identifierName": "X"
+                },
+                "name": "X"
+              },
+              "typeParameters": null,
+              "extends": [],
+              "implements": [],
+              "mixins": [],
+              "body": {
+                "type": "ObjectTypeAnnotation",
+                "start": 37,
+                "end": 39,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 20
+                  }
+                },
+                "callProperties": [],
+                "properties": [],
+                "indexers": [],
+                "internalSlots": [],
+                "exact": false
+              }
+            }
+          ]
+        },
+        "kind": "CommonJS"
+      },
+      {
+        "type": "ClassDeclaration",
+        "start": 43,
+        "end": 53,
+        "loc": {
+          "start": {
+            "line": 5,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 10
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 49,
+          "end": 50,
+          "loc": {
+            "start": {
+              "line": 5,
+              "column": 6
+            },
+            "end": {
+              "line": 5,
+              "column": 7
+            },
+            "identifierName": "X"
+          },
+          "name": "X"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 51,
+          "end": 53,
+          "loc": {
+            "start": {
+              "line": 5,
+              "column": 8
+            },
+            "end": {
+              "line": 5,
+              "column": 10
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-opaque-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-opaque-type/input.js
new file mode 100644
index 000000000000..22286388e087
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-opaque-type/input.js
@@ -0,0 +1,2 @@
+const A = 1;
+opaque type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-opaque-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-opaque-type/options.json
new file mode 100644
index 000000000000..81dc2c90799f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-opaque-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-type/input.js
new file mode 100644
index 000000000000..09676cc69535
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-type/input.js
@@ -0,0 +1,2 @@
+const A = 1;
+type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-type/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-const-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-opaque-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-opaque-type/input.js
new file mode 100644
index 000000000000..f388a626baa6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-opaque-type/input.js
@@ -0,0 +1,2 @@
+let A = 1;
+opaque type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-opaque-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-opaque-type/options.json
new file mode 100644
index 000000000000..81dc2c90799f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-opaque-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-type/input.js
new file mode 100644
index 000000000000..acd0aedaa643
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-type/input.js
@@ -0,0 +1,2 @@
+let A = 1;
+type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-type/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-let-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-const/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-const/input.js
new file mode 100644
index 000000000000..68252d13d604
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-const/input.js
@@ -0,0 +1,2 @@
+opaque type A = {};
+const A = 1;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-const/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-const/options.json
new file mode 100644
index 000000000000..336686170eb0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-const/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-let/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-let/input.js
new file mode 100644
index 000000000000..cb701d75b873
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-let/input.js
@@ -0,0 +1,2 @@
+opaque type A = {};
+let A = 1;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-let/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-let/options.json
new file mode 100644
index 000000000000..b6ff3a4b0987
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-opaque-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-opaque-type/input.js
new file mode 100644
index 000000000000..ea475eaf7548
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-opaque-type/input.js
@@ -0,0 +1,2 @@
+opaque type A = {};
+opaque type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-opaque-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-opaque-type/options.json
new file mode 100644
index 000000000000..81dc2c90799f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-opaque-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-type/input.js
new file mode 100644
index 000000000000..9f3827951edb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-type/input.js
@@ -0,0 +1,2 @@
+opaque type A = {};
+type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-type/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-var/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-var/input.js
new file mode 100644
index 000000000000..265278011940
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-var/input.js
@@ -0,0 +1,2 @@
+opaque type A = {};
+var A = 1;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-var/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-var/options.json
new file mode 100644
index 000000000000..b6ff3a4b0987
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-opaque-type-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-const/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-const/input.js
new file mode 100644
index 000000000000..2b045e915ada
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-const/input.js
@@ -0,0 +1,2 @@
+type A = {};
+const A = 1;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-const/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-const/options.json
new file mode 100644
index 000000000000..336686170eb0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-const/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-let/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-let/input.js
new file mode 100644
index 000000000000..c827929c6d17
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-let/input.js
@@ -0,0 +1,2 @@
+type A = {};
+let A = 1;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-let/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-let/options.json
new file mode 100644
index 000000000000..b6ff3a4b0987
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-opaque-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-opaque-type/input.js
new file mode 100644
index 000000000000..03d17d1612aa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-opaque-type/input.js
@@ -0,0 +1,2 @@
+type A = {};
+opaque type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-opaque-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-opaque-type/options.json
new file mode 100644
index 000000000000..81dc2c90799f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-opaque-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-type/input.js
new file mode 100644
index 000000000000..72146f415607
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-type/input.js
@@ -0,0 +1,2 @@
+type A = {};
+type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-type/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-var/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-var/input.js
new file mode 100644
index 000000000000..04e932fa9c8a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-var/input.js
@@ -0,0 +1,2 @@
+type A = {};
+var A = 1;
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-var/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-var/options.json
new file mode 100644
index 000000000000..b6ff3a4b0987
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-type-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-opaque-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-opaque-type/input.js
new file mode 100644
index 000000000000..e4d5ab41ec30
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-opaque-type/input.js
@@ -0,0 +1,2 @@
+var A = 1;
+opaque type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-opaque-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-opaque-type/options.json
new file mode 100644
index 000000000000..81dc2c90799f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-opaque-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:12)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-type/input.js b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-type/input.js
new file mode 100644
index 000000000000..3427e135d606
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-type/input.js
@@ -0,0 +1,2 @@
+var A = 1;
+type A = {};
diff --git a/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-type/options.json b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-type/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/scope/dupl-decl-var-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/input.js b/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/input.js
index f0afdd16f8e5..cd488659aca6 100644
--- a/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/input.js
+++ b/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/input.js
@@ -1,2 +1,2 @@
 export type Foo = number;
-export opaque type Foo = number;
+export opaque type Foo2 = number;
diff --git a/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/output.json b/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/output.json
index fc72d6467694..70d30bbe8a92 100644
--- a/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/output.json
+++ b/packages/babel-parser/test/fixtures/flow/sourcetype-script/export-named/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 58,
+  "end": 59,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 2,
-      "column": 32
+      "column": 33
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 58,
+    "end": 59,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 2,
-        "column": 32
+        "column": 33
       }
     },
     "sourceType": "script",
@@ -98,7 +98,7 @@
       {
         "type": "ExportNamedDeclaration",
         "start": 26,
-        "end": 58,
+        "end": 59,
         "loc": {
           "start": {
             "line": 2,
@@ -106,7 +106,7 @@
           },
           "end": {
             "line": 2,
-            "column": 32
+            "column": 33
           }
         },
         "specifiers": [],
@@ -115,7 +115,7 @@
         "declaration": {
           "type": "OpaqueType",
           "start": 33,
-          "end": 58,
+          "end": 59,
           "loc": {
             "start": {
               "line": 2,
@@ -123,13 +123,13 @@
             },
             "end": {
               "line": 2,
-              "column": 32
+              "column": 33
             }
           },
           "id": {
             "type": "Identifier",
             "start": 45,
-            "end": 48,
+            "end": 49,
             "loc": {
               "start": {
                 "line": 2,
@@ -137,26 +137,26 @@
               },
               "end": {
                 "line": 2,
-                "column": 22
+                "column": 23
               },
-              "identifierName": "Foo"
+              "identifierName": "Foo2"
             },
-            "name": "Foo"
+            "name": "Foo2"
           },
           "typeParameters": null,
           "supertype": null,
           "impltype": {
             "type": "NumberTypeAnnotation",
-            "start": 51,
-            "end": 57,
+            "start": 52,
+            "end": 58,
             "loc": {
               "start": {
                 "line": 2,
-                "column": 25
+                "column": 26
               },
               "end": {
                 "line": 2,
-                "column": 31
+                "column": 32
               }
             }
           }
diff --git a/packages/babel-parser/test/fixtures/flow/type-alias/4/output.json b/packages/babel-parser/test/fixtures/flow/type-alias/4/output.json
index c7bc62245446..a1ff7e2786c1 100644
--- a/packages/babel-parser/test/fixtures/flow/type-alias/4/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-alias/4/output.json
@@ -153,7 +153,8 @@
               ],
               "indexers": [],
               "internalSlots": [],
-              "exact": false
+              "exact": false,
+              "inexact": false
             },
             {
               "type": "ObjectTypeAnnotation",
@@ -232,7 +233,8 @@
               ],
               "indexers": [],
               "internalSlots": [],
-              "exact": false
+              "exact": false,
+              "inexact": false
             }
           ]
         }
@@ -626,7 +628,8 @@
                     ],
                     "indexers": [],
                     "internalSlots": [],
-                    "exact": false
+                    "exact": false,
+                    "inexact": false
                   },
                   {
                     "type": "ObjectTypeAnnotation",
@@ -705,7 +708,8 @@
                     ],
                     "indexers": [],
                     "internalSlots": [],
-                    "exact": false
+                    "exact": false,
+                    "inexact": false
                   }
                 ]
               },
@@ -715,7 +719,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       },
       {
@@ -893,7 +898,8 @@
                     ],
                     "indexers": [],
                     "internalSlots": [],
-                    "exact": false
+                    "exact": false,
+                    "inexact": false
                   },
                   {
                     "type": "ObjectTypeAnnotation",
@@ -972,7 +978,8 @@
                     ],
                     "indexers": [],
                     "internalSlots": [],
-                    "exact": false
+                    "exact": false,
+                    "inexact": false
                   }
                 ]
               },
@@ -982,7 +989,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-alias/5/5.js b/packages/babel-parser/test/fixtures/flow/type-alias/5/input.js
similarity index 100%
rename from packages/babel-parser/test/fixtures/flow/type-alias/5/5.js
rename to packages/babel-parser/test/fixtures/flow/type-alias/5/input.js
diff --git a/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json b/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json
index 3a2bf08816ad..75a8bc8b79e1 100644
--- a/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-alias/5/output.json
@@ -1,34 +1,553 @@
 {
   "type": "File",
   "start": 0,
-  "end": 0,
+  "end": 98,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 0
+      "line": 9,
+      "column": 2
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 0,
+    "end": 98,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 0
+        "line": 9,
+        "column": 2
       }
     },
     "sourceType": "module",
     "interpreter": null,
-    "body": [],
+    "body": [
+      {
+        "type": "TypeAlias",
+        "start": 0,
+        "end": 48,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 2
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "GenericTypeAnnotation",
+          "start": 9,
+          "end": 47,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "typeParameters": {
+            "type": "TypeParameterInstantiation",
+            "start": 12,
+            "end": 47,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 12
+              },
+              "end": {
+                "line": 4,
+                "column": 1
+              }
+            },
+            "params": [
+              {
+                "type": "UnionTypeAnnotation",
+                "start": 16,
+                "end": 45,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 15
+                  }
+                },
+                "types": [
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 18,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 19,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 19,
+                          "end": 23,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 25,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "A",
+                            "raw": "\"A\""
+                          },
+                          "value": "A"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  },
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 34,
+                    "end": 45,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 35,
+                        "end": 44,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 35,
+                          "end": 39,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 41,
+                          "end": 44,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "B",
+                            "raw": "\"B\""
+                          },
+                          "value": "B"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  }
+                ]
+              }
+            ]
+          },
+          "id": {
+            "type": "Identifier",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              },
+              "identifierName": "Foo"
+            },
+            "name": "Foo"
+          }
+        }
+      },
+      {
+        "type": "TypeAlias",
+        "start": 50,
+        "end": 98,
+        "loc": {
+          "start": {
+            "line": 6,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 2
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 55,
+          "end": 56,
+          "loc": {
+            "start": {
+              "line": 6,
+              "column": 5
+            },
+            "end": {
+              "line": 6,
+              "column": 6
+            },
+            "identifierName": "B"
+          },
+          "name": "B"
+        },
+        "typeParameters": null,
+        "right": {
+          "type": "GenericTypeAnnotation",
+          "start": 59,
+          "end": 97,
+          "loc": {
+            "start": {
+              "line": 6,
+              "column": 9
+            },
+            "end": {
+              "line": 9,
+              "column": 1
+            }
+          },
+          "typeParameters": {
+            "type": "TypeParameterInstantiation",
+            "start": 62,
+            "end": 97,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 12
+              },
+              "end": {
+                "line": 9,
+                "column": 1
+              }
+            },
+            "params": [
+              {
+                "type": "IntersectionTypeAnnotation",
+                "start": 66,
+                "end": 95,
+                "loc": {
+                  "start": {
+                    "line": 7,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 15
+                  }
+                },
+                "types": [
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 68,
+                    "end": 79,
+                    "loc": {
+                      "start": {
+                        "line": 7,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 7,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 69,
+                        "end": 78,
+                        "loc": {
+                          "start": {
+                            "line": 7,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 7,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 69,
+                          "end": 73,
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 75,
+                          "end": 78,
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "A",
+                            "raw": "\"A\""
+                          },
+                          "value": "A"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  },
+                  {
+                    "type": "ObjectTypeAnnotation",
+                    "start": 84,
+                    "end": 95,
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 15
+                      }
+                    },
+                    "callProperties": [],
+                    "properties": [
+                      {
+                        "type": "ObjectTypeProperty",
+                        "start": 85,
+                        "end": 94,
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 14
+                          }
+                        },
+                        "key": {
+                          "type": "Identifier",
+                          "start": 85,
+                          "end": 89,
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 5
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 9
+                            },
+                            "identifierName": "type"
+                          },
+                          "name": "type"
+                        },
+                        "static": false,
+                        "proto": false,
+                        "kind": "init",
+                        "method": false,
+                        "value": {
+                          "type": "StringLiteralTypeAnnotation",
+                          "start": 91,
+                          "end": 94,
+                          "loc": {
+                            "start": {
+                              "line": 8,
+                              "column": 11
+                            },
+                            "end": {
+                              "line": 8,
+                              "column": 14
+                            }
+                          },
+                          "extra": {
+                            "rawValue": "B",
+                            "raw": "\"B\""
+                          },
+                          "value": "B"
+                        },
+                        "variance": null,
+                        "optional": false
+                      }
+                    ],
+                    "indexers": [],
+                    "internalSlots": [],
+                    "exact": false,
+                    "inexact": false
+                  }
+                ]
+              }
+            ]
+          },
+          "id": {
+            "type": "Identifier",
+            "start": 59,
+            "end": 62,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 9
+              },
+              "end": {
+                "line": 6,
+                "column": 12
+              },
+              "identifierName": "Foo"
+            },
+            "name": "Foo"
+          }
+        }
+      }
+    ],
     "directives": []
   }
 }
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/108/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/108/output.json
index 59d32d37d0fb..a3e8ba642bf2 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/108/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/108/output.json
@@ -213,7 +213,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": true
+                  "exact": true,
+                  "inexact": false
                 }
               }
             },
@@ -532,7 +533,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": true
+                  "exact": true,
+                  "inexact": false
                 }
               }
             },
@@ -744,7 +746,8 @@
                   "properties": [],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": true
+                  "exact": true,
+                  "inexact": false
                 }
               }
             },
@@ -1003,7 +1006,8 @@
                         ],
                         "indexers": [],
                         "internalSlots": [],
-                        "exact": true
+                        "exact": true,
+                        "inexact": false
                       },
                       "variance": null,
                       "optional": false
@@ -1064,7 +1068,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
@@ -1537,7 +1542,8 @@
                         ],
                         "indexers": [],
                         "internalSlots": [],
-                        "exact": false
+                        "exact": false,
+                        "inexact": false
                       },
                       "variance": null,
                       "optional": false
@@ -1598,7 +1604,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": true
+                  "exact": true,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/110/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/110/output.json
index 4929bc3d478f..4b3587d4c8a8 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/110/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/110/output.json
@@ -166,7 +166,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/111/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/111/output.json
index afb693e33614..ec02ec57394d 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/111/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/111/output.json
@@ -166,7 +166,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/114/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/114/output.json
index 0cb28d6e0fd3..ed6301370237 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/114/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/114/output.json
@@ -195,7 +195,8 @@
             }
           ],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/115/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/115/output.json
index da040897ade4..df1f40c30646 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/115/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/115/output.json
@@ -195,7 +195,8 @@
             }
           ],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/127/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/127/output.json
index 4d08cf624407..165aac2e4caa 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/127/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/127/output.json
@@ -128,7 +128,8 @@
             }
           ],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/128/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/128/output.json
index cf23e569d27c..345675c7e135 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/128/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/128/output.json
@@ -160,7 +160,8 @@
             }
           ],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json
index bb5c8425acd9..50bea8a5db27 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/131/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type number (1:5)"
+  "throws": "Cannot overwrite reserved type number (1:5)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json
index 0148048697b7..257d651b33e2 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/132/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type number (1:9)"
+  "throws": "Cannot overwrite reserved type number (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json
index fb0222c596f6..2c7a5836d8bc 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/133/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:11)"
+  "throws": "Cannot overwrite reserved type string (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json
index 839b0e04eff9..396a14ca22d4 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/134/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type bool (1:13)"
+  "throws": "Cannot overwrite reserved type bool (1:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/135/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/135/output.json
index aa8891c0b701..ce7e04fe7836 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/135/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/135/output.json
@@ -110,7 +110,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/136/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/136/output.json
index f2a1f069cffc..bdd81eaa2c09 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/136/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/136/output.json
@@ -130,7 +130,8 @@
                 "properties": [],
                 "indexers": [],
                 "internalSlots": [],
-                "exact": false
+                "exact": false,
+                "inexact": false
               },
               "variance": null,
               "optional": false
@@ -167,13 +168,15 @@
                 "properties": [],
                 "indexers": [],
                 "internalSlots": [],
-                "exact": false
+                "exact": false,
+                "inexact": false
               }
             }
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/137/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/137/options.json
index f4cabf034ae4..786acad32af0 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/137/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/137/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Spread operator cannot appear in class or interface definitions (2:1)"
+  "throws": "Spread operator cannot appear in class or interface definitions (2:1)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/138/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/138/output.json
index 1987550217b1..6e48beeb05dc 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/138/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/138/output.json
@@ -276,7 +276,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/16/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/16/output.json
index 4db03aa8f5aa..59fe3a8d364e 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/16/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/16/output.json
@@ -96,7 +96,8 @@
             "properties": [],
             "indexers": [],
             "internalSlots": [],
-            "exact": false
+            "exact": false,
+            "inexact": false
           }
         },
         "body": {
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/32/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/32/output.json
index 6e85ab61db4e..70cbbd4fef08 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/32/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/32/output.json
@@ -160,7 +160,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/33/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/33/output.json
index 5b4664821d6c..1ef29b3b8bb6 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/33/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/33/output.json
@@ -160,7 +160,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/34/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/34/output.json
index e0cef862f368..b389c49201ad 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/34/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/34/output.json
@@ -225,7 +225,8 @@
                     }
                   ],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/35/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/35/output.json
index 42d9e07ef5fd..cc227490d30a 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/35/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/35/output.json
@@ -174,7 +174,8 @@
                     ],
                     "indexers": [],
                     "internalSlots": [],
-                    "exact": false
+                    "exact": false,
+                    "inexact": false
                   }
                 }
               }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/36/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/36/output.json
index fee4f6be4559..431aa501bc4d 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/36/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/36/output.json
@@ -213,7 +213,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/37/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/37/output.json
index 24897a890d17..428bb08cb9aa 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/37/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/37/output.json
@@ -211,7 +211,8 @@
                         ],
                         "indexers": [],
                         "internalSlots": [],
-                        "exact": false
+                        "exact": false,
+                        "inexact": false
                       },
                       "variance": null,
                       "optional": false
@@ -219,7 +220,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/38/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/38/output.json
index 537525fd5058..0e133ba1cfbc 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/38/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/38/output.json
@@ -225,7 +225,8 @@
                           ],
                           "indexers": [],
                           "internalSlots": [],
-                          "exact": false
+                          "exact": false,
+                          "inexact": false
                         }
                       },
                       "variance": null,
@@ -234,7 +235,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/39/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/39/output.json
index fe3cbacc4b91..03cc703ab871 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/39/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/39/output.json
@@ -213,7 +213,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/40/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/40/output.json
index ed33244fe9cb..2cfc8de95973 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/40/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/40/output.json
@@ -213,7 +213,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/41/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/41/output.json
index 9e2c759153b9..2f073e822eff 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/41/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/41/output.json
@@ -235,7 +235,8 @@
                     }
                   ],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/42/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/42/output.json
index 446275326eff..b918a1e51b0a 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/42/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/42/output.json
@@ -322,7 +322,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/43/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/43/output.json
index 027091719c88..05ff2466b98b 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/43/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/43/output.json
@@ -295,7 +295,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/60/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/60/output.json
index 1f013f7840a1..cfa5f6db54cc 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/60/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/60/output.json
@@ -215,7 +215,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/61/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/61/output.json
index c26e02abf8ad..25d46071b872 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/61/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/61/output.json
@@ -215,7 +215,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/63/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/63/output.json
index 7311b8c2411e..e9fb827b5b7d 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/63/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/63/output.json
@@ -220,7 +220,8 @@
                 ],
                 "indexers": [],
                 "internalSlots": [],
-                "exact": false
+                "exact": false,
+                "inexact": false
               }
             }
           }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/98/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/98/output.json
index 669cab2fd5e9..6a24cf2f1e35 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/98/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/98/output.json
@@ -266,7 +266,8 @@
                   ],
                   "indexers": [],
                   "internalSlots": [],
-                  "exact": false
+                  "exact": false,
+                  "inexact": false
                 }
               }
             },
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/input.js b/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/input.js
index 777868f31ed8..04fd627b994e 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/input.js
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/input.js
@@ -1,16 +1,16 @@
 // bounds
-type T = any;
-type T = mixed;
-type T = empty;
+type T1 = any;
+type T2 = mixed;
+type T3 = empty;
 // builtins
-type T = void;
-type T = number;
-type T = string;
-type T = bool;
-type T = boolean;
+type T4 = void;
+type T5 = number;
+type T6 = string;
+type T7 = bool;
+type T8 = boolean;
 // literal type annotations
-type T = null;
-type T = "";
-type T = 0;
-type T = true;
-type T = false;
+type T9 = null;
+type T10 = "";
+type T11 = 0;
+type T12 = true;
+type T13 = false;
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/output.json
index 379ea71424c4..9b3179172293 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/builtin/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 248,
+  "end": 265,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 16,
-      "column": 15
+      "column": 17
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 248,
+    "end": 265,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 16,
-        "column": 15
+        "column": 17
       }
     },
     "sourceType": "module",
@@ -32,7 +32,7 @@
       {
         "type": "TypeAlias",
         "start": 10,
-        "end": 23,
+        "end": 24,
         "loc": {
           "start": {
             "line": 2,
@@ -40,13 +40,13 @@
           },
           "end": {
             "line": 2,
-            "column": 13
+            "column": 14
           }
         },
         "id": {
           "type": "Identifier",
           "start": 15,
-          "end": 16,
+          "end": 17,
           "loc": {
             "start": {
               "line": 2,
@@ -54,25 +54,25 @@
             },
             "end": {
               "line": 2,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T1"
           },
-          "name": "T"
+          "name": "T1"
         },
         "typeParameters": null,
         "right": {
           "type": "AnyTypeAnnotation",
-          "start": 19,
-          "end": 22,
+          "start": 20,
+          "end": 23,
           "loc": {
             "start": {
               "line": 2,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 2,
-              "column": 12
+              "column": 13
             }
           }
         },
@@ -97,8 +97,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 24,
-        "end": 39,
+        "start": 25,
+        "end": 41,
         "loc": {
           "start": {
             "line": 3,
@@ -106,13 +106,13 @@
           },
           "end": {
             "line": 3,
-            "column": 15
+            "column": 16
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 29,
-          "end": 30,
+          "start": 30,
+          "end": 32,
           "loc": {
             "start": {
               "line": 3,
@@ -120,33 +120,33 @@
             },
             "end": {
               "line": 3,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T2"
           },
-          "name": "T"
+          "name": "T2"
         },
         "typeParameters": null,
         "right": {
           "type": "MixedTypeAnnotation",
-          "start": 33,
-          "end": 38,
+          "start": 35,
+          "end": 40,
           "loc": {
             "start": {
               "line": 3,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 3,
-              "column": 14
+              "column": 15
             }
           }
         }
       },
       {
         "type": "TypeAlias",
-        "start": 40,
-        "end": 55,
+        "start": 42,
+        "end": 58,
         "loc": {
           "start": {
             "line": 4,
@@ -154,13 +154,13 @@
           },
           "end": {
             "line": 4,
-            "column": 15
+            "column": 16
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 45,
-          "end": 46,
+          "start": 47,
+          "end": 49,
           "loc": {
             "start": {
               "line": 4,
@@ -168,25 +168,25 @@
             },
             "end": {
               "line": 4,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T3"
           },
-          "name": "T"
+          "name": "T3"
         },
         "typeParameters": null,
         "right": {
           "type": "EmptyTypeAnnotation",
-          "start": 49,
-          "end": 54,
+          "start": 52,
+          "end": 57,
           "loc": {
             "start": {
               "line": 4,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 4,
-              "column": 14
+              "column": 15
             }
           }
         },
@@ -194,8 +194,8 @@
           {
             "type": "CommentLine",
             "value": " builtins",
-            "start": 56,
-            "end": 67,
+            "start": 59,
+            "end": 70,
             "loc": {
               "start": {
                 "line": 5,
@@ -211,8 +211,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 68,
-        "end": 82,
+        "start": 71,
+        "end": 86,
         "loc": {
           "start": {
             "line": 6,
@@ -220,13 +220,13 @@
           },
           "end": {
             "line": 6,
-            "column": 14
+            "column": 15
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 73,
-          "end": 74,
+          "start": 76,
+          "end": 78,
           "loc": {
             "start": {
               "line": 6,
@@ -234,25 +234,25 @@
             },
             "end": {
               "line": 6,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T4"
           },
-          "name": "T"
+          "name": "T4"
         },
         "typeParameters": null,
         "right": {
           "type": "VoidTypeAnnotation",
-          "start": 77,
-          "end": 81,
+          "start": 81,
+          "end": 85,
           "loc": {
             "start": {
               "line": 6,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 6,
-              "column": 13
+              "column": 14
             }
           }
         },
@@ -260,8 +260,8 @@
           {
             "type": "CommentLine",
             "value": " builtins",
-            "start": 56,
-            "end": 67,
+            "start": 59,
+            "end": 70,
             "loc": {
               "start": {
                 "line": 5,
@@ -277,8 +277,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 83,
-        "end": 99,
+        "start": 87,
+        "end": 104,
         "loc": {
           "start": {
             "line": 7,
@@ -286,13 +286,13 @@
           },
           "end": {
             "line": 7,
-            "column": 16
+            "column": 17
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 88,
-          "end": 89,
+          "start": 92,
+          "end": 94,
           "loc": {
             "start": {
               "line": 7,
@@ -300,33 +300,33 @@
             },
             "end": {
               "line": 7,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T5"
           },
-          "name": "T"
+          "name": "T5"
         },
         "typeParameters": null,
         "right": {
           "type": "NumberTypeAnnotation",
-          "start": 92,
-          "end": 98,
+          "start": 97,
+          "end": 103,
           "loc": {
             "start": {
               "line": 7,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 7,
-              "column": 15
+              "column": 16
             }
           }
         }
       },
       {
         "type": "TypeAlias",
-        "start": 100,
-        "end": 116,
+        "start": 105,
+        "end": 122,
         "loc": {
           "start": {
             "line": 8,
@@ -334,13 +334,13 @@
           },
           "end": {
             "line": 8,
-            "column": 16
+            "column": 17
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 105,
-          "end": 106,
+          "start": 110,
+          "end": 112,
           "loc": {
             "start": {
               "line": 8,
@@ -348,33 +348,33 @@
             },
             "end": {
               "line": 8,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T6"
           },
-          "name": "T"
+          "name": "T6"
         },
         "typeParameters": null,
         "right": {
           "type": "StringTypeAnnotation",
-          "start": 109,
-          "end": 115,
+          "start": 115,
+          "end": 121,
           "loc": {
             "start": {
               "line": 8,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 8,
-              "column": 15
+              "column": 16
             }
           }
         }
       },
       {
         "type": "TypeAlias",
-        "start": 117,
-        "end": 131,
+        "start": 123,
+        "end": 138,
         "loc": {
           "start": {
             "line": 9,
@@ -382,13 +382,13 @@
           },
           "end": {
             "line": 9,
-            "column": 14
+            "column": 15
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 122,
-          "end": 123,
+          "start": 128,
+          "end": 130,
           "loc": {
             "start": {
               "line": 9,
@@ -396,33 +396,33 @@
             },
             "end": {
               "line": 9,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T7"
           },
-          "name": "T"
+          "name": "T7"
         },
         "typeParameters": null,
         "right": {
           "type": "BooleanTypeAnnotation",
-          "start": 126,
-          "end": 130,
+          "start": 133,
+          "end": 137,
           "loc": {
             "start": {
               "line": 9,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 9,
-              "column": 13
+              "column": 14
             }
           }
         }
       },
       {
         "type": "TypeAlias",
-        "start": 132,
-        "end": 149,
+        "start": 139,
+        "end": 157,
         "loc": {
           "start": {
             "line": 10,
@@ -430,13 +430,13 @@
           },
           "end": {
             "line": 10,
-            "column": 17
+            "column": 18
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 137,
-          "end": 138,
+          "start": 144,
+          "end": 146,
           "loc": {
             "start": {
               "line": 10,
@@ -444,25 +444,25 @@
             },
             "end": {
               "line": 10,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T8"
           },
-          "name": "T"
+          "name": "T8"
         },
         "typeParameters": null,
         "right": {
           "type": "BooleanTypeAnnotation",
-          "start": 141,
-          "end": 148,
+          "start": 149,
+          "end": 156,
           "loc": {
             "start": {
               "line": 10,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 10,
-              "column": 16
+              "column": 17
             }
           }
         },
@@ -470,8 +470,8 @@
           {
             "type": "CommentLine",
             "value": " literal type annotations",
-            "start": 150,
-            "end": 177,
+            "start": 158,
+            "end": 185,
             "loc": {
               "start": {
                 "line": 11,
@@ -487,8 +487,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 178,
-        "end": 192,
+        "start": 186,
+        "end": 201,
         "loc": {
           "start": {
             "line": 12,
@@ -496,13 +496,13 @@
           },
           "end": {
             "line": 12,
-            "column": 14
+            "column": 15
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 183,
-          "end": 184,
+          "start": 191,
+          "end": 193,
           "loc": {
             "start": {
               "line": 12,
@@ -510,25 +510,25 @@
             },
             "end": {
               "line": 12,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T9"
           },
-          "name": "T"
+          "name": "T9"
         },
         "typeParameters": null,
         "right": {
           "type": "NullLiteralTypeAnnotation",
-          "start": 187,
-          "end": 191,
+          "start": 196,
+          "end": 200,
           "loc": {
             "start": {
               "line": 12,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 12,
-              "column": 13
+              "column": 14
             }
           }
         },
@@ -536,8 +536,8 @@
           {
             "type": "CommentLine",
             "value": " literal type annotations",
-            "start": 150,
-            "end": 177,
+            "start": 158,
+            "end": 185,
             "loc": {
               "start": {
                 "line": 11,
@@ -553,8 +553,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 193,
-        "end": 205,
+        "start": 202,
+        "end": 216,
         "loc": {
           "start": {
             "line": 13,
@@ -562,13 +562,13 @@
           },
           "end": {
             "line": 13,
-            "column": 12
+            "column": 14
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 198,
-          "end": 199,
+          "start": 207,
+          "end": 210,
           "loc": {
             "start": {
               "line": 13,
@@ -576,25 +576,25 @@
             },
             "end": {
               "line": 13,
-              "column": 6
+              "column": 8
             },
-            "identifierName": "T"
+            "identifierName": "T10"
           },
-          "name": "T"
+          "name": "T10"
         },
         "typeParameters": null,
         "right": {
           "type": "StringLiteralTypeAnnotation",
-          "start": 202,
-          "end": 204,
+          "start": 213,
+          "end": 215,
           "loc": {
             "start": {
               "line": 13,
-              "column": 9
+              "column": 11
             },
             "end": {
               "line": 13,
-              "column": 11
+              "column": 13
             }
           },
           "extra": {
@@ -606,8 +606,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 206,
-        "end": 217,
+        "start": 217,
+        "end": 230,
         "loc": {
           "start": {
             "line": 14,
@@ -615,13 +615,13 @@
           },
           "end": {
             "line": 14,
-            "column": 11
+            "column": 13
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 211,
-          "end": 212,
+          "start": 222,
+          "end": 225,
           "loc": {
             "start": {
               "line": 14,
@@ -629,25 +629,25 @@
             },
             "end": {
               "line": 14,
-              "column": 6
+              "column": 8
             },
-            "identifierName": "T"
+            "identifierName": "T11"
           },
-          "name": "T"
+          "name": "T11"
         },
         "typeParameters": null,
         "right": {
           "type": "NumberLiteralTypeAnnotation",
-          "start": 215,
-          "end": 216,
+          "start": 228,
+          "end": 229,
           "loc": {
             "start": {
               "line": 14,
-              "column": 9
+              "column": 11
             },
             "end": {
               "line": 14,
-              "column": 10
+              "column": 12
             }
           },
           "extra": {
@@ -659,8 +659,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 218,
-        "end": 232,
+        "start": 231,
+        "end": 247,
         "loc": {
           "start": {
             "line": 15,
@@ -668,13 +668,13 @@
           },
           "end": {
             "line": 15,
-            "column": 14
+            "column": 16
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 223,
-          "end": 224,
+          "start": 236,
+          "end": 239,
           "loc": {
             "start": {
               "line": 15,
@@ -682,25 +682,25 @@
             },
             "end": {
               "line": 15,
-              "column": 6
+              "column": 8
             },
-            "identifierName": "T"
+            "identifierName": "T12"
           },
-          "name": "T"
+          "name": "T12"
         },
         "typeParameters": null,
         "right": {
           "type": "BooleanLiteralTypeAnnotation",
-          "start": 227,
-          "end": 231,
+          "start": 242,
+          "end": 246,
           "loc": {
             "start": {
               "line": 15,
-              "column": 9
+              "column": 11
             },
             "end": {
               "line": 15,
-              "column": 13
+              "column": 15
             }
           },
           "value": true
@@ -708,8 +708,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 233,
-        "end": 248,
+        "start": 248,
+        "end": 265,
         "loc": {
           "start": {
             "line": 16,
@@ -717,13 +717,13 @@
           },
           "end": {
             "line": 16,
-            "column": 15
+            "column": 17
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 238,
-          "end": 239,
+          "start": 253,
+          "end": 256,
           "loc": {
             "start": {
               "line": 16,
@@ -731,25 +731,25 @@
             },
             "end": {
               "line": 16,
-              "column": 6
+              "column": 8
             },
-            "identifierName": "T"
+            "identifierName": "T13"
           },
-          "name": "T"
+          "name": "T13"
         },
         "typeParameters": null,
         "right": {
           "type": "BooleanLiteralTypeAnnotation",
-          "start": 242,
-          "end": 247,
+          "start": 259,
+          "end": 264,
           "loc": {
             "start": {
               "line": 16,
-              "column": 9
+              "column": 11
             },
             "end": {
               "line": 16,
-              "column": 14
+              "column": 16
             }
           },
           "value": false
@@ -778,8 +778,8 @@
     {
       "type": "CommentLine",
       "value": " builtins",
-      "start": 56,
-      "end": 67,
+      "start": 59,
+      "end": 70,
       "loc": {
         "start": {
           "line": 5,
@@ -794,8 +794,8 @@
     {
       "type": "CommentLine",
       "value": " literal type annotations",
-      "start": 150,
-      "end": 177,
+      "start": 158,
+      "end": 185,
       "loc": {
         "start": {
           "line": 11,
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/function-is-valid-type/input.js b/packages/babel-parser/test/fixtures/flow/type-annotations/function-is-valid-type/input.js
new file mode 100644
index 000000000000..0a30a10d7808
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/function-is-valid-type/input.js
@@ -0,0 +1 @@
+function foo(a:function) {}
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/function-is-valid-type/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/function-is-valid-type/output.json
new file mode 100644
index 000000000000..056dc7de7b00
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/function-is-valid-type/output.json
@@ -0,0 +1,137 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 27,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 27
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 27,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 27
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 27
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "params": [
+          {
+            "type": "Identifier",
+            "start": 13,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 23
+              },
+              "identifierName": "a"
+            },
+            "name": "a",
+            "typeAnnotation": {
+              "type": "TypeAnnotation",
+              "start": 14,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 23
+                }
+              },
+              "typeAnnotation": {
+                "type": "Identifier",
+                "start": 15,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 23
+                  },
+                  "identifierName": "function"
+                },
+                "name": "function"
+              }
+            }
+          }
+        ],
+        "body": {
+          "type": "BlockStatement",
+          "start": 25,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 25
+            },
+            "end": {
+              "line": 1,
+              "column": 27
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/input.js b/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/input.js
index 216a4222b3bb..435219343e08 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/input.js
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/input.js
@@ -1,12 +1,12 @@
 type T = { a: () => void };
-type T = { a: <T>() => void };
-type T = { a(): void };
-type T = { a<T>(): void };
+type T1 = { a: <T>() => void };
+type T2 = { a(): void };
+type T3 = { a<T>(): void };
 
-type T = { (): number };
-type T = { <T>(x: T): number; }
+type T4 = { (): number };
+type T5 = { <T>(x: T): number; }
 
-declare class T { foo(): number; }
-declare class T { static foo(): number; }
-declare class T { (): number }
-declare class T { static (): number }
+declare class T6 { foo(): number; }
+declare class T7 { static foo(): number; }
+declare class T8 { (): number }
+declare class T9 { static (): number }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/output.json b/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/output.json
index 61c974a71802..49fb1b3a7b0d 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/object-type-method/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 314,
+  "end": 323,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 12,
-      "column": 37
+      "column": 38
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 314,
+    "end": 323,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 12,
-        "column": 37
+        "column": 38
       }
     },
     "sourceType": "module",
@@ -151,13 +151,14 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       },
       {
         "type": "TypeAlias",
         "start": 28,
-        "end": 58,
+        "end": 59,
         "loc": {
           "start": {
             "line": 2,
@@ -165,13 +166,13 @@
           },
           "end": {
             "line": 2,
-            "column": 30
+            "column": 31
           }
         },
         "id": {
           "type": "Identifier",
           "start": 33,
-          "end": 34,
+          "end": 35,
           "loc": {
             "start": {
               "line": 2,
@@ -179,55 +180,55 @@
             },
             "end": {
               "line": 2,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T1"
           },
-          "name": "T"
+          "name": "T1"
         },
         "typeParameters": null,
         "right": {
           "type": "ObjectTypeAnnotation",
-          "start": 37,
-          "end": 57,
+          "start": 38,
+          "end": 58,
           "loc": {
             "start": {
               "line": 2,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 2,
-              "column": 29
+              "column": 30
             }
           },
           "callProperties": [],
           "properties": [
             {
               "type": "ObjectTypeProperty",
-              "start": 39,
-              "end": 55,
+              "start": 40,
+              "end": 56,
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 11
+                  "column": 12
                 },
                 "end": {
                   "line": 2,
-                  "column": 27
+                  "column": 28
                 }
               },
               "key": {
                 "type": "Identifier",
-                "start": 39,
-                "end": 40,
+                "start": 40,
+                "end": 41,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 2,
-                    "column": 12
+                    "column": 13
                   },
                   "identifierName": "a"
                 },
@@ -239,45 +240,45 @@
               "method": false,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 42,
-                "end": 55,
+                "start": 43,
+                "end": 56,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 14
+                    "column": 15
                   },
                   "end": {
                     "line": 2,
-                    "column": 27
+                    "column": 28
                   }
                 },
                 "typeParameters": {
                   "type": "TypeParameterDeclaration",
-                  "start": 42,
-                  "end": 45,
+                  "start": 43,
+                  "end": 46,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 14
+                      "column": 15
                     },
                     "end": {
                       "line": 2,
-                      "column": 17
+                      "column": 18
                     }
                   },
                   "params": [
                     {
                       "type": "TypeParameter",
-                      "start": 43,
-                      "end": 44,
+                      "start": 44,
+                      "end": 45,
                       "loc": {
                         "start": {
                           "line": 2,
-                          "column": 15
+                          "column": 16
                         },
                         "end": {
                           "line": 2,
-                          "column": 16
+                          "column": 17
                         }
                       },
                       "name": "T",
@@ -289,16 +290,16 @@
                 "rest": null,
                 "returnType": {
                   "type": "VoidTypeAnnotation",
-                  "start": 51,
-                  "end": 55,
+                  "start": 52,
+                  "end": 56,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 23
+                      "column": 24
                     },
                     "end": {
                       "line": 2,
-                      "column": 27
+                      "column": 28
                     }
                   }
                 }
@@ -309,13 +310,14 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       },
       {
         "type": "TypeAlias",
-        "start": 59,
-        "end": 82,
+        "start": 60,
+        "end": 84,
         "loc": {
           "start": {
             "line": 3,
@@ -323,13 +325,13 @@
           },
           "end": {
             "line": 3,
-            "column": 23
+            "column": 24
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 64,
-          "end": 65,
+          "start": 65,
+          "end": 67,
           "loc": {
             "start": {
               "line": 3,
@@ -337,55 +339,55 @@
             },
             "end": {
               "line": 3,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T2"
           },
-          "name": "T"
+          "name": "T2"
         },
         "typeParameters": null,
         "right": {
           "type": "ObjectTypeAnnotation",
-          "start": 68,
-          "end": 81,
+          "start": 70,
+          "end": 83,
           "loc": {
             "start": {
               "line": 3,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 3,
-              "column": 22
+              "column": 23
             }
           },
           "callProperties": [],
           "properties": [
             {
               "type": "ObjectTypeProperty",
-              "start": 70,
-              "end": 79,
+              "start": 72,
+              "end": 81,
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 11
+                  "column": 12
                 },
                 "end": {
                   "line": 3,
-                  "column": 20
+                  "column": 21
                 }
               },
               "key": {
                 "type": "Identifier",
-                "start": 70,
-                "end": 71,
+                "start": 72,
+                "end": 73,
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 3,
-                    "column": 12
+                    "column": 13
                   },
                   "identifierName": "a"
                 },
@@ -397,16 +399,16 @@
               "method": true,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 70,
-                "end": 79,
+                "start": 72,
+                "end": 81,
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 3,
-                    "column": 20
+                    "column": 21
                   }
                 },
                 "params": [],
@@ -414,16 +416,16 @@
                 "typeParameters": null,
                 "returnType": {
                   "type": "VoidTypeAnnotation",
-                  "start": 75,
-                  "end": 79,
+                  "start": 77,
+                  "end": 81,
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 16
+                      "column": 17
                     },
                     "end": {
                       "line": 3,
-                      "column": 20
+                      "column": 21
                     }
                   }
                 }
@@ -433,13 +435,14 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       },
       {
         "type": "TypeAlias",
-        "start": 83,
-        "end": 109,
+        "start": 85,
+        "end": 112,
         "loc": {
           "start": {
             "line": 4,
@@ -447,13 +450,13 @@
           },
           "end": {
             "line": 4,
-            "column": 26
+            "column": 27
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 88,
-          "end": 89,
+          "start": 90,
+          "end": 92,
           "loc": {
             "start": {
               "line": 4,
@@ -461,55 +464,55 @@
             },
             "end": {
               "line": 4,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T3"
           },
-          "name": "T"
+          "name": "T3"
         },
         "typeParameters": null,
         "right": {
           "type": "ObjectTypeAnnotation",
-          "start": 92,
-          "end": 108,
+          "start": 95,
+          "end": 111,
           "loc": {
             "start": {
               "line": 4,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 4,
-              "column": 25
+              "column": 26
             }
           },
           "callProperties": [],
           "properties": [
             {
               "type": "ObjectTypeProperty",
-              "start": 94,
-              "end": 106,
+              "start": 97,
+              "end": 109,
               "loc": {
                 "start": {
                   "line": 4,
-                  "column": 11
+                  "column": 12
                 },
                 "end": {
                   "line": 4,
-                  "column": 23
+                  "column": 24
                 }
               },
               "key": {
                 "type": "Identifier",
-                "start": 94,
-                "end": 95,
+                "start": 97,
+                "end": 98,
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 4,
-                    "column": 12
+                    "column": 13
                   },
                   "identifierName": "a"
                 },
@@ -521,47 +524,47 @@
               "method": true,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 94,
-                "end": 106,
+                "start": 97,
+                "end": 109,
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 4,
-                    "column": 23
+                    "column": 24
                   }
                 },
                 "params": [],
                 "rest": null,
                 "typeParameters": {
                   "type": "TypeParameterDeclaration",
-                  "start": 95,
-                  "end": 98,
+                  "start": 98,
+                  "end": 101,
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 12
+                      "column": 13
                     },
                     "end": {
                       "line": 4,
-                      "column": 15
+                      "column": 16
                     }
                   },
                   "params": [
                     {
                       "type": "TypeParameter",
-                      "start": 96,
-                      "end": 97,
+                      "start": 99,
+                      "end": 100,
                       "loc": {
                         "start": {
                           "line": 4,
-                          "column": 13
+                          "column": 14
                         },
                         "end": {
                           "line": 4,
-                          "column": 14
+                          "column": 15
                         }
                       },
                       "name": "T",
@@ -571,16 +574,16 @@
                 },
                 "returnType": {
                   "type": "VoidTypeAnnotation",
-                  "start": 102,
-                  "end": 106,
+                  "start": 105,
+                  "end": 109,
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 19
+                      "column": 20
                     },
                     "end": {
                       "line": 4,
-                      "column": 23
+                      "column": 24
                     }
                   }
                 }
@@ -590,13 +593,14 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       },
       {
         "type": "TypeAlias",
-        "start": 111,
-        "end": 135,
+        "start": 114,
+        "end": 139,
         "loc": {
           "start": {
             "line": 6,
@@ -604,13 +608,13 @@
           },
           "end": {
             "line": 6,
-            "column": 24
+            "column": 25
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 116,
-          "end": 117,
+          "start": 119,
+          "end": 121,
           "loc": {
             "start": {
               "line": 6,
@@ -618,55 +622,55 @@
             },
             "end": {
               "line": 6,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T4"
           },
-          "name": "T"
+          "name": "T4"
         },
         "typeParameters": null,
         "right": {
           "type": "ObjectTypeAnnotation",
-          "start": 120,
-          "end": 134,
+          "start": 124,
+          "end": 138,
           "loc": {
             "start": {
               "line": 6,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 6,
-              "column": 23
+              "column": 24
             }
           },
           "callProperties": [
             {
               "type": "ObjectTypeCallProperty",
-              "start": 122,
-              "end": 132,
+              "start": 126,
+              "end": 136,
               "loc": {
                 "start": {
                   "line": 6,
-                  "column": 11
+                  "column": 12
                 },
                 "end": {
                   "line": 6,
-                  "column": 21
+                  "column": 22
                 }
               },
               "static": false,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 122,
-                "end": 132,
+                "start": 126,
+                "end": 136,
                 "loc": {
                   "start": {
                     "line": 6,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 6,
-                    "column": 21
+                    "column": 22
                   }
                 },
                 "params": [],
@@ -674,16 +678,16 @@
                 "typeParameters": null,
                 "returnType": {
                   "type": "NumberTypeAnnotation",
-                  "start": 126,
-                  "end": 132,
+                  "start": 130,
+                  "end": 136,
                   "loc": {
                     "start": {
                       "line": 6,
-                      "column": 15
+                      "column": 16
                     },
                     "end": {
                       "line": 6,
-                      "column": 21
+                      "column": 22
                     }
                   }
                 }
@@ -693,13 +697,14 @@
           "properties": [],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       },
       {
         "type": "TypeAlias",
-        "start": 136,
-        "end": 167,
+        "start": 140,
+        "end": 172,
         "loc": {
           "start": {
             "line": 7,
@@ -707,13 +712,13 @@
           },
           "end": {
             "line": 7,
-            "column": 31
+            "column": 32
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 141,
-          "end": 142,
+          "start": 145,
+          "end": 147,
           "loc": {
             "start": {
               "line": 7,
@@ -721,84 +726,84 @@
             },
             "end": {
               "line": 7,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "T"
+            "identifierName": "T5"
           },
-          "name": "T"
+          "name": "T5"
         },
         "typeParameters": null,
         "right": {
           "type": "ObjectTypeAnnotation",
-          "start": 145,
-          "end": 167,
+          "start": 150,
+          "end": 172,
           "loc": {
             "start": {
               "line": 7,
-              "column": 9
+              "column": 10
             },
             "end": {
               "line": 7,
-              "column": 31
+              "column": 32
             }
           },
           "callProperties": [
             {
               "type": "ObjectTypeCallProperty",
-              "start": 147,
-              "end": 164,
+              "start": 152,
+              "end": 169,
               "loc": {
                 "start": {
                   "line": 7,
-                  "column": 11
+                  "column": 12
                 },
                 "end": {
                   "line": 7,
-                  "column": 28
+                  "column": 29
                 }
               },
               "static": false,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 147,
-                "end": 164,
+                "start": 152,
+                "end": 169,
                 "loc": {
                   "start": {
                     "line": 7,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 7,
-                    "column": 28
+                    "column": 29
                   }
                 },
                 "params": [
                   {
                     "type": "FunctionTypeParam",
-                    "start": 151,
-                    "end": 155,
+                    "start": 156,
+                    "end": 160,
                     "loc": {
                       "start": {
                         "line": 7,
-                        "column": 15
+                        "column": 16
                       },
                       "end": {
                         "line": 7,
-                        "column": 19
+                        "column": 20
                       }
                     },
                     "name": {
                       "type": "Identifier",
-                      "start": 151,
-                      "end": 152,
+                      "start": 156,
+                      "end": 157,
                       "loc": {
                         "start": {
                           "line": 7,
-                          "column": 15
+                          "column": 16
                         },
                         "end": {
                           "line": 7,
-                          "column": 16
+                          "column": 17
                         },
                         "identifierName": "x"
                       },
@@ -807,31 +812,31 @@
                     "optional": false,
                     "typeAnnotation": {
                       "type": "GenericTypeAnnotation",
-                      "start": 154,
-                      "end": 155,
+                      "start": 159,
+                      "end": 160,
                       "loc": {
                         "start": {
                           "line": 7,
-                          "column": 18
+                          "column": 19
                         },
                         "end": {
                           "line": 7,
-                          "column": 19
+                          "column": 20
                         }
                       },
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
-                        "start": 154,
-                        "end": 155,
+                        "start": 159,
+                        "end": 160,
                         "loc": {
                           "start": {
                             "line": 7,
-                            "column": 18
+                            "column": 19
                           },
                           "end": {
                             "line": 7,
-                            "column": 19
+                            "column": 20
                           },
                           "identifierName": "T"
                         },
@@ -843,31 +848,31 @@
                 "rest": null,
                 "typeParameters": {
                   "type": "TypeParameterDeclaration",
-                  "start": 147,
-                  "end": 150,
+                  "start": 152,
+                  "end": 155,
                   "loc": {
                     "start": {
                       "line": 7,
-                      "column": 11
+                      "column": 12
                     },
                     "end": {
                       "line": 7,
-                      "column": 14
+                      "column": 15
                     }
                   },
                   "params": [
                     {
                       "type": "TypeParameter",
-                      "start": 148,
-                      "end": 149,
+                      "start": 153,
+                      "end": 154,
                       "loc": {
                         "start": {
                           "line": 7,
-                          "column": 12
+                          "column": 13
                         },
                         "end": {
                           "line": 7,
-                          "column": 13
+                          "column": 14
                         }
                       },
                       "name": "T",
@@ -877,16 +882,16 @@
                 },
                 "returnType": {
                   "type": "NumberTypeAnnotation",
-                  "start": 158,
-                  "end": 164,
+                  "start": 163,
+                  "end": 169,
                   "loc": {
                     "start": {
                       "line": 7,
-                      "column": 22
+                      "column": 23
                     },
                     "end": {
                       "line": 7,
-                      "column": 28
+                      "column": 29
                     }
                   }
                 }
@@ -896,13 +901,14 @@
           "properties": [],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       },
       {
         "type": "DeclareClass",
-        "start": 169,
-        "end": 203,
+        "start": 174,
+        "end": 209,
         "loc": {
           "start": {
             "line": 9,
@@ -910,13 +916,13 @@
           },
           "end": {
             "line": 9,
-            "column": 34
+            "column": 35
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 183,
-          "end": 184,
+          "start": 188,
+          "end": 190,
           "loc": {
             "start": {
               "line": 9,
@@ -924,11 +930,11 @@
             },
             "end": {
               "line": 9,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T6"
           },
-          "name": "T"
+          "name": "T6"
         },
         "typeParameters": null,
         "extends": [],
@@ -936,46 +942,46 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 185,
-          "end": 203,
+          "start": 191,
+          "end": 209,
           "loc": {
             "start": {
               "line": 9,
-              "column": 16
+              "column": 17
             },
             "end": {
               "line": 9,
-              "column": 34
+              "column": 35
             }
           },
           "callProperties": [],
           "properties": [
             {
               "type": "ObjectTypeProperty",
-              "start": 187,
-              "end": 200,
+              "start": 193,
+              "end": 206,
               "loc": {
                 "start": {
                   "line": 9,
-                  "column": 18
+                  "column": 19
                 },
                 "end": {
                   "line": 9,
-                  "column": 31
+                  "column": 32
                 }
               },
               "key": {
                 "type": "Identifier",
-                "start": 187,
-                "end": 190,
+                "start": 193,
+                "end": 196,
                 "loc": {
                   "start": {
                     "line": 9,
-                    "column": 18
+                    "column": 19
                   },
                   "end": {
                     "line": 9,
-                    "column": 21
+                    "column": 22
                   },
                   "identifierName": "foo"
                 },
@@ -987,16 +993,16 @@
               "method": true,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 187,
-                "end": 200,
+                "start": 193,
+                "end": 206,
                 "loc": {
                   "start": {
                     "line": 9,
-                    "column": 18
+                    "column": 19
                   },
                   "end": {
                     "line": 9,
-                    "column": 31
+                    "column": 32
                   }
                 },
                 "params": [],
@@ -1004,16 +1010,16 @@
                 "typeParameters": null,
                 "returnType": {
                   "type": "NumberTypeAnnotation",
-                  "start": 194,
-                  "end": 200,
+                  "start": 200,
+                  "end": 206,
                   "loc": {
                     "start": {
                       "line": 9,
-                      "column": 25
+                      "column": 26
                     },
                     "end": {
                       "line": 9,
-                      "column": 31
+                      "column": 32
                     }
                   }
                 }
@@ -1028,8 +1034,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 204,
-        "end": 245,
+        "start": 210,
+        "end": 252,
         "loc": {
           "start": {
             "line": 10,
@@ -1037,13 +1043,13 @@
           },
           "end": {
             "line": 10,
-            "column": 41
+            "column": 42
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 218,
-          "end": 219,
+          "start": 224,
+          "end": 226,
           "loc": {
             "start": {
               "line": 10,
@@ -1051,11 +1057,11 @@
             },
             "end": {
               "line": 10,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T7"
           },
-          "name": "T"
+          "name": "T7"
         },
         "typeParameters": null,
         "extends": [],
@@ -1063,46 +1069,46 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 220,
-          "end": 245,
+          "start": 227,
+          "end": 252,
           "loc": {
             "start": {
               "line": 10,
-              "column": 16
+              "column": 17
             },
             "end": {
               "line": 10,
-              "column": 41
+              "column": 42
             }
           },
           "callProperties": [],
           "properties": [
             {
               "type": "ObjectTypeProperty",
-              "start": 222,
-              "end": 242,
+              "start": 229,
+              "end": 249,
               "loc": {
                 "start": {
                   "line": 10,
-                  "column": 18
+                  "column": 19
                 },
                 "end": {
                   "line": 10,
-                  "column": 38
+                  "column": 39
                 }
               },
               "key": {
                 "type": "Identifier",
-                "start": 229,
-                "end": 232,
+                "start": 236,
+                "end": 239,
                 "loc": {
                   "start": {
                     "line": 10,
-                    "column": 25
+                    "column": 26
                   },
                   "end": {
                     "line": 10,
-                    "column": 28
+                    "column": 29
                   },
                   "identifierName": "foo"
                 },
@@ -1114,16 +1120,16 @@
               "method": true,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 222,
-                "end": 242,
+                "start": 229,
+                "end": 249,
                 "loc": {
                   "start": {
                     "line": 10,
-                    "column": 18
+                    "column": 19
                   },
                   "end": {
                     "line": 10,
-                    "column": 38
+                    "column": 39
                   }
                 },
                 "params": [],
@@ -1131,16 +1137,16 @@
                 "typeParameters": null,
                 "returnType": {
                   "type": "NumberTypeAnnotation",
-                  "start": 236,
-                  "end": 242,
+                  "start": 243,
+                  "end": 249,
                   "loc": {
                     "start": {
                       "line": 10,
-                      "column": 32
+                      "column": 33
                     },
                     "end": {
                       "line": 10,
-                      "column": 38
+                      "column": 39
                     }
                   }
                 }
@@ -1155,8 +1161,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 246,
-        "end": 276,
+        "start": 253,
+        "end": 284,
         "loc": {
           "start": {
             "line": 11,
@@ -1164,13 +1170,13 @@
           },
           "end": {
             "line": 11,
-            "column": 30
+            "column": 31
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 260,
-          "end": 261,
+          "start": 267,
+          "end": 269,
           "loc": {
             "start": {
               "line": 11,
@@ -1178,11 +1184,11 @@
             },
             "end": {
               "line": 11,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T8"
           },
-          "name": "T"
+          "name": "T8"
         },
         "typeParameters": null,
         "extends": [],
@@ -1190,46 +1196,46 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 262,
-          "end": 276,
+          "start": 270,
+          "end": 284,
           "loc": {
             "start": {
               "line": 11,
-              "column": 16
+              "column": 17
             },
             "end": {
               "line": 11,
-              "column": 30
+              "column": 31
             }
           },
           "callProperties": [
             {
               "type": "ObjectTypeCallProperty",
-              "start": 264,
-              "end": 274,
+              "start": 272,
+              "end": 282,
               "loc": {
                 "start": {
                   "line": 11,
-                  "column": 18
+                  "column": 19
                 },
                 "end": {
                   "line": 11,
-                  "column": 28
+                  "column": 29
                 }
               },
               "static": false,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 264,
-                "end": 274,
+                "start": 272,
+                "end": 282,
                 "loc": {
                   "start": {
                     "line": 11,
-                    "column": 18
+                    "column": 19
                   },
                   "end": {
                     "line": 11,
-                    "column": 28
+                    "column": 29
                   }
                 },
                 "params": [],
@@ -1237,16 +1243,16 @@
                 "typeParameters": null,
                 "returnType": {
                   "type": "NumberTypeAnnotation",
-                  "start": 268,
-                  "end": 274,
+                  "start": 276,
+                  "end": 282,
                   "loc": {
                     "start": {
                       "line": 11,
-                      "column": 22
+                      "column": 23
                     },
                     "end": {
                       "line": 11,
-                      "column": 28
+                      "column": 29
                     }
                   }
                 }
@@ -1261,8 +1267,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 277,
-        "end": 314,
+        "start": 285,
+        "end": 323,
         "loc": {
           "start": {
             "line": 12,
@@ -1270,13 +1276,13 @@
           },
           "end": {
             "line": 12,
-            "column": 37
+            "column": 38
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 291,
-          "end": 292,
+          "start": 299,
+          "end": 301,
           "loc": {
             "start": {
               "line": 12,
@@ -1284,11 +1290,11 @@
             },
             "end": {
               "line": 12,
-              "column": 15
+              "column": 16
             },
-            "identifierName": "T"
+            "identifierName": "T9"
           },
-          "name": "T"
+          "name": "T9"
         },
         "typeParameters": null,
         "extends": [],
@@ -1296,46 +1302,46 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 293,
-          "end": 314,
+          "start": 302,
+          "end": 323,
           "loc": {
             "start": {
               "line": 12,
-              "column": 16
+              "column": 17
             },
             "end": {
               "line": 12,
-              "column": 37
+              "column": 38
             }
           },
           "callProperties": [
             {
               "type": "ObjectTypeCallProperty",
-              "start": 295,
-              "end": 312,
+              "start": 304,
+              "end": 321,
               "loc": {
                 "start": {
                   "line": 12,
-                  "column": 18
+                  "column": 19
                 },
                 "end": {
                   "line": 12,
-                  "column": 35
+                  "column": 36
                 }
               },
               "static": true,
               "value": {
                 "type": "FunctionTypeAnnotation",
-                "start": 302,
-                "end": 312,
+                "start": 311,
+                "end": 321,
                 "loc": {
                   "start": {
                     "line": 12,
-                    "column": 25
+                    "column": 26
                   },
                   "end": {
                     "line": 12,
-                    "column": 35
+                    "column": 36
                   }
                 },
                 "params": [],
@@ -1343,16 +1349,16 @@
                 "typeParameters": null,
                 "returnType": {
                   "type": "NumberTypeAnnotation",
-                  "start": 306,
-                  "end": 312,
+                  "start": 315,
+                  "end": 321,
                   "loc": {
                     "start": {
                       "line": 12,
-                      "column": 29
+                      "column": 30
                     },
                     "end": {
                       "line": 12,
-                      "column": 35
+                      "column": 36
                     }
                   }
                 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-annotations/with-default-invalid/options.json b/packages/babel-parser/test/fixtures/flow/type-annotations/with-default-invalid/options.json
index aedf72ddb707..24792311b3e9 100644
--- a/packages/babel-parser/test/fixtures/flow/type-annotations/with-default-invalid/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-annotations/with-default-invalid/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25` (1:20)"
+  "throws": "Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25` (1:20)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-exports/specifier/input.js b/packages/babel-parser/test/fixtures/flow/type-exports/specifier/input.js
index e34ea63759dc..168e2cff4a3e 100644
--- a/packages/babel-parser/test/fixtures/flow/type-exports/specifier/input.js
+++ b/packages/babel-parser/test/fixtures/flow/type-exports/specifier/input.js
@@ -1 +1,2 @@
+let foo;
 export type { foo };
diff --git a/packages/babel-parser/test/fixtures/flow/type-exports/specifier/output.json b/packages/babel-parser/test/fixtures/flow/type-exports/specifier/output.json
index 4481726d786b..f4d18be8251b 100644
--- a/packages/babel-parser/test/fixtures/flow/type-exports/specifier/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-exports/specifier/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 20,
+  "end": 29,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
+      "line": 2,
       "column": 20
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 20,
+    "end": 29,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
+        "line": 2,
         "column": 20
       }
     },
@@ -30,9 +30,9 @@
     "interpreter": null,
     "body": [
       {
-        "type": "ExportNamedDeclaration",
+        "type": "VariableDeclaration",
         "start": 0,
-        "end": 20,
+        "end": 8,
         "loc": {
           "start": {
             "line": 1,
@@ -40,35 +40,86 @@
           },
           "end": {
             "line": 1,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 9,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
             "column": 20
           }
         },
         "specifiers": [
           {
             "type": "ExportSpecifier",
-            "start": 14,
-            "end": 17,
+            "start": 23,
+            "end": 26,
             "loc": {
               "start": {
-                "line": 1,
+                "line": 2,
                 "column": 14
               },
               "end": {
-                "line": 1,
+                "line": 2,
                 "column": 17
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 14,
-              "end": 17,
+              "start": 23,
+              "end": 26,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 14
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 17
                 },
                 "identifierName": "foo"
@@ -77,15 +128,15 @@
             },
             "exported": {
               "type": "Identifier",
-              "start": 14,
-              "end": 17,
+              "start": 23,
+              "end": 26,
               "loc": {
                 "start": {
-                  "line": 1,
+                  "line": 2,
                   "column": 14
                 },
                 "end": {
-                  "line": 1,
+                  "line": 2,
                   "column": 17
                 },
                 "identifierName": "foo"
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/import-type-2/input.js b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-2/input.js
new file mode 100644
index 000000000000..34f185e05fe4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-2/input.js
@@ -0,0 +1 @@
+import type, { foo } from "bar";
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/import-type-2/output.json b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-2/output.json
new file mode 100644
index 000000000000..f5fc078a42ce
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-2/output.json
@@ -0,0 +1,155 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 7,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                },
+                "identifierName": "type"
+              },
+              "name": "type"
+            }
+          },
+          {
+            "type": "ImportSpecifier",
+            "start": 15,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "imported": {
+              "type": "Identifier",
+              "start": 15,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 15
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "importKind": null,
+            "local": {
+              "type": "Identifier",
+              "start": 15,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 15
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            }
+          }
+        ],
+        "importKind": "value",
+        "source": {
+          "type": "StringLiteral",
+          "start": 26,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 26
+            },
+            "end": {
+              "line": 1,
+              "column": 31
+            }
+          },
+          "extra": {
+            "rawValue": "bar",
+            "raw": "\"bar\""
+          },
+          "value": "bar"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/input.js b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/input.js
index 43d6942549b4..8dcd1106d55e 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/input.js
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/input.js
@@ -5,7 +5,7 @@ import {type as as foo} from "foo";
 import {type t as u} from "foo";
 import {type switch} from "foo";
 
-import {typeof t} from "foo";
-import {typeof as} from "foo";
-import {typeof t as u} from "foo";
-import {typeof switch} from "foo";
+import {typeof t2} from "foo";
+import {typeof as2} from "foo";
+import {typeof t as u2} from "foo";
+import {typeof switch2} from "foo";
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/output.json b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/output.json
index f464931404cd..aeb7eded0711 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/import-type-shorthand/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 316,
+  "end": 320,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 11,
-      "column": 34
+      "column": 35
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 316,
+    "end": 320,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 11,
-        "column": 34
+        "column": 35
       }
     },
     "sourceType": "module",
@@ -560,7 +560,7 @@
       {
         "type": "ImportDeclaration",
         "start": 186,
-        "end": 215,
+        "end": 216,
         "loc": {
           "start": {
             "line": 8,
@@ -568,14 +568,14 @@
           },
           "end": {
             "line": 8,
-            "column": 29
+            "column": 30
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
             "start": 194,
-            "end": 202,
+            "end": 203,
             "loc": {
               "start": {
                 "line": 8,
@@ -583,13 +583,13 @@
               },
               "end": {
                 "line": 8,
-                "column": 16
+                "column": 17
               }
             },
             "imported": {
               "type": "Identifier",
               "start": 201,
-              "end": 202,
+              "end": 203,
               "loc": {
                 "start": {
                   "line": 8,
@@ -597,17 +597,17 @@
                 },
                 "end": {
                   "line": 8,
-                  "column": 16
+                  "column": 17
                 },
-                "identifierName": "t"
+                "identifierName": "t2"
               },
-              "name": "t"
+              "name": "t2"
             },
             "importKind": "typeof",
             "local": {
               "type": "Identifier",
               "start": 201,
-              "end": 202,
+              "end": 203,
               "loc": {
                 "start": {
                   "line": 8,
@@ -615,27 +615,27 @@
                 },
                 "end": {
                   "line": 8,
-                  "column": 16
+                  "column": 17
                 },
-                "identifierName": "t"
+                "identifierName": "t2"
               },
-              "name": "t"
+              "name": "t2"
             }
           }
         ],
         "importKind": "value",
         "source": {
           "type": "StringLiteral",
-          "start": 209,
-          "end": 214,
+          "start": 210,
+          "end": 215,
           "loc": {
             "start": {
               "line": 8,
-              "column": 23
+              "column": 24
             },
             "end": {
               "line": 8,
-              "column": 28
+              "column": 29
             }
           },
           "extra": {
@@ -647,8 +647,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 216,
-        "end": 246,
+        "start": 217,
+        "end": 248,
         "loc": {
           "start": {
             "line": 9,
@@ -656,14 +656,14 @@
           },
           "end": {
             "line": 9,
-            "column": 30
+            "column": 31
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
-            "start": 224,
-            "end": 233,
+            "start": 225,
+            "end": 235,
             "loc": {
               "start": {
                 "line": 9,
@@ -671,13 +671,13 @@
               },
               "end": {
                 "line": 9,
-                "column": 17
+                "column": 18
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 231,
-              "end": 233,
+              "start": 232,
+              "end": 235,
               "loc": {
                 "start": {
                   "line": 9,
@@ -685,17 +685,17 @@
                 },
                 "end": {
                   "line": 9,
-                  "column": 17
+                  "column": 18
                 },
-                "identifierName": "as"
+                "identifierName": "as2"
               },
-              "name": "as"
+              "name": "as2"
             },
             "importKind": "typeof",
             "local": {
               "type": "Identifier",
-              "start": 231,
-              "end": 233,
+              "start": 232,
+              "end": 235,
               "loc": {
                 "start": {
                   "line": 9,
@@ -703,27 +703,27 @@
                 },
                 "end": {
                   "line": 9,
-                  "column": 17
+                  "column": 18
                 },
-                "identifierName": "as"
+                "identifierName": "as2"
               },
-              "name": "as"
+              "name": "as2"
             }
           }
         ],
         "importKind": "value",
         "source": {
           "type": "StringLiteral",
-          "start": 240,
-          "end": 245,
+          "start": 242,
+          "end": 247,
           "loc": {
             "start": {
               "line": 9,
-              "column": 24
+              "column": 25
             },
             "end": {
               "line": 9,
-              "column": 29
+              "column": 30
             }
           },
           "extra": {
@@ -735,8 +735,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 247,
-        "end": 281,
+        "start": 249,
+        "end": 284,
         "loc": {
           "start": {
             "line": 10,
@@ -744,14 +744,14 @@
           },
           "end": {
             "line": 10,
-            "column": 34
+            "column": 35
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
-            "start": 255,
-            "end": 268,
+            "start": 257,
+            "end": 271,
             "loc": {
               "start": {
                 "line": 10,
@@ -759,13 +759,13 @@
               },
               "end": {
                 "line": 10,
-                "column": 21
+                "column": 22
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 262,
-              "end": 263,
+              "start": 264,
+              "end": 265,
               "loc": {
                 "start": {
                   "line": 10,
@@ -782,8 +782,8 @@
             "importKind": "typeof",
             "local": {
               "type": "Identifier",
-              "start": 267,
-              "end": 268,
+              "start": 269,
+              "end": 271,
               "loc": {
                 "start": {
                   "line": 10,
@@ -791,27 +791,27 @@
                 },
                 "end": {
                   "line": 10,
-                  "column": 21
+                  "column": 22
                 },
-                "identifierName": "u"
+                "identifierName": "u2"
               },
-              "name": "u"
+              "name": "u2"
             }
           }
         ],
         "importKind": "value",
         "source": {
           "type": "StringLiteral",
-          "start": 275,
-          "end": 280,
+          "start": 278,
+          "end": 283,
           "loc": {
             "start": {
               "line": 10,
-              "column": 28
+              "column": 29
             },
             "end": {
               "line": 10,
-              "column": 33
+              "column": 34
             }
           },
           "extra": {
@@ -823,8 +823,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 282,
-        "end": 316,
+        "start": 285,
+        "end": 320,
         "loc": {
           "start": {
             "line": 11,
@@ -832,14 +832,14 @@
           },
           "end": {
             "line": 11,
-            "column": 34
+            "column": 35
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
-            "start": 290,
-            "end": 303,
+            "start": 293,
+            "end": 307,
             "loc": {
               "start": {
                 "line": 11,
@@ -847,13 +847,13 @@
               },
               "end": {
                 "line": 11,
-                "column": 21
+                "column": 22
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 297,
-              "end": 303,
+              "start": 300,
+              "end": 307,
               "loc": {
                 "start": {
                   "line": 11,
@@ -861,17 +861,17 @@
                 },
                 "end": {
                   "line": 11,
-                  "column": 21
+                  "column": 22
                 },
-                "identifierName": "switch"
+                "identifierName": "switch2"
               },
-              "name": "switch"
+              "name": "switch2"
             },
             "importKind": "typeof",
             "local": {
               "type": "Identifier",
-              "start": 297,
-              "end": 303,
+              "start": 300,
+              "end": 307,
               "loc": {
                 "start": {
                   "line": 11,
@@ -879,27 +879,27 @@
                 },
                 "end": {
                   "line": 11,
-                  "column": 21
+                  "column": 22
                 },
-                "identifierName": "switch"
+                "identifierName": "switch2"
               },
-              "name": "switch"
+              "name": "switch2"
             }
           }
         ],
         "importKind": "value",
         "source": {
           "type": "StringLiteral",
-          "start": 310,
-          "end": 315,
+          "start": 314,
+          "end": 319,
           "loc": {
             "start": {
               "line": 11,
-              "column": 28
+              "column": 29
             },
             "end": {
               "line": 11,
-              "column": 33
+              "column": 34
             }
           },
           "extra": {
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/import-type/input.js b/packages/babel-parser/test/fixtures/flow/type-imports/import-type/input.js
index 70d71926f930..c2a9d4360fa8 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/import-type/input.js
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/import-type/input.js
@@ -1,14 +1,13 @@
-import type Def from "foo";
-import type {named} from "foo";
-import type Def, {named} from "foo";
-import type switch from "foo";
-import type { switch } from "foo";
-import type { foo, bar } from "baz";
+import type Def1 from "foo";
+import type {named1} from "foo";
+import type Def2, {named2} from "foo";
+import type switch1 from "foo";
+import type { switch2 } from "foo";
+import type { foo1, bar1 } from "baz";
 import type from "foo";
-import type, { foo } from "bar";
-import typeof foo from "bar";
-import typeof switch from "foo";
-import typeof { switch } from "foo";
-import typeof { foo as bar } from "baz";
-import typeof * as ns from "foo";
-import typeof * as switch from "foo";
+import typeof foo3 from "bar";
+import typeof switch4 from "foo";
+import typeof { switch5 } from "foo";
+import typeof { foo as bar6 } from "baz";
+import typeof * as ns7 from "foo";
+import typeof * as switch8 from "foo";
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/import-type/output.json b/packages/babel-parser/test/fixtures/flow/type-imports/import-type/output.json
index 904bcfab268f..8e626c8ad0a5 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/import-type/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/import-type/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 469,
+  "end": 450,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 14,
-      "column": 37
+      "line": 13,
+      "column": 38
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 469,
+    "end": 450,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 14,
-        "column": 37
+        "line": 13,
+        "column": 38
       }
     },
     "sourceType": "module",
@@ -32,7 +32,7 @@
       {
         "type": "ImportDeclaration",
         "start": 0,
-        "end": 27,
+        "end": 28,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 27
+            "column": 28
           }
         },
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
             "start": 12,
-            "end": 15,
+            "end": 16,
             "loc": {
               "start": {
                 "line": 1,
@@ -55,13 +55,13 @@
               },
               "end": {
                 "line": 1,
-                "column": 15
+                "column": 16
               }
             },
             "local": {
               "type": "Identifier",
               "start": 12,
-              "end": 15,
+              "end": 16,
               "loc": {
                 "start": {
                   "line": 1,
@@ -69,27 +69,27 @@
                 },
                 "end": {
                   "line": 1,
-                  "column": 15
+                  "column": 16
                 },
-                "identifierName": "Def"
+                "identifierName": "Def1"
               },
-              "name": "Def"
+              "name": "Def1"
             }
           }
         ],
         "importKind": "type",
         "source": {
           "type": "StringLiteral",
-          "start": 21,
-          "end": 26,
+          "start": 22,
+          "end": 27,
           "loc": {
             "start": {
               "line": 1,
-              "column": 21
+              "column": 22
             },
             "end": {
               "line": 1,
-              "column": 26
+              "column": 27
             }
           },
           "extra": {
@@ -101,8 +101,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 28,
-        "end": 59,
+        "start": 29,
+        "end": 61,
         "loc": {
           "start": {
             "line": 2,
@@ -110,14 +110,14 @@
           },
           "end": {
             "line": 2,
-            "column": 31
+            "column": 32
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
-            "start": 41,
-            "end": 46,
+            "start": 42,
+            "end": 48,
             "loc": {
               "start": {
                 "line": 2,
@@ -125,13 +125,13 @@
               },
               "end": {
                 "line": 2,
-                "column": 18
+                "column": 19
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 41,
-              "end": 46,
+              "start": 42,
+              "end": 48,
               "loc": {
                 "start": {
                   "line": 2,
@@ -139,17 +139,17 @@
                 },
                 "end": {
                   "line": 2,
-                  "column": 18
+                  "column": 19
                 },
-                "identifierName": "named"
+                "identifierName": "named1"
               },
-              "name": "named"
+              "name": "named1"
             },
             "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 41,
-              "end": 46,
+              "start": 42,
+              "end": 48,
               "loc": {
                 "start": {
                   "line": 2,
@@ -157,27 +157,27 @@
                 },
                 "end": {
                   "line": 2,
-                  "column": 18
+                  "column": 19
                 },
-                "identifierName": "named"
+                "identifierName": "named1"
               },
-              "name": "named"
+              "name": "named1"
             }
           }
         ],
         "importKind": "type",
         "source": {
           "type": "StringLiteral",
-          "start": 53,
-          "end": 58,
+          "start": 55,
+          "end": 60,
           "loc": {
             "start": {
               "line": 2,
-              "column": 25
+              "column": 26
             },
             "end": {
               "line": 2,
-              "column": 30
+              "column": 31
             }
           },
           "extra": {
@@ -189,8 +189,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 60,
-        "end": 96,
+        "start": 62,
+        "end": 100,
         "loc": {
           "start": {
             "line": 3,
@@ -198,14 +198,14 @@
           },
           "end": {
             "line": 3,
-            "column": 36
+            "column": 38
           }
         },
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
-            "start": 72,
-            "end": 75,
+            "start": 74,
+            "end": 78,
             "loc": {
               "start": {
                 "line": 3,
@@ -213,13 +213,13 @@
               },
               "end": {
                 "line": 3,
-                "column": 15
+                "column": 16
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 72,
-              "end": 75,
+              "start": 74,
+              "end": 78,
               "loc": {
                 "start": {
                   "line": 3,
@@ -227,77 +227,77 @@
                 },
                 "end": {
                   "line": 3,
-                  "column": 15
+                  "column": 16
                 },
-                "identifierName": "Def"
+                "identifierName": "Def2"
               },
-              "name": "Def"
+              "name": "Def2"
             }
           },
           {
             "type": "ImportSpecifier",
-            "start": 78,
-            "end": 83,
+            "start": 81,
+            "end": 87,
             "loc": {
               "start": {
                 "line": 3,
-                "column": 18
+                "column": 19
               },
               "end": {
                 "line": 3,
-                "column": 23
+                "column": 25
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 78,
-              "end": 83,
+              "start": 81,
+              "end": 87,
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 18
+                  "column": 19
                 },
                 "end": {
                   "line": 3,
-                  "column": 23
+                  "column": 25
                 },
-                "identifierName": "named"
+                "identifierName": "named2"
               },
-              "name": "named"
+              "name": "named2"
             },
             "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 78,
-              "end": 83,
+              "start": 81,
+              "end": 87,
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 18
+                  "column": 19
                 },
                 "end": {
                   "line": 3,
-                  "column": 23
+                  "column": 25
                 },
-                "identifierName": "named"
+                "identifierName": "named2"
               },
-              "name": "named"
+              "name": "named2"
             }
           }
         ],
         "importKind": "type",
         "source": {
           "type": "StringLiteral",
-          "start": 90,
-          "end": 95,
+          "start": 94,
+          "end": 99,
           "loc": {
             "start": {
               "line": 3,
-              "column": 30
+              "column": 32
             },
             "end": {
               "line": 3,
-              "column": 35
+              "column": 37
             }
           },
           "extra": {
@@ -309,8 +309,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 97,
-        "end": 127,
+        "start": 101,
+        "end": 132,
         "loc": {
           "start": {
             "line": 4,
@@ -318,14 +318,14 @@
           },
           "end": {
             "line": 4,
-            "column": 30
+            "column": 31
           }
         },
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
-            "start": 109,
-            "end": 115,
+            "start": 113,
+            "end": 120,
             "loc": {
               "start": {
                 "line": 4,
@@ -333,13 +333,13 @@
               },
               "end": {
                 "line": 4,
-                "column": 18
+                "column": 19
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 109,
-              "end": 115,
+              "start": 113,
+              "end": 120,
               "loc": {
                 "start": {
                   "line": 4,
@@ -347,27 +347,27 @@
                 },
                 "end": {
                   "line": 4,
-                  "column": 18
+                  "column": 19
                 },
-                "identifierName": "switch"
+                "identifierName": "switch1"
               },
-              "name": "switch"
+              "name": "switch1"
             }
           }
         ],
         "importKind": "type",
         "source": {
           "type": "StringLiteral",
-          "start": 121,
-          "end": 126,
+          "start": 126,
+          "end": 131,
           "loc": {
             "start": {
               "line": 4,
-              "column": 24
+              "column": 25
             },
             "end": {
               "line": 4,
-              "column": 29
+              "column": 30
             }
           },
           "extra": {
@@ -379,8 +379,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 128,
-        "end": 162,
+        "start": 133,
+        "end": 168,
         "loc": {
           "start": {
             "line": 5,
@@ -388,14 +388,14 @@
           },
           "end": {
             "line": 5,
-            "column": 34
+            "column": 35
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
-            "start": 142,
-            "end": 148,
+            "start": 147,
+            "end": 154,
             "loc": {
               "start": {
                 "line": 5,
@@ -403,13 +403,13 @@
               },
               "end": {
                 "line": 5,
-                "column": 20
+                "column": 21
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 142,
-              "end": 148,
+              "start": 147,
+              "end": 154,
               "loc": {
                 "start": {
                   "line": 5,
@@ -417,17 +417,17 @@
                 },
                 "end": {
                   "line": 5,
-                  "column": 20
+                  "column": 21
                 },
-                "identifierName": "switch"
+                "identifierName": "switch2"
               },
-              "name": "switch"
+              "name": "switch2"
             },
             "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 142,
-              "end": 148,
+              "start": 147,
+              "end": 154,
               "loc": {
                 "start": {
                   "line": 5,
@@ -435,27 +435,27 @@
                 },
                 "end": {
                   "line": 5,
-                  "column": 20
+                  "column": 21
                 },
-                "identifierName": "switch"
+                "identifierName": "switch2"
               },
-              "name": "switch"
+              "name": "switch2"
             }
           }
         ],
         "importKind": "type",
         "source": {
           "type": "StringLiteral",
-          "start": 156,
-          "end": 161,
+          "start": 162,
+          "end": 167,
           "loc": {
             "start": {
               "line": 5,
-              "column": 28
+              "column": 29
             },
             "end": {
               "line": 5,
-              "column": 33
+              "column": 34
             }
           },
           "extra": {
@@ -467,8 +467,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 163,
-        "end": 199,
+        "start": 169,
+        "end": 207,
         "loc": {
           "start": {
             "line": 6,
@@ -476,14 +476,14 @@
           },
           "end": {
             "line": 6,
-            "column": 36
+            "column": 38
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
-            "start": 177,
-            "end": 180,
+            "start": 183,
+            "end": 187,
             "loc": {
               "start": {
                 "line": 6,
@@ -491,13 +491,13 @@
               },
               "end": {
                 "line": 6,
-                "column": 17
+                "column": 18
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 177,
-              "end": 180,
+              "start": 183,
+              "end": 187,
               "loc": {
                 "start": {
                   "line": 6,
@@ -505,17 +505,17 @@
                 },
                 "end": {
                   "line": 6,
-                  "column": 17
+                  "column": 18
                 },
-                "identifierName": "foo"
+                "identifierName": "foo1"
               },
-              "name": "foo"
+              "name": "foo1"
             },
             "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 177,
-              "end": 180,
+              "start": 183,
+              "end": 187,
               "loc": {
                 "start": {
                   "line": 6,
@@ -523,77 +523,77 @@
                 },
                 "end": {
                   "line": 6,
-                  "column": 17
+                  "column": 18
                 },
-                "identifierName": "foo"
+                "identifierName": "foo1"
               },
-              "name": "foo"
+              "name": "foo1"
             }
           },
           {
             "type": "ImportSpecifier",
-            "start": 182,
-            "end": 185,
+            "start": 189,
+            "end": 193,
             "loc": {
               "start": {
                 "line": 6,
-                "column": 19
+                "column": 20
               },
               "end": {
                 "line": 6,
-                "column": 22
+                "column": 24
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 182,
-              "end": 185,
+              "start": 189,
+              "end": 193,
               "loc": {
                 "start": {
                   "line": 6,
-                  "column": 19
+                  "column": 20
                 },
                 "end": {
                   "line": 6,
-                  "column": 22
+                  "column": 24
                 },
-                "identifierName": "bar"
+                "identifierName": "bar1"
               },
-              "name": "bar"
+              "name": "bar1"
             },
             "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 182,
-              "end": 185,
+              "start": 189,
+              "end": 193,
               "loc": {
                 "start": {
                   "line": 6,
-                  "column": 19
+                  "column": 20
                 },
                 "end": {
                   "line": 6,
-                  "column": 22
+                  "column": 24
                 },
-                "identifierName": "bar"
+                "identifierName": "bar1"
               },
-              "name": "bar"
+              "name": "bar1"
             }
           }
         ],
         "importKind": "type",
         "source": {
           "type": "StringLiteral",
-          "start": 193,
-          "end": 198,
+          "start": 201,
+          "end": 206,
           "loc": {
             "start": {
               "line": 6,
-              "column": 30
+              "column": 32
             },
             "end": {
               "line": 6,
-              "column": 35
+              "column": 37
             }
           },
           "extra": {
@@ -605,8 +605,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 200,
-        "end": 223,
+        "start": 208,
+        "end": 231,
         "loc": {
           "start": {
             "line": 7,
@@ -620,8 +620,8 @@
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
-            "start": 207,
-            "end": 211,
+            "start": 215,
+            "end": 219,
             "loc": {
               "start": {
                 "line": 7,
@@ -634,8 +634,8 @@
             },
             "local": {
               "type": "Identifier",
-              "start": 207,
-              "end": 211,
+              "start": 215,
+              "end": 219,
               "loc": {
                 "start": {
                   "line": 7,
@@ -654,8 +654,8 @@
         "importKind": "value",
         "source": {
           "type": "StringLiteral",
-          "start": 217,
-          "end": 222,
+          "start": 225,
+          "end": 230,
           "loc": {
             "start": {
               "line": 7,
@@ -675,8 +675,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 224,
-        "end": 256,
+        "start": 232,
+        "end": 262,
         "loc": {
           "start": {
             "line": 8,
@@ -684,106 +684,56 @@
           },
           "end": {
             "line": 8,
-            "column": 32
+            "column": 30
           }
         },
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
-            "start": 231,
-            "end": 235,
-            "loc": {
-              "start": {
-                "line": 8,
-                "column": 7
-              },
-              "end": {
-                "line": 8,
-                "column": 11
-              }
-            },
-            "local": {
-              "type": "Identifier",
-              "start": 231,
-              "end": 235,
-              "loc": {
-                "start": {
-                  "line": 8,
-                  "column": 7
-                },
-                "end": {
-                  "line": 8,
-                  "column": 11
-                },
-                "identifierName": "type"
-              },
-              "name": "type"
-            }
-          },
-          {
-            "type": "ImportSpecifier",
-            "start": 239,
-            "end": 242,
+            "start": 246,
+            "end": 250,
             "loc": {
               "start": {
                 "line": 8,
-                "column": 15
+                "column": 14
               },
               "end": {
                 "line": 8,
                 "column": 18
               }
             },
-            "imported": {
-              "type": "Identifier",
-              "start": 239,
-              "end": 242,
-              "loc": {
-                "start": {
-                  "line": 8,
-                  "column": 15
-                },
-                "end": {
-                  "line": 8,
-                  "column": 18
-                },
-                "identifierName": "foo"
-              },
-              "name": "foo"
-            },
-            "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 239,
-              "end": 242,
+              "start": 246,
+              "end": 250,
               "loc": {
                 "start": {
                   "line": 8,
-                  "column": 15
+                  "column": 14
                 },
                 "end": {
                   "line": 8,
                   "column": 18
                 },
-                "identifierName": "foo"
+                "identifierName": "foo3"
               },
-              "name": "foo"
+              "name": "foo3"
             }
           }
         ],
-        "importKind": "value",
+        "importKind": "typeof",
         "source": {
           "type": "StringLiteral",
-          "start": 250,
-          "end": 255,
+          "start": 256,
+          "end": 261,
           "loc": {
             "start": {
               "line": 8,
-              "column": 26
+              "column": 24
             },
             "end": {
               "line": 8,
-              "column": 31
+              "column": 29
             }
           },
           "extra": {
@@ -795,8 +745,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 257,
-        "end": 286,
+        "start": 263,
+        "end": 296,
         "loc": {
           "start": {
             "line": 9,
@@ -804,14 +754,14 @@
           },
           "end": {
             "line": 9,
-            "column": 29
+            "column": 33
           }
         },
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
-            "start": 271,
-            "end": 274,
+            "start": 277,
+            "end": 284,
             "loc": {
               "start": {
                 "line": 9,
@@ -819,13 +769,13 @@
               },
               "end": {
                 "line": 9,
-                "column": 17
+                "column": 21
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 271,
-              "end": 274,
+              "start": 277,
+              "end": 284,
               "loc": {
                 "start": {
                   "line": 9,
@@ -833,40 +783,40 @@
                 },
                 "end": {
                   "line": 9,
-                  "column": 17
+                  "column": 21
                 },
-                "identifierName": "foo"
+                "identifierName": "switch4"
               },
-              "name": "foo"
+              "name": "switch4"
             }
           }
         ],
         "importKind": "typeof",
         "source": {
           "type": "StringLiteral",
-          "start": 280,
-          "end": 285,
+          "start": 290,
+          "end": 295,
           "loc": {
             "start": {
               "line": 9,
-              "column": 23
+              "column": 27
             },
             "end": {
               "line": 9,
-              "column": 28
+              "column": 32
             }
           },
           "extra": {
-            "rawValue": "bar",
-            "raw": "\"bar\""
+            "rawValue": "foo",
+            "raw": "\"foo\""
           },
-          "value": "bar"
+          "value": "foo"
         }
       },
       {
         "type": "ImportDeclaration",
-        "start": 287,
-        "end": 319,
+        "start": 297,
+        "end": 334,
         "loc": {
           "start": {
             "line": 10,
@@ -874,56 +824,74 @@
           },
           "end": {
             "line": 10,
-            "column": 32
+            "column": 37
           }
         },
         "specifiers": [
           {
-            "type": "ImportDefaultSpecifier",
-            "start": 301,
-            "end": 307,
+            "type": "ImportSpecifier",
+            "start": 313,
+            "end": 320,
             "loc": {
               "start": {
                 "line": 10,
-                "column": 14
+                "column": 16
               },
               "end": {
                 "line": 10,
-                "column": 20
+                "column": 23
               }
             },
+            "imported": {
+              "type": "Identifier",
+              "start": 313,
+              "end": 320,
+              "loc": {
+                "start": {
+                  "line": 10,
+                  "column": 16
+                },
+                "end": {
+                  "line": 10,
+                  "column": 23
+                },
+                "identifierName": "switch5"
+              },
+              "name": "switch5"
+            },
+            "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 301,
-              "end": 307,
+              "start": 313,
+              "end": 320,
               "loc": {
                 "start": {
                   "line": 10,
-                  "column": 14
+                  "column": 16
                 },
                 "end": {
                   "line": 10,
-                  "column": 20
+                  "column": 23
                 },
-                "identifierName": "switch"
+                "identifierName": "switch5"
               },
-              "name": "switch"
+              "name": "switch5"
             }
           }
         ],
         "importKind": "typeof",
         "source": {
           "type": "StringLiteral",
-          "start": 313,
-          "end": 318,
+          "start": 328,
+          "end": 333,
           "loc": {
             "start": {
               "line": 10,
-              "column": 26
+              "column": 31
             },
             "end": {
               "line": 10,
-              "column": 31
+              "column": 36
             }
           },
           "extra": {
@@ -935,8 +903,8 @@
       },
       {
         "type": "ImportDeclaration",
-        "start": 320,
-        "end": 356,
+        "start": 335,
+        "end": 376,
         "loc": {
           "start": {
             "line": 11,
@@ -944,14 +912,14 @@
           },
           "end": {
             "line": 11,
-            "column": 36
+            "column": 41
           }
         },
         "specifiers": [
           {
             "type": "ImportSpecifier",
-            "start": 336,
-            "end": 342,
+            "start": 351,
+            "end": 362,
             "loc": {
               "start": {
                 "line": 11,
@@ -959,13 +927,13 @@
               },
               "end": {
                 "line": 11,
-                "column": 22
+                "column": 27
               }
             },
             "imported": {
               "type": "Identifier",
-              "start": 336,
-              "end": 342,
+              "start": 351,
+              "end": 354,
               "loc": {
                 "start": {
                   "line": 11,
@@ -973,58 +941,58 @@
                 },
                 "end": {
                   "line": 11,
-                  "column": 22
+                  "column": 19
                 },
-                "identifierName": "switch"
+                "identifierName": "foo"
               },
-              "name": "switch"
+              "name": "foo"
             },
             "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 336,
-              "end": 342,
+              "start": 358,
+              "end": 362,
               "loc": {
                 "start": {
                   "line": 11,
-                  "column": 16
+                  "column": 23
                 },
                 "end": {
                   "line": 11,
-                  "column": 22
+                  "column": 27
                 },
-                "identifierName": "switch"
+                "identifierName": "bar6"
               },
-              "name": "switch"
+              "name": "bar6"
             }
           }
         ],
         "importKind": "typeof",
         "source": {
           "type": "StringLiteral",
-          "start": 350,
-          "end": 355,
+          "start": 370,
+          "end": 375,
           "loc": {
             "start": {
               "line": 11,
-              "column": 30
+              "column": 35
             },
             "end": {
               "line": 11,
-              "column": 35
+              "column": 40
             }
           },
           "extra": {
-            "rawValue": "foo",
-            "raw": "\"foo\""
+            "rawValue": "baz",
+            "raw": "\"baz\""
           },
-          "value": "foo"
+          "value": "baz"
         }
       },
       {
         "type": "ImportDeclaration",
-        "start": 357,
-        "end": 397,
+        "start": 377,
+        "end": 411,
         "loc": {
           "start": {
             "line": 12,
@@ -1032,87 +1000,69 @@
           },
           "end": {
             "line": 12,
-            "column": 40
+            "column": 34
           }
         },
         "specifiers": [
           {
-            "type": "ImportSpecifier",
-            "start": 373,
-            "end": 383,
+            "type": "ImportNamespaceSpecifier",
+            "start": 391,
+            "end": 399,
             "loc": {
               "start": {
                 "line": 12,
-                "column": 16
+                "column": 14
               },
               "end": {
                 "line": 12,
-                "column": 26
+                "column": 22
               }
             },
-            "imported": {
-              "type": "Identifier",
-              "start": 373,
-              "end": 376,
-              "loc": {
-                "start": {
-                  "line": 12,
-                  "column": 16
-                },
-                "end": {
-                  "line": 12,
-                  "column": 19
-                },
-                "identifierName": "foo"
-              },
-              "name": "foo"
-            },
-            "importKind": null,
             "local": {
               "type": "Identifier",
-              "start": 380,
-              "end": 383,
+              "start": 396,
+              "end": 399,
               "loc": {
                 "start": {
                   "line": 12,
-                  "column": 23
+                  "column": 19
                 },
                 "end": {
                   "line": 12,
-                  "column": 26
+                  "column": 22
                 },
-                "identifierName": "bar"
+                "identifierName": "ns7"
               },
-              "name": "bar"
+              "name": "ns7"
             }
           }
         ],
         "importKind": "typeof",
         "source": {
           "type": "StringLiteral",
-          "start": 391,
-          "end": 396,
+          "start": 405,
+          "end": 410,
           "loc": {
             "start": {
               "line": 12,
-              "column": 34
+              "column": 28
             },
             "end": {
               "line": 12,
-              "column": 39
+              "column": 33
             }
           },
           "extra": {
-            "rawValue": "baz",
-            "raw": "\"baz\""
+            "rawValue": "foo",
+            "raw": "\"foo\""
           },
-          "value": "baz"
+          "value": "foo"
         }
       },
       {
         "type": "ImportDeclaration",
-        "start": 398,
-        "end": 431,
+        "start": 412,
+        "end": 450,
         "loc": {
           "start": {
             "line": 13,
@@ -1120,14 +1070,14 @@
           },
           "end": {
             "line": 13,
-            "column": 33
+            "column": 38
           }
         },
         "specifiers": [
           {
             "type": "ImportNamespaceSpecifier",
-            "start": 412,
-            "end": 419,
+            "start": 426,
+            "end": 438,
             "loc": {
               "start": {
                 "line": 13,
@@ -1135,13 +1085,13 @@
               },
               "end": {
                 "line": 13,
-                "column": 21
+                "column": 26
               }
             },
             "local": {
               "type": "Identifier",
-              "start": 417,
-              "end": 419,
+              "start": 431,
+              "end": 438,
               "loc": {
                 "start": {
                   "line": 13,
@@ -1149,97 +1099,27 @@
                 },
                 "end": {
                   "line": 13,
-                  "column": 21
+                  "column": 26
                 },
-                "identifierName": "ns"
+                "identifierName": "switch8"
               },
-              "name": "ns"
+              "name": "switch8"
             }
           }
         ],
         "importKind": "typeof",
         "source": {
           "type": "StringLiteral",
-          "start": 425,
-          "end": 430,
+          "start": 444,
+          "end": 449,
           "loc": {
             "start": {
-              "line": 13,
-              "column": 27
-            },
-            "end": {
               "line": 13,
               "column": 32
-            }
-          },
-          "extra": {
-            "rawValue": "foo",
-            "raw": "\"foo\""
-          },
-          "value": "foo"
-        }
-      },
-      {
-        "type": "ImportDeclaration",
-        "start": 432,
-        "end": 469,
-        "loc": {
-          "start": {
-            "line": 14,
-            "column": 0
-          },
-          "end": {
-            "line": 14,
-            "column": 37
-          }
-        },
-        "specifiers": [
-          {
-            "type": "ImportNamespaceSpecifier",
-            "start": 446,
-            "end": 457,
-            "loc": {
-              "start": {
-                "line": 14,
-                "column": 14
-              },
-              "end": {
-                "line": 14,
-                "column": 25
-              }
-            },
-            "local": {
-              "type": "Identifier",
-              "start": 451,
-              "end": 457,
-              "loc": {
-                "start": {
-                  "line": 14,
-                  "column": 19
-                },
-                "end": {
-                  "line": 14,
-                  "column": 25
-                },
-                "identifierName": "switch"
-              },
-              "name": "switch"
-            }
-          }
-        ],
-        "importKind": "typeof",
-        "source": {
-          "type": "StringLiteral",
-          "start": 463,
-          "end": 468,
-          "loc": {
-            "start": {
-              "line": 14,
-              "column": 31
             },
             "end": {
-              "line": 14,
-              "column": 36
+              "line": 13,
+              "column": 37
             }
           },
           "extra": {
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json
index 7f4fe7d13efb..7624c4d3b99a 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-2/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:14)"
+  "throws": "Cannot overwrite reserved type string (1:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json
index 7f4fe7d13efb..7624c4d3b99a 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-3/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:14)"
+  "throws": "Cannot overwrite reserved type string (1:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json
index 39481cdad495..d64a5d353bf8 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-4/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:19)"
+  "throws": "Cannot overwrite reserved type string (1:19)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-as/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-as/options.json
index 011c7d25dad5..5133797973d2 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-as/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-as/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "debugger is a reserved word (1:17)"
+  "throws": "Unexpected keyword 'debugger' (1:17)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-2/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-2/options.json
index 132b4a19ec67..036229c5b95a 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-2/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-2/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements (1:13)"
+  "throws": "The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements (1:13)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json
index bb13e8023fa8..e425b795f180 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-3/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:16)"
+  "throws": "Cannot overwrite reserved type string (1:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json
index 7f4fe7d13efb..7624c4d3b99a 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand-4/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:14)"
+  "throws": "Cannot overwrite reserved type string (1:14)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand/options.json
index 4ee840273c10..7aa4274c7160 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type-shorthand/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements (1:15)"
+  "throws": "The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements (1:15)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json
index 6bf62df4a991..0c2cdd4d777c 100644
--- a/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-imports/invalid-import-type/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Cannot overwrite primitive type string (1:12)"
+  "throws": "Cannot overwrite reserved type string (1:12)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/arrow_error_without_jsx/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/arrow_error_without_jsx/options.json
index c349e4e3999e..cf72e7dfcad7 100644
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/arrow_error_without_jsx/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/arrow_error_without_jsx/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": ["flow"],
-  "throws":
-    "Expected an arrow function after this type parameter declaration (1:0)"
+  "throws": "Expected an arrow function after this type parameter declaration (1:0)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-1/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-1/input.js
deleted file mode 100644
index e85753f1bf25..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-1/input.js
+++ /dev/null
@@ -1,3 +0,0 @@
-(class A {
-  foo<T = string>() {}
-});
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-1/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-1/options.json
deleted file mode 100644
index ef2b7c682fba..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-1/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (2:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-2/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-2/input.js
deleted file mode 100644
index 088051643fa2..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-2/input.js
+++ /dev/null
@@ -1 +0,0 @@
-({ foo<T = string>() {} });
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-2/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-2/options.json
deleted file mode 100644
index 2a28555f76db..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-2/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:9)"
-}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-3/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-3/input.js
deleted file mode 100644
index 742685c460ec..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-3/input.js
+++ /dev/null
@@ -1 +0,0 @@
-declare class A { foo<T = string>(): void }
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-3/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-3/options.json
deleted file mode 100644
index fa579aa83145..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-3/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:24)"
-}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-4/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-4/input.js
deleted file mode 100644
index a35315333a49..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-4/input.js
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-  foo<T = string>() {}
-}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-4/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-4/options.json
deleted file mode 100644
index ef2b7c682fba..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-4/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (2:8)"
-}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-5/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-5/input.js
deleted file mode 100644
index 3223246d3979..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-5/input.js
+++ /dev/null
@@ -1 +0,0 @@
-function foo<T = string>() {}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-5/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-5/options.json
deleted file mode 100644
index 98d712379010..000000000000
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-5/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:15)"
-}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-class-extends/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-class-extends/input.js
new file mode 100644
index 000000000000..2b40a1ba03fc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-class-extends/input.js
@@ -0,0 +1 @@
+class A extends B<T = number> {}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-class-extends/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-class-extends/options.json
new file mode 100644
index 000000000000..6f017e5a5919
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-class-extends/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:20)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-declare-func/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-declare-func/input.js
new file mode 100644
index 000000000000..018ada1c550e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-declare-func/input.js
@@ -0,0 +1 @@
+declare function foo<T = string>() {}
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-declare-func/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-declare-func/options.json
new file mode 100644
index 000000000000..161afd296dc4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-declare-func/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \":\" (1:35)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-var-type/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-var-type/input.js
new file mode 100644
index 000000000000..646522dea3d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-var-type/input.js
@@ -0,0 +1 @@
+var x: Array<T = number>
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-var-type/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-var-type/options.json
new file mode 100644
index 000000000000..fbfad415eebf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-invalid-var-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \",\" (1:15)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-missing/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-missing/options.json
index 3c2ac7c9b913..022607b81797 100644
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-missing/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default-missing/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Type parameter declaration needs a default, since a preceding type parameter declaration has a default. (1:28)"
+  "throws": "Type parameter declaration needs a default, since a preceding type parameter declaration has a default. (1:28)"
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/input.js b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/input.js
index faa1bc88aeb7..4feffe1038d6 100644
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/input.js
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/input.js
@@ -1,22 +1,32 @@
-type A<T = string> = T
-type A<T = *> = T
-type A<T: ?string = string> = T
-type A<S, T: ?string = string> = T
-type A<S = number, T: ?string = string> = T
-class A<T = string> {}
-class A<T: ?string = string> {}
-class A<S, T: ?string = string> {}
-class A<S = number, T: ?string = string> {}
-;(class A<T = string> {})
-;(class A<T: ?string = string> {})
-;(class A<S, T: ?string = string> {})
-;(class A<S = number, T: ?string = string> {})
-declare class A<T = string> {}
-declare class A<T: ?string = string> {}
-declare class A<S, T: ?string = string> {}
-declare class A<S = number, T: ?string = string> {}
-interface A<T = string> {}
-interface A<T: ?string = string> {}
-interface A<S, T: ?string = string> {}
-interface A<S = number, T: ?string = string> {}
-type A<T = void> = T
+type A1<T = string> = T
+type A2<T = *> = T
+type A3<T: ?string = string> = T
+type A4<S, T: ?string = string> = T
+type A5<S = number, T: ?string = string> = T
+class A6<T = string> {}
+class A7<T: ?string = string> {}
+class A8<S, T: ?string = string> {}
+class A9<S = number, T: ?string = string> {}
+;(class A10<T = string> {})
+;(class A11<T: ?string = string> {})
+;(class A12<S, T: ?string = string> {})
+;(class A13<S = number, T: ?string = string> {})
+declare class A14<T = string> {}
+declare class A15<T: ?string = string> {}
+declare class A16<S, T: ?string = string> {}
+declare class A17<S = number, T: ?string = string> {}
+interface A18<T = string> {}
+interface A19<T: ?string = string> {}
+interface A20<S, T: ?string = string> {}
+interface A21<S = number, T: ?string = string> {}
+type A22<T = void> = T
+function A26<T = string>() {}
+;({ A28<T = string>() {} });
+class A29 {
+  foo<T = string>() {}
+}
+;(class A30 {
+  foo<T = string>() {}
+});
+declare class A31 { foo<T = string>(): void }
+<T = string>() => 123;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/output.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/output.json
index 28f3fe73841a..8b2db5858c66 100644
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/default/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 768,
+  "end": 1009,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 22,
-      "column": 20
+      "line": 32,
+      "column": 22
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 768,
+    "end": 1009,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 22,
-        "column": 20
+        "line": 32,
+        "column": 22
       }
     },
     "sourceType": "module",
@@ -32,7 +32,7 @@
       {
         "type": "TypeAlias",
         "start": 0,
-        "end": 22,
+        "end": 23,
         "loc": {
           "start": {
             "line": 1,
@@ -40,13 +40,13 @@
           },
           "end": {
             "line": 1,
-            "column": 22
+            "column": 23
           }
         },
         "id": {
           "type": "Identifier",
           "start": 5,
-          "end": 6,
+          "end": 7,
           "loc": {
             "start": {
               "line": 1,
@@ -54,55 +54,55 @@
             },
             "end": {
               "line": 1,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "A"
+            "identifierName": "A1"
           },
-          "name": "A"
+          "name": "A1"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 6,
-          "end": 18,
+          "start": 7,
+          "end": 19,
           "loc": {
             "start": {
               "line": 1,
-              "column": 6
+              "column": 7
             },
             "end": {
               "line": 1,
-              "column": 18
+              "column": 19
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 7,
-              "end": 17,
+              "start": 8,
+              "end": 18,
               "loc": {
                 "start": {
                   "line": 1,
-                  "column": 7
+                  "column": 8
                 },
                 "end": {
                   "line": 1,
-                  "column": 17
+                  "column": 18
                 }
               },
               "name": "T",
               "variance": null,
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 11,
-                "end": 17,
+                "start": 12,
+                "end": 18,
                 "loc": {
                   "start": {
                     "line": 1,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 1,
-                    "column": 17
+                    "column": 18
                   }
                 }
               }
@@ -111,31 +111,31 @@
         },
         "right": {
           "type": "GenericTypeAnnotation",
-          "start": 21,
-          "end": 22,
+          "start": 22,
+          "end": 23,
           "loc": {
             "start": {
               "line": 1,
-              "column": 21
+              "column": 22
             },
             "end": {
               "line": 1,
-              "column": 22
+              "column": 23
             }
           },
           "typeParameters": null,
           "id": {
             "type": "Identifier",
-            "start": 21,
-            "end": 22,
+            "start": 22,
+            "end": 23,
             "loc": {
               "start": {
                 "line": 1,
-                "column": 21
+                "column": 22
               },
               "end": {
                 "line": 1,
-                "column": 22
+                "column": 23
               },
               "identifierName": "T"
             },
@@ -145,8 +145,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 23,
-        "end": 40,
+        "start": 24,
+        "end": 42,
         "loc": {
           "start": {
             "line": 2,
@@ -154,13 +154,13 @@
           },
           "end": {
             "line": 2,
-            "column": 17
+            "column": 18
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 28,
-          "end": 29,
+          "start": 29,
+          "end": 31,
           "loc": {
             "start": {
               "line": 2,
@@ -168,55 +168,55 @@
             },
             "end": {
               "line": 2,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "A"
+            "identifierName": "A2"
           },
-          "name": "A"
+          "name": "A2"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 29,
-          "end": 36,
+          "start": 31,
+          "end": 38,
           "loc": {
             "start": {
               "line": 2,
-              "column": 6
+              "column": 7
             },
             "end": {
               "line": 2,
-              "column": 13
+              "column": 14
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 30,
-              "end": 35,
+              "start": 32,
+              "end": 37,
               "loc": {
                 "start": {
                   "line": 2,
-                  "column": 7
+                  "column": 8
                 },
                 "end": {
                   "line": 2,
-                  "column": 12
+                  "column": 13
                 }
               },
               "name": "T",
               "variance": null,
               "default": {
                 "type": "ExistsTypeAnnotation",
-                "start": 34,
-                "end": 35,
+                "start": 36,
+                "end": 37,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 2,
-                    "column": 12
+                    "column": 13
                   }
                 }
               }
@@ -225,31 +225,31 @@
         },
         "right": {
           "type": "GenericTypeAnnotation",
-          "start": 39,
-          "end": 40,
+          "start": 41,
+          "end": 42,
           "loc": {
             "start": {
               "line": 2,
-              "column": 16
+              "column": 17
             },
             "end": {
               "line": 2,
-              "column": 17
+              "column": 18
             }
           },
           "typeParameters": null,
           "id": {
             "type": "Identifier",
-            "start": 39,
-            "end": 40,
+            "start": 41,
+            "end": 42,
             "loc": {
               "start": {
                 "line": 2,
-                "column": 16
+                "column": 17
               },
               "end": {
                 "line": 2,
-                "column": 17
+                "column": 18
               },
               "identifierName": "T"
             },
@@ -259,8 +259,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 41,
-        "end": 72,
+        "start": 43,
+        "end": 75,
         "loc": {
           "start": {
             "line": 3,
@@ -268,13 +268,13 @@
           },
           "end": {
             "line": 3,
-            "column": 31
+            "column": 32
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 46,
-          "end": 47,
+          "start": 48,
+          "end": 50,
           "loc": {
             "start": {
               "line": 3,
@@ -282,83 +282,83 @@
             },
             "end": {
               "line": 3,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "A"
+            "identifierName": "A3"
           },
-          "name": "A"
+          "name": "A3"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 47,
-          "end": 68,
+          "start": 50,
+          "end": 71,
           "loc": {
             "start": {
               "line": 3,
-              "column": 6
+              "column": 7
             },
             "end": {
               "line": 3,
-              "column": 27
+              "column": 28
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 48,
-              "end": 67,
+              "start": 51,
+              "end": 70,
               "loc": {
                 "start": {
                   "line": 3,
-                  "column": 7
+                  "column": 8
                 },
                 "end": {
                   "line": 3,
-                  "column": 26
+                  "column": 27
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 49,
-                "end": 58,
+                "start": 52,
+                "end": 61,
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 8
+                    "column": 9
                   },
                   "end": {
                     "line": 3,
-                    "column": 17
+                    "column": 18
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 51,
-                  "end": 58,
+                  "start": 54,
+                  "end": 61,
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 10
+                      "column": 11
                     },
                     "end": {
                       "line": 3,
-                      "column": 17
+                      "column": 18
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 52,
-                    "end": 58,
+                    "start": 55,
+                    "end": 61,
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 11
+                        "column": 12
                       },
                       "end": {
                         "line": 3,
-                        "column": 17
+                        "column": 18
                       }
                     }
                   }
@@ -366,16 +366,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 61,
-                "end": 67,
+                "start": 64,
+                "end": 70,
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 20
+                    "column": 21
                   },
                   "end": {
                     "line": 3,
-                    "column": 26
+                    "column": 27
                   }
                 }
               }
@@ -384,31 +384,31 @@
         },
         "right": {
           "type": "GenericTypeAnnotation",
-          "start": 71,
-          "end": 72,
+          "start": 74,
+          "end": 75,
           "loc": {
             "start": {
               "line": 3,
-              "column": 30
+              "column": 31
             },
             "end": {
               "line": 3,
-              "column": 31
+              "column": 32
             }
           },
           "typeParameters": null,
           "id": {
             "type": "Identifier",
-            "start": 71,
-            "end": 72,
+            "start": 74,
+            "end": 75,
             "loc": {
               "start": {
                 "line": 3,
-                "column": 30
+                "column": 31
               },
               "end": {
                 "line": 3,
-                "column": 31
+                "column": 32
               },
               "identifierName": "T"
             },
@@ -418,8 +418,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 73,
-        "end": 107,
+        "start": 76,
+        "end": 111,
         "loc": {
           "start": {
             "line": 4,
@@ -427,13 +427,13 @@
           },
           "end": {
             "line": 4,
-            "column": 34
+            "column": 35
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 78,
-          "end": 79,
+          "start": 81,
+          "end": 83,
           "loc": {
             "start": {
               "line": 4,
@@ -441,39 +441,39 @@
             },
             "end": {
               "line": 4,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "A"
+            "identifierName": "A4"
           },
-          "name": "A"
+          "name": "A4"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 79,
-          "end": 103,
+          "start": 83,
+          "end": 107,
           "loc": {
             "start": {
               "line": 4,
-              "column": 6
+              "column": 7
             },
             "end": {
               "line": 4,
-              "column": 30
+              "column": 31
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 80,
-              "end": 81,
+              "start": 84,
+              "end": 85,
               "loc": {
                 "start": {
                   "line": 4,
-                  "column": 7
+                  "column": 8
                 },
                 "end": {
                   "line": 4,
-                  "column": 8
+                  "column": 9
                 }
               },
               "name": "S",
@@ -481,60 +481,60 @@
             },
             {
               "type": "TypeParameter",
-              "start": 83,
-              "end": 102,
+              "start": 87,
+              "end": 106,
               "loc": {
                 "start": {
                   "line": 4,
-                  "column": 10
+                  "column": 11
                 },
                 "end": {
                   "line": 4,
-                  "column": 29
+                  "column": 30
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 84,
-                "end": 93,
+                "start": 88,
+                "end": 97,
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 4,
-                    "column": 20
+                    "column": 21
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 86,
-                  "end": 93,
+                  "start": 90,
+                  "end": 97,
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 13
+                      "column": 14
                     },
                     "end": {
                       "line": 4,
-                      "column": 20
+                      "column": 21
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 87,
-                    "end": 93,
+                    "start": 91,
+                    "end": 97,
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 14
+                        "column": 15
                       },
                       "end": {
                         "line": 4,
-                        "column": 20
+                        "column": 21
                       }
                     }
                   }
@@ -542,16 +542,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 96,
-                "end": 102,
+                "start": 100,
+                "end": 106,
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 23
+                    "column": 24
                   },
                   "end": {
                     "line": 4,
-                    "column": 29
+                    "column": 30
                   }
                 }
               }
@@ -560,31 +560,31 @@
         },
         "right": {
           "type": "GenericTypeAnnotation",
-          "start": 106,
-          "end": 107,
+          "start": 110,
+          "end": 111,
           "loc": {
             "start": {
               "line": 4,
-              "column": 33
+              "column": 34
             },
             "end": {
               "line": 4,
-              "column": 34
+              "column": 35
             }
           },
           "typeParameters": null,
           "id": {
             "type": "Identifier",
-            "start": 106,
-            "end": 107,
+            "start": 110,
+            "end": 111,
             "loc": {
               "start": {
                 "line": 4,
-                "column": 33
+                "column": 34
               },
               "end": {
                 "line": 4,
-                "column": 34
+                "column": 35
               },
               "identifierName": "T"
             },
@@ -594,8 +594,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 108,
-        "end": 151,
+        "start": 112,
+        "end": 156,
         "loc": {
           "start": {
             "line": 5,
@@ -603,13 +603,13 @@
           },
           "end": {
             "line": 5,
-            "column": 43
+            "column": 44
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 113,
-          "end": 114,
+          "start": 117,
+          "end": 119,
           "loc": {
             "start": {
               "line": 5,
@@ -617,115 +617,115 @@
             },
             "end": {
               "line": 5,
-              "column": 6
+              "column": 7
             },
-            "identifierName": "A"
+            "identifierName": "A5"
           },
-          "name": "A"
+          "name": "A5"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 114,
-          "end": 147,
+          "start": 119,
+          "end": 152,
           "loc": {
             "start": {
               "line": 5,
-              "column": 6
+              "column": 7
             },
             "end": {
               "line": 5,
-              "column": 39
+              "column": 40
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 115,
-              "end": 125,
+              "start": 120,
+              "end": 130,
               "loc": {
                 "start": {
                   "line": 5,
-                  "column": 7
+                  "column": 8
                 },
                 "end": {
                   "line": 5,
-                  "column": 17
+                  "column": 18
                 }
               },
               "name": "S",
               "variance": null,
               "default": {
                 "type": "NumberTypeAnnotation",
-                "start": 119,
-                "end": 125,
+                "start": 124,
+                "end": 130,
                 "loc": {
                   "start": {
                     "line": 5,
-                    "column": 11
+                    "column": 12
                   },
                   "end": {
                     "line": 5,
-                    "column": 17
+                    "column": 18
                   }
                 }
               }
             },
             {
               "type": "TypeParameter",
-              "start": 127,
-              "end": 146,
+              "start": 132,
+              "end": 151,
               "loc": {
                 "start": {
                   "line": 5,
-                  "column": 19
+                  "column": 20
                 },
                 "end": {
                   "line": 5,
-                  "column": 38
+                  "column": 39
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 128,
-                "end": 137,
+                "start": 133,
+                "end": 142,
                 "loc": {
                   "start": {
                     "line": 5,
-                    "column": 20
+                    "column": 21
                   },
                   "end": {
                     "line": 5,
-                    "column": 29
+                    "column": 30
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 130,
-                  "end": 137,
+                  "start": 135,
+                  "end": 142,
                   "loc": {
                     "start": {
                       "line": 5,
-                      "column": 22
+                      "column": 23
                     },
                     "end": {
                       "line": 5,
-                      "column": 29
+                      "column": 30
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 131,
-                    "end": 137,
+                    "start": 136,
+                    "end": 142,
                     "loc": {
                       "start": {
                         "line": 5,
-                        "column": 23
+                        "column": 24
                       },
                       "end": {
                         "line": 5,
-                        "column": 29
+                        "column": 30
                       }
                     }
                   }
@@ -733,16 +733,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 140,
-                "end": 146,
+                "start": 145,
+                "end": 151,
                 "loc": {
                   "start": {
                     "line": 5,
-                    "column": 32
+                    "column": 33
                   },
                   "end": {
                     "line": 5,
-                    "column": 38
+                    "column": 39
                   }
                 }
               }
@@ -751,31 +751,31 @@
         },
         "right": {
           "type": "GenericTypeAnnotation",
-          "start": 150,
-          "end": 151,
+          "start": 155,
+          "end": 156,
           "loc": {
             "start": {
               "line": 5,
-              "column": 42
+              "column": 43
             },
             "end": {
               "line": 5,
-              "column": 43
+              "column": 44
             }
           },
           "typeParameters": null,
           "id": {
             "type": "Identifier",
-            "start": 150,
-            "end": 151,
+            "start": 155,
+            "end": 156,
             "loc": {
               "start": {
                 "line": 5,
-                "column": 42
+                "column": 43
               },
               "end": {
                 "line": 5,
-                "column": 43
+                "column": 44
               },
               "identifierName": "T"
             },
@@ -785,8 +785,8 @@
       },
       {
         "type": "ClassDeclaration",
-        "start": 152,
-        "end": 174,
+        "start": 157,
+        "end": 180,
         "loc": {
           "start": {
             "line": 6,
@@ -794,13 +794,13 @@
           },
           "end": {
             "line": 6,
-            "column": 22
+            "column": 23
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 158,
-          "end": 159,
+          "start": 163,
+          "end": 165,
           "loc": {
             "start": {
               "line": 6,
@@ -808,55 +808,55 @@
             },
             "end": {
               "line": 6,
-              "column": 7
+              "column": 8
             },
-            "identifierName": "A"
+            "identifierName": "A6"
           },
-          "name": "A"
+          "name": "A6"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 159,
-          "end": 171,
+          "start": 165,
+          "end": 177,
           "loc": {
             "start": {
               "line": 6,
-              "column": 7
+              "column": 8
             },
             "end": {
               "line": 6,
-              "column": 19
+              "column": 20
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 160,
-              "end": 170,
+              "start": 166,
+              "end": 176,
               "loc": {
                 "start": {
                   "line": 6,
-                  "column": 8
+                  "column": 9
                 },
                 "end": {
                   "line": 6,
-                  "column": 18
+                  "column": 19
                 }
               },
               "name": "T",
               "variance": null,
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 164,
-                "end": 170,
+                "start": 170,
+                "end": 176,
                 "loc": {
                   "start": {
                     "line": 6,
-                    "column": 12
+                    "column": 13
                   },
                   "end": {
                     "line": 6,
-                    "column": 18
+                    "column": 19
                   }
                 }
               }
@@ -866,16 +866,16 @@
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 172,
-          "end": 174,
+          "start": 178,
+          "end": 180,
           "loc": {
             "start": {
               "line": 6,
-              "column": 20
+              "column": 21
             },
             "end": {
               "line": 6,
-              "column": 22
+              "column": 23
             }
           },
           "body": []
@@ -883,8 +883,8 @@
       },
       {
         "type": "ClassDeclaration",
-        "start": 175,
-        "end": 206,
+        "start": 181,
+        "end": 213,
         "loc": {
           "start": {
             "line": 7,
@@ -892,13 +892,13 @@
           },
           "end": {
             "line": 7,
-            "column": 31
+            "column": 32
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 181,
-          "end": 182,
+          "start": 187,
+          "end": 189,
           "loc": {
             "start": {
               "line": 7,
@@ -906,83 +906,83 @@
             },
             "end": {
               "line": 7,
-              "column": 7
+              "column": 8
             },
-            "identifierName": "A"
+            "identifierName": "A7"
           },
-          "name": "A"
+          "name": "A7"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 182,
-          "end": 203,
+          "start": 189,
+          "end": 210,
           "loc": {
             "start": {
               "line": 7,
-              "column": 7
+              "column": 8
             },
             "end": {
               "line": 7,
-              "column": 28
+              "column": 29
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 183,
-              "end": 202,
+              "start": 190,
+              "end": 209,
               "loc": {
                 "start": {
                   "line": 7,
-                  "column": 8
+                  "column": 9
                 },
                 "end": {
                   "line": 7,
-                  "column": 27
+                  "column": 28
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 184,
-                "end": 193,
+                "start": 191,
+                "end": 200,
                 "loc": {
                   "start": {
                     "line": 7,
-                    "column": 9
+                    "column": 10
                   },
                   "end": {
                     "line": 7,
-                    "column": 18
+                    "column": 19
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 186,
-                  "end": 193,
+                  "start": 193,
+                  "end": 200,
                   "loc": {
                     "start": {
                       "line": 7,
-                      "column": 11
+                      "column": 12
                     },
                     "end": {
                       "line": 7,
-                      "column": 18
+                      "column": 19
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 187,
-                    "end": 193,
+                    "start": 194,
+                    "end": 200,
                     "loc": {
                       "start": {
                         "line": 7,
-                        "column": 12
+                        "column": 13
                       },
                       "end": {
                         "line": 7,
-                        "column": 18
+                        "column": 19
                       }
                     }
                   }
@@ -990,16 +990,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 196,
-                "end": 202,
+                "start": 203,
+                "end": 209,
                 "loc": {
                   "start": {
                     "line": 7,
-                    "column": 21
+                    "column": 22
                   },
                   "end": {
                     "line": 7,
-                    "column": 27
+                    "column": 28
                   }
                 }
               }
@@ -1009,16 +1009,16 @@
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 204,
-          "end": 206,
+          "start": 211,
+          "end": 213,
           "loc": {
             "start": {
               "line": 7,
-              "column": 29
+              "column": 30
             },
             "end": {
               "line": 7,
-              "column": 31
+              "column": 32
             }
           },
           "body": []
@@ -1026,8 +1026,8 @@
       },
       {
         "type": "ClassDeclaration",
-        "start": 207,
-        "end": 241,
+        "start": 214,
+        "end": 249,
         "loc": {
           "start": {
             "line": 8,
@@ -1035,13 +1035,13 @@
           },
           "end": {
             "line": 8,
-            "column": 34
+            "column": 35
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 213,
-          "end": 214,
+          "start": 220,
+          "end": 222,
           "loc": {
             "start": {
               "line": 8,
@@ -1049,39 +1049,39 @@
             },
             "end": {
               "line": 8,
-              "column": 7
+              "column": 8
             },
-            "identifierName": "A"
+            "identifierName": "A8"
           },
-          "name": "A"
+          "name": "A8"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 214,
-          "end": 238,
+          "start": 222,
+          "end": 246,
           "loc": {
             "start": {
               "line": 8,
-              "column": 7
+              "column": 8
             },
             "end": {
               "line": 8,
-              "column": 31
+              "column": 32
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 215,
-              "end": 216,
+              "start": 223,
+              "end": 224,
               "loc": {
                 "start": {
                   "line": 8,
-                  "column": 8
+                  "column": 9
                 },
                 "end": {
                   "line": 8,
-                  "column": 9
+                  "column": 10
                 }
               },
               "name": "S",
@@ -1089,60 +1089,60 @@
             },
             {
               "type": "TypeParameter",
-              "start": 218,
-              "end": 237,
+              "start": 226,
+              "end": 245,
               "loc": {
                 "start": {
                   "line": 8,
-                  "column": 11
+                  "column": 12
                 },
                 "end": {
                   "line": 8,
-                  "column": 30
+                  "column": 31
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 219,
-                "end": 228,
+                "start": 227,
+                "end": 236,
                 "loc": {
                   "start": {
                     "line": 8,
-                    "column": 12
+                    "column": 13
                   },
                   "end": {
                     "line": 8,
-                    "column": 21
+                    "column": 22
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 221,
-                  "end": 228,
+                  "start": 229,
+                  "end": 236,
                   "loc": {
                     "start": {
                       "line": 8,
-                      "column": 14
+                      "column": 15
                     },
                     "end": {
                       "line": 8,
-                      "column": 21
+                      "column": 22
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 222,
-                    "end": 228,
+                    "start": 230,
+                    "end": 236,
                     "loc": {
                       "start": {
                         "line": 8,
-                        "column": 15
+                        "column": 16
                       },
                       "end": {
                         "line": 8,
-                        "column": 21
+                        "column": 22
                       }
                     }
                   }
@@ -1150,16 +1150,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 231,
-                "end": 237,
+                "start": 239,
+                "end": 245,
                 "loc": {
                   "start": {
                     "line": 8,
-                    "column": 24
+                    "column": 25
                   },
                   "end": {
                     "line": 8,
-                    "column": 30
+                    "column": 31
                   }
                 }
               }
@@ -1169,16 +1169,16 @@
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 239,
-          "end": 241,
+          "start": 247,
+          "end": 249,
           "loc": {
             "start": {
               "line": 8,
-              "column": 32
+              "column": 33
             },
             "end": {
               "line": 8,
-              "column": 34
+              "column": 35
             }
           },
           "body": []
@@ -1186,8 +1186,8 @@
       },
       {
         "type": "ClassDeclaration",
-        "start": 242,
-        "end": 285,
+        "start": 250,
+        "end": 294,
         "loc": {
           "start": {
             "line": 9,
@@ -1195,13 +1195,13 @@
           },
           "end": {
             "line": 9,
-            "column": 43
+            "column": 44
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 248,
-          "end": 249,
+          "start": 256,
+          "end": 258,
           "loc": {
             "start": {
               "line": 9,
@@ -1209,115 +1209,115 @@
             },
             "end": {
               "line": 9,
-              "column": 7
+              "column": 8
             },
-            "identifierName": "A"
+            "identifierName": "A9"
           },
-          "name": "A"
+          "name": "A9"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 249,
-          "end": 282,
+          "start": 258,
+          "end": 291,
           "loc": {
             "start": {
               "line": 9,
-              "column": 7
+              "column": 8
             },
             "end": {
               "line": 9,
-              "column": 40
+              "column": 41
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 250,
-              "end": 260,
+              "start": 259,
+              "end": 269,
               "loc": {
                 "start": {
                   "line": 9,
-                  "column": 8
+                  "column": 9
                 },
                 "end": {
                   "line": 9,
-                  "column": 18
+                  "column": 19
                 }
               },
               "name": "S",
               "variance": null,
               "default": {
                 "type": "NumberTypeAnnotation",
-                "start": 254,
-                "end": 260,
+                "start": 263,
+                "end": 269,
                 "loc": {
                   "start": {
                     "line": 9,
-                    "column": 12
+                    "column": 13
                   },
                   "end": {
                     "line": 9,
-                    "column": 18
+                    "column": 19
                   }
                 }
               }
             },
             {
               "type": "TypeParameter",
-              "start": 262,
-              "end": 281,
+              "start": 271,
+              "end": 290,
               "loc": {
                 "start": {
                   "line": 9,
-                  "column": 20
+                  "column": 21
                 },
                 "end": {
                   "line": 9,
-                  "column": 39
+                  "column": 40
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 263,
-                "end": 272,
+                "start": 272,
+                "end": 281,
                 "loc": {
                   "start": {
                     "line": 9,
-                    "column": 21
+                    "column": 22
                   },
                   "end": {
                     "line": 9,
-                    "column": 30
+                    "column": 31
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 265,
-                  "end": 272,
+                  "start": 274,
+                  "end": 281,
                   "loc": {
                     "start": {
                       "line": 9,
-                      "column": 23
+                      "column": 24
                     },
                     "end": {
                       "line": 9,
-                      "column": 30
+                      "column": 31
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 266,
-                    "end": 272,
+                    "start": 275,
+                    "end": 281,
                     "loc": {
                       "start": {
                         "line": 9,
-                        "column": 24
+                        "column": 25
                       },
                       "end": {
                         "line": 9,
-                        "column": 30
+                        "column": 31
                       }
                     }
                   }
@@ -1325,16 +1325,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 275,
-                "end": 281,
+                "start": 284,
+                "end": 290,
                 "loc": {
                   "start": {
                     "line": 9,
-                    "column": 33
+                    "column": 34
                   },
                   "end": {
                     "line": 9,
-                    "column": 39
+                    "column": 40
                   }
                 }
               }
@@ -1344,16 +1344,16 @@
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 283,
-          "end": 285,
+          "start": 292,
+          "end": 294,
           "loc": {
             "start": {
               "line": 9,
-              "column": 41
+              "column": 42
             },
             "end": {
               "line": 9,
-              "column": 43
+              "column": 44
             }
           },
           "body": []
@@ -1361,8 +1361,8 @@
       },
       {
         "type": "EmptyStatement",
-        "start": 286,
-        "end": 287,
+        "start": 295,
+        "end": 296,
         "loc": {
           "start": {
             "line": 10,
@@ -1376,8 +1376,8 @@
       },
       {
         "type": "ExpressionStatement",
-        "start": 287,
-        "end": 313,
+        "start": 296,
+        "end": 324,
         "loc": {
           "start": {
             "line": 10,
@@ -1390,8 +1390,8 @@
         },
         "expression": {
           "type": "ClassExpression",
-          "start": 288,
-          "end": 310,
+          "start": 297,
+          "end": 321,
           "loc": {
             "start": {
               "line": 10,
@@ -1399,13 +1399,13 @@
             },
             "end": {
               "line": 10,
-              "column": 24
+              "column": 26
             }
           },
           "id": {
             "type": "Identifier",
-            "start": 294,
-            "end": 295,
+            "start": 303,
+            "end": 306,
             "loc": {
               "start": {
                 "line": 10,
@@ -1413,55 +1413,55 @@
               },
               "end": {
                 "line": 10,
-                "column": 9
+                "column": 11
               },
-              "identifierName": "A"
+              "identifierName": "A10"
             },
-            "name": "A"
+            "name": "A10"
           },
           "typeParameters": {
             "type": "TypeParameterDeclaration",
-            "start": 295,
-            "end": 307,
+            "start": 306,
+            "end": 318,
             "loc": {
               "start": {
                 "line": 10,
-                "column": 9
+                "column": 11
               },
               "end": {
                 "line": 10,
-                "column": 21
+                "column": 23
               }
             },
             "params": [
               {
                 "type": "TypeParameter",
-                "start": 296,
-                "end": 306,
+                "start": 307,
+                "end": 317,
                 "loc": {
                   "start": {
                     "line": 10,
-                    "column": 10
+                    "column": 12
                   },
                   "end": {
                     "line": 10,
-                    "column": 20
+                    "column": 22
                   }
                 },
                 "name": "T",
                 "variance": null,
                 "default": {
                   "type": "StringTypeAnnotation",
-                  "start": 300,
-                  "end": 306,
+                  "start": 311,
+                  "end": 317,
                   "loc": {
                     "start": {
                       "line": 10,
-                      "column": 14
+                      "column": 16
                     },
                     "end": {
                       "line": 10,
-                      "column": 20
+                      "column": 22
                     }
                   }
                 }
@@ -1471,30 +1471,30 @@
           "superClass": null,
           "body": {
             "type": "ClassBody",
-            "start": 308,
-            "end": 310,
+            "start": 319,
+            "end": 321,
             "loc": {
               "start": {
                 "line": 10,
-                "column": 22
+                "column": 24
               },
               "end": {
                 "line": 10,
-                "column": 24
+                "column": 26
               }
             },
             "body": []
           },
           "extra": {
             "parenthesized": true,
-            "parenStart": 287
+            "parenStart": 296
           }
         }
       },
       {
         "type": "ExpressionStatement",
-        "start": 313,
-        "end": 348,
+        "start": 324,
+        "end": 361,
         "loc": {
           "start": {
             "line": 11,
@@ -1507,8 +1507,8 @@
         },
         "expression": {
           "type": "ClassExpression",
-          "start": 314,
-          "end": 345,
+          "start": 325,
+          "end": 358,
           "loc": {
             "start": {
               "line": 11,
@@ -1516,13 +1516,13 @@
             },
             "end": {
               "line": 11,
-              "column": 33
+              "column": 35
             }
           },
           "id": {
             "type": "Identifier",
-            "start": 320,
-            "end": 321,
+            "start": 331,
+            "end": 334,
             "loc": {
               "start": {
                 "line": 11,
@@ -1530,83 +1530,83 @@
               },
               "end": {
                 "line": 11,
-                "column": 9
+                "column": 11
               },
-              "identifierName": "A"
+              "identifierName": "A11"
             },
-            "name": "A"
+            "name": "A11"
           },
           "typeParameters": {
             "type": "TypeParameterDeclaration",
-            "start": 321,
-            "end": 342,
+            "start": 334,
+            "end": 355,
             "loc": {
               "start": {
                 "line": 11,
-                "column": 9
+                "column": 11
               },
               "end": {
                 "line": 11,
-                "column": 30
+                "column": 32
               }
             },
             "params": [
               {
                 "type": "TypeParameter",
-                "start": 322,
-                "end": 341,
+                "start": 335,
+                "end": 354,
                 "loc": {
                   "start": {
                     "line": 11,
-                    "column": 10
+                    "column": 12
                   },
                   "end": {
                     "line": 11,
-                    "column": 29
+                    "column": 31
                   }
                 },
                 "name": "T",
                 "variance": null,
                 "bound": {
                   "type": "TypeAnnotation",
-                  "start": 323,
-                  "end": 332,
+                  "start": 336,
+                  "end": 345,
                   "loc": {
                     "start": {
                       "line": 11,
-                      "column": 11
+                      "column": 13
                     },
                     "end": {
                       "line": 11,
-                      "column": 20
+                      "column": 22
                     }
                   },
                   "typeAnnotation": {
                     "type": "NullableTypeAnnotation",
-                    "start": 325,
-                    "end": 332,
+                    "start": 338,
+                    "end": 345,
                     "loc": {
                       "start": {
                         "line": 11,
-                        "column": 13
+                        "column": 15
                       },
                       "end": {
                         "line": 11,
-                        "column": 20
+                        "column": 22
                       }
                     },
                     "typeAnnotation": {
                       "type": "StringTypeAnnotation",
-                      "start": 326,
-                      "end": 332,
+                      "start": 339,
+                      "end": 345,
                       "loc": {
                         "start": {
                           "line": 11,
-                          "column": 14
+                          "column": 16
                         },
                         "end": {
                           "line": 11,
-                          "column": 20
+                          "column": 22
                         }
                       }
                     }
@@ -1614,16 +1614,16 @@
                 },
                 "default": {
                   "type": "StringTypeAnnotation",
-                  "start": 335,
-                  "end": 341,
+                  "start": 348,
+                  "end": 354,
                   "loc": {
                     "start": {
                       "line": 11,
-                      "column": 23
+                      "column": 25
                     },
                     "end": {
                       "line": 11,
-                      "column": 29
+                      "column": 31
                     }
                   }
                 }
@@ -1633,30 +1633,30 @@
           "superClass": null,
           "body": {
             "type": "ClassBody",
-            "start": 343,
-            "end": 345,
+            "start": 356,
+            "end": 358,
             "loc": {
               "start": {
                 "line": 11,
-                "column": 31
+                "column": 33
               },
               "end": {
                 "line": 11,
-                "column": 33
+                "column": 35
               }
             },
             "body": []
           },
           "extra": {
             "parenthesized": true,
-            "parenStart": 313
+            "parenStart": 324
           }
         }
       },
       {
         "type": "ExpressionStatement",
-        "start": 348,
-        "end": 386,
+        "start": 361,
+        "end": 401,
         "loc": {
           "start": {
             "line": 12,
@@ -1669,8 +1669,8 @@
         },
         "expression": {
           "type": "ClassExpression",
-          "start": 349,
-          "end": 383,
+          "start": 362,
+          "end": 398,
           "loc": {
             "start": {
               "line": 12,
@@ -1678,13 +1678,13 @@
             },
             "end": {
               "line": 12,
-              "column": 36
+              "column": 38
             }
           },
           "id": {
             "type": "Identifier",
-            "start": 355,
-            "end": 356,
+            "start": 368,
+            "end": 371,
             "loc": {
               "start": {
                 "line": 12,
@@ -1692,39 +1692,39 @@
               },
               "end": {
                 "line": 12,
-                "column": 9
+                "column": 11
               },
-              "identifierName": "A"
+              "identifierName": "A12"
             },
-            "name": "A"
+            "name": "A12"
           },
           "typeParameters": {
             "type": "TypeParameterDeclaration",
-            "start": 356,
-            "end": 380,
+            "start": 371,
+            "end": 395,
             "loc": {
               "start": {
                 "line": 12,
-                "column": 9
+                "column": 11
               },
               "end": {
                 "line": 12,
-                "column": 33
+                "column": 35
               }
             },
             "params": [
               {
                 "type": "TypeParameter",
-                "start": 357,
-                "end": 358,
+                "start": 372,
+                "end": 373,
                 "loc": {
                   "start": {
                     "line": 12,
-                    "column": 10
+                    "column": 12
                   },
                   "end": {
                     "line": 12,
-                    "column": 11
+                    "column": 13
                   }
                 },
                 "name": "S",
@@ -1732,60 +1732,60 @@
               },
               {
                 "type": "TypeParameter",
-                "start": 360,
-                "end": 379,
+                "start": 375,
+                "end": 394,
                 "loc": {
                   "start": {
                     "line": 12,
-                    "column": 13
+                    "column": 15
                   },
                   "end": {
                     "line": 12,
-                    "column": 32
+                    "column": 34
                   }
                 },
                 "name": "T",
                 "variance": null,
                 "bound": {
                   "type": "TypeAnnotation",
-                  "start": 361,
-                  "end": 370,
+                  "start": 376,
+                  "end": 385,
                   "loc": {
                     "start": {
                       "line": 12,
-                      "column": 14
+                      "column": 16
                     },
                     "end": {
                       "line": 12,
-                      "column": 23
+                      "column": 25
                     }
                   },
                   "typeAnnotation": {
                     "type": "NullableTypeAnnotation",
-                    "start": 363,
-                    "end": 370,
+                    "start": 378,
+                    "end": 385,
                     "loc": {
                       "start": {
                         "line": 12,
-                        "column": 16
+                        "column": 18
                       },
                       "end": {
                         "line": 12,
-                        "column": 23
+                        "column": 25
                       }
                     },
                     "typeAnnotation": {
                       "type": "StringTypeAnnotation",
-                      "start": 364,
-                      "end": 370,
+                      "start": 379,
+                      "end": 385,
                       "loc": {
                         "start": {
                           "line": 12,
-                          "column": 17
+                          "column": 19
                         },
                         "end": {
                           "line": 12,
-                          "column": 23
+                          "column": 25
                         }
                       }
                     }
@@ -1793,16 +1793,16 @@
                 },
                 "default": {
                   "type": "StringTypeAnnotation",
-                  "start": 373,
-                  "end": 379,
+                  "start": 388,
+                  "end": 394,
                   "loc": {
                     "start": {
                       "line": 12,
-                      "column": 26
+                      "column": 28
                     },
                     "end": {
                       "line": 12,
-                      "column": 32
+                      "column": 34
                     }
                   }
                 }
@@ -1812,30 +1812,30 @@
           "superClass": null,
           "body": {
             "type": "ClassBody",
-            "start": 381,
-            "end": 383,
+            "start": 396,
+            "end": 398,
             "loc": {
               "start": {
                 "line": 12,
-                "column": 34
+                "column": 36
               },
               "end": {
                 "line": 12,
-                "column": 36
+                "column": 38
               }
             },
             "body": []
           },
           "extra": {
             "parenthesized": true,
-            "parenStart": 348
+            "parenStart": 361
           }
         }
       },
       {
         "type": "ExpressionStatement",
-        "start": 386,
-        "end": 431,
+        "start": 401,
+        "end": 448,
         "loc": {
           "start": {
             "line": 13,
@@ -1843,13 +1843,13 @@
           },
           "end": {
             "line": 13,
-            "column": 46
+            "column": 48
           }
         },
         "expression": {
           "type": "ClassExpression",
-          "start": 387,
-          "end": 430,
+          "start": 402,
+          "end": 447,
           "loc": {
             "start": {
               "line": 13,
@@ -1857,13 +1857,13 @@
             },
             "end": {
               "line": 13,
-              "column": 45
+              "column": 47
             }
           },
           "id": {
             "type": "Identifier",
-            "start": 393,
-            "end": 394,
+            "start": 408,
+            "end": 411,
             "loc": {
               "start": {
                 "line": 13,
@@ -1871,115 +1871,115 @@
               },
               "end": {
                 "line": 13,
-                "column": 9
+                "column": 11
               },
-              "identifierName": "A"
+              "identifierName": "A13"
             },
-            "name": "A"
+            "name": "A13"
           },
           "typeParameters": {
             "type": "TypeParameterDeclaration",
-            "start": 394,
-            "end": 427,
+            "start": 411,
+            "end": 444,
             "loc": {
               "start": {
                 "line": 13,
-                "column": 9
+                "column": 11
               },
               "end": {
                 "line": 13,
-                "column": 42
+                "column": 44
               }
             },
             "params": [
               {
                 "type": "TypeParameter",
-                "start": 395,
-                "end": 405,
+                "start": 412,
+                "end": 422,
                 "loc": {
                   "start": {
                     "line": 13,
-                    "column": 10
+                    "column": 12
                   },
                   "end": {
                     "line": 13,
-                    "column": 20
+                    "column": 22
                   }
                 },
                 "name": "S",
                 "variance": null,
                 "default": {
                   "type": "NumberTypeAnnotation",
-                  "start": 399,
-                  "end": 405,
+                  "start": 416,
+                  "end": 422,
                   "loc": {
                     "start": {
                       "line": 13,
-                      "column": 14
+                      "column": 16
                     },
                     "end": {
                       "line": 13,
-                      "column": 20
+                      "column": 22
                     }
                   }
                 }
               },
               {
                 "type": "TypeParameter",
-                "start": 407,
-                "end": 426,
+                "start": 424,
+                "end": 443,
                 "loc": {
                   "start": {
                     "line": 13,
-                    "column": 22
+                    "column": 24
                   },
                   "end": {
                     "line": 13,
-                    "column": 41
+                    "column": 43
                   }
                 },
                 "name": "T",
                 "variance": null,
                 "bound": {
                   "type": "TypeAnnotation",
-                  "start": 408,
-                  "end": 417,
+                  "start": 425,
+                  "end": 434,
                   "loc": {
                     "start": {
                       "line": 13,
-                      "column": 23
+                      "column": 25
                     },
                     "end": {
                       "line": 13,
-                      "column": 32
+                      "column": 34
                     }
                   },
                   "typeAnnotation": {
                     "type": "NullableTypeAnnotation",
-                    "start": 410,
-                    "end": 417,
+                    "start": 427,
+                    "end": 434,
                     "loc": {
                       "start": {
                         "line": 13,
-                        "column": 25
+                        "column": 27
                       },
                       "end": {
                         "line": 13,
-                        "column": 32
+                        "column": 34
                       }
                     },
                     "typeAnnotation": {
                       "type": "StringTypeAnnotation",
-                      "start": 411,
-                      "end": 417,
+                      "start": 428,
+                      "end": 434,
                       "loc": {
                         "start": {
                           "line": 13,
-                          "column": 26
+                          "column": 28
                         },
                         "end": {
                           "line": 13,
-                          "column": 32
+                          "column": 34
                         }
                       }
                     }
@@ -1987,16 +1987,16 @@
                 },
                 "default": {
                   "type": "StringTypeAnnotation",
-                  "start": 420,
-                  "end": 426,
+                  "start": 437,
+                  "end": 443,
                   "loc": {
                     "start": {
                       "line": 13,
-                      "column": 35
+                      "column": 37
                     },
                     "end": {
                       "line": 13,
-                      "column": 41
+                      "column": 43
                     }
                   }
                 }
@@ -2006,30 +2006,30 @@
           "superClass": null,
           "body": {
             "type": "ClassBody",
-            "start": 428,
-            "end": 430,
+            "start": 445,
+            "end": 447,
             "loc": {
               "start": {
                 "line": 13,
-                "column": 43
+                "column": 45
               },
               "end": {
                 "line": 13,
-                "column": 45
+                "column": 47
               }
             },
             "body": []
           },
           "extra": {
             "parenthesized": true,
-            "parenStart": 386
+            "parenStart": 401
           }
         }
       },
       {
         "type": "DeclareClass",
-        "start": 432,
-        "end": 462,
+        "start": 449,
+        "end": 481,
         "loc": {
           "start": {
             "line": 14,
@@ -2037,13 +2037,13 @@
           },
           "end": {
             "line": 14,
-            "column": 30
+            "column": 32
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 446,
-          "end": 447,
+          "start": 463,
+          "end": 466,
           "loc": {
             "start": {
               "line": 14,
@@ -2051,55 +2051,55 @@
             },
             "end": {
               "line": 14,
-              "column": 15
+              "column": 17
             },
-            "identifierName": "A"
+            "identifierName": "A14"
           },
-          "name": "A"
+          "name": "A14"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 447,
-          "end": 459,
+          "start": 466,
+          "end": 478,
           "loc": {
             "start": {
               "line": 14,
-              "column": 15
+              "column": 17
             },
             "end": {
               "line": 14,
-              "column": 27
+              "column": 29
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 448,
-              "end": 458,
+              "start": 467,
+              "end": 477,
               "loc": {
                 "start": {
                   "line": 14,
-                  "column": 16
+                  "column": 18
                 },
                 "end": {
                   "line": 14,
-                  "column": 26
+                  "column": 28
                 }
               },
               "name": "T",
               "variance": null,
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 452,
-                "end": 458,
+                "start": 471,
+                "end": 477,
                 "loc": {
                   "start": {
                     "line": 14,
-                    "column": 20
+                    "column": 22
                   },
                   "end": {
                     "line": 14,
-                    "column": 26
+                    "column": 28
                   }
                 }
               }
@@ -2111,16 +2111,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 460,
-          "end": 462,
+          "start": 479,
+          "end": 481,
           "loc": {
             "start": {
               "line": 14,
-              "column": 28
+              "column": 30
             },
             "end": {
               "line": 14,
-              "column": 30
+              "column": 32
             }
           },
           "callProperties": [],
@@ -2132,8 +2132,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 463,
-        "end": 502,
+        "start": 482,
+        "end": 523,
         "loc": {
           "start": {
             "line": 15,
@@ -2141,13 +2141,13 @@
           },
           "end": {
             "line": 15,
-            "column": 39
+            "column": 41
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 477,
-          "end": 478,
+          "start": 496,
+          "end": 499,
           "loc": {
             "start": {
               "line": 15,
@@ -2155,83 +2155,83 @@
             },
             "end": {
               "line": 15,
-              "column": 15
+              "column": 17
             },
-            "identifierName": "A"
+            "identifierName": "A15"
           },
-          "name": "A"
+          "name": "A15"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 478,
-          "end": 499,
+          "start": 499,
+          "end": 520,
           "loc": {
             "start": {
               "line": 15,
-              "column": 15
+              "column": 17
             },
             "end": {
               "line": 15,
-              "column": 36
+              "column": 38
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 479,
-              "end": 498,
+              "start": 500,
+              "end": 519,
               "loc": {
                 "start": {
                   "line": 15,
-                  "column": 16
+                  "column": 18
                 },
                 "end": {
                   "line": 15,
-                  "column": 35
+                  "column": 37
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 480,
-                "end": 489,
+                "start": 501,
+                "end": 510,
                 "loc": {
                   "start": {
                     "line": 15,
-                    "column": 17
+                    "column": 19
                   },
                   "end": {
                     "line": 15,
-                    "column": 26
+                    "column": 28
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 482,
-                  "end": 489,
+                  "start": 503,
+                  "end": 510,
                   "loc": {
                     "start": {
                       "line": 15,
-                      "column": 19
+                      "column": 21
                     },
                     "end": {
                       "line": 15,
-                      "column": 26
+                      "column": 28
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 483,
-                    "end": 489,
+                    "start": 504,
+                    "end": 510,
                     "loc": {
                       "start": {
                         "line": 15,
-                        "column": 20
+                        "column": 22
                       },
                       "end": {
                         "line": 15,
-                        "column": 26
+                        "column": 28
                       }
                     }
                   }
@@ -2239,16 +2239,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 492,
-                "end": 498,
+                "start": 513,
+                "end": 519,
                 "loc": {
                   "start": {
                     "line": 15,
-                    "column": 29
+                    "column": 31
                   },
                   "end": {
                     "line": 15,
-                    "column": 35
+                    "column": 37
                   }
                 }
               }
@@ -2260,16 +2260,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 500,
-          "end": 502,
+          "start": 521,
+          "end": 523,
           "loc": {
             "start": {
               "line": 15,
-              "column": 37
+              "column": 39
             },
             "end": {
               "line": 15,
-              "column": 39
+              "column": 41
             }
           },
           "callProperties": [],
@@ -2281,8 +2281,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 503,
-        "end": 545,
+        "start": 524,
+        "end": 568,
         "loc": {
           "start": {
             "line": 16,
@@ -2290,13 +2290,13 @@
           },
           "end": {
             "line": 16,
-            "column": 42
+            "column": 44
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 517,
-          "end": 518,
+          "start": 538,
+          "end": 541,
           "loc": {
             "start": {
               "line": 16,
@@ -2304,39 +2304,39 @@
             },
             "end": {
               "line": 16,
-              "column": 15
+              "column": 17
             },
-            "identifierName": "A"
+            "identifierName": "A16"
           },
-          "name": "A"
+          "name": "A16"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 518,
-          "end": 542,
+          "start": 541,
+          "end": 565,
           "loc": {
             "start": {
               "line": 16,
-              "column": 15
+              "column": 17
             },
             "end": {
               "line": 16,
-              "column": 39
+              "column": 41
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 519,
-              "end": 520,
+              "start": 542,
+              "end": 543,
               "loc": {
                 "start": {
                   "line": 16,
-                  "column": 16
+                  "column": 18
                 },
                 "end": {
                   "line": 16,
-                  "column": 17
+                  "column": 19
                 }
               },
               "name": "S",
@@ -2344,60 +2344,60 @@
             },
             {
               "type": "TypeParameter",
-              "start": 522,
-              "end": 541,
+              "start": 545,
+              "end": 564,
               "loc": {
                 "start": {
                   "line": 16,
-                  "column": 19
+                  "column": 21
                 },
                 "end": {
                   "line": 16,
-                  "column": 38
+                  "column": 40
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 523,
-                "end": 532,
+                "start": 546,
+                "end": 555,
                 "loc": {
                   "start": {
                     "line": 16,
-                    "column": 20
+                    "column": 22
                   },
                   "end": {
                     "line": 16,
-                    "column": 29
+                    "column": 31
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 525,
-                  "end": 532,
+                  "start": 548,
+                  "end": 555,
                   "loc": {
                     "start": {
                       "line": 16,
-                      "column": 22
+                      "column": 24
                     },
                     "end": {
                       "line": 16,
-                      "column": 29
+                      "column": 31
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 526,
-                    "end": 532,
+                    "start": 549,
+                    "end": 555,
                     "loc": {
                       "start": {
                         "line": 16,
-                        "column": 23
+                        "column": 25
                       },
                       "end": {
                         "line": 16,
-                        "column": 29
+                        "column": 31
                       }
                     }
                   }
@@ -2405,16 +2405,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 535,
-                "end": 541,
+                "start": 558,
+                "end": 564,
                 "loc": {
                   "start": {
                     "line": 16,
-                    "column": 32
+                    "column": 34
                   },
                   "end": {
                     "line": 16,
-                    "column": 38
+                    "column": 40
                   }
                 }
               }
@@ -2426,16 +2426,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 543,
-          "end": 545,
+          "start": 566,
+          "end": 568,
           "loc": {
             "start": {
               "line": 16,
-              "column": 40
+              "column": 42
             },
             "end": {
               "line": 16,
-              "column": 42
+              "column": 44
             }
           },
           "callProperties": [],
@@ -2447,8 +2447,8 @@
       },
       {
         "type": "DeclareClass",
-        "start": 546,
-        "end": 597,
+        "start": 569,
+        "end": 622,
         "loc": {
           "start": {
             "line": 17,
@@ -2456,13 +2456,13 @@
           },
           "end": {
             "line": 17,
-            "column": 51
+            "column": 53
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 560,
-          "end": 561,
+          "start": 583,
+          "end": 586,
           "loc": {
             "start": {
               "line": 17,
@@ -2470,115 +2470,115 @@
             },
             "end": {
               "line": 17,
-              "column": 15
+              "column": 17
             },
-            "identifierName": "A"
+            "identifierName": "A17"
           },
-          "name": "A"
+          "name": "A17"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 561,
-          "end": 594,
+          "start": 586,
+          "end": 619,
           "loc": {
             "start": {
               "line": 17,
-              "column": 15
+              "column": 17
             },
             "end": {
               "line": 17,
-              "column": 48
+              "column": 50
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 562,
-              "end": 572,
+              "start": 587,
+              "end": 597,
               "loc": {
                 "start": {
                   "line": 17,
-                  "column": 16
+                  "column": 18
                 },
                 "end": {
                   "line": 17,
-                  "column": 26
+                  "column": 28
                 }
               },
               "name": "S",
               "variance": null,
               "default": {
                 "type": "NumberTypeAnnotation",
-                "start": 566,
-                "end": 572,
+                "start": 591,
+                "end": 597,
                 "loc": {
                   "start": {
                     "line": 17,
-                    "column": 20
+                    "column": 22
                   },
                   "end": {
                     "line": 17,
-                    "column": 26
+                    "column": 28
                   }
                 }
               }
             },
             {
               "type": "TypeParameter",
-              "start": 574,
-              "end": 593,
+              "start": 599,
+              "end": 618,
               "loc": {
                 "start": {
                   "line": 17,
-                  "column": 28
+                  "column": 30
                 },
                 "end": {
                   "line": 17,
-                  "column": 47
+                  "column": 49
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 575,
-                "end": 584,
+                "start": 600,
+                "end": 609,
                 "loc": {
                   "start": {
                     "line": 17,
-                    "column": 29
+                    "column": 31
                   },
                   "end": {
                     "line": 17,
-                    "column": 38
+                    "column": 40
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 577,
-                  "end": 584,
+                  "start": 602,
+                  "end": 609,
                   "loc": {
                     "start": {
                       "line": 17,
-                      "column": 31
+                      "column": 33
                     },
                     "end": {
                       "line": 17,
-                      "column": 38
+                      "column": 40
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 578,
-                    "end": 584,
+                    "start": 603,
+                    "end": 609,
                     "loc": {
                       "start": {
                         "line": 17,
-                        "column": 32
+                        "column": 34
                       },
                       "end": {
                         "line": 17,
-                        "column": 38
+                        "column": 40
                       }
                     }
                   }
@@ -2586,16 +2586,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 587,
-                "end": 593,
+                "start": 612,
+                "end": 618,
                 "loc": {
                   "start": {
                     "line": 17,
-                    "column": 41
+                    "column": 43
                   },
                   "end": {
                     "line": 17,
-                    "column": 47
+                    "column": 49
                   }
                 }
               }
@@ -2607,16 +2607,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 595,
-          "end": 597,
+          "start": 620,
+          "end": 622,
           "loc": {
             "start": {
               "line": 17,
-              "column": 49
+              "column": 51
             },
             "end": {
               "line": 17,
-              "column": 51
+              "column": 53
             }
           },
           "callProperties": [],
@@ -2628,8 +2628,8 @@
       },
       {
         "type": "InterfaceDeclaration",
-        "start": 598,
-        "end": 624,
+        "start": 623,
+        "end": 651,
         "loc": {
           "start": {
             "line": 18,
@@ -2637,13 +2637,13 @@
           },
           "end": {
             "line": 18,
-            "column": 26
+            "column": 28
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 608,
-          "end": 609,
+          "start": 633,
+          "end": 636,
           "loc": {
             "start": {
               "line": 18,
@@ -2651,55 +2651,55 @@
             },
             "end": {
               "line": 18,
-              "column": 11
+              "column": 13
             },
-            "identifierName": "A"
+            "identifierName": "A18"
           },
-          "name": "A"
+          "name": "A18"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 609,
-          "end": 621,
+          "start": 636,
+          "end": 648,
           "loc": {
             "start": {
               "line": 18,
-              "column": 11
+              "column": 13
             },
             "end": {
               "line": 18,
-              "column": 23
+              "column": 25
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 610,
-              "end": 620,
+              "start": 637,
+              "end": 647,
               "loc": {
                 "start": {
                   "line": 18,
-                  "column": 12
+                  "column": 14
                 },
                 "end": {
                   "line": 18,
-                  "column": 22
+                  "column": 24
                 }
               },
               "name": "T",
               "variance": null,
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 614,
-                "end": 620,
+                "start": 641,
+                "end": 647,
                 "loc": {
                   "start": {
                     "line": 18,
-                    "column": 16
+                    "column": 18
                   },
                   "end": {
                     "line": 18,
-                    "column": 22
+                    "column": 24
                   }
                 }
               }
@@ -2711,16 +2711,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 622,
-          "end": 624,
+          "start": 649,
+          "end": 651,
           "loc": {
             "start": {
               "line": 18,
-              "column": 24
+              "column": 26
             },
             "end": {
               "line": 18,
-              "column": 26
+              "column": 28
             }
           },
           "callProperties": [],
@@ -2732,8 +2732,8 @@
       },
       {
         "type": "InterfaceDeclaration",
-        "start": 625,
-        "end": 660,
+        "start": 652,
+        "end": 689,
         "loc": {
           "start": {
             "line": 19,
@@ -2741,13 +2741,13 @@
           },
           "end": {
             "line": 19,
-            "column": 35
+            "column": 37
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 635,
-          "end": 636,
+          "start": 662,
+          "end": 665,
           "loc": {
             "start": {
               "line": 19,
@@ -2755,83 +2755,83 @@
             },
             "end": {
               "line": 19,
-              "column": 11
+              "column": 13
             },
-            "identifierName": "A"
+            "identifierName": "A19"
           },
-          "name": "A"
+          "name": "A19"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 636,
-          "end": 657,
+          "start": 665,
+          "end": 686,
           "loc": {
             "start": {
               "line": 19,
-              "column": 11
+              "column": 13
             },
             "end": {
               "line": 19,
-              "column": 32
+              "column": 34
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 637,
-              "end": 656,
+              "start": 666,
+              "end": 685,
               "loc": {
                 "start": {
                   "line": 19,
-                  "column": 12
+                  "column": 14
                 },
                 "end": {
                   "line": 19,
-                  "column": 31
+                  "column": 33
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 638,
-                "end": 647,
+                "start": 667,
+                "end": 676,
                 "loc": {
                   "start": {
                     "line": 19,
-                    "column": 13
+                    "column": 15
                   },
                   "end": {
                     "line": 19,
-                    "column": 22
+                    "column": 24
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 640,
-                  "end": 647,
+                  "start": 669,
+                  "end": 676,
                   "loc": {
                     "start": {
                       "line": 19,
-                      "column": 15
+                      "column": 17
                     },
                     "end": {
                       "line": 19,
-                      "column": 22
+                      "column": 24
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 641,
-                    "end": 647,
+                    "start": 670,
+                    "end": 676,
                     "loc": {
                       "start": {
                         "line": 19,
-                        "column": 16
+                        "column": 18
                       },
                       "end": {
                         "line": 19,
-                        "column": 22
+                        "column": 24
                       }
                     }
                   }
@@ -2839,16 +2839,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 650,
-                "end": 656,
+                "start": 679,
+                "end": 685,
                 "loc": {
                   "start": {
                     "line": 19,
-                    "column": 25
+                    "column": 27
                   },
                   "end": {
                     "line": 19,
-                    "column": 31
+                    "column": 33
                   }
                 }
               }
@@ -2860,16 +2860,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 658,
-          "end": 660,
+          "start": 687,
+          "end": 689,
           "loc": {
             "start": {
               "line": 19,
-              "column": 33
+              "column": 35
             },
             "end": {
               "line": 19,
-              "column": 35
+              "column": 37
             }
           },
           "callProperties": [],
@@ -2881,8 +2881,8 @@
       },
       {
         "type": "InterfaceDeclaration",
-        "start": 661,
-        "end": 699,
+        "start": 690,
+        "end": 730,
         "loc": {
           "start": {
             "line": 20,
@@ -2890,13 +2890,13 @@
           },
           "end": {
             "line": 20,
-            "column": 38
+            "column": 40
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 671,
-          "end": 672,
+          "start": 700,
+          "end": 703,
           "loc": {
             "start": {
               "line": 20,
@@ -2904,39 +2904,39 @@
             },
             "end": {
               "line": 20,
-              "column": 11
+              "column": 13
             },
-            "identifierName": "A"
+            "identifierName": "A20"
           },
-          "name": "A"
+          "name": "A20"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 672,
-          "end": 696,
+          "start": 703,
+          "end": 727,
           "loc": {
             "start": {
               "line": 20,
-              "column": 11
+              "column": 13
             },
             "end": {
               "line": 20,
-              "column": 35
+              "column": 37
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 673,
-              "end": 674,
+              "start": 704,
+              "end": 705,
               "loc": {
                 "start": {
                   "line": 20,
-                  "column": 12
+                  "column": 14
                 },
                 "end": {
                   "line": 20,
-                  "column": 13
+                  "column": 15
                 }
               },
               "name": "S",
@@ -2944,60 +2944,60 @@
             },
             {
               "type": "TypeParameter",
-              "start": 676,
-              "end": 695,
+              "start": 707,
+              "end": 726,
               "loc": {
                 "start": {
                   "line": 20,
-                  "column": 15
+                  "column": 17
                 },
                 "end": {
                   "line": 20,
-                  "column": 34
+                  "column": 36
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 677,
-                "end": 686,
+                "start": 708,
+                "end": 717,
                 "loc": {
                   "start": {
                     "line": 20,
-                    "column": 16
+                    "column": 18
                   },
                   "end": {
                     "line": 20,
-                    "column": 25
+                    "column": 27
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 679,
-                  "end": 686,
+                  "start": 710,
+                  "end": 717,
                   "loc": {
                     "start": {
                       "line": 20,
-                      "column": 18
+                      "column": 20
                     },
                     "end": {
                       "line": 20,
-                      "column": 25
+                      "column": 27
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 680,
-                    "end": 686,
+                    "start": 711,
+                    "end": 717,
                     "loc": {
                       "start": {
                         "line": 20,
-                        "column": 19
+                        "column": 21
                       },
                       "end": {
                         "line": 20,
-                        "column": 25
+                        "column": 27
                       }
                     }
                   }
@@ -3005,16 +3005,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 689,
-                "end": 695,
+                "start": 720,
+                "end": 726,
                 "loc": {
                   "start": {
                     "line": 20,
-                    "column": 28
+                    "column": 30
                   },
                   "end": {
                     "line": 20,
-                    "column": 34
+                    "column": 36
                   }
                 }
               }
@@ -3026,16 +3026,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 697,
-          "end": 699,
+          "start": 728,
+          "end": 730,
           "loc": {
             "start": {
               "line": 20,
-              "column": 36
+              "column": 38
             },
             "end": {
               "line": 20,
-              "column": 38
+              "column": 40
             }
           },
           "callProperties": [],
@@ -3047,8 +3047,8 @@
       },
       {
         "type": "InterfaceDeclaration",
-        "start": 700,
-        "end": 747,
+        "start": 731,
+        "end": 780,
         "loc": {
           "start": {
             "line": 21,
@@ -3056,13 +3056,13 @@
           },
           "end": {
             "line": 21,
-            "column": 47
+            "column": 49
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 710,
-          "end": 711,
+          "start": 741,
+          "end": 744,
           "loc": {
             "start": {
               "line": 21,
@@ -3070,115 +3070,115 @@
             },
             "end": {
               "line": 21,
-              "column": 11
+              "column": 13
             },
-            "identifierName": "A"
+            "identifierName": "A21"
           },
-          "name": "A"
+          "name": "A21"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 711,
-          "end": 744,
+          "start": 744,
+          "end": 777,
           "loc": {
             "start": {
               "line": 21,
-              "column": 11
+              "column": 13
             },
             "end": {
               "line": 21,
-              "column": 44
+              "column": 46
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 712,
-              "end": 722,
+              "start": 745,
+              "end": 755,
               "loc": {
                 "start": {
                   "line": 21,
-                  "column": 12
+                  "column": 14
                 },
                 "end": {
                   "line": 21,
-                  "column": 22
+                  "column": 24
                 }
               },
               "name": "S",
               "variance": null,
               "default": {
                 "type": "NumberTypeAnnotation",
-                "start": 716,
-                "end": 722,
+                "start": 749,
+                "end": 755,
                 "loc": {
                   "start": {
                     "line": 21,
-                    "column": 16
+                    "column": 18
                   },
                   "end": {
                     "line": 21,
-                    "column": 22
+                    "column": 24
                   }
                 }
               }
             },
             {
               "type": "TypeParameter",
-              "start": 724,
-              "end": 743,
+              "start": 757,
+              "end": 776,
               "loc": {
                 "start": {
                   "line": 21,
-                  "column": 24
+                  "column": 26
                 },
                 "end": {
                   "line": 21,
-                  "column": 43
+                  "column": 45
                 }
               },
               "name": "T",
               "variance": null,
               "bound": {
                 "type": "TypeAnnotation",
-                "start": 725,
-                "end": 734,
+                "start": 758,
+                "end": 767,
                 "loc": {
                   "start": {
                     "line": 21,
-                    "column": 25
+                    "column": 27
                   },
                   "end": {
                     "line": 21,
-                    "column": 34
+                    "column": 36
                   }
                 },
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
-                  "start": 727,
-                  "end": 734,
+                  "start": 760,
+                  "end": 767,
                   "loc": {
                     "start": {
                       "line": 21,
-                      "column": 27
+                      "column": 29
                     },
                     "end": {
                       "line": 21,
-                      "column": 34
+                      "column": 36
                     }
                   },
                   "typeAnnotation": {
                     "type": "StringTypeAnnotation",
-                    "start": 728,
-                    "end": 734,
+                    "start": 761,
+                    "end": 767,
                     "loc": {
                       "start": {
                         "line": 21,
-                        "column": 28
+                        "column": 30
                       },
                       "end": {
                         "line": 21,
-                        "column": 34
+                        "column": 36
                       }
                     }
                   }
@@ -3186,16 +3186,16 @@
               },
               "default": {
                 "type": "StringTypeAnnotation",
-                "start": 737,
-                "end": 743,
+                "start": 770,
+                "end": 776,
                 "loc": {
                   "start": {
                     "line": 21,
-                    "column": 37
+                    "column": 39
                   },
                   "end": {
                     "line": 21,
-                    "column": 43
+                    "column": 45
                   }
                 }
               }
@@ -3207,16 +3207,16 @@
         "mixins": [],
         "body": {
           "type": "ObjectTypeAnnotation",
-          "start": 745,
-          "end": 747,
+          "start": 778,
+          "end": 780,
           "loc": {
             "start": {
               "line": 21,
-              "column": 45
+              "column": 47
             },
             "end": {
               "line": 21,
-              "column": 47
+              "column": 49
             }
           },
           "callProperties": [],
@@ -3228,8 +3228,8 @@
       },
       {
         "type": "TypeAlias",
-        "start": 748,
-        "end": 768,
+        "start": 781,
+        "end": 803,
         "loc": {
           "start": {
             "line": 22,
@@ -3237,13 +3237,13 @@
           },
           "end": {
             "line": 22,
-            "column": 20
+            "column": 22
           }
         },
         "id": {
           "type": "Identifier",
-          "start": 753,
-          "end": 754,
+          "start": 786,
+          "end": 789,
           "loc": {
             "start": {
               "line": 22,
@@ -3251,55 +3251,55 @@
             },
             "end": {
               "line": 22,
-              "column": 6
+              "column": 8
             },
-            "identifierName": "A"
+            "identifierName": "A22"
           },
-          "name": "A"
+          "name": "A22"
         },
         "typeParameters": {
           "type": "TypeParameterDeclaration",
-          "start": 754,
-          "end": 764,
+          "start": 789,
+          "end": 799,
           "loc": {
             "start": {
               "line": 22,
-              "column": 6
+              "column": 8
             },
             "end": {
               "line": 22,
-              "column": 16
+              "column": 18
             }
           },
           "params": [
             {
               "type": "TypeParameter",
-              "start": 755,
-              "end": 763,
+              "start": 790,
+              "end": 798,
               "loc": {
                 "start": {
                   "line": 22,
-                  "column": 7
+                  "column": 9
                 },
                 "end": {
                   "line": 22,
-                  "column": 15
+                  "column": 17
                 }
               },
               "name": "T",
               "variance": null,
               "default": {
                 "type": "VoidTypeAnnotation",
-                "start": 759,
-                "end": 763,
+                "start": 794,
+                "end": 798,
                 "loc": {
                   "start": {
                     "line": 22,
-                    "column": 11
+                    "column": 13
                   },
                   "end": {
                     "line": 22,
-                    "column": 15
+                    "column": 17
                   }
                 }
               }
@@ -3308,37 +3308,916 @@
         },
         "right": {
           "type": "GenericTypeAnnotation",
-          "start": 767,
-          "end": 768,
+          "start": 802,
+          "end": 803,
           "loc": {
             "start": {
               "line": 22,
-              "column": 19
+              "column": 21
             },
             "end": {
               "line": 22,
-              "column": 20
+              "column": 22
             }
           },
           "typeParameters": null,
           "id": {
             "type": "Identifier",
-            "start": 767,
-            "end": 768,
+            "start": 802,
+            "end": 803,
             "loc": {
               "start": {
                 "line": 22,
-                "column": 19
+                "column": 21
               },
               "end": {
                 "line": 22,
-                "column": 20
+                "column": 22
               },
               "identifierName": "T"
             },
             "name": "T"
           }
         }
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 804,
+        "end": 833,
+        "loc": {
+          "start": {
+            "line": 23,
+            "column": 0
+          },
+          "end": {
+            "line": 23,
+            "column": 29
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 813,
+          "end": 816,
+          "loc": {
+            "start": {
+              "line": 23,
+              "column": 9
+            },
+            "end": {
+              "line": 23,
+              "column": 12
+            },
+            "identifierName": "A26"
+          },
+          "name": "A26"
+        },
+        "generator": false,
+        "async": false,
+        "typeParameters": {
+          "type": "TypeParameterDeclaration",
+          "start": 816,
+          "end": 828,
+          "loc": {
+            "start": {
+              "line": 23,
+              "column": 12
+            },
+            "end": {
+              "line": 23,
+              "column": 24
+            }
+          },
+          "params": [
+            {
+              "type": "TypeParameter",
+              "start": 817,
+              "end": 827,
+              "loc": {
+                "start": {
+                  "line": 23,
+                  "column": 13
+                },
+                "end": {
+                  "line": 23,
+                  "column": 23
+                }
+              },
+              "name": "T",
+              "variance": null,
+              "default": {
+                "type": "StringTypeAnnotation",
+                "start": 821,
+                "end": 827,
+                "loc": {
+                  "start": {
+                    "line": 23,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 23,
+                    "column": 23
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 831,
+          "end": 833,
+          "loc": {
+            "start": {
+              "line": 23,
+              "column": 27
+            },
+            "end": {
+              "line": 23,
+              "column": 29
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "EmptyStatement",
+        "start": 834,
+        "end": 835,
+        "loc": {
+          "start": {
+            "line": 24,
+            "column": 0
+          },
+          "end": {
+            "line": 24,
+            "column": 1
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 835,
+        "end": 862,
+        "loc": {
+          "start": {
+            "line": 24,
+            "column": 1
+          },
+          "end": {
+            "line": 24,
+            "column": 28
+          }
+        },
+        "expression": {
+          "type": "ObjectExpression",
+          "start": 836,
+          "end": 860,
+          "loc": {
+            "start": {
+              "line": 24,
+              "column": 2
+            },
+            "end": {
+              "line": 24,
+              "column": 26
+            }
+          },
+          "properties": [
+            {
+              "type": "ObjectMethod",
+              "start": 838,
+              "end": 858,
+              "loc": {
+                "start": {
+                  "line": 24,
+                  "column": 4
+                },
+                "end": {
+                  "line": 24,
+                  "column": 24
+                }
+              },
+              "method": true,
+              "key": {
+                "type": "Identifier",
+                "start": 838,
+                "end": 841,
+                "loc": {
+                  "start": {
+                    "line": 24,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 24,
+                    "column": 7
+                  },
+                  "identifierName": "A28"
+                },
+                "name": "A28"
+              },
+              "computed": false,
+              "kind": "method",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 856,
+                "end": 858,
+                "loc": {
+                  "start": {
+                    "line": 24,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 24,
+                    "column": 24
+                  }
+                },
+                "body": [],
+                "directives": []
+              },
+              "typeParameters": {
+                "type": "TypeParameterDeclaration",
+                "start": 841,
+                "end": 853,
+                "loc": {
+                  "start": {
+                    "line": 24,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 24,
+                    "column": 19
+                  }
+                },
+                "params": [
+                  {
+                    "type": "TypeParameter",
+                    "start": 842,
+                    "end": 852,
+                    "loc": {
+                      "start": {
+                        "line": 24,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 24,
+                        "column": 18
+                      }
+                    },
+                    "name": "T",
+                    "variance": null,
+                    "default": {
+                      "type": "StringTypeAnnotation",
+                      "start": 846,
+                      "end": 852,
+                      "loc": {
+                        "start": {
+                          "line": 24,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 24,
+                          "column": 18
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          ],
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 835
+          }
+        }
+      },
+      {
+        "type": "ClassDeclaration",
+        "start": 863,
+        "end": 899,
+        "loc": {
+          "start": {
+            "line": 25,
+            "column": 0
+          },
+          "end": {
+            "line": 27,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 869,
+          "end": 872,
+          "loc": {
+            "start": {
+              "line": 25,
+              "column": 6
+            },
+            "end": {
+              "line": 25,
+              "column": 9
+            },
+            "identifierName": "A29"
+          },
+          "name": "A29"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 873,
+          "end": 899,
+          "loc": {
+            "start": {
+              "line": 25,
+              "column": 10
+            },
+            "end": {
+              "line": 27,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassMethod",
+              "start": 877,
+              "end": 897,
+              "loc": {
+                "start": {
+                  "line": 26,
+                  "column": 2
+                },
+                "end": {
+                  "line": 26,
+                  "column": 22
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 877,
+                "end": 880,
+                "loc": {
+                  "start": {
+                    "line": 26,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 26,
+                    "column": 5
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "computed": false,
+              "kind": "method",
+              "typeParameters": {
+                "type": "TypeParameterDeclaration",
+                "start": 880,
+                "end": 892,
+                "loc": {
+                  "start": {
+                    "line": 26,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 26,
+                    "column": 17
+                  }
+                },
+                "params": [
+                  {
+                    "type": "TypeParameter",
+                    "start": 881,
+                    "end": 891,
+                    "loc": {
+                      "start": {
+                        "line": 26,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 26,
+                        "column": 16
+                      }
+                    },
+                    "name": "T",
+                    "variance": null,
+                    "default": {
+                      "type": "StringTypeAnnotation",
+                      "start": 885,
+                      "end": 891,
+                      "loc": {
+                        "start": {
+                          "line": 26,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 26,
+                          "column": 16
+                        }
+                      }
+                    }
+                  }
+                ]
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 895,
+                "end": 897,
+                "loc": {
+                  "start": {
+                    "line": 26,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 26,
+                    "column": 22
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "EmptyStatement",
+        "start": 900,
+        "end": 901,
+        "loc": {
+          "start": {
+            "line": 28,
+            "column": 0
+          },
+          "end": {
+            "line": 28,
+            "column": 1
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 901,
+        "end": 940,
+        "loc": {
+          "start": {
+            "line": 28,
+            "column": 1
+          },
+          "end": {
+            "line": 30,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "ClassExpression",
+          "start": 902,
+          "end": 938,
+          "loc": {
+            "start": {
+              "line": 28,
+              "column": 2
+            },
+            "end": {
+              "line": 30,
+              "column": 1
+            }
+          },
+          "id": {
+            "type": "Identifier",
+            "start": 908,
+            "end": 911,
+            "loc": {
+              "start": {
+                "line": 28,
+                "column": 8
+              },
+              "end": {
+                "line": 28,
+                "column": 11
+              },
+              "identifierName": "A30"
+            },
+            "name": "A30"
+          },
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start": 912,
+            "end": 938,
+            "loc": {
+              "start": {
+                "line": 28,
+                "column": 12
+              },
+              "end": {
+                "line": 30,
+                "column": 1
+              }
+            },
+            "body": [
+              {
+                "type": "ClassMethod",
+                "start": 916,
+                "end": 936,
+                "loc": {
+                  "start": {
+                    "line": 29,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 29,
+                    "column": 22
+                  }
+                },
+                "static": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 916,
+                  "end": 919,
+                  "loc": {
+                    "start": {
+                      "line": 29,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 29,
+                      "column": 5
+                    },
+                    "identifierName": "foo"
+                  },
+                  "name": "foo"
+                },
+                "computed": false,
+                "kind": "method",
+                "typeParameters": {
+                  "type": "TypeParameterDeclaration",
+                  "start": 919,
+                  "end": 931,
+                  "loc": {
+                    "start": {
+                      "line": 29,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 29,
+                      "column": 17
+                    }
+                  },
+                  "params": [
+                    {
+                      "type": "TypeParameter",
+                      "start": 920,
+                      "end": 930,
+                      "loc": {
+                        "start": {
+                          "line": 29,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 29,
+                          "column": 16
+                        }
+                      },
+                      "name": "T",
+                      "variance": null,
+                      "default": {
+                        "type": "StringTypeAnnotation",
+                        "start": 924,
+                        "end": 930,
+                        "loc": {
+                          "start": {
+                            "line": 29,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 29,
+                            "column": 16
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 934,
+                  "end": 936,
+                  "loc": {
+                    "start": {
+                      "line": 29,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 29,
+                      "column": 22
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            ]
+          },
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 901
+          }
+        }
+      },
+      {
+        "type": "DeclareClass",
+        "start": 941,
+        "end": 986,
+        "loc": {
+          "start": {
+            "line": 31,
+            "column": 0
+          },
+          "end": {
+            "line": 31,
+            "column": 45
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 955,
+          "end": 958,
+          "loc": {
+            "start": {
+              "line": 31,
+              "column": 14
+            },
+            "end": {
+              "line": 31,
+              "column": 17
+            },
+            "identifierName": "A31"
+          },
+          "name": "A31"
+        },
+        "typeParameters": null,
+        "extends": [],
+        "implements": [],
+        "mixins": [],
+        "body": {
+          "type": "ObjectTypeAnnotation",
+          "start": 959,
+          "end": 986,
+          "loc": {
+            "start": {
+              "line": 31,
+              "column": 18
+            },
+            "end": {
+              "line": 31,
+              "column": 45
+            }
+          },
+          "callProperties": [],
+          "properties": [
+            {
+              "type": "ObjectTypeProperty",
+              "start": 961,
+              "end": 984,
+              "loc": {
+                "start": {
+                  "line": 31,
+                  "column": 20
+                },
+                "end": {
+                  "line": 31,
+                  "column": 43
+                }
+              },
+              "key": {
+                "type": "Identifier",
+                "start": 961,
+                "end": 964,
+                "loc": {
+                  "start": {
+                    "line": 31,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 31,
+                    "column": 23
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "static": false,
+              "proto": false,
+              "kind": "init",
+              "method": true,
+              "value": {
+                "type": "FunctionTypeAnnotation",
+                "start": 961,
+                "end": 984,
+                "loc": {
+                  "start": {
+                    "line": 31,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 31,
+                    "column": 43
+                  }
+                },
+                "params": [],
+                "rest": null,
+                "typeParameters": {
+                  "type": "TypeParameterDeclaration",
+                  "start": 964,
+                  "end": 976,
+                  "loc": {
+                    "start": {
+                      "line": 31,
+                      "column": 23
+                    },
+                    "end": {
+                      "line": 31,
+                      "column": 35
+                    }
+                  },
+                  "params": [
+                    {
+                      "type": "TypeParameter",
+                      "start": 965,
+                      "end": 975,
+                      "loc": {
+                        "start": {
+                          "line": 31,
+                          "column": 24
+                        },
+                        "end": {
+                          "line": 31,
+                          "column": 34
+                        }
+                      },
+                      "name": "T",
+                      "variance": null,
+                      "default": {
+                        "type": "StringTypeAnnotation",
+                        "start": 969,
+                        "end": 975,
+                        "loc": {
+                          "start": {
+                            "line": 31,
+                            "column": 28
+                          },
+                          "end": {
+                            "line": 31,
+                            "column": 34
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "returnType": {
+                  "type": "VoidTypeAnnotation",
+                  "start": 980,
+                  "end": 984,
+                  "loc": {
+                    "start": {
+                      "line": 31,
+                      "column": 39
+                    },
+                    "end": {
+                      "line": 31,
+                      "column": 43
+                    }
+                  }
+                }
+              },
+              "optional": false
+            }
+          ],
+          "indexers": [],
+          "internalSlots": [],
+          "exact": false
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 987,
+        "end": 1009,
+        "loc": {
+          "start": {
+            "line": 32,
+            "column": 0
+          },
+          "end": {
+            "line": 32,
+            "column": 22
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 987,
+          "end": 1008,
+          "loc": {
+            "start": {
+              "line": 32,
+              "column": 0
+            },
+            "end": {
+              "line": 32,
+              "column": 21
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [],
+          "body": {
+            "type": "NumericLiteral",
+            "start": 1005,
+            "end": 1008,
+            "loc": {
+              "start": {
+                "line": 32,
+                "column": 18
+              },
+              "end": {
+                "line": 32,
+                "column": 21
+              }
+            },
+            "extra": {
+              "rawValue": 123,
+              "raw": "123"
+            },
+            "value": 123
+          },
+          "typeParameters": {
+            "type": "TypeParameterDeclaration",
+            "start": 987,
+            "end": 999,
+            "loc": {
+              "start": {
+                "line": 32,
+                "column": 0
+              },
+              "end": {
+                "line": 32,
+                "column": 12
+              }
+            },
+            "params": [
+              {
+                "type": "TypeParameter",
+                "start": 988,
+                "end": 998,
+                "loc": {
+                  "start": {
+                    "line": 32,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 32,
+                    "column": 11
+                  }
+                },
+                "name": "T",
+                "variance": null,
+                "default": {
+                  "type": "StringTypeAnnotation",
+                  "start": 992,
+                  "end": 998,
+                  "loc": {
+                    "start": {
+                      "line": 32,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 32,
+                      "column": 11
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/reserved-word-class-name-failure/options.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/reserved-word-class-name-failure/options.json
index e8aeb07ed731..f45196d78df9 100644
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/reserved-word-class-name-failure/options.json
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/reserved-word-class-name-failure/options.json
@@ -1,4 +1,4 @@
 {
-  "throws": "delete is a reserved word (1:14)",
+  "throws": "Unexpected keyword 'delete' (1:14)",
   "plugins": ["flow", "jsx"]
 }
diff --git a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/output.json b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/output.json
index 0b9e5fd724bd..d817f6ed4713 100644
--- a/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/output.json
+++ b/packages/babel-parser/test/fixtures/flow/type-parameter-declaration/type-object-reserved-word/output.json
@@ -492,7 +492,8 @@
           ],
           "indexers": [],
           "internalSlots": [],
-          "exact": false
+          "exact": false,
+          "inexact": false
         }
       }
     ],
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_allowed_trailing_commas/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_allowed_trailing_commas/input.js
new file mode 100644
index 000000000000..364601fa788d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_allowed_trailing_commas/input.js
@@ -0,0 +1,8 @@
+//@flow
+test<
+  _,
+  _,
+  number,
+  _,
+  _,
+>();
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_allowed_trailing_commas/output.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_allowed_trailing_commas/output.json
new file mode 100644
index 000000000000..e30f8a938f73
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_allowed_trailing_commas/output.json
@@ -0,0 +1,283 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 48,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 8,
+      "column": 4
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 48,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 8,
+        "column": 4
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 8,
+        "end": 48,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 8,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 8,
+          "end": 47,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 8,
+              "column": 3
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 4
+              },
+              "identifierName": "test"
+            },
+            "name": "test"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 12,
+            "end": 45,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 8,
+                "column": 1
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 16,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 3
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 16,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 3
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 21,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 3
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 21,
+                  "end": 22,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 3
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              },
+              {
+                "type": "NumberTypeAnnotation",
+                "start": 26,
+                "end": 32,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 8
+                  }
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 36,
+                "end": 37,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 3
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 36,
+                  "end": 37,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 3
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 41,
+                "end": 42,
+                "loc": {
+                  "start": {
+                    "line": 7,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 7,
+                    "column": 3
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 41,
+                  "end": 42,
+                  "loc": {
+                    "start": {
+                      "line": 7,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 7,
+                      "column": 3
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              }
+            ]
+          },
+          "arguments": []
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": "@flow",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "@flow",
+      "start": 0,
+      "end": 7,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 7
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_param_instantiation_otherwise/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_param_instantiation_otherwise/input.js
new file mode 100644
index 000000000000..7886a45bd928
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_param_instantiation_otherwise/input.js
@@ -0,0 +1,2 @@
+//@flow
+var x: Generic<_> = 3;
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_param_instantiation_otherwise/options.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_param_instantiation_otherwise/options.json
new file mode 100644
index 000000000000..101e77f3861c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_param_instantiation_otherwise/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "`_` is only allowed as a type argument to call or new (2:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/input.js
new file mode 100644
index 000000000000..3f9596914f16
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/input.js
@@ -0,0 +1,2 @@
+//@flow
+type _ = number;
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json
new file mode 100644
index 000000000000..85a0456eceff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_name/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Cannot overwrite reserved type _ (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/input.js
new file mode 100644
index 000000000000..849ac4c23b18
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/input.js
@@ -0,0 +1,2 @@
+//@flow
+type Generic<_> = _;
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json
new file mode 100644
index 000000000000..872ad2f73408
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_illegal_type_param_name/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["jsx", "flow"],
+  "throws": "Cannot overwrite reserved type _ (2:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_anywhere_in_list/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_anywhere_in_list/input.js
new file mode 100644
index 000000000000..b9aaa5913aa2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_anywhere_in_list/input.js
@@ -0,0 +1,2 @@
+//@flow
+test<number, _, string, _, _, _, Foo, Bar, Baz>();
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_anywhere_in_list/output.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_anywhere_in_list/output.json
new file mode 100644
index 000000000000..7b90b530ad65
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_anywhere_in_list/output.json
@@ -0,0 +1,397 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 58,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 50
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 58,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 50
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 8,
+        "end": 58,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 50
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 8,
+          "end": 57,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 49
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 4
+              },
+              "identifierName": "test"
+            },
+            "name": "test"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 12,
+            "end": 55,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 47
+              }
+            },
+            "params": [
+              {
+                "type": "NumberTypeAnnotation",
+                "start": 13,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 11
+                  }
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 21,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 14
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 21,
+                  "end": 22,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 14
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              },
+              {
+                "type": "StringTypeAnnotation",
+                "start": 24,
+                "end": 30,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 22
+                  }
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 32,
+                "end": 33,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 25
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 32,
+                  "end": 33,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 24
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 25
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 35,
+                "end": 36,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 27
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 28
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 35,
+                  "end": 36,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 27
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 28
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 38,
+                "end": 39,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 30
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 31
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 38,
+                  "end": 39,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 30
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 31
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 41,
+                "end": 44,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 33
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 36
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 41,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 33
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 36
+                    },
+                    "identifierName": "Foo"
+                  },
+                  "name": "Foo"
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 46,
+                "end": 49,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 38
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 41
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 46,
+                  "end": 49,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 38
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 41
+                    },
+                    "identifierName": "Bar"
+                  },
+                  "name": "Bar"
+                }
+              },
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 51,
+                "end": 54,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 43
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 46
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 51,
+                  "end": 54,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 43
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 46
+                    },
+                    "identifierName": "Baz"
+                  },
+                  "name": "Baz"
+                }
+              }
+            ]
+          },
+          "arguments": []
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": "@flow",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "@flow",
+      "start": 0,
+      "end": 7,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 7
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_calls/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_calls/input.js
new file mode 100644
index 000000000000..51ba34d9c1d6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_calls/input.js
@@ -0,0 +1,2 @@
+//@flow
+test<_>();
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_calls/output.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_calls/output.json
new file mode 100644
index 000000000000..6d1aceded869
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_calls/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 8,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 8,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 9
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 4
+              },
+              "identifierName": "test"
+            },
+            "name": "test"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 12,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 7
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 6
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 13,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 6
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              }
+            ]
+          },
+          "arguments": []
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": "@flow",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "@flow",
+      "start": 0,
+      "end": 7,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 7
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_methods/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_methods/input.js
new file mode 100644
index 000000000000..27f8acf9165a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_methods/input.js
@@ -0,0 +1,2 @@
+//@flow
+instance.method()<_>();
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_methods/output.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_methods/output.json
new file mode 100644
index 000000000000..26c9a3ee4039
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_methods/output.json
@@ -0,0 +1,218 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 31,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 23
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 31,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 23
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 8,
+        "end": 31,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 23
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 8,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 22
+            }
+          },
+          "callee": {
+            "type": "CallExpression",
+            "start": 8,
+            "end": 25,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 17
+              }
+            },
+            "callee": {
+              "type": "MemberExpression",
+              "start": 8,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 0
+                },
+                "end": {
+                  "line": 2,
+                  "column": 15
+                }
+              },
+              "object": {
+                "type": "Identifier",
+                "start": 8,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 8
+                  },
+                  "identifierName": "instance"
+                },
+                "name": "instance"
+              },
+              "property": {
+                "type": "Identifier",
+                "start": 17,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 15
+                  },
+                  "identifierName": "method"
+                },
+                "name": "method"
+              },
+              "computed": false
+            },
+            "arguments": []
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 25,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 17
+              },
+              "end": {
+                "line": 2,
+                "column": 20
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 26,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 19
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 26,
+                  "end": 27,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 19
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              }
+            ]
+          },
+          "arguments": []
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": "@flow",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "@flow",
+      "start": 0,
+      "end": 7,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 7
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_new/input.js b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_new/input.js
new file mode 100644
index 000000000000..4805c6ee75cc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_new/input.js
@@ -0,0 +1,2 @@
+//@flow
+new test<_>();
diff --git a/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_new/output.json b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_new/output.json
new file mode 100644
index 000000000000..6c48948afe6a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typeapp-call/underscore_is_implicit_in_new/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 8,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "NewExpression",
+          "start": 8,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 13
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 12,
+            "end": 16,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 8
+              },
+              "identifierName": "test"
+            },
+            "name": "test"
+          },
+          "typeArguments": {
+            "type": "TypeParameterInstantiation",
+            "start": 16,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 8
+              },
+              "end": {
+                "line": 2,
+                "column": 11
+              }
+            },
+            "params": [
+              {
+                "type": "GenericTypeAnnotation",
+                "start": 17,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 10
+                  }
+                },
+                "typeParameters": null,
+                "id": {
+                  "type": "Identifier",
+                  "start": 17,
+                  "end": 18,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 10
+                    },
+                    "identifierName": "_"
+                  },
+                  "name": "_"
+                }
+              }
+            ]
+          },
+          "arguments": []
+        },
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": "@flow",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "@flow",
+      "start": 0,
+      "end": 7,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 7
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/2/output.json b/packages/babel-parser/test/fixtures/flow/typecasts/2/output.json
index 45638f476d7a..4d9f9da74bf5 100644
--- a/packages/babel-parser/test/fixtures/flow/typecasts/2/output.json
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/2/output.json
@@ -323,7 +323,8 @@
               ],
               "indexers": [],
               "internalSlots": [],
-              "exact": false
+              "exact": false,
+              "inexact": false
             }
           },
           "extra": {
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls-with-one-arg/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls-with-one-arg/input.js
new file mode 100644
index 000000000000..33bdb94b5828
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls-with-one-arg/input.js
@@ -0,0 +1 @@
+funccall(b: string);
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls-with-one-arg/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls-with-one-arg/options.json
new file mode 100644
index 000000000000..e4012a53ad5d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls-with-one-arg/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls/input.js
new file mode 100644
index 000000000000..56208a86b2b8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls/input.js
@@ -0,0 +1 @@
+funccall(a, b: string);
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls/options.json
new file mode 100644
index 000000000000..3f861de320eb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fail-in-calls/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fail-without-parens/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fail-without-parens/input.js
new file mode 100644
index 000000000000..767b0cba53b8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fail-without-parens/input.js
@@ -0,0 +1 @@
+(A, B: T)
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fail-without-parens/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fail-without-parens/options.json
new file mode 100644
index 000000000000..847e987ef0af
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fail-without-parens/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-1/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-1/input.js
new file mode 100644
index 000000000000..499e10703f06
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-1/input.js
@@ -0,0 +1 @@
+[a: string];
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-1/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-1/options.json
new file mode 100644
index 000000000000..18cdf0d35e40
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-1/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-2/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-2/input.js
new file mode 100644
index 000000000000..e71b5b600092
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-2/input.js
@@ -0,0 +1 @@
+([a: string]);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-2/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-2/options.json
new file mode 100644
index 000000000000..624681c0d415
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-2/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:3)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-3/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-3/input.js
new file mode 100644
index 000000000000..21e59fd647b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-3/input.js
@@ -0,0 +1 @@
+([a, [b: string]]);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-3/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-3/options.json
new file mode 100644
index 000000000000..7f8da08031af
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-3/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:7)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-4/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-4/input.js
new file mode 100644
index 000000000000..6335f1fb022d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-4/input.js
@@ -0,0 +1 @@
+async ([a: string]);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-4/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-4/options.json
new file mode 100644
index 000000000000..23c75013dad4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-4/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-5/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-5/input.js
new file mode 100644
index 000000000000..5e04cb830166
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-5/input.js
@@ -0,0 +1 @@
+async ([a, [b: string]]);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-5/options.json b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-5/options.json
new file mode 100644
index 000000000000..3f861de320eb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/fails-in-array-expression-5/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "The type cast expression is expected to be wrapped with parenthesis (1:13)"
+}
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/works-in-array-pattern/input.js b/packages/babel-parser/test/fixtures/flow/typecasts/works-in-array-pattern/input.js
new file mode 100644
index 000000000000..89c03246bbc8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/works-in-array-pattern/input.js
@@ -0,0 +1,14 @@
+([a: string]) => {};
+([a, [b: string]]) => {};
+([a: string] = []) => {};
+({ x: [a: string] }) => {};
+
+async ([a: string]) => {};
+async ([a, [b: string]]) => {};
+async ([a: string] = []) => {};
+async ({ x: [a: string] }) => {};
+
+let [a1: string] = c;
+let [a2, [b: string]] = c;
+let [a3: string] = c;
+let { x: [a4: string] } = c;
diff --git a/packages/babel-parser/test/fixtures/flow/typecasts/works-in-array-pattern/output.json b/packages/babel-parser/test/fixtures/flow/typecasts/works-in-array-pattern/output.json
new file mode 100644
index 000000000000..0dc34605bead
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/flow/typecasts/works-in-array-pattern/output.json
@@ -0,0 +1,1739 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 327,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 14,
+      "column": 28
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 327,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 14,
+        "column": 28
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ArrayPattern",
+              "start": 1,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 2,
+                  "end": 11,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 11
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a",
+                  "typeAnnotation": {
+                    "type": "TypeAnnotation",
+                    "start": 3,
+                    "end": 11,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 3
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 11
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "StringTypeAnnotation",
+                      "start": 5,
+                      "end": 11,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 5
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 11
+                        }
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 17,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 17
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 21,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 25
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 21,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 24
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ArrayPattern",
+              "start": 22,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 1
+                },
+                "end": {
+                  "line": 2,
+                  "column": 17
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 23,
+                  "end": 24,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 3
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a"
+                },
+                {
+                  "type": "ArrayPattern",
+                  "start": 26,
+                  "end": 37,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 16
+                    }
+                  },
+                  "elements": [
+                    {
+                      "type": "Identifier",
+                      "start": 27,
+                      "end": 36,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 6
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 15
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b",
+                      "typeAnnotation": {
+                        "type": "TypeAnnotation",
+                        "start": 28,
+                        "end": 36,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 15
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "StringTypeAnnotation",
+                          "start": 30,
+                          "end": 36,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 9
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 15
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 43,
+            "end": 45,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 22
+              },
+              "end": {
+                "line": 2,
+                "column": 24
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 47,
+        "end": 72,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 25
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 47,
+          "end": 71,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 0
+            },
+            "end": {
+              "line": 3,
+              "column": 24
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "AssignmentPattern",
+              "start": 48,
+              "end": 64,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 1
+                },
+                "end": {
+                  "line": 3,
+                  "column": 17
+                }
+              },
+              "left": {
+                "type": "ArrayPattern",
+                "start": 48,
+                "end": 59,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 12
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "Identifier",
+                    "start": 49,
+                    "end": 58,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 2
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 11
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a",
+                    "typeAnnotation": {
+                      "type": "TypeAnnotation",
+                      "start": 50,
+                      "end": 58,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 3
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 11
+                        }
+                      },
+                      "typeAnnotation": {
+                        "type": "StringTypeAnnotation",
+                        "start": 52,
+                        "end": 58,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 5
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 11
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              },
+              "right": {
+                "type": "ArrayExpression",
+                "start": 62,
+                "end": 64,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 17
+                  }
+                },
+                "elements": []
+              }
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 69,
+            "end": 71,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 22
+              },
+              "end": {
+                "line": 3,
+                "column": 24
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 73,
+        "end": 100,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 27
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 73,
+          "end": 99,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 0
+            },
+            "end": {
+              "line": 4,
+              "column": 26
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 74,
+              "end": 92,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 1
+                },
+                "end": {
+                  "line": 4,
+                  "column": 19
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 76,
+                  "end": 90,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 3
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 17
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 76,
+                    "end": 77,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 3
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 4
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "ArrayPattern",
+                    "start": 79,
+                    "end": 90,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 17
+                      }
+                    },
+                    "elements": [
+                      {
+                        "type": "Identifier",
+                        "start": 80,
+                        "end": 89,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 7
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 16
+                          },
+                          "identifierName": "a"
+                        },
+                        "name": "a",
+                        "typeAnnotation": {
+                          "type": "TypeAnnotation",
+                          "start": 81,
+                          "end": 89,
+                          "loc": {
+                            "start": {
+                              "line": 4,
+                              "column": 8
+                            },
+                            "end": {
+                              "line": 4,
+                              "column": 16
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "StringTypeAnnotation",
+                            "start": 83,
+                            "end": 89,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 10
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 16
+                              }
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 97,
+            "end": 99,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 24
+              },
+              "end": {
+                "line": 4,
+                "column": 26
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 102,
+        "end": 128,
+        "loc": {
+          "start": {
+            "line": 6,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 26
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 102,
+          "end": 127,
+          "loc": {
+            "start": {
+              "line": 6,
+              "column": 0
+            },
+            "end": {
+              "line": 6,
+              "column": 25
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": true,
+          "params": [
+            {
+              "type": "ArrayPattern",
+              "start": 109,
+              "end": 120,
+              "loc": {
+                "start": {
+                  "line": 6,
+                  "column": 7
+                },
+                "end": {
+                  "line": 6,
+                  "column": 18
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 110,
+                  "end": 119,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 17
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a",
+                  "typeAnnotation": {
+                    "type": "TypeAnnotation",
+                    "start": 111,
+                    "end": 119,
+                    "loc": {
+                      "start": {
+                        "line": 6,
+                        "column": 9
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 17
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "StringTypeAnnotation",
+                      "start": 113,
+                      "end": 119,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 17
+                        }
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 125,
+            "end": 127,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 23
+              },
+              "end": {
+                "line": 6,
+                "column": 25
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 129,
+        "end": 160,
+        "loc": {
+          "start": {
+            "line": 7,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 31
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 129,
+          "end": 159,
+          "loc": {
+            "start": {
+              "line": 7,
+              "column": 0
+            },
+            "end": {
+              "line": 7,
+              "column": 30
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": true,
+          "params": [
+            {
+              "type": "ArrayPattern",
+              "start": 136,
+              "end": 152,
+              "loc": {
+                "start": {
+                  "line": 7,
+                  "column": 7
+                },
+                "end": {
+                  "line": 7,
+                  "column": 23
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 137,
+                  "end": 138,
+                  "loc": {
+                    "start": {
+                      "line": 7,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 7,
+                      "column": 9
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a"
+                },
+                {
+                  "type": "ArrayPattern",
+                  "start": 140,
+                  "end": 151,
+                  "loc": {
+                    "start": {
+                      "line": 7,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 7,
+                      "column": 22
+                    }
+                  },
+                  "elements": [
+                    {
+                      "type": "Identifier",
+                      "start": 141,
+                      "end": 150,
+                      "loc": {
+                        "start": {
+                          "line": 7,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 7,
+                          "column": 21
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b",
+                      "typeAnnotation": {
+                        "type": "TypeAnnotation",
+                        "start": 142,
+                        "end": 150,
+                        "loc": {
+                          "start": {
+                            "line": 7,
+                            "column": 13
+                          },
+                          "end": {
+                            "line": 7,
+                            "column": 21
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "StringTypeAnnotation",
+                          "start": 144,
+                          "end": 150,
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 15
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 21
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 157,
+            "end": 159,
+            "loc": {
+              "start": {
+                "line": 7,
+                "column": 28
+              },
+              "end": {
+                "line": 7,
+                "column": 30
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 161,
+        "end": 192,
+        "loc": {
+          "start": {
+            "line": 8,
+            "column": 0
+          },
+          "end": {
+            "line": 8,
+            "column": 31
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 161,
+          "end": 191,
+          "loc": {
+            "start": {
+              "line": 8,
+              "column": 0
+            },
+            "end": {
+              "line": 8,
+              "column": 30
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": true,
+          "params": [
+            {
+              "type": "AssignmentPattern",
+              "start": 168,
+              "end": 184,
+              "loc": {
+                "start": {
+                  "line": 8,
+                  "column": 7
+                },
+                "end": {
+                  "line": 8,
+                  "column": 23
+                }
+              },
+              "left": {
+                "type": "ArrayPattern",
+                "start": 168,
+                "end": 179,
+                "loc": {
+                  "start": {
+                    "line": 8,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 18
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "Identifier",
+                    "start": 169,
+                    "end": 178,
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 8,
+                        "column": 17
+                      },
+                      "identifierName": "a"
+                    },
+                    "name": "a",
+                    "typeAnnotation": {
+                      "type": "TypeAnnotation",
+                      "start": 170,
+                      "end": 178,
+                      "loc": {
+                        "start": {
+                          "line": 8,
+                          "column": 9
+                        },
+                        "end": {
+                          "line": 8,
+                          "column": 17
+                        }
+                      },
+                      "typeAnnotation": {
+                        "type": "StringTypeAnnotation",
+                        "start": 172,
+                        "end": 178,
+                        "loc": {
+                          "start": {
+                            "line": 8,
+                            "column": 11
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 17
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              },
+              "right": {
+                "type": "ArrayExpression",
+                "start": 182,
+                "end": 184,
+                "loc": {
+                  "start": {
+                    "line": 8,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 23
+                  }
+                },
+                "elements": []
+              }
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 189,
+            "end": 191,
+            "loc": {
+              "start": {
+                "line": 8,
+                "column": 28
+              },
+              "end": {
+                "line": 8,
+                "column": 30
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 193,
+        "end": 226,
+        "loc": {
+          "start": {
+            "line": 9,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 33
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 193,
+          "end": 225,
+          "loc": {
+            "start": {
+              "line": 9,
+              "column": 0
+            },
+            "end": {
+              "line": 9,
+              "column": 32
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": true,
+          "params": [
+            {
+              "type": "ObjectPattern",
+              "start": 200,
+              "end": 218,
+              "loc": {
+                "start": {
+                  "line": 9,
+                  "column": 7
+                },
+                "end": {
+                  "line": 9,
+                  "column": 25
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 202,
+                  "end": 216,
+                  "loc": {
+                    "start": {
+                      "line": 9,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 23
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 202,
+                    "end": 203,
+                    "loc": {
+                      "start": {
+                        "line": 9,
+                        "column": 9
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 10
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "ArrayPattern",
+                    "start": 205,
+                    "end": 216,
+                    "loc": {
+                      "start": {
+                        "line": 9,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 23
+                      }
+                    },
+                    "elements": [
+                      {
+                        "type": "Identifier",
+                        "start": 206,
+                        "end": 215,
+                        "loc": {
+                          "start": {
+                            "line": 9,
+                            "column": 13
+                          },
+                          "end": {
+                            "line": 9,
+                            "column": 22
+                          },
+                          "identifierName": "a"
+                        },
+                        "name": "a",
+                        "typeAnnotation": {
+                          "type": "TypeAnnotation",
+                          "start": 207,
+                          "end": 215,
+                          "loc": {
+                            "start": {
+                              "line": 9,
+                              "column": 14
+                            },
+                            "end": {
+                              "line": 9,
+                              "column": 22
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "StringTypeAnnotation",
+                            "start": 209,
+                            "end": 215,
+                            "loc": {
+                              "start": {
+                                "line": 9,
+                                "column": 16
+                              },
+                              "end": {
+                                "line": 9,
+                                "column": 22
+                              }
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 223,
+            "end": 225,
+            "loc": {
+              "start": {
+                "line": 9,
+                "column": 30
+              },
+              "end": {
+                "line": 9,
+                "column": 32
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 228,
+        "end": 249,
+        "loc": {
+          "start": {
+            "line": 11,
+            "column": 0
+          },
+          "end": {
+            "line": 11,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 232,
+            "end": 248,
+            "loc": {
+              "start": {
+                "line": 11,
+                "column": 4
+              },
+              "end": {
+                "line": 11,
+                "column": 20
+              }
+            },
+            "id": {
+              "type": "ArrayPattern",
+              "start": 232,
+              "end": 244,
+              "loc": {
+                "start": {
+                  "line": 11,
+                  "column": 4
+                },
+                "end": {
+                  "line": 11,
+                  "column": 16
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 233,
+                  "end": 243,
+                  "loc": {
+                    "start": {
+                      "line": 11,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 11,
+                      "column": 15
+                    },
+                    "identifierName": "a1"
+                  },
+                  "name": "a1",
+                  "typeAnnotation": {
+                    "type": "TypeAnnotation",
+                    "start": 235,
+                    "end": 243,
+                    "loc": {
+                      "start": {
+                        "line": 11,
+                        "column": 7
+                      },
+                      "end": {
+                        "line": 11,
+                        "column": 15
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "StringTypeAnnotation",
+                      "start": 237,
+                      "end": 243,
+                      "loc": {
+                        "start": {
+                          "line": 11,
+                          "column": 9
+                        },
+                        "end": {
+                          "line": 11,
+                          "column": 15
+                        }
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "init": {
+              "type": "Identifier",
+              "start": 247,
+              "end": 248,
+              "loc": {
+                "start": {
+                  "line": 11,
+                  "column": 19
+                },
+                "end": {
+                  "line": 11,
+                  "column": 20
+                },
+                "identifierName": "c"
+              },
+              "name": "c"
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 250,
+        "end": 276,
+        "loc": {
+          "start": {
+            "line": 12,
+            "column": 0
+          },
+          "end": {
+            "line": 12,
+            "column": 26
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 254,
+            "end": 275,
+            "loc": {
+              "start": {
+                "line": 12,
+                "column": 4
+              },
+              "end": {
+                "line": 12,
+                "column": 25
+              }
+            },
+            "id": {
+              "type": "ArrayPattern",
+              "start": 254,
+              "end": 271,
+              "loc": {
+                "start": {
+                  "line": 12,
+                  "column": 4
+                },
+                "end": {
+                  "line": 12,
+                  "column": 21
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 255,
+                  "end": 257,
+                  "loc": {
+                    "start": {
+                      "line": 12,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 12,
+                      "column": 7
+                    },
+                    "identifierName": "a2"
+                  },
+                  "name": "a2"
+                },
+                {
+                  "type": "ArrayPattern",
+                  "start": 259,
+                  "end": 270,
+                  "loc": {
+                    "start": {
+                      "line": 12,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 12,
+                      "column": 20
+                    }
+                  },
+                  "elements": [
+                    {
+                      "type": "Identifier",
+                      "start": 260,
+                      "end": 269,
+                      "loc": {
+                        "start": {
+                          "line": 12,
+                          "column": 10
+                        },
+                        "end": {
+                          "line": 12,
+                          "column": 19
+                        },
+                        "identifierName": "b"
+                      },
+                      "name": "b",
+                      "typeAnnotation": {
+                        "type": "TypeAnnotation",
+                        "start": 261,
+                        "end": 269,
+                        "loc": {
+                          "start": {
+                            "line": 12,
+                            "column": 11
+                          },
+                          "end": {
+                            "line": 12,
+                            "column": 19
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "StringTypeAnnotation",
+                          "start": 263,
+                          "end": 269,
+                          "loc": {
+                            "start": {
+                              "line": 12,
+                              "column": 13
+                            },
+                            "end": {
+                              "line": 12,
+                              "column": 19
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            "init": {
+              "type": "Identifier",
+              "start": 274,
+              "end": 275,
+              "loc": {
+                "start": {
+                  "line": 12,
+                  "column": 24
+                },
+                "end": {
+                  "line": 12,
+                  "column": 25
+                },
+                "identifierName": "c"
+              },
+              "name": "c"
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 277,
+        "end": 298,
+        "loc": {
+          "start": {
+            "line": 13,
+            "column": 0
+          },
+          "end": {
+            "line": 13,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 281,
+            "end": 297,
+            "loc": {
+              "start": {
+                "line": 13,
+                "column": 4
+              },
+              "end": {
+                "line": 13,
+                "column": 20
+              }
+            },
+            "id": {
+              "type": "ArrayPattern",
+              "start": 281,
+              "end": 293,
+              "loc": {
+                "start": {
+                  "line": 13,
+                  "column": 4
+                },
+                "end": {
+                  "line": 13,
+                  "column": 16
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 282,
+                  "end": 292,
+                  "loc": {
+                    "start": {
+                      "line": 13,
+                      "column": 5
+                    },
+                    "end": {
+                      "line": 13,
+                      "column": 15
+                    },
+                    "identifierName": "a3"
+                  },
+                  "name": "a3",
+                  "typeAnnotation": {
+                    "type": "TypeAnnotation",
+                    "start": 284,
+                    "end": 292,
+                    "loc": {
+                      "start": {
+                        "line": 13,
+                        "column": 7
+                      },
+                      "end": {
+                        "line": 13,
+                        "column": 15
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "StringTypeAnnotation",
+                      "start": 286,
+                      "end": 292,
+                      "loc": {
+                        "start": {
+                          "line": 13,
+                          "column": 9
+                        },
+                        "end": {
+                          "line": 13,
+                          "column": 15
+                        }
+                      }
+                    }
+                  }
+                }
+              ]
+            },
+            "init": {
+              "type": "Identifier",
+              "start": 296,
+              "end": 297,
+              "loc": {
+                "start": {
+                  "line": 13,
+                  "column": 19
+                },
+                "end": {
+                  "line": 13,
+                  "column": 20
+                },
+                "identifierName": "c"
+              },
+              "name": "c"
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 299,
+        "end": 327,
+        "loc": {
+          "start": {
+            "line": 14,
+            "column": 0
+          },
+          "end": {
+            "line": 14,
+            "column": 28
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 303,
+            "end": 326,
+            "loc": {
+              "start": {
+                "line": 14,
+                "column": 4
+              },
+              "end": {
+                "line": 14,
+                "column": 27
+              }
+            },
+            "id": {
+              "type": "ObjectPattern",
+              "start": 303,
+              "end": 322,
+              "loc": {
+                "start": {
+                  "line": 14,
+                  "column": 4
+                },
+                "end": {
+                  "line": 14,
+                  "column": 23
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 305,
+                  "end": 320,
+                  "loc": {
+                    "start": {
+                      "line": 14,
+                      "column": 6
+                    },
+                    "end": {
+                      "line": 14,
+                      "column": 21
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 305,
+                    "end": 306,
+                    "loc": {
+                      "start": {
+                        "line": 14,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 14,
+                        "column": 7
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "ArrayPattern",
+                    "start": 308,
+                    "end": 320,
+                    "loc": {
+                      "start": {
+                        "line": 14,
+                        "column": 9
+                      },
+                      "end": {
+                        "line": 14,
+                        "column": 21
+                      }
+                    },
+                    "elements": [
+                      {
+                        "type": "Identifier",
+                        "start": 309,
+                        "end": 319,
+                        "loc": {
+                          "start": {
+                            "line": 14,
+                            "column": 10
+                          },
+                          "end": {
+                            "line": 14,
+                            "column": 20
+                          },
+                          "identifierName": "a4"
+                        },
+                        "name": "a4",
+                        "typeAnnotation": {
+                          "type": "TypeAnnotation",
+                          "start": 311,
+                          "end": 319,
+                          "loc": {
+                            "start": {
+                              "line": 14,
+                              "column": 12
+                            },
+                            "end": {
+                              "line": 14,
+                              "column": 20
+                            }
+                          },
+                          "typeAnnotation": {
+                            "type": "StringTypeAnnotation",
+                            "start": 313,
+                            "end": 319,
+                            "loc": {
+                              "start": {
+                                "line": 14,
+                                "column": 14
+                              },
+                              "end": {
+                                "line": 14,
+                                "column": 20
+                              }
+                            }
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "init": {
+              "type": "Identifier",
+              "start": 325,
+              "end": 326,
+              "loc": {
+                "start": {
+                  "line": 14,
+                  "column": 26
+                },
+                "end": {
+                  "line": 14,
+                  "column": 27
+                },
+                "identifierName": "c"
+              },
+              "name": "c"
+            }
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/jsx/errors/adjacent-tags/options.json b/packages/babel-parser/test/fixtures/jsx/errors/adjacent-tags/options.json
index a87c9c653817..182a3a9016d8 100644
--- a/packages/babel-parser/test/fixtures/jsx/errors/adjacent-tags/options.json
+++ b/packages/babel-parser/test/fixtures/jsx/errors/adjacent-tags/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Adjacent JSX elements must be wrapped in an enclosing tag. Did you want a JSX fragment <>...</>? (1:22)"
+  "throws": "Adjacent JSX elements must be wrapped in an enclosing tag. Did you want a JSX fragment <>...</>? (1:22)"
 }
diff --git a/packages/babel-parser/test/fixtures/jsx/errors/attribute-arbitrary-expression/options.json b/packages/babel-parser/test/fixtures/jsx/errors/attribute-arbitrary-expression/options.json
index ed93e1882a40..19a214000ffc 100644
--- a/packages/babel-parser/test/fixtures/jsx/errors/attribute-arbitrary-expression/options.json
+++ b/packages/babel-parser/test/fixtures/jsx/errors/attribute-arbitrary-expression/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "JSX value should be either an expression or a quoted JSX text (1:9)"
+  "throws": "JSX value should be either an expression or a quoted JSX text (1:9)"
 }
diff --git a/packages/babel-parser/test/fixtures/jsx/errors/html-comment/input.js b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/input.js
new file mode 100644
index 000000000000..5190fb0e1d65
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/input.js
@@ -0,0 +1 @@
+<!--a
diff --git a/packages/babel-parser/test/fixtures/jsx/errors/html-comment/options.json b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/options.json
new file mode 100644
index 000000000000..8a619bce4daf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "script",
+  "plugins": ["jsx", "flow"]
+}
diff --git a/packages/babel-parser/test/fixtures/jsx/errors/html-comment/output.json b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/output.json
new file mode 100644
index 000000000000..cf95c18b54b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/jsx/errors/html-comment/output.json
@@ -0,0 +1,70 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 5,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 5
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 5,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 5
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [],
+    "directives": [],
+    "innerComments": [
+      {
+        "type": "CommentLine",
+        "value": "a",
+        "start": 0,
+        "end": 5,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 5
+          }
+        }
+      }
+    ]
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "a",
+      "start": 0,
+      "end": 5,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 5
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/jsx/regression/issue-8891/input.js b/packages/babel-parser/test/fixtures/jsx/regression/issue-8891/input.js
new file mode 100644
index 000000000000..845c7e610fe0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/jsx/regression/issue-8891/input.js
@@ -0,0 +1,6 @@
+<>
+<Select prop={{ function: 'test' }} />
+<Select prop={{ class: 'test' }} />
+<Select prop={{ delete: 'test' }} />
+<Select prop={{ enum: 'test' }} />
+</>
diff --git a/packages/babel-parser/test/fixtures/jsx/regression/issue-8891/output.json b/packages/babel-parser/test/fixtures/jsx/regression/issue-8891/output.json
new file mode 100644
index 000000000000..abafdf5c8759
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/jsx/regression/issue-8891/output.json
@@ -0,0 +1,873 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 153,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 6,
+      "column": 3
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 153,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 6,
+        "column": 3
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 153,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "JSXFragment",
+          "start": 0,
+          "end": 153,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 6,
+              "column": 3
+            }
+          },
+          "openingFragment": {
+            "type": "JSXOpeningFragment",
+            "start": 0,
+            "end": 2,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 2
+              }
+            }
+          },
+          "closingFragment": {
+            "type": "JSXClosingFragment",
+            "start": 150,
+            "end": 153,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 0
+              },
+              "end": {
+                "line": 6,
+                "column": 3
+              }
+            }
+          },
+          "children": [
+            {
+              "type": "JSXText",
+              "start": 2,
+              "end": 3,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 0
+                }
+              },
+              "extra": {
+                "rawValue": "\n",
+                "raw": "\n"
+              },
+              "value": "\n"
+            },
+            {
+              "type": "JSXElement",
+              "start": 3,
+              "end": 41,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 0
+                },
+                "end": {
+                  "line": 2,
+                  "column": 38
+                }
+              },
+              "openingElement": {
+                "type": "JSXOpeningElement",
+                "start": 3,
+                "end": 41,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 38
+                  }
+                },
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start": 4,
+                  "end": 10,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 7
+                    }
+                  },
+                  "name": "Select"
+                },
+                "attributes": [
+                  {
+                    "type": "JSXAttribute",
+                    "start": 11,
+                    "end": 38,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 35
+                      }
+                    },
+                    "name": {
+                      "type": "JSXIdentifier",
+                      "start": 11,
+                      "end": 15,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 12
+                        }
+                      },
+                      "name": "prop"
+                    },
+                    "value": {
+                      "type": "JSXExpressionContainer",
+                      "start": 16,
+                      "end": 38,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 35
+                        }
+                      },
+                      "expression": {
+                        "type": "ObjectExpression",
+                        "start": 17,
+                        "end": 37,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 14
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 34
+                          }
+                        },
+                        "properties": [
+                          {
+                            "type": "ObjectProperty",
+                            "start": 19,
+                            "end": 35,
+                            "loc": {
+                              "start": {
+                                "line": 2,
+                                "column": 16
+                              },
+                              "end": {
+                                "line": 2,
+                                "column": 32
+                              }
+                            },
+                            "method": false,
+                            "key": {
+                              "type": "Identifier",
+                              "start": 19,
+                              "end": 27,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 16
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 24
+                                },
+                                "identifierName": "function"
+                              },
+                              "name": "function"
+                            },
+                            "computed": false,
+                            "shorthand": false,
+                            "value": {
+                              "type": "StringLiteral",
+                              "start": 29,
+                              "end": 35,
+                              "loc": {
+                                "start": {
+                                  "line": 2,
+                                  "column": 26
+                                },
+                                "end": {
+                                  "line": 2,
+                                  "column": 32
+                                }
+                              },
+                              "extra": {
+                                "rawValue": "test",
+                                "raw": "'test'"
+                              },
+                              "value": "test"
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                ],
+                "selfClosing": true
+              },
+              "closingElement": null,
+              "children": []
+            },
+            {
+              "type": "JSXText",
+              "start": 41,
+              "end": 42,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 38
+                },
+                "end": {
+                  "line": 3,
+                  "column": 0
+                }
+              },
+              "extra": {
+                "rawValue": "\n",
+                "raw": "\n"
+              },
+              "value": "\n"
+            },
+            {
+              "type": "JSXElement",
+              "start": 42,
+              "end": 77,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 0
+                },
+                "end": {
+                  "line": 3,
+                  "column": 35
+                }
+              },
+              "openingElement": {
+                "type": "JSXOpeningElement",
+                "start": 42,
+                "end": 77,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 35
+                  }
+                },
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start": 43,
+                  "end": 49,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 7
+                    }
+                  },
+                  "name": "Select"
+                },
+                "attributes": [
+                  {
+                    "type": "JSXAttribute",
+                    "start": 50,
+                    "end": 74,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 32
+                      }
+                    },
+                    "name": {
+                      "type": "JSXIdentifier",
+                      "start": 50,
+                      "end": 54,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 12
+                        }
+                      },
+                      "name": "prop"
+                    },
+                    "value": {
+                      "type": "JSXExpressionContainer",
+                      "start": 55,
+                      "end": 74,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 32
+                        }
+                      },
+                      "expression": {
+                        "type": "ObjectExpression",
+                        "start": 56,
+                        "end": 73,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 14
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 31
+                          }
+                        },
+                        "properties": [
+                          {
+                            "type": "ObjectProperty",
+                            "start": 58,
+                            "end": 71,
+                            "loc": {
+                              "start": {
+                                "line": 3,
+                                "column": 16
+                              },
+                              "end": {
+                                "line": 3,
+                                "column": 29
+                              }
+                            },
+                            "method": false,
+                            "key": {
+                              "type": "Identifier",
+                              "start": 58,
+                              "end": 63,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 16
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 21
+                                },
+                                "identifierName": "class"
+                              },
+                              "name": "class"
+                            },
+                            "computed": false,
+                            "shorthand": false,
+                            "value": {
+                              "type": "StringLiteral",
+                              "start": 65,
+                              "end": 71,
+                              "loc": {
+                                "start": {
+                                  "line": 3,
+                                  "column": 23
+                                },
+                                "end": {
+                                  "line": 3,
+                                  "column": 29
+                                }
+                              },
+                              "extra": {
+                                "rawValue": "test",
+                                "raw": "'test'"
+                              },
+                              "value": "test"
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                ],
+                "selfClosing": true
+              },
+              "closingElement": null,
+              "children": []
+            },
+            {
+              "type": "JSXText",
+              "start": 77,
+              "end": 78,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 35
+                },
+                "end": {
+                  "line": 4,
+                  "column": 0
+                }
+              },
+              "extra": {
+                "rawValue": "\n",
+                "raw": "\n"
+              },
+              "value": "\n"
+            },
+            {
+              "type": "JSXElement",
+              "start": 78,
+              "end": 114,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 0
+                },
+                "end": {
+                  "line": 4,
+                  "column": 36
+                }
+              },
+              "openingElement": {
+                "type": "JSXOpeningElement",
+                "start": 78,
+                "end": 114,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 36
+                  }
+                },
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start": 79,
+                  "end": 85,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 7
+                    }
+                  },
+                  "name": "Select"
+                },
+                "attributes": [
+                  {
+                    "type": "JSXAttribute",
+                    "start": 86,
+                    "end": 111,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 33
+                      }
+                    },
+                    "name": {
+                      "type": "JSXIdentifier",
+                      "start": 86,
+                      "end": 90,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 12
+                        }
+                      },
+                      "name": "prop"
+                    },
+                    "value": {
+                      "type": "JSXExpressionContainer",
+                      "start": 91,
+                      "end": 111,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 33
+                        }
+                      },
+                      "expression": {
+                        "type": "ObjectExpression",
+                        "start": 92,
+                        "end": 110,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 14
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 32
+                          }
+                        },
+                        "properties": [
+                          {
+                            "type": "ObjectProperty",
+                            "start": 94,
+                            "end": 108,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 16
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 30
+                              }
+                            },
+                            "method": false,
+                            "key": {
+                              "type": "Identifier",
+                              "start": 94,
+                              "end": 100,
+                              "loc": {
+                                "start": {
+                                  "line": 4,
+                                  "column": 16
+                                },
+                                "end": {
+                                  "line": 4,
+                                  "column": 22
+                                },
+                                "identifierName": "delete"
+                              },
+                              "name": "delete"
+                            },
+                            "computed": false,
+                            "shorthand": false,
+                            "value": {
+                              "type": "StringLiteral",
+                              "start": 102,
+                              "end": 108,
+                              "loc": {
+                                "start": {
+                                  "line": 4,
+                                  "column": 24
+                                },
+                                "end": {
+                                  "line": 4,
+                                  "column": 30
+                                }
+                              },
+                              "extra": {
+                                "rawValue": "test",
+                                "raw": "'test'"
+                              },
+                              "value": "test"
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                ],
+                "selfClosing": true
+              },
+              "closingElement": null,
+              "children": []
+            },
+            {
+              "type": "JSXText",
+              "start": 114,
+              "end": 115,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 36
+                },
+                "end": {
+                  "line": 5,
+                  "column": 0
+                }
+              },
+              "extra": {
+                "rawValue": "\n",
+                "raw": "\n"
+              },
+              "value": "\n"
+            },
+            {
+              "type": "JSXElement",
+              "start": 115,
+              "end": 149,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 0
+                },
+                "end": {
+                  "line": 5,
+                  "column": 34
+                }
+              },
+              "openingElement": {
+                "type": "JSXOpeningElement",
+                "start": 115,
+                "end": 149,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 0
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 34
+                  }
+                },
+                "name": {
+                  "type": "JSXIdentifier",
+                  "start": 116,
+                  "end": 122,
+                  "loc": {
+                    "start": {
+                      "line": 5,
+                      "column": 1
+                    },
+                    "end": {
+                      "line": 5,
+                      "column": 7
+                    }
+                  },
+                  "name": "Select"
+                },
+                "attributes": [
+                  {
+                    "type": "JSXAttribute",
+                    "start": 123,
+                    "end": 146,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 31
+                      }
+                    },
+                    "name": {
+                      "type": "JSXIdentifier",
+                      "start": 123,
+                      "end": 127,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 12
+                        }
+                      },
+                      "name": "prop"
+                    },
+                    "value": {
+                      "type": "JSXExpressionContainer",
+                      "start": 128,
+                      "end": 146,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 31
+                        }
+                      },
+                      "expression": {
+                        "type": "ObjectExpression",
+                        "start": 129,
+                        "end": 145,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 14
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 30
+                          }
+                        },
+                        "properties": [
+                          {
+                            "type": "ObjectProperty",
+                            "start": 131,
+                            "end": 143,
+                            "loc": {
+                              "start": {
+                                "line": 5,
+                                "column": 16
+                              },
+                              "end": {
+                                "line": 5,
+                                "column": 28
+                              }
+                            },
+                            "method": false,
+                            "key": {
+                              "type": "Identifier",
+                              "start": 131,
+                              "end": 135,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 16
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 20
+                                },
+                                "identifierName": "enum"
+                              },
+                              "name": "enum"
+                            },
+                            "computed": false,
+                            "shorthand": false,
+                            "value": {
+                              "type": "StringLiteral",
+                              "start": 137,
+                              "end": 143,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 22
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 28
+                                }
+                              },
+                              "extra": {
+                                "rawValue": "test",
+                                "raw": "'test'"
+                              },
+                              "value": "test"
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                ],
+                "selfClosing": true
+              },
+              "closingElement": null,
+              "children": []
+            },
+            {
+              "type": "JSXText",
+              "start": 149,
+              "end": 150,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 34
+                },
+                "end": {
+                  "line": 6,
+                  "column": 0
+                }
+              },
+              "extra": {
+                "rawValue": "\n",
+                "raw": "\n"
+              },
+              "value": "\n"
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/_errors/no-plugin/input.js b/packages/babel-parser/test/fixtures/placeholders/_errors/no-plugin/input.js
new file mode 100644
index 000000000000..06d3e367d700
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/_errors/no-plugin/input.js
@@ -0,0 +1 @@
+%%FOO%%
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/_errors/no-plugin/options.json b/packages/babel-parser/test/fixtures/placeholders/_errors/no-plugin/options.json
new file mode 100644
index 000000000000..550f9f8667f9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/_errors/no-plugin/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [],
+  "throws": "Unexpected token (1:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/_errors/space-after/input.js b/packages/babel-parser/test/fixtures/placeholders/_errors/space-after/input.js
new file mode 100644
index 000000000000..f0c987242e5f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/_errors/space-after/input.js
@@ -0,0 +1 @@
+%%FOO %%
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/_errors/space-after/options.json b/packages/babel-parser/test/fixtures/placeholders/_errors/space-after/options.json
new file mode 100644
index 000000000000..a307a35df63e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/_errors/space-after/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["placeholders"],
+  "throws": "Unexpected space in placeholder. (1:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/_errors/space-before/input.js b/packages/babel-parser/test/fixtures/placeholders/_errors/space-before/input.js
new file mode 100644
index 000000000000..a19d1a7dbf9d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/_errors/space-before/input.js
@@ -0,0 +1 @@
+%% FOO%%
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/_errors/space-before/options.json b/packages/babel-parser/test/fixtures/placeholders/_errors/space-before/options.json
new file mode 100644
index 000000000000..2d76cfab7e2f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/_errors/space-before/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["placeholders"],
+  "throws": "Unexpected space in placeholder. (1:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/async-parenless/input.js b/packages/babel-parser/test/fixtures/placeholders/arrow/async-parenless/input.js
new file mode 100644
index 000000000000..ccc04f6163ae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/async-parenless/input.js
@@ -0,0 +1 @@
+async %%PARAM%% => %%BODY%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/async-parenless/options.json b/packages/babel-parser/test/fixtures/placeholders/arrow/async-parenless/options.json
new file mode 100644
index 000000000000..91e2a8bf915b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/async-parenless/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["placeholders"],
+  "throws": "Unexpected token, expected \";\" (1:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/async/input.js b/packages/babel-parser/test/fixtures/placeholders/arrow/async/input.js
new file mode 100644
index 000000000000..5620afc8e818
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/async/input.js
@@ -0,0 +1 @@
+async (%%PARAM%%) => %%BODY%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/async/output.json b/packages/babel-parser/test/fixtures/placeholders/arrow/async/output.json
new file mode 100644
index 000000000000..4896328afde6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/async/output.json
@@ -0,0 +1,136 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 30
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 30
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 30
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 29
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": true,
+          "params": [
+            {
+              "type": "Placeholder",
+              "start": 7,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "identifierName": "PARAM"
+                },
+                "name": "PARAM"
+              },
+              "expectedNode": "Pattern"
+            }
+          ],
+          "body": {
+            "type": "Placeholder",
+            "start": 21,
+            "end": 29,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 21
+              },
+              "end": {
+                "line": 1,
+                "column": 29
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 23,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 23
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                },
+                "identifierName": "BODY"
+              },
+              "name": "BODY"
+            },
+            "expectedNode": "Expression"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/sync-parenless/input.js b/packages/babel-parser/test/fixtures/placeholders/arrow/sync-parenless/input.js
new file mode 100644
index 000000000000..03f6196a9250
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/sync-parenless/input.js
@@ -0,0 +1 @@
+%%PARAM%% => %%BODY%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/sync-parenless/options.json b/packages/babel-parser/test/fixtures/placeholders/arrow/sync-parenless/options.json
new file mode 100644
index 000000000000..c2a8ef725fb6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/sync-parenless/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["placeholders"],
+  "throws": "Unexpected token, expected \";\" (1:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/sync/input.js b/packages/babel-parser/test/fixtures/placeholders/arrow/sync/input.js
new file mode 100644
index 000000000000..d8e462edb43b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/sync/input.js
@@ -0,0 +1 @@
+(%%PARAM%%) => %%BODY%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/arrow/sync/output.json b/packages/babel-parser/test/fixtures/placeholders/arrow/sync/output.json
new file mode 100644
index 000000000000..6b0b16b70fc7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/arrow/sync/output.json
@@ -0,0 +1,136 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": false,
+          "params": [
+            {
+              "type": "Placeholder",
+              "start": 1,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 3,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 3
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "identifierName": "PARAM"
+                },
+                "name": "PARAM"
+              },
+              "expectedNode": "Pattern"
+            }
+          ],
+          "body": {
+            "type": "Placeholder",
+            "start": 15,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 23
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 17,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                },
+                "identifierName": "BODY"
+              },
+              "name": "BODY"
+            },
+            "expectedNode": "Expression"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/body_expression/input.js b/packages/babel-parser/test/fixtures/placeholders/class/body_expression/input.js
new file mode 100644
index 000000000000..9789bed118e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/body_expression/input.js
@@ -0,0 +1 @@
+void class %%BODY%%
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/body_expression/output.json b/packages/babel-parser/test/fixtures/placeholders/class/body_expression/output.json
new file mode 100644
index 000000000000..61966406846e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/body_expression/output.json
@@ -0,0 +1,116 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "expression": {
+          "type": "UnaryExpression",
+          "start": 0,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "operator": "void",
+          "prefix": true,
+          "argument": {
+            "type": "ClassExpression",
+            "start": 5,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "id": null,
+            "body": {
+              "type": "Placeholder",
+              "start": 11,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 11
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 13,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "identifierName": "BODY"
+                },
+                "name": "BODY"
+              },
+              "expectedNode": "ClassBody"
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/body_statement/input.js b/packages/babel-parser/test/fixtures/placeholders/class/body_statement/input.js
new file mode 100644
index 000000000000..4447c2e48a44
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/body_statement/input.js
@@ -0,0 +1 @@
+class Cl %%BODY%%
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/body_statement/output.json b/packages/babel-parser/test/fixtures/placeholders/class/body_statement/output.json
new file mode 100644
index 000000000000..70f4a636520e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/body_statement/output.json
@@ -0,0 +1,101 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 17,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 17,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 17
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            },
+            "identifierName": "Cl"
+          },
+          "name": "Cl"
+        },
+        "superClass": null,
+        "body": {
+          "type": "Placeholder",
+          "start": 9,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 17
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 11,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              },
+              "identifierName": "BODY"
+            },
+            "name": "BODY"
+          },
+          "expectedNode": "ClassBody"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/decorators/input.js b/packages/babel-parser/test/fixtures/placeholders/class/decorators/input.js
new file mode 100644
index 000000000000..33732420452f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/decorators/input.js
@@ -0,0 +1,2 @@
+@(%%FOO%%)
+class A {}
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/decorators/options.json b/packages/babel-parser/test/fixtures/placeholders/class/decorators/options.json
new file mode 100644
index 000000000000..f453a9b6abdc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/decorators/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "placeholders",
+    ["decorators", { "decoratorsBeforeExport": true }]
+  ]
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/decorators/output.json b/packages/babel-parser/test/fixtures/placeholders/class/decorators/output.json
new file mode 100644
index 000000000000..459dacb35f2c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/decorators/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 10
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 10
+          }
+        },
+        "decorators": [
+          {
+            "type": "Decorator",
+            "start": 0,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "expression": {
+              "type": "Placeholder",
+              "start": 2,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 4,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "identifierName": "FOO"
+                },
+                "name": "FOO"
+              },
+              "expectedNode": "Expression"
+            }
+          }
+        ],
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 7
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 19,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 8
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id-body/input.js b/packages/babel-parser/test/fixtures/placeholders/class/id-body/input.js
new file mode 100644
index 000000000000..e6b57a64de88
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id-body/input.js
@@ -0,0 +1 @@
+class %%ID%% %%BODY%%
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id-body/output.json b/packages/babel-parser/test/fixtures/placeholders/class/id-body/output.json
new file mode 100644
index 000000000000..0fe8c71d4786
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id-body/output.json
@@ -0,0 +1,117 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "id": {
+          "type": "Placeholder",
+          "start": 6,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 8
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              },
+              "identifierName": "ID"
+            },
+            "name": "ID"
+          },
+          "expectedNode": "Identifier"
+        },
+        "superClass": null,
+        "body": {
+          "type": "Placeholder",
+          "start": 13,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              },
+              "identifierName": "BODY"
+            },
+            "name": "BODY"
+          },
+          "expectedNode": "ClassBody"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id-super-body/input.js b/packages/babel-parser/test/fixtures/placeholders/class/id-super-body/input.js
new file mode 100644
index 000000000000..30edd2cb7f4a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id-super-body/input.js
@@ -0,0 +1 @@
+class %%ID%% extends %%SUPER%% %%BODY%%
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id-super-body/output.json b/packages/babel-parser/test/fixtures/placeholders/class/id-super-body/output.json
new file mode 100644
index 000000000000..b891fe7c30d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id-super-body/output.json
@@ -0,0 +1,149 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 39,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 39
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 39,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 39
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 39,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 39
+          }
+        },
+        "id": {
+          "type": "Placeholder",
+          "start": 6,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 8
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              },
+              "identifierName": "ID"
+            },
+            "name": "ID"
+          },
+          "expectedNode": "Identifier"
+        },
+        "superClass": {
+          "type": "Placeholder",
+          "start": 21,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 21
+            },
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 23,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 23
+              },
+              "end": {
+                "line": 1,
+                "column": 28
+              },
+              "identifierName": "SUPER"
+            },
+            "name": "SUPER"
+          },
+          "expectedNode": "Expression"
+        },
+        "body": {
+          "type": "Placeholder",
+          "start": 31,
+          "end": 39,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 31
+            },
+            "end": {
+              "line": 1,
+              "column": 39
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 33,
+            "end": 37,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 33
+              },
+              "end": {
+                "line": 1,
+                "column": 37
+              },
+              "identifierName": "BODY"
+            },
+            "name": "BODY"
+          },
+          "expectedNode": "ClassBody"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id-super/input.js b/packages/babel-parser/test/fixtures/placeholders/class/id-super/input.js
new file mode 100644
index 000000000000..2f652c767e90
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id-super/input.js
@@ -0,0 +1 @@
+class %%ID%% extends %%SUPER%% {}
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id-super/output.json b/packages/babel-parser/test/fixtures/placeholders/class/id-super/output.json
new file mode 100644
index 000000000000..cde4f271b7de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id-super/output.json
@@ -0,0 +1,132 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 33
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 33
+          }
+        },
+        "id": {
+          "type": "Placeholder",
+          "start": 6,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 8
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              },
+              "identifierName": "ID"
+            },
+            "name": "ID"
+          },
+          "expectedNode": "Identifier"
+        },
+        "superClass": {
+          "type": "Placeholder",
+          "start": 21,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 21
+            },
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 23,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 23
+              },
+              "end": {
+                "line": 1,
+                "column": 28
+              },
+              "identifierName": "SUPER"
+            },
+            "name": "SUPER"
+          },
+          "expectedNode": "Expression"
+        },
+        "body": {
+          "type": "ClassBody",
+          "start": 31,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 31
+            },
+            "end": {
+              "line": 1,
+              "column": 33
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id_expression/input.js b/packages/babel-parser/test/fixtures/placeholders/class/id_expression/input.js
new file mode 100644
index 000000000000..d6f2785faa3a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id_expression/input.js
@@ -0,0 +1 @@
+void class %%ID%% {}
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id_expression/output.json b/packages/babel-parser/test/fixtures/placeholders/class/id_expression/output.json
new file mode 100644
index 000000000000..8ec0bdeaeb64
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id_expression/output.json
@@ -0,0 +1,132 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "expression": {
+          "type": "UnaryExpression",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            }
+          },
+          "operator": "void",
+          "prefix": true,
+          "argument": {
+            "type": "ClassExpression",
+            "start": 5,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "id": {
+              "type": "Placeholder",
+              "start": 11,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 11
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 13,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "ID"
+                },
+                "name": "ID"
+              },
+              "expectedNode": "Identifier"
+            },
+            "superClass": null,
+            "body": {
+              "type": "ClassBody",
+              "start": 18,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "body": []
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id_statement/input.js b/packages/babel-parser/test/fixtures/placeholders/class/id_statement/input.js
new file mode 100644
index 000000000000..b56524d15767
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id_statement/input.js
@@ -0,0 +1 @@
+class %%ID%% {}
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/id_statement/output.json b/packages/babel-parser/test/fixtures/placeholders/class/id_statement/output.json
new file mode 100644
index 000000000000..61ecc899ae22
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/id_statement/output.json
@@ -0,0 +1,100 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Placeholder",
+          "start": 6,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 8,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 8
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              },
+              "identifierName": "ID"
+            },
+            "name": "ID"
+          },
+          "expectedNode": "Identifier"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 13,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/super/input.js b/packages/babel-parser/test/fixtures/placeholders/class/super/input.js
new file mode 100644
index 000000000000..ce315dbaa68c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/super/input.js
@@ -0,0 +1 @@
+class Cl extends %%SUPER%% {}
diff --git a/packages/babel-parser/test/fixtures/placeholders/class/super/output.json b/packages/babel-parser/test/fixtures/placeholders/class/super/output.json
new file mode 100644
index 000000000000..966639d5d351
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/class/super/output.json
@@ -0,0 +1,116 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 29,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 29
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 29,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 29
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 29
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            },
+            "identifierName": "Cl"
+          },
+          "name": "Cl"
+        },
+        "superClass": {
+          "type": "Placeholder",
+          "start": 17,
+          "end": 26,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 1,
+              "column": 26
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 19,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 19
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              },
+              "identifierName": "SUPER"
+            },
+            "name": "SUPER"
+          },
+          "expectedNode": "Expression"
+        },
+        "body": {
+          "type": "ClassBody",
+          "start": 27,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 27
+            },
+            "end": {
+              "line": 1,
+              "column": 29
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/declaration/input.js b/packages/babel-parser/test/fixtures/placeholders/export/declaration/input.js
new file mode 100644
index 000000000000..e06647491291
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/declaration/input.js
@@ -0,0 +1 @@
+export %%DECL%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/declaration/output.json b/packages/babel-parser/test/fixtures/placeholders/export/declaration/output.json
new file mode 100644
index 000000000000..a0cc4fb21147
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/declaration/output.json
@@ -0,0 +1,100 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "Placeholder",
+          "start": 7,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 9,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              },
+              "identifierName": "DECL"
+            },
+            "name": "DECL"
+          },
+          "expectedNode": "Declaration"
+        }
+      },
+      {
+        "type": "EmptyStatement",
+        "start": 15,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 15
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-default-from/input.js b/packages/babel-parser/test/fixtures/placeholders/export/default-default-from/input.js
new file mode 100644
index 000000000000..e9e71b211a7a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-default-from/input.js
@@ -0,0 +1 @@
+export default from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-default-from/options.json b/packages/babel-parser/test/fixtures/placeholders/export/default-default-from/options.json
new file mode 100644
index 000000000000..b3f883263b7b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-default-from/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "placeholders"
+  ],
+  "sourceType": "module",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-2/input.js b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-2/input.js
new file mode 100644
index 000000000000..acd2d28ed6e0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-2/input.js
@@ -0,0 +1 @@
+export %%NAME%% from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-2/options.json b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-2/options.json
new file mode 100644
index 000000000000..404b94bc6cbe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-2/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "placeholders"
+  ],
+  "sourceType": "module",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:16)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-3/input.js b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-3/input.js
new file mode 100644
index 000000000000..a2ac20ea9b87
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-3/input.js
@@ -0,0 +1 @@
+export %%NAME%% from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-3/options.json b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-3/options.json
new file mode 100644
index 000000000000..404b94bc6cbe
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from-3/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "placeholders"
+  ],
+  "sourceType": "module",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:16)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-named-from/input.js b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from/input.js
new file mode 100644
index 000000000000..2ec55e24cc45
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from/input.js
@@ -0,0 +1 @@
+export name from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/default-named-from/options.json b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from/options.json
new file mode 100644
index 000000000000..b3f883263b7b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/default-named-from/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "placeholders"
+  ],
+  "sourceType": "module",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportDefaultFrom' (1:7)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-alias-2/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-2/input.js
new file mode 100644
index 000000000000..ccc71c84d0ab
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-2/input.js
@@ -0,0 +1 @@
+export { name as %%ALIAS%% };
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-alias-2/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-2/output.json
new file mode 100644
index 000000000000..3da7a5b3b526
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-2/output.json
@@ -0,0 +1,119 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 29,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 29
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 29,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 29
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 29
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 26
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "name"
+              },
+              "name": "name"
+            },
+            "exported": {
+              "type": "Placeholder",
+              "start": 17,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 26
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 19,
+                "end": 24,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 19
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "identifierName": "ALIAS"
+                },
+                "name": "ALIAS"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-alias-3/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-3/input.js
new file mode 100644
index 000000000000..ebe9a78080c2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-3/input.js
@@ -0,0 +1 @@
+export { %%NAME%% as %%ALIAS%% };
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-alias-3/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-3/output.json
new file mode 100644
index 000000000000..79bf65de1189
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-alias-3/output.json
@@ -0,0 +1,135 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 33
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 33
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            },
+            "exported": {
+              "type": "Placeholder",
+              "start": 21,
+              "end": 30,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 21
+                },
+                "end": {
+                  "line": 1,
+                  "column": 30
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 23,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 23
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 28
+                  },
+                  "identifierName": "ALIAS"
+                },
+                "name": "ALIAS"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-alias/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-alias/input.js
new file mode 100644
index 000000000000..ff261bd263d7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-alias/input.js
@@ -0,0 +1 @@
+export { %%NAME%% as alias };
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-alias/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-alias/output.json
new file mode 100644
index 000000000000..ddabad2b64c7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-alias/output.json
@@ -0,0 +1,119 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 29,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 29
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 29,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 29
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 29
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 26
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 21,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 21
+                },
+                "end": {
+                  "line": 1,
+                  "column": 26
+                },
+                "identifierName": "alias"
+              },
+              "name": "alias"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-2/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-from-2/input.js
new file mode 100644
index 000000000000..3bf7f2ff4f01
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-2/input.js
@@ -0,0 +1 @@
+export { name } from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-2/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-from-2/output.json
new file mode 100644
index 000000000000..5d7db268eb97
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-2/output.json
@@ -0,0 +1,135 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 30
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 30
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 30
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "name"
+              },
+              "name": "name"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "name"
+              },
+              "name": "name"
+            }
+          }
+        ],
+        "source": {
+          "type": "Placeholder",
+          "start": 21,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 21
+            },
+            "end": {
+              "line": 1,
+              "column": 29
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 23,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 23
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              },
+              "identifierName": "FILE"
+            },
+            "name": "FILE"
+          },
+          "expectedNode": "StringLiteral"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-3/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-from-3/input.js
new file mode 100644
index 000000000000..0a86eaa83ca1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-3/input.js
@@ -0,0 +1 @@
+export { %%NAME%% } from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-3/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-from-3/output.json
new file mode 100644
index 000000000000..f89643fc0a7b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-3/output.json
@@ -0,0 +1,167 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            },
+            "exported": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "Placeholder",
+          "start": 25,
+          "end": 33,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 25
+            },
+            "end": {
+              "line": 1,
+              "column": 33
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 27,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 27
+              },
+              "end": {
+                "line": 1,
+                "column": 31
+              },
+              "identifierName": "FILE"
+            },
+            "name": "FILE"
+          },
+          "expectedNode": "StringLiteral"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-2/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-2/input.js
new file mode 100644
index 000000000000..7a9d409e879f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-2/input.js
@@ -0,0 +1 @@
+export { name as %%ALIAS%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-2/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-2/output.json
new file mode 100644
index 000000000000..637b5256b845
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-2/output.json
@@ -0,0 +1,138 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 41,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 41
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 41,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 41
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 41
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 26
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "name"
+              },
+              "name": "name"
+            },
+            "exported": {
+              "type": "Placeholder",
+              "start": 17,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 26
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 19,
+                "end": 24,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 19
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "identifierName": "ALIAS"
+                },
+                "name": "ALIAS"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 34,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 34
+            },
+            "end": {
+              "line": 1,
+              "column": 40
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-3/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-3/input.js
new file mode 100644
index 000000000000..0fc04b4a2f46
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-3/input.js
@@ -0,0 +1 @@
+export { %%NAME%% as %%ALIAS%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-3/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-3/output.json
new file mode 100644
index 000000000000..2fd4cc6f3a99
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias-3/output.json
@@ -0,0 +1,154 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 45,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 45
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 45,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 45
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 45,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 45
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            },
+            "exported": {
+              "type": "Placeholder",
+              "start": 21,
+              "end": 30,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 21
+                },
+                "end": {
+                  "line": 1,
+                  "column": 30
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 23,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 23
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 28
+                  },
+                  "identifierName": "ALIAS"
+                },
+                "name": "ALIAS"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 38,
+          "end": 44,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 38
+            },
+            "end": {
+              "line": 1,
+              "column": 44
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias/input.js
new file mode 100644
index 000000000000..395bf89474cb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias/input.js
@@ -0,0 +1 @@
+export { %%NAME%% as alias } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias/output.json
new file mode 100644
index 000000000000..34e8dd6e3a04
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from-alias/output.json
@@ -0,0 +1,138 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 41,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 41
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 41,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 41
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 41,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 41
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 26
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 21,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 21
+                },
+                "end": {
+                  "line": 1,
+                  "column": 26
+                },
+                "identifierName": "alias"
+              },
+              "name": "alias"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 34,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 34
+            },
+            "end": {
+              "line": 1,
+              "column": 40
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named-from/input.js
new file mode 100644
index 000000000000..c74dfbf297a1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from/input.js
@@ -0,0 +1 @@
+export { %%NAME%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named-from/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named-from/output.json
new file mode 100644
index 000000000000..5c9ae8516dd4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named-from/output.json
@@ -0,0 +1,154 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            },
+            "exported": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 25,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 25
+            },
+            "end": {
+              "line": 1,
+              "column": 31
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named/input.js b/packages/babel-parser/test/fixtures/placeholders/export/named/input.js
new file mode 100644
index 000000000000..03cd701e264c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named/input.js
@@ -0,0 +1 @@
+export { %%NAME%% };
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/named/output.json b/packages/babel-parser/test/fixtures/placeholders/export/named/output.json
new file mode 100644
index 000000000000..67b0f0429f79
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/named/output.json
@@ -0,0 +1,135 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            },
+            "exported": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "NAME"
+                },
+                "name": "NAME"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/options.json b/packages/babel-parser/test/fixtures/placeholders/export/options.json
new file mode 100644
index 000000000000..e7ff26ae7014
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["placeholders", "exportDefaultFrom", "exportNamespaceFrom"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/star-from-2/input.js b/packages/babel-parser/test/fixtures/placeholders/export/star-from-2/input.js
new file mode 100644
index 000000000000..8a6343daed94
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/star-from-2/input.js
@@ -0,0 +1 @@
+export * as %%STAR%% from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/star-from-2/options.json b/packages/babel-parser/test/fixtures/placeholders/export/star-from-2/options.json
new file mode 100644
index 000000000000..8c48e4fc0f20
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/star-from-2/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "placeholders"
+  ],
+  "sourceType": "module",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportNamespaceFrom' (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/star-from-3/input.js b/packages/babel-parser/test/fixtures/placeholders/export/star-from-3/input.js
new file mode 100644
index 000000000000..cdb724867079
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/star-from-3/input.js
@@ -0,0 +1 @@
+export * as %%STAR%% from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/star-from-3/options.json b/packages/babel-parser/test/fixtures/placeholders/export/star-from-3/options.json
new file mode 100644
index 000000000000..8c48e4fc0f20
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/star-from-3/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "placeholders"
+  ],
+  "sourceType": "module",
+  "throws": "This experimental syntax requires enabling the parser plugin: 'exportNamespaceFrom' (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/star-from/input.js b/packages/babel-parser/test/fixtures/placeholders/export/star-from/input.js
new file mode 100644
index 000000000000..87fc3f0d362d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/star-from/input.js
@@ -0,0 +1 @@
+export * from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/export/star-from/output.json b/packages/babel-parser/test/fixtures/placeholders/export/star-from/output.json
new file mode 100644
index 000000000000..87a301212145
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/export/star-from/output.json
@@ -0,0 +1,83 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 23
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 23
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportAllDeclaration",
+        "start": 0,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 23
+          }
+        },
+        "source": {
+          "type": "Placeholder",
+          "start": 14,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 14
+            },
+            "end": {
+              "line": 1,
+              "column": 22
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 16,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 16
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              },
+              "identifierName": "FILE"
+            },
+            "name": "FILE"
+          },
+          "expectedNode": "StringLiteral"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/expression/01/input.js b/packages/babel-parser/test/fixtures/placeholders/expression/01/input.js
new file mode 100644
index 000000000000..1ca196c41413
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/expression/01/input.js
@@ -0,0 +1 @@
+%%FOO%% + %%BAR%%(%%BAZ%%);
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/expression/01/output.json b/packages/babel-parser/test/fixtures/placeholders/expression/01/output.json
new file mode 100644
index 000000000000..9de9b6f77eda
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/expression/01/output.json
@@ -0,0 +1,182 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 27,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 27
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 27,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 27
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 27
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 26,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 26
+            }
+          },
+          "left": {
+            "type": "Placeholder",
+            "start": 0,
+            "end": 7,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 7
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 2,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 2
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "FOO"
+              },
+              "name": "FOO"
+            },
+            "expectedNode": "Expression"
+          },
+          "operator": "+",
+          "right": {
+            "type": "CallExpression",
+            "start": 10,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 10
+              },
+              "end": {
+                "line": 1,
+                "column": 26
+              }
+            },
+            "callee": {
+              "type": "Placeholder",
+              "start": 10,
+              "end": 17,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 17
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 12,
+                "end": 15,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 12
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "identifierName": "BAR"
+                },
+                "name": "BAR"
+              },
+              "expectedNode": "Expression"
+            },
+            "arguments": [
+              {
+                "type": "Placeholder",
+                "start": 18,
+                "end": 25,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 25
+                  }
+                },
+                "name": {
+                  "type": "Identifier",
+                  "start": 20,
+                  "end": 23,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 23
+                    },
+                    "identifierName": "BAZ"
+                  },
+                  "name": "BAZ"
+                },
+                "expectedNode": "Expression"
+              }
+            ]
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/expression/options.json b/packages/babel-parser/test/fixtures/placeholders/expression/options.json
new file mode 100644
index 000000000000..92404e501295
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/expression/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["placeholders"]
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/body/input.js b/packages/babel-parser/test/fixtures/placeholders/function/body/input.js
new file mode 100644
index 000000000000..09db19b409a7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/body/input.js
@@ -0,0 +1 @@
+function f() %%BODY%%
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/body/output.json b/packages/babel-parser/test/fixtures/placeholders/function/body/output.json
new file mode 100644
index 000000000000..3139e3132180
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/body/output.json
@@ -0,0 +1,103 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 21
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 21
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 21
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "Placeholder",
+          "start": 13,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 21
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 15,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              },
+              "identifierName": "BODY"
+            },
+            "name": "BODY"
+          },
+          "expectedNode": "BlockStatement"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/id-params-body/input.js b/packages/babel-parser/test/fixtures/placeholders/function/id-params-body/input.js
new file mode 100644
index 000000000000..9f0f6607b320
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/id-params-body/input.js
@@ -0,0 +1 @@
+function %%ID%%(%%PARAM%%, %%PARAM%%) %%BODY%%
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/id-params-body/output.json b/packages/babel-parser/test/fixtures/placeholders/function/id-params-body/output.json
new file mode 100644
index 000000000000..fd6205f7ab8e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/id-params-body/output.json
@@ -0,0 +1,186 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 46
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 46
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 46
+          }
+        },
+        "id": {
+          "type": "Placeholder",
+          "start": 9,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 11,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              },
+              "identifierName": "ID"
+            },
+            "name": "ID"
+          },
+          "expectedNode": "Identifier"
+        },
+        "generator": false,
+        "async": false,
+        "params": [
+          {
+            "type": "Placeholder",
+            "start": 16,
+            "end": 25,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 16
+              },
+              "end": {
+                "line": 1,
+                "column": 25
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 18,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 23
+                },
+                "identifierName": "PARAM"
+              },
+              "name": "PARAM"
+            },
+            "expectedNode": "Pattern"
+          },
+          {
+            "type": "Placeholder",
+            "start": 27,
+            "end": 36,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 27
+              },
+              "end": {
+                "line": 1,
+                "column": 36
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 29,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 29
+                },
+                "end": {
+                  "line": 1,
+                  "column": 34
+                },
+                "identifierName": "PARAM"
+              },
+              "name": "PARAM"
+            },
+            "expectedNode": "Pattern"
+          }
+        ],
+        "body": {
+          "type": "Placeholder",
+          "start": 38,
+          "end": 46,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 38
+            },
+            "end": {
+              "line": 1,
+              "column": 46
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 40,
+            "end": 44,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 40
+              },
+              "end": {
+                "line": 1,
+                "column": 44
+              },
+              "identifierName": "BODY"
+            },
+            "name": "BODY"
+          },
+          "expectedNode": "BlockStatement"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/id_declaration/input.js b/packages/babel-parser/test/fixtures/placeholders/function/id_declaration/input.js
new file mode 100644
index 000000000000..8afee84ad037
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/id_declaration/input.js
@@ -0,0 +1 @@
+function %%ID%%() {}
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/id_declaration/output.json b/packages/babel-parser/test/fixtures/placeholders/function/id_declaration/output.json
new file mode 100644
index 000000000000..a07531190e7d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/id_declaration/output.json
@@ -0,0 +1,103 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "id": {
+          "type": "Placeholder",
+          "start": 9,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 11,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              },
+              "identifierName": "ID"
+            },
+            "name": "ID"
+          },
+          "expectedNode": "Identifier"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 18,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 18
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/id_expression/input.js b/packages/babel-parser/test/fixtures/placeholders/function/id_expression/input.js
new file mode 100644
index 000000000000..69db50cde003
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/id_expression/input.js
@@ -0,0 +1 @@
+void function %%ID%%() {};
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/id_expression/output.json b/packages/babel-parser/test/fixtures/placeholders/function/id_expression/output.json
new file mode 100644
index 000000000000..1bc90cefa7fc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/id_expression/output.json
@@ -0,0 +1,135 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 26,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 26
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 26,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 26
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 26,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 26
+          }
+        },
+        "expression": {
+          "type": "UnaryExpression",
+          "start": 0,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 25
+            }
+          },
+          "operator": "void",
+          "prefix": true,
+          "argument": {
+            "type": "FunctionExpression",
+            "start": 5,
+            "end": 25,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 25
+              }
+            },
+            "id": {
+              "type": "Placeholder",
+              "start": 14,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 16,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "identifierName": "ID"
+                },
+                "name": "ID"
+              },
+              "expectedNode": "Identifier"
+            },
+            "generator": false,
+            "async": false,
+            "params": [],
+            "body": {
+              "type": "BlockStatement",
+              "start": 23,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 23
+                },
+                "end": {
+                  "line": 1,
+                  "column": 25
+                }
+              },
+              "body": [],
+              "directives": []
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/param/input.js b/packages/babel-parser/test/fixtures/placeholders/function/param/input.js
new file mode 100644
index 000000000000..f06bb0431462
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/param/input.js
@@ -0,0 +1 @@
+function f(%%PARAM%%) {}
diff --git a/packages/babel-parser/test/fixtures/placeholders/function/param/output.json b/packages/babel-parser/test/fixtures/placeholders/function/param/output.json
new file mode 100644
index 000000000000..9026f46c40db
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/function/param/output.json
@@ -0,0 +1,121 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": false,
+        "async": false,
+        "params": [
+          {
+            "type": "Placeholder",
+            "start": 11,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 11
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 13,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 13
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                },
+                "identifierName": "PARAM"
+              },
+              "name": "PARAM"
+            },
+            "expectedNode": "Pattern"
+          }
+        ],
+        "body": {
+          "type": "BlockStatement",
+          "start": 22,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 22
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-file/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default-file/input.mjs
new file mode 100644
index 000000000000..d4e434f4ccec
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-file/input.mjs
@@ -0,0 +1 @@
+import %%DEFAULT%% from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-file/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default-file/output.json
new file mode 100644
index 000000000000..b4fdc7e984fa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-file/output.json
@@ -0,0 +1,133 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 33
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 33
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 7,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "DEFAULT"
+                },
+                "name": "DEFAULT"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "Placeholder",
+          "start": 24,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 24
+            },
+            "end": {
+              "line": 1,
+              "column": 32
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 26,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 26
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              },
+              "identifierName": "FILE"
+            },
+            "name": "FILE"
+          },
+          "expectedNode": "StringLiteral"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-named-2/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default-named-2/input.mjs
new file mode 100644
index 000000000000..aca97b71e5c4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-named-2/input.mjs
@@ -0,0 +1 @@
+import %%DEFAULT%%, { named } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-named-2/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default-named-2/output.json
new file mode 100644
index 000000000000..3ec417645be0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-named-2/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 42,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 42
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 42,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 42
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 42,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 42
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 7,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "DEFAULT"
+                },
+                "name": "DEFAULT"
+              },
+              "expectedNode": "Identifier"
+            }
+          },
+          {
+            "type": "ImportSpecifier",
+            "start": 22,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 22
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "imported": {
+              "type": "Identifier",
+              "start": 22,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                },
+                "identifierName": "named"
+              },
+              "name": "named"
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 22,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                },
+                "identifierName": "named"
+              },
+              "name": "named"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 35,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 35
+            },
+            "end": {
+              "line": 1,
+              "column": 41
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-named-3/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default-named-3/input.mjs
new file mode 100644
index 000000000000..42d98a2cb7ba
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-named-3/input.mjs
@@ -0,0 +1 @@
+import %%DEFAULT%%, { %%NAMED%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-named-3/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default-named-3/output.json
new file mode 100644
index 000000000000..e681ffb18417
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-named-3/output.json
@@ -0,0 +1,201 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 46
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 46
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 46
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 7,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "DEFAULT"
+                },
+                "name": "DEFAULT"
+              },
+              "expectedNode": "Identifier"
+            }
+          },
+          {
+            "type": "ImportSpecifier",
+            "start": 22,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 22
+              },
+              "end": {
+                "line": 1,
+                "column": 31
+              }
+            },
+            "imported": {
+              "type": "Placeholder",
+              "start": 22,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 24,
+                "end": 29,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 29
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 22,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 24,
+                "end": 29,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 29
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 39,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 39
+            },
+            "end": {
+              "line": 1,
+              "column": 45
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-named/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default-named/input.mjs
new file mode 100644
index 000000000000..5857bed1cd1d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-named/input.mjs
@@ -0,0 +1 @@
+import _default, { %%NAMED%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-named/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default-named/output.json
new file mode 100644
index 000000000000..62d764263d3d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-named/output.json
@@ -0,0 +1,185 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 43,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 43
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 43,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 43
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 43,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 43
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 7,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                },
+                "identifierName": "_default"
+              },
+              "name": "_default"
+            }
+          },
+          {
+            "type": "ImportSpecifier",
+            "start": 19,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 19
+              },
+              "end": {
+                "line": 1,
+                "column": 28
+              }
+            },
+            "imported": {
+              "type": "Placeholder",
+              "start": 19,
+              "end": 28,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 19
+                },
+                "end": {
+                  "line": 1,
+                  "column": 28
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 21,
+                "end": 26,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 26
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 19,
+              "end": 28,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 19
+                },
+                "end": {
+                  "line": 1,
+                  "column": 28
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 21,
+                "end": 26,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 26
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 36,
+          "end": 42,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 36
+            },
+            "end": {
+              "line": 1,
+              "column": 42
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-star-2/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default-star-2/input.mjs
new file mode 100644
index 000000000000..32a49347ad55
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-star-2/input.mjs
@@ -0,0 +1 @@
+import _default, * as %%STAR%% from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-star-2/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default-star-2/output.json
new file mode 100644
index 000000000000..6fd8a2dbed1f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-star-2/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 43,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 43
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 43,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 43
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 43,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 43
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 15,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 15
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 7,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                },
+                "identifierName": "_default"
+              },
+              "name": "_default"
+            }
+          },
+          {
+            "type": "ImportNamespaceSpecifier",
+            "start": 17,
+            "end": 30,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 17
+              },
+              "end": {
+                "line": 1,
+                "column": 30
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 22,
+              "end": 30,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 30
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 24,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 28
+                  },
+                  "identifierName": "STAR"
+                },
+                "name": "STAR"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 36,
+          "end": 42,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 36
+            },
+            "end": {
+              "line": 1,
+              "column": 42
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-star-3/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default-star-3/input.mjs
new file mode 100644
index 000000000000..f2cafcebaea3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-star-3/input.mjs
@@ -0,0 +1 @@
+import %%DEFAULT%%, * as %%STAR%% from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-star-3/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default-star-3/output.json
new file mode 100644
index 000000000000..a92281d0746a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-star-3/output.json
@@ -0,0 +1,168 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 46
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 46
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 46
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 7,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "DEFAULT"
+                },
+                "name": "DEFAULT"
+              },
+              "expectedNode": "Identifier"
+            }
+          },
+          {
+            "type": "ImportNamespaceSpecifier",
+            "start": 20,
+            "end": 33,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 20
+              },
+              "end": {
+                "line": 1,
+                "column": 33
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 25,
+              "end": 33,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 25
+                },
+                "end": {
+                  "line": 1,
+                  "column": 33
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 27,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 27
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  },
+                  "identifierName": "STAR"
+                },
+                "name": "STAR"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 39,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 39
+            },
+            "end": {
+              "line": 1,
+              "column": 45
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-star/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default-star/input.mjs
new file mode 100644
index 000000000000..97bb0fbb2083
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-star/input.mjs
@@ -0,0 +1 @@
+import %%DEFAULT%%, * as star from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default-star/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default-star/output.json
new file mode 100644
index 000000000000..3976944a46bc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default-star/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 42,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 42
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 42,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 42
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 42,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 42
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 7,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "DEFAULT"
+                },
+                "name": "DEFAULT"
+              },
+              "expectedNode": "Identifier"
+            }
+          },
+          {
+            "type": "ImportNamespaceSpecifier",
+            "start": 20,
+            "end": 29,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 20
+              },
+              "end": {
+                "line": 1,
+                "column": 29
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 25,
+              "end": 29,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 25
+                },
+                "end": {
+                  "line": 1,
+                  "column": 29
+                },
+                "identifierName": "star"
+              },
+              "name": "star"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 35,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 35
+            },
+            "end": {
+              "line": 1,
+              "column": 41
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/default/input.mjs
new file mode 100644
index 000000000000..cbfc52e13d87
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default/input.mjs
@@ -0,0 +1 @@
+import %%DEFAULT%% from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/default/output.json b/packages/babel-parser/test/fixtures/placeholders/import/default/output.json
new file mode 100644
index 000000000000..4ff06895645b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/default/output.json
@@ -0,0 +1,120 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 31,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 31
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 31,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 31
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 31,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 31
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start": 7,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 7,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "DEFAULT"
+                },
+                "name": "DEFAULT"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 24,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 24
+            },
+            "end": {
+              "line": 1,
+              "column": 30
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/file-empty/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/file-empty/input.mjs
new file mode 100644
index 000000000000..1412ce08fe08
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/file-empty/input.mjs
@@ -0,0 +1 @@
+import {} from %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/file-empty/output.json b/packages/babel-parser/test/fixtures/placeholders/import/file-empty/output.json
new file mode 100644
index 000000000000..5690ee81f00f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/file-empty/output.json
@@ -0,0 +1,84 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "specifiers": [],
+        "source": {
+          "type": "Placeholder",
+          "start": 15,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 15
+            },
+            "end": {
+              "line": 1,
+              "column": 23
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 17,
+            "end": 21,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 17
+              },
+              "end": {
+                "line": 1,
+                "column": 21
+              },
+              "identifierName": "FILE"
+            },
+            "name": "FILE"
+          },
+          "expectedNode": "StringLiteral"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/file/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/file/input.mjs
new file mode 100644
index 000000000000..634197cbb739
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/file/input.mjs
@@ -0,0 +1 @@
+import %%FILE%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/file/output.json b/packages/babel-parser/test/fixtures/placeholders/import/file/output.json
new file mode 100644
index 000000000000..e33e48771a60
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/file/output.json
@@ -0,0 +1,84 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 16
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "specifiers": [],
+        "source": {
+          "type": "Placeholder",
+          "start": 7,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 9,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              },
+              "identifierName": "FILE"
+            },
+            "name": "FILE"
+          },
+          "expectedNode": "StringLiteral"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named-alias-2/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-2/input.mjs
new file mode 100644
index 000000000000..114cf3db239c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-2/input.mjs
@@ -0,0 +1 @@
+import { %%NAMED%% as alias } from "file";
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named-alias-2/output.json b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-2/output.json
new file mode 100644
index 000000000000..c7d936e96c64
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-2/output.json
@@ -0,0 +1,137 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 42,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 42
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 42,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 42
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 42,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 42
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportSpecifier",
+            "start": 9,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "imported": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 22,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                },
+                "identifierName": "alias"
+              },
+              "name": "alias"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 35,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 35
+            },
+            "end": {
+              "line": 1,
+              "column": 41
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named-alias-3/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-3/input.mjs
new file mode 100644
index 000000000000..0531ff7d03a9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-3/input.mjs
@@ -0,0 +1 @@
+import { %%NAMED%% as %%ALIAS%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named-alias-3/output.json b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-3/output.json
new file mode 100644
index 000000000000..bfae4a044410
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named-alias-3/output.json
@@ -0,0 +1,153 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 46
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 46
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 46
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportSpecifier",
+            "start": 9,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 31
+              }
+            },
+            "imported": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 22,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 24,
+                "end": 29,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 29
+                  },
+                  "identifierName": "ALIAS"
+                },
+                "name": "ALIAS"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 39,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 39
+            },
+            "end": {
+              "line": 1,
+              "column": 45
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named-alias/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/named-alias/input.mjs
new file mode 100644
index 000000000000..cc0bfd46c515
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named-alias/input.mjs
@@ -0,0 +1 @@
+import { named as %%ALIAS%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named-alias/output.json b/packages/babel-parser/test/fixtures/placeholders/import/named-alias/output.json
new file mode 100644
index 000000000000..5477bef4ca9e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named-alias/output.json
@@ -0,0 +1,137 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 42,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 42
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 42,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 42
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 42,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 42
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportSpecifier",
+            "start": 9,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "imported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                },
+                "identifierName": "named"
+              },
+              "name": "named"
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 18,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 20,
+                "end": 25,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 25
+                  },
+                  "identifierName": "ALIAS"
+                },
+                "name": "ALIAS"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 35,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 35
+            },
+            "end": {
+              "line": 1,
+              "column": 41
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/named/input.mjs
new file mode 100644
index 000000000000..24d0c9bc5adf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named/input.mjs
@@ -0,0 +1 @@
+import { %%NAMED%% } from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/named/output.json b/packages/babel-parser/test/fixtures/placeholders/import/named/output.json
new file mode 100644
index 000000000000..9b3f08486a88
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/named/output.json
@@ -0,0 +1,153 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 33
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 33
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportSpecifier",
+            "start": 9,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            },
+            "imported": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 9,
+              "end": 18,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 18
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 11,
+                "end": 16,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "identifierName": "NAMED"
+                },
+                "name": "NAMED"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 26,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 26
+            },
+            "end": {
+              "line": 1,
+              "column": 32
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/options.json b/packages/babel-parser/test/fixtures/placeholders/import/options.json
new file mode 100644
index 000000000000..986e9cefa93e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["placeholders"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/star/input.mjs b/packages/babel-parser/test/fixtures/placeholders/import/star/input.mjs
new file mode 100644
index 000000000000..df386a7c7ba7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/star/input.mjs
@@ -0,0 +1 @@
+import * as %%STAR%% from "file";
diff --git a/packages/babel-parser/test/fixtures/placeholders/import/star/output.json b/packages/babel-parser/test/fixtures/placeholders/import/star/output.json
new file mode 100644
index 000000000000..7ff6bfd05846
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/import/star/output.json
@@ -0,0 +1,120 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 33,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 33
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 33,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 33
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 33,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 33
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ImportNamespaceSpecifier",
+            "start": 7,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 7
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "local": {
+              "type": "Placeholder",
+              "start": 12,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 12
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "name": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "identifierName": "STAR"
+                },
+                "name": "STAR"
+              },
+              "expectedNode": "Identifier"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 26,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 26
+            },
+            "end": {
+              "line": 1,
+              "column": 32
+            }
+          },
+          "extra": {
+            "rawValue": "file",
+            "raw": "\"file\""
+          },
+          "value": "file"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/asi/input.js b/packages/babel-parser/test/fixtures/placeholders/labels/asi/input.js
new file mode 100644
index 000000000000..9c5f9fcc13d6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/asi/input.js
@@ -0,0 +1,4 @@
+loop: while (0) {
+  break
+  %%LABEL%%;
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/asi/output.json b/packages/babel-parser/test/fixtures/placeholders/labels/asi/output.json
new file mode 100644
index 000000000000..f1e2f1614781
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/asi/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "LabeledStatement",
+        "start": 0,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
+        "body": {
+          "type": "WhileStatement",
+          "start": 6,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 4,
+              "column": 1
+            }
+          },
+          "test": {
+            "type": "NumericLiteral",
+            "start": 13,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          },
+          "body": {
+            "type": "BlockStatement",
+            "start": 16,
+            "end": 40,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 16
+              },
+              "end": {
+                "line": 4,
+                "column": 1
+              }
+            },
+            "body": [
+              {
+                "type": "BreakStatement",
+                "start": 20,
+                "end": 25,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 7
+                  }
+                },
+                "label": null
+              },
+              {
+                "type": "Placeholder",
+                "start": 28,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 12
+                  }
+                },
+                "name": {
+                  "type": "Identifier",
+                  "start": 30,
+                  "end": 35,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 9
+                    },
+                    "identifierName": "LABEL"
+                  },
+                  "name": "LABEL"
+                },
+                "expectedNode": "Statement"
+              }
+            ],
+            "directives": []
+          }
+        },
+        "label": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            },
+            "identifierName": "loop"
+          },
+          "name": "loop"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/break/input.js b/packages/babel-parser/test/fixtures/placeholders/labels/break/input.js
new file mode 100644
index 000000000000..bcc6f5bae986
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/break/input.js
@@ -0,0 +1,3 @@
+block: {
+  break %%LABEL%%;
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/break/output.json b/packages/babel-parser/test/fixtures/placeholders/labels/break/output.json
new file mode 100644
index 000000000000..ab4488d5a04c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/break/output.json
@@ -0,0 +1,133 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 29,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 29,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "LabeledStatement",
+        "start": 0,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start": 7,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "BreakStatement",
+              "start": 11,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 18
+                }
+              },
+              "label": {
+                "type": "Placeholder",
+                "start": 17,
+                "end": 26,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 17
+                  }
+                },
+                "name": {
+                  "type": "Identifier",
+                  "start": 19,
+                  "end": 24,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 15
+                    },
+                    "identifierName": "LABEL"
+                  },
+                  "name": "LABEL"
+                },
+                "expectedNode": "Identifier"
+              }
+            }
+          ],
+          "directives": []
+        },
+        "label": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            },
+            "identifierName": "block"
+          },
+          "name": "block"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/continue/input.js b/packages/babel-parser/test/fixtures/placeholders/labels/continue/input.js
new file mode 100644
index 000000000000..52fd9da0d283
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/continue/input.js
@@ -0,0 +1,3 @@
+loop: while (0) {
+  continue %%LOOP%%;
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/continue/output.json b/packages/babel-parser/test/fixtures/placeholders/labels/continue/output.json
new file mode 100644
index 000000000000..b6876979197b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/continue/output.json
@@ -0,0 +1,168 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "LabeledStatement",
+        "start": 0,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "body": {
+          "type": "WhileStatement",
+          "start": 6,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "test": {
+            "type": "NumericLiteral",
+            "start": 13,
+            "end": 14,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 14
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          },
+          "body": {
+            "type": "BlockStatement",
+            "start": 16,
+            "end": 40,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 16
+              },
+              "end": {
+                "line": 3,
+                "column": 1
+              }
+            },
+            "body": [
+              {
+                "type": "ContinueStatement",
+                "start": 20,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 20
+                  }
+                },
+                "label": {
+                  "type": "Placeholder",
+                  "start": 29,
+                  "end": 37,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 19
+                    }
+                  },
+                  "name": {
+                    "type": "Identifier",
+                    "start": 31,
+                    "end": 35,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 17
+                      },
+                      "identifierName": "LOOP"
+                    },
+                    "name": "LOOP"
+                  },
+                  "expectedNode": "Identifier"
+                }
+              }
+            ],
+            "directives": []
+          }
+        },
+        "label": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            },
+            "identifierName": "loop"
+          },
+          "name": "loop"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/labeled-statement/input.js b/packages/babel-parser/test/fixtures/placeholders/labels/labeled-statement/input.js
new file mode 100644
index 000000000000..8bc65e46a765
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/labeled-statement/input.js
@@ -0,0 +1 @@
+%%FOO%%: 0;
diff --git a/packages/babel-parser/test/fixtures/placeholders/labels/labeled-statement/output.json b/packages/babel-parser/test/fixtures/placeholders/labels/labeled-statement/output.json
new file mode 100644
index 000000000000..597468988557
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/labels/labeled-statement/output.json
@@ -0,0 +1,118 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "LabeledStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "label": {
+          "type": "Placeholder",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 2,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 2
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "FOO"
+            },
+            "name": "FOO"
+          },
+          "expectedNode": "Identifier"
+        },
+        "body": {
+          "type": "ExpressionStatement",
+          "start": 9,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            }
+          },
+          "expression": {
+            "type": "NumericLiteral",
+            "start": 9,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "extra": {
+              "rawValue": 0,
+              "raw": "0"
+            },
+            "value": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/options.json b/packages/babel-parser/test/fixtures/placeholders/options.json
new file mode 100644
index 000000000000..92404e501295
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["placeholders"]
+}
diff --git a/packages/babel-parser/test/fixtures/placeholders/statement/asi/input.js b/packages/babel-parser/test/fixtures/placeholders/statement/asi/input.js
new file mode 100644
index 000000000000..deeb32f8f173
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/statement/asi/input.js
@@ -0,0 +1,2 @@
+%%FOO%%
+%%BAR%%
diff --git a/packages/babel-parser/test/fixtures/placeholders/statement/asi/output.json b/packages/babel-parser/test/fixtures/placeholders/statement/asi/output.json
new file mode 100644
index 000000000000..9980b76f599a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/statement/asi/output.json
@@ -0,0 +1,101 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 7
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "Placeholder",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "name": {
+          "type": "Identifier",
+          "start": 2,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 2
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            },
+            "identifierName": "FOO"
+          },
+          "name": "FOO"
+        },
+        "expectedNode": "Statement"
+      },
+      {
+        "type": "Placeholder",
+        "start": 8,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 7
+          }
+        },
+        "name": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 2
+            },
+            "end": {
+              "line": 2,
+              "column": 5
+            },
+            "identifierName": "BAR"
+          },
+          "name": "BAR"
+        },
+        "expectedNode": "Statement"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/statement/nested/input.js b/packages/babel-parser/test/fixtures/placeholders/statement/nested/input.js
new file mode 100644
index 000000000000..6530842e22d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/statement/nested/input.js
@@ -0,0 +1 @@
+if (0) %%FOO%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/statement/nested/output.json b/packages/babel-parser/test/fixtures/placeholders/statement/nested/output.json
new file mode 100644
index 000000000000..1f071964bf16
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/statement/nested/output.json
@@ -0,0 +1,104 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 15,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 15,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 15
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "IfStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "test": {
+          "type": "NumericLiteral",
+          "start": 4,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            }
+          },
+          "extra": {
+            "rawValue": 0,
+            "raw": "0"
+          },
+          "value": 0
+        },
+        "consequent": {
+          "type": "Placeholder",
+          "start": 7,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              },
+              "identifierName": "FOO"
+            },
+            "name": "FOO"
+          },
+          "expectedNode": "Statement"
+        },
+        "alternate": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/statement/top-level/input.js b/packages/babel-parser/test/fixtures/placeholders/statement/top-level/input.js
new file mode 100644
index 000000000000..34e9906e93b8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/statement/top-level/input.js
@@ -0,0 +1 @@
+%%FOO%%;
diff --git a/packages/babel-parser/test/fixtures/placeholders/statement/top-level/output.json b/packages/babel-parser/test/fixtures/placeholders/statement/top-level/output.json
new file mode 100644
index 000000000000..d5f19f4035d0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/statement/top-level/output.json
@@ -0,0 +1,68 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 8,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 8,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 8
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "Placeholder",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "name": {
+          "type": "Identifier",
+          "start": 2,
+          "end": 5,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 2
+            },
+            "end": {
+              "line": 1,
+              "column": 5
+            },
+            "identifierName": "FOO"
+          },
+          "name": "FOO"
+        },
+        "expectedNode": "Statement"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/input.js b/packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/input.js
new file mode 100644
index 000000000000..97af833dd216
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/input.js
@@ -0,0 +1 @@
+try %%TRY%% catch %%CATCH%% finally %%FINALLY%%
diff --git a/packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/output.json b/packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/output.json
new file mode 100644
index 000000000000..133cd26c2bbb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/try/try-catch-finally/output.json
@@ -0,0 +1,165 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 47,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 47
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 47,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 47
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 47,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 47
+          }
+        },
+        "block": {
+          "type": "Placeholder",
+          "start": 4,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 6,
+            "end": 9,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 9
+              },
+              "identifierName": "TRY"
+            },
+            "name": "TRY"
+          },
+          "expectedNode": "BlockStatement"
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 12,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 27
+            }
+          },
+          "param": null,
+          "body": {
+            "type": "Placeholder",
+            "start": 18,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 18
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 20,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 20
+                },
+                "end": {
+                  "line": 1,
+                  "column": 25
+                },
+                "identifierName": "CATCH"
+              },
+              "name": "CATCH"
+            },
+            "expectedNode": "BlockStatement"
+          }
+        },
+        "finalizer": {
+          "type": "Placeholder",
+          "start": 36,
+          "end": 47,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 36
+            },
+            "end": {
+              "line": 1,
+              "column": 47
+            }
+          },
+          "name": {
+            "type": "Identifier",
+            "start": 38,
+            "end": 45,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 38
+              },
+              "end": {
+                "line": 1,
+                "column": 45
+              },
+              "identifierName": "FINALLY"
+            },
+            "name": "FINALLY"
+          },
+          "expectedNode": "BlockStatement"
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/input.js b/packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/input.js
new file mode 100644
index 000000000000..e47082a3bd0d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/input.js
@@ -0,0 +1 @@
+try {} catch (%%PARAM%%) %%CATCH%%
diff --git a/packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/output.json b/packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/output.json
new file mode 100644
index 000000000000..8c1574395e8d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/placeholders/try/with-catch-param/output.json
@@ -0,0 +1,149 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 34
+      }
+    },
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TryStatement",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 34
+          }
+        },
+        "block": {
+          "type": "BlockStatement",
+          "start": 4,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 4
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            }
+          },
+          "body": [],
+          "directives": []
+        },
+        "handler": {
+          "type": "CatchClause",
+          "start": 7,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 7
+            },
+            "end": {
+              "line": 1,
+              "column": 34
+            }
+          },
+          "param": {
+            "type": "Placeholder",
+            "start": 14,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 14
+              },
+              "end": {
+                "line": 1,
+                "column": 23
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 16,
+              "end": 21,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 16
+                },
+                "end": {
+                  "line": 1,
+                  "column": 21
+                },
+                "identifierName": "PARAM"
+              },
+              "name": "PARAM"
+            },
+            "expectedNode": "Pattern"
+          },
+          "body": {
+            "type": "Placeholder",
+            "start": 25,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 25
+              },
+              "end": {
+                "line": 1,
+                "column": 34
+              }
+            },
+            "name": {
+              "type": "Identifier",
+              "start": 27,
+              "end": 32,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 27
+                },
+                "end": {
+                  "line": 1,
+                  "column": 32
+                },
+                "identifierName": "CATCH"
+              },
+              "name": "CATCH"
+            },
+            "expectedNode": "BlockStatement"
+          }
+        },
+        "finalizer": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/annotated/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/annotated/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/annotated/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/annotated/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/input.ts b/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/input.ts
new file mode 100644
index 000000000000..5868c4e2feda
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/input.ts
@@ -0,0 +1,2 @@
+async (f)
+: t => { }
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/output.json b/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/output.json
new file mode 100644
index 000000000000..01a056dd1898
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/arrow-function-with-newline/output.json
@@ -0,0 +1,151 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 10
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            }
+          },
+          "returnType": {
+            "type": "TSTypeAnnotation",
+            "start": 10,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 3
+              }
+            },
+            "typeAnnotation": {
+              "type": "TSTypeReference",
+              "start": 12,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 2,
+                  "column": 3
+                }
+              },
+              "typeName": {
+                "type": "Identifier",
+                "start": 12,
+                "end": 13,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 3
+                  },
+                  "identifierName": "t"
+                },
+                "name": "t"
+              }
+            }
+          },
+          "id": null,
+          "generator": false,
+          "async": true,
+          "params": [
+            {
+              "type": "Identifier",
+              "start": 7,
+              "end": 8,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 8
+                },
+                "identifierName": "f"
+              },
+              "name": "f"
+            }
+          ],
+          "body": {
+            "type": "BlockStatement",
+            "start": 17,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 7
+              },
+              "end": {
+                "line": 2,
+                "column": 10
+              }
+            },
+            "body": [],
+            "directives": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-await-null/input.ts b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-await-null/input.ts
new file mode 100644
index 000000000000..924ee33ccd2a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-await-null/input.ts
@@ -0,0 +1 @@
+async <T>() => await null;
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-await-null/output.json b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-await-null/output.json
new file mode 100644
index 000000000000..8af1eae03c46
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-await-null/output.json
@@ -0,0 +1,132 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 26,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 26
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 26,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 26
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 26,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 26
+          }
+        },
+        "expression": {
+          "type": "ArrowFunctionExpression",
+          "start": 0,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 25
+            }
+          },
+          "typeParameters": {
+            "type": "TSTypeParameterDeclaration",
+            "start": 6,
+            "end": 9,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 9
+              }
+            },
+            "params": [
+              {
+                "type": "TSTypeParameter",
+                "start": 7,
+                "end": 8,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 8
+                  }
+                },
+                "name": "T"
+              }
+            ]
+          },
+          "params": [],
+          "id": null,
+          "generator": false,
+          "async": true,
+          "body": {
+            "type": "AwaitExpression",
+            "start": 15,
+            "end": 25,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 15
+              },
+              "end": {
+                "line": 1,
+                "column": 25
+              }
+            },
+            "argument": {
+              "type": "NullLiteral",
+              "start": 21,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 21
+                },
+                "end": {
+                  "line": 1,
+                  "column": 25
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic-false-positive/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic-false-positive/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic-false-positive/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic-false-positive/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/output.json b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/output.json
index cad181eb8702..89af25ded2c0 100644
--- a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-generic/output.json
@@ -205,7 +205,6 @@
           },
           "id": null,
           "generator": false,
-          "expression": true,
           "async": true,
           "body": {
             "type": "Identifier",
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest-optional-parameter/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest-optional-parameter/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest-optional-parameter/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest-optional-parameter/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/async-rest/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/async/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/async/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/async/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/async/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/default-parameter-values/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/default-parameter-values/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/default-parameter-values/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/default-parameter-values/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/destructuring/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/destructuring/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/destructuring/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/destructuring/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/output.json b/packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/output.json
index ee5c663d37a9..58c3d9672124 100644
--- a/packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/generic-tsx/output.json
@@ -45,12 +45,12 @@
         },
         "expression": {
           "type": "ArrowFunctionExpression",
-          "start": 62,
+          "start": 61,
           "end": 78,
           "loc": {
             "start": {
               "line": 2,
-              "column": 1
+              "column": 0
             },
             "end": {
               "line": 2,
@@ -264,4 +264,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/generic/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/generic/output.json b/packages/babel-parser/test/fixtures/typescript/arrow-function/generic/output.json
index 5b7f66c90e1b..1f99918b7ad3 100644
--- a/packages/babel-parser/test/fixtures/typescript/arrow-function/generic/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/generic/output.json
@@ -45,12 +45,12 @@
         },
         "expression": {
           "type": "ArrowFunctionExpression",
-          "start": 1,
+          "start": 0,
           "end": 17,
           "loc": {
             "start": {
               "line": 1,
-              "column": 1
+              "column": 0
             },
             "end": {
               "line": 1,
@@ -228,4 +228,4 @@
     ],
     "directives": []
   }
-}
\ No newline at end of file
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/input.js
deleted file mode 100644
index 4b8fea779cf1..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/input.js
+++ /dev/null
@@ -1 +0,0 @@
-(x?: number): any => x;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/input.ts b/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/input.ts
new file mode 100644
index 000000000000..f3019ef4b6be
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/input.ts
@@ -0,0 +1,2 @@
+(x?: number): any => x;
+((k?) => k + 1)();
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/output.json b/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/output.json
index de4c8043c314..3a08e42c865c 100644
--- a/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/arrow-function/optional-parameter/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 23,
+  "end": 42,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 1,
-      "column": 23
+      "line": 2,
+      "column": 18
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 23,
+    "end": 42,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 1,
-        "column": 23
+        "line": 2,
+        "column": 18
       }
     },
     "sourceType": "module",
@@ -158,6 +158,132 @@
             "name": "x"
           }
         }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 24,
+        "end": 42,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 18
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 24,
+          "end": 41,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 17
+            }
+          },
+          "callee": {
+            "type": "ArrowFunctionExpression",
+            "start": 25,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 1
+              },
+              "end": {
+                "line": 2,
+                "column": 14
+              }
+            },
+            "id": null,
+            "generator": false,
+            "async": false,
+            "params": [
+              {
+                "type": "Identifier",
+                "start": 26,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "identifierName": "k"
+                },
+                "name": "k",
+                "optional": true
+              }
+            ],
+            "body": {
+              "type": "BinaryExpression",
+              "start": 33,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 9
+                },
+                "end": {
+                  "line": 2,
+                  "column": 14
+                }
+              },
+              "left": {
+                "type": "Identifier",
+                "start": 33,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 10
+                  },
+                  "identifierName": "k"
+                },
+                "name": "k"
+              },
+              "operator": "+",
+              "right": {
+                "type": "NumericLiteral",
+                "start": 37,
+                "end": 38,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": 1,
+                  "raw": "1"
+                },
+                "value": 1
+              }
+            },
+            "extra": {
+              "parenthesized": true,
+              "parenStart": 24
+            }
+          },
+          "arguments": []
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/typescript/arrow-function/predicate-types/input.js b/packages/babel-parser/test/fixtures/typescript/arrow-function/predicate-types/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/arrow-function/predicate-types/input.js
rename to packages/babel-parser/test/fixtures/typescript/arrow-function/predicate-types/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/input.ts b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/input.ts
new file mode 100644
index 000000000000..746078a226a0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/input.ts
@@ -0,0 +1 @@
+async (a as T) => {};
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/options.json b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/options.json
new file mode 100644
index 000000000000..69d91502496d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-as/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected type cast in parameter position. (1:7)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/input.ts b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/input.ts
new file mode 100644
index 000000000000..5e3f1481d6e7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/input.ts
@@ -0,0 +1 @@
+async (<T> a) => {};
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/options.json b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/options.json
new file mode 100644
index 000000000000..69d91502496d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-async-parameter-assertion/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected type cast in parameter position. (1:7)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/input.ts b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/input.ts
new file mode 100644
index 000000000000..f9f644977286
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/input.ts
@@ -0,0 +1 @@
+var asserted1 = <any>((n) => { return n; });
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/options.json b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/options.json
new file mode 100644
index 000000000000..9dc8f2c9c994
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/options.json
@@ -0,0 +1,4 @@
+{
+  "createParenthesizedExpressions": true,
+  "plugins": ["typescript"]
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/output.json b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/output.json
new file mode 100644
index 000000000000..29e413f17d6f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens-with-parens-node/output.json
@@ -0,0 +1,217 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 44,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 44
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 44,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 44
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 44,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 44
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 43
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "asserted1"
+              },
+              "name": "asserted1"
+            },
+            "init": {
+              "type": "TSTypeAssertion",
+              "start": 16,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 16
+                },
+                "end": {
+                  "line": 1,
+                  "column": 43
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSAnyKeyword",
+                "start": 17,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                }
+              },
+              "expression": {
+                "type": "ParenthesizedExpression",
+                "start": 21,
+                "end": 43,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 43
+                  }
+                },
+                "expression": {
+                  "type": "ArrowFunctionExpression",
+                  "start": 22,
+                  "end": 42,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 22
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 42
+                    }
+                  },
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 23,
+                      "end": 24,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 23
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 24
+                        },
+                        "identifierName": "n"
+                      },
+                      "name": "n"
+                    }
+                  ],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 29,
+                    "end": 42,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 29
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 42
+                      }
+                    },
+                    "body": [
+                      {
+                        "type": "ReturnStatement",
+                        "start": 31,
+                        "end": 40,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 31
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 40
+                          }
+                        },
+                        "argument": {
+                          "type": "Identifier",
+                          "start": 38,
+                          "end": 39,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 38
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 39
+                            },
+                            "identifierName": "n"
+                          },
+                          "name": "n"
+                        }
+                      }
+                    ],
+                    "directives": []
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/input.ts b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/input.ts
new file mode 100644
index 000000000000..f9f644977286
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/input.ts
@@ -0,0 +1 @@
+var asserted1 = <any>((n) => { return n; });
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/output.json b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/output.json
new file mode 100644
index 000000000000..08bffbefa06b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-in-parens/output.json
@@ -0,0 +1,206 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 44,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 44
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 44,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 44
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 44,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 44
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 43
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "asserted1"
+              },
+              "name": "asserted1"
+            },
+            "init": {
+              "type": "TSTypeAssertion",
+              "start": 16,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 16
+                },
+                "end": {
+                  "line": 1,
+                  "column": 43
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSAnyKeyword",
+                "start": 17,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                }
+              },
+              "expression": {
+                "type": "ArrowFunctionExpression",
+                "start": 22,
+                "end": 42,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 42
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [
+                  {
+                    "type": "Identifier",
+                    "start": 23,
+                    "end": 24,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 24
+                      },
+                      "identifierName": "n"
+                    },
+                    "name": "n"
+                  }
+                ],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 29,
+                  "end": 42,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 29
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 42
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ReturnStatement",
+                      "start": 31,
+                      "end": 40,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 31
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 40
+                        }
+                      },
+                      "argument": {
+                        "type": "Identifier",
+                        "start": 38,
+                        "end": 39,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 38
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 39
+                          },
+                          "identifierName": "n"
+                        },
+                        "name": "n"
+                      }
+                    }
+                  ],
+                  "directives": []
+                },
+                "extra": {
+                  "parenthesized": true,
+                  "parenStart": 21
+                }
+              }
+            }
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/input.ts b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/input.ts
new file mode 100644
index 000000000000..dc2282c6bdc8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/input.ts
@@ -0,0 +1 @@
+(a as T) => {};
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/options.json b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/options.json
new file mode 100644
index 000000000000..b5bdba868c9f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-as/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected type cast in parameter position. (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/input.ts b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/input.ts
new file mode 100644
index 000000000000..39dae7d0cf4a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/input.ts
@@ -0,0 +1 @@
+(<T> a) => {};
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/options.json b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/options.json
new file mode 100644
index 000000000000..b5bdba868c9f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/arrow-parameter-assertion/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected type cast in parameter position. (1:1)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/as-const/input.ts b/packages/babel-parser/test/fixtures/typescript/cast/as-const/input.ts
new file mode 100644
index 000000000000..23d232739908
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/as-const/input.ts
@@ -0,0 +1,39 @@
+// Copied over from TypeScript's test case
+// https://github.com/Microsoft/TypeScript/blob/master/tests/baselines/reference/constAssertions.js
+let v1 = 'abc' as const;
+let v2 = `abc` as const;
+let v3 = 10 as const;
+let v4 = -10 as const;
+let v5 = +10 as const;
+let v6 = 10 as const;
+let v7 = -10 as const;
+let v8 = true as const;
+let v9 = false as const;
+
+let a1 = [] as const;
+let a2 = [1, 2, 3] as const;
+let a3 = [10, 'hello', true] as const;
+let a4 = [...[1, 2, 3]] as const;
+let a5 = [1, 2, 3];
+let a6 = [...a5] as const;
+let a8 = ['abc', ...a7] as const;
+
+let o1 = { x: 10, y: 20 } as const;
+let o2 = { a: 1, 'b': 2, ['c']: 3, d() {}, ['e' + '']: 4 } as const;
+let o3 = { ...o1, ...o2 } as const;
+let o5 = { ...o4 } as const;
+let o7 = { ...d } as const;
+let o9 = { x: 10, foo() { this.x = 20 } } as const;  // Error
+
+let p1 = (10) as const;
+let p2 = ((-10)) as const;
+let p3 = ([(10)]) as const;
+let p4 = [[[[10]]]] as const;
+
+let x1 = { x: 10, y: [20, 30], z: { a: { b: 42 } } } as const;
+
+let q1 = <const> 10;
+let q2 = <const> 'abc';
+let q3 = <const> true;
+let q4 = <const> [1, 2, 3];
+let q5 = <const> { x: 10, y: 20 };
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/as-const/output.json b/packages/babel-parser/test/fixtures/typescript/cast/as-const/output.json
new file mode 100644
index 000000000000..e1177f2c1eff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/cast/as-const/output.json
@@ -0,0 +1,5572 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 1127,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 39,
+      "column": 34
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 1127,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 39,
+        "column": 34
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 143,
+        "end": 167,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 24
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 147,
+            "end": 166,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 4
+              },
+              "end": {
+                "line": 3,
+                "column": 23
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 147,
+              "end": 149,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 6
+                },
+                "identifierName": "v1"
+              },
+              "name": "v1"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 152,
+              "end": 166,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 23
+                }
+              },
+              "expression": {
+                "type": "StringLiteral",
+                "start": 152,
+                "end": 157,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": "abc",
+                  "raw": "'abc'"
+                },
+                "value": "abc"
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 161,
+                "end": 166,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 23
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 161,
+                  "end": 166,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 23
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let",
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " Copied over from TypeScript's test case",
+            "start": 0,
+            "end": 42,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 42
+              }
+            }
+          },
+          {
+            "type": "CommentLine",
+            "value": " https://github.com/Microsoft/TypeScript/blob/master/tests/baselines/reference/constAssertions.js",
+            "start": 43,
+            "end": 142,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 99
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 168,
+        "end": 192,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 24
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 172,
+            "end": 191,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 4
+              },
+              "end": {
+                "line": 4,
+                "column": 23
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 172,
+              "end": 174,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 4
+                },
+                "end": {
+                  "line": 4,
+                  "column": 6
+                },
+                "identifierName": "v2"
+              },
+              "name": "v2"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 177,
+              "end": 191,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 9
+                },
+                "end": {
+                  "line": 4,
+                  "column": 23
+                }
+              },
+              "expression": {
+                "type": "TemplateLiteral",
+                "start": 177,
+                "end": 182,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 14
+                  }
+                },
+                "expressions": [],
+                "quasis": [
+                  {
+                    "type": "TemplateElement",
+                    "start": 178,
+                    "end": 181,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 13
+                      }
+                    },
+                    "value": {
+                      "raw": "abc",
+                      "cooked": "abc"
+                    },
+                    "tail": true
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 186,
+                "end": 191,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 23
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 186,
+                  "end": 191,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 23
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 193,
+        "end": 214,
+        "loc": {
+          "start": {
+            "line": 5,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 197,
+            "end": 213,
+            "loc": {
+              "start": {
+                "line": 5,
+                "column": 4
+              },
+              "end": {
+                "line": 5,
+                "column": 20
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 197,
+              "end": 199,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 4
+                },
+                "end": {
+                  "line": 5,
+                  "column": 6
+                },
+                "identifierName": "v3"
+              },
+              "name": "v3"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 202,
+              "end": 213,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 9
+                },
+                "end": {
+                  "line": 5,
+                  "column": 20
+                }
+              },
+              "expression": {
+                "type": "NumericLiteral",
+                "start": 202,
+                "end": 204,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 11
+                  }
+                },
+                "extra": {
+                  "rawValue": 10,
+                  "raw": "10"
+                },
+                "value": 10
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 208,
+                "end": 213,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 20
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 208,
+                  "end": 213,
+                  "loc": {
+                    "start": {
+                      "line": 5,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 5,
+                      "column": 20
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 215,
+        "end": 237,
+        "loc": {
+          "start": {
+            "line": 6,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 22
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 219,
+            "end": 236,
+            "loc": {
+              "start": {
+                "line": 6,
+                "column": 4
+              },
+              "end": {
+                "line": 6,
+                "column": 21
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 219,
+              "end": 221,
+              "loc": {
+                "start": {
+                  "line": 6,
+                  "column": 4
+                },
+                "end": {
+                  "line": 6,
+                  "column": 6
+                },
+                "identifierName": "v4"
+              },
+              "name": "v4"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 224,
+              "end": 236,
+              "loc": {
+                "start": {
+                  "line": 6,
+                  "column": 9
+                },
+                "end": {
+                  "line": 6,
+                  "column": 21
+                }
+              },
+              "expression": {
+                "type": "UnaryExpression",
+                "start": 224,
+                "end": 227,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 12
+                  }
+                },
+                "operator": "-",
+                "prefix": true,
+                "argument": {
+                  "type": "NumericLiteral",
+                  "start": 225,
+                  "end": 227,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 231,
+                "end": 236,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 21
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 231,
+                  "end": 236,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 21
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 238,
+        "end": 260,
+        "loc": {
+          "start": {
+            "line": 7,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 22
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 242,
+            "end": 259,
+            "loc": {
+              "start": {
+                "line": 7,
+                "column": 4
+              },
+              "end": {
+                "line": 7,
+                "column": 21
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 242,
+              "end": 244,
+              "loc": {
+                "start": {
+                  "line": 7,
+                  "column": 4
+                },
+                "end": {
+                  "line": 7,
+                  "column": 6
+                },
+                "identifierName": "v5"
+              },
+              "name": "v5"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 247,
+              "end": 259,
+              "loc": {
+                "start": {
+                  "line": 7,
+                  "column": 9
+                },
+                "end": {
+                  "line": 7,
+                  "column": 21
+                }
+              },
+              "expression": {
+                "type": "UnaryExpression",
+                "start": 247,
+                "end": 250,
+                "loc": {
+                  "start": {
+                    "line": 7,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 7,
+                    "column": 12
+                  }
+                },
+                "operator": "+",
+                "prefix": true,
+                "argument": {
+                  "type": "NumericLiteral",
+                  "start": 248,
+                  "end": 250,
+                  "loc": {
+                    "start": {
+                      "line": 7,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 7,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 254,
+                "end": 259,
+                "loc": {
+                  "start": {
+                    "line": 7,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 7,
+                    "column": 21
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 254,
+                  "end": 259,
+                  "loc": {
+                    "start": {
+                      "line": 7,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 7,
+                      "column": 21
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 261,
+        "end": 282,
+        "loc": {
+          "start": {
+            "line": 8,
+            "column": 0
+          },
+          "end": {
+            "line": 8,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 265,
+            "end": 281,
+            "loc": {
+              "start": {
+                "line": 8,
+                "column": 4
+              },
+              "end": {
+                "line": 8,
+                "column": 20
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 265,
+              "end": 267,
+              "loc": {
+                "start": {
+                  "line": 8,
+                  "column": 4
+                },
+                "end": {
+                  "line": 8,
+                  "column": 6
+                },
+                "identifierName": "v6"
+              },
+              "name": "v6"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 270,
+              "end": 281,
+              "loc": {
+                "start": {
+                  "line": 8,
+                  "column": 9
+                },
+                "end": {
+                  "line": 8,
+                  "column": 20
+                }
+              },
+              "expression": {
+                "type": "NumericLiteral",
+                "start": 270,
+                "end": 272,
+                "loc": {
+                  "start": {
+                    "line": 8,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 11
+                  }
+                },
+                "extra": {
+                  "rawValue": 10,
+                  "raw": "10"
+                },
+                "value": 10
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 276,
+                "end": 281,
+                "loc": {
+                  "start": {
+                    "line": 8,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 8,
+                    "column": 20
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 276,
+                  "end": 281,
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 20
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 283,
+        "end": 305,
+        "loc": {
+          "start": {
+            "line": 9,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 22
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 287,
+            "end": 304,
+            "loc": {
+              "start": {
+                "line": 9,
+                "column": 4
+              },
+              "end": {
+                "line": 9,
+                "column": 21
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 287,
+              "end": 289,
+              "loc": {
+                "start": {
+                  "line": 9,
+                  "column": 4
+                },
+                "end": {
+                  "line": 9,
+                  "column": 6
+                },
+                "identifierName": "v7"
+              },
+              "name": "v7"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 292,
+              "end": 304,
+              "loc": {
+                "start": {
+                  "line": 9,
+                  "column": 9
+                },
+                "end": {
+                  "line": 9,
+                  "column": 21
+                }
+              },
+              "expression": {
+                "type": "UnaryExpression",
+                "start": 292,
+                "end": 295,
+                "loc": {
+                  "start": {
+                    "line": 9,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 9,
+                    "column": 12
+                  }
+                },
+                "operator": "-",
+                "prefix": true,
+                "argument": {
+                  "type": "NumericLiteral",
+                  "start": 293,
+                  "end": 295,
+                  "loc": {
+                    "start": {
+                      "line": 9,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 12
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 299,
+                "end": 304,
+                "loc": {
+                  "start": {
+                    "line": 9,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 9,
+                    "column": 21
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 299,
+                  "end": 304,
+                  "loc": {
+                    "start": {
+                      "line": 9,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 21
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 306,
+        "end": 329,
+        "loc": {
+          "start": {
+            "line": 10,
+            "column": 0
+          },
+          "end": {
+            "line": 10,
+            "column": 23
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 310,
+            "end": 328,
+            "loc": {
+              "start": {
+                "line": 10,
+                "column": 4
+              },
+              "end": {
+                "line": 10,
+                "column": 22
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 310,
+              "end": 312,
+              "loc": {
+                "start": {
+                  "line": 10,
+                  "column": 4
+                },
+                "end": {
+                  "line": 10,
+                  "column": 6
+                },
+                "identifierName": "v8"
+              },
+              "name": "v8"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 315,
+              "end": 328,
+              "loc": {
+                "start": {
+                  "line": 10,
+                  "column": 9
+                },
+                "end": {
+                  "line": 10,
+                  "column": 22
+                }
+              },
+              "expression": {
+                "type": "BooleanLiteral",
+                "start": 315,
+                "end": 319,
+                "loc": {
+                  "start": {
+                    "line": 10,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 10,
+                    "column": 13
+                  }
+                },
+                "value": true
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 323,
+                "end": 328,
+                "loc": {
+                  "start": {
+                    "line": 10,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 10,
+                    "column": 22
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 323,
+                  "end": 328,
+                  "loc": {
+                    "start": {
+                      "line": 10,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 10,
+                      "column": 22
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 330,
+        "end": 354,
+        "loc": {
+          "start": {
+            "line": 11,
+            "column": 0
+          },
+          "end": {
+            "line": 11,
+            "column": 24
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 334,
+            "end": 353,
+            "loc": {
+              "start": {
+                "line": 11,
+                "column": 4
+              },
+              "end": {
+                "line": 11,
+                "column": 23
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 334,
+              "end": 336,
+              "loc": {
+                "start": {
+                  "line": 11,
+                  "column": 4
+                },
+                "end": {
+                  "line": 11,
+                  "column": 6
+                },
+                "identifierName": "v9"
+              },
+              "name": "v9"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 339,
+              "end": 353,
+              "loc": {
+                "start": {
+                  "line": 11,
+                  "column": 9
+                },
+                "end": {
+                  "line": 11,
+                  "column": 23
+                }
+              },
+              "expression": {
+                "type": "BooleanLiteral",
+                "start": 339,
+                "end": 344,
+                "loc": {
+                  "start": {
+                    "line": 11,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 11,
+                    "column": 14
+                  }
+                },
+                "value": false
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 348,
+                "end": 353,
+                "loc": {
+                  "start": {
+                    "line": 11,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 11,
+                    "column": 23
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 348,
+                  "end": 353,
+                  "loc": {
+                    "start": {
+                      "line": 11,
+                      "column": 18
+                    },
+                    "end": {
+                      "line": 11,
+                      "column": 23
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 356,
+        "end": 377,
+        "loc": {
+          "start": {
+            "line": 13,
+            "column": 0
+          },
+          "end": {
+            "line": 13,
+            "column": 21
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 360,
+            "end": 376,
+            "loc": {
+              "start": {
+                "line": 13,
+                "column": 4
+              },
+              "end": {
+                "line": 13,
+                "column": 20
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 360,
+              "end": 362,
+              "loc": {
+                "start": {
+                  "line": 13,
+                  "column": 4
+                },
+                "end": {
+                  "line": 13,
+                  "column": 6
+                },
+                "identifierName": "a1"
+              },
+              "name": "a1"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 365,
+              "end": 376,
+              "loc": {
+                "start": {
+                  "line": 13,
+                  "column": 9
+                },
+                "end": {
+                  "line": 13,
+                  "column": 20
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 365,
+                "end": 367,
+                "loc": {
+                  "start": {
+                    "line": 13,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 13,
+                    "column": 11
+                  }
+                },
+                "elements": []
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 371,
+                "end": 376,
+                "loc": {
+                  "start": {
+                    "line": 13,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 13,
+                    "column": 20
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 371,
+                  "end": 376,
+                  "loc": {
+                    "start": {
+                      "line": 13,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 13,
+                      "column": 20
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 378,
+        "end": 406,
+        "loc": {
+          "start": {
+            "line": 14,
+            "column": 0
+          },
+          "end": {
+            "line": 14,
+            "column": 28
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 382,
+            "end": 405,
+            "loc": {
+              "start": {
+                "line": 14,
+                "column": 4
+              },
+              "end": {
+                "line": 14,
+                "column": 27
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 382,
+              "end": 384,
+              "loc": {
+                "start": {
+                  "line": 14,
+                  "column": 4
+                },
+                "end": {
+                  "line": 14,
+                  "column": 6
+                },
+                "identifierName": "a2"
+              },
+              "name": "a2"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 387,
+              "end": 405,
+              "loc": {
+                "start": {
+                  "line": 14,
+                  "column": 9
+                },
+                "end": {
+                  "line": 14,
+                  "column": 27
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 387,
+                "end": 396,
+                "loc": {
+                  "start": {
+                    "line": 14,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 14,
+                    "column": 18
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "NumericLiteral",
+                    "start": 388,
+                    "end": 389,
+                    "loc": {
+                      "start": {
+                        "line": 14,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 14,
+                        "column": 11
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  },
+                  {
+                    "type": "NumericLiteral",
+                    "start": 391,
+                    "end": 392,
+                    "loc": {
+                      "start": {
+                        "line": 14,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 14,
+                        "column": 14
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 2,
+                      "raw": "2"
+                    },
+                    "value": 2
+                  },
+                  {
+                    "type": "NumericLiteral",
+                    "start": 394,
+                    "end": 395,
+                    "loc": {
+                      "start": {
+                        "line": 14,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 14,
+                        "column": 17
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 3,
+                      "raw": "3"
+                    },
+                    "value": 3
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 400,
+                "end": 405,
+                "loc": {
+                  "start": {
+                    "line": 14,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 14,
+                    "column": 27
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 400,
+                  "end": 405,
+                  "loc": {
+                    "start": {
+                      "line": 14,
+                      "column": 22
+                    },
+                    "end": {
+                      "line": 14,
+                      "column": 27
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 407,
+        "end": 445,
+        "loc": {
+          "start": {
+            "line": 15,
+            "column": 0
+          },
+          "end": {
+            "line": 15,
+            "column": 38
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 411,
+            "end": 444,
+            "loc": {
+              "start": {
+                "line": 15,
+                "column": 4
+              },
+              "end": {
+                "line": 15,
+                "column": 37
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 411,
+              "end": 413,
+              "loc": {
+                "start": {
+                  "line": 15,
+                  "column": 4
+                },
+                "end": {
+                  "line": 15,
+                  "column": 6
+                },
+                "identifierName": "a3"
+              },
+              "name": "a3"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 416,
+              "end": 444,
+              "loc": {
+                "start": {
+                  "line": 15,
+                  "column": 9
+                },
+                "end": {
+                  "line": 15,
+                  "column": 37
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 416,
+                "end": 435,
+                "loc": {
+                  "start": {
+                    "line": 15,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 15,
+                    "column": 28
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "NumericLiteral",
+                    "start": 417,
+                    "end": 419,
+                    "loc": {
+                      "start": {
+                        "line": 15,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 15,
+                        "column": 12
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 10,
+                      "raw": "10"
+                    },
+                    "value": 10
+                  },
+                  {
+                    "type": "StringLiteral",
+                    "start": 421,
+                    "end": 428,
+                    "loc": {
+                      "start": {
+                        "line": 15,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 15,
+                        "column": 21
+                      }
+                    },
+                    "extra": {
+                      "rawValue": "hello",
+                      "raw": "'hello'"
+                    },
+                    "value": "hello"
+                  },
+                  {
+                    "type": "BooleanLiteral",
+                    "start": 430,
+                    "end": 434,
+                    "loc": {
+                      "start": {
+                        "line": 15,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 15,
+                        "column": 27
+                      }
+                    },
+                    "value": true
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 439,
+                "end": 444,
+                "loc": {
+                  "start": {
+                    "line": 15,
+                    "column": 32
+                  },
+                  "end": {
+                    "line": 15,
+                    "column": 37
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 439,
+                  "end": 444,
+                  "loc": {
+                    "start": {
+                      "line": 15,
+                      "column": 32
+                    },
+                    "end": {
+                      "line": 15,
+                      "column": 37
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 446,
+        "end": 479,
+        "loc": {
+          "start": {
+            "line": 16,
+            "column": 0
+          },
+          "end": {
+            "line": 16,
+            "column": 33
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 450,
+            "end": 478,
+            "loc": {
+              "start": {
+                "line": 16,
+                "column": 4
+              },
+              "end": {
+                "line": 16,
+                "column": 32
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 450,
+              "end": 452,
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 4
+                },
+                "end": {
+                  "line": 16,
+                  "column": 6
+                },
+                "identifierName": "a4"
+              },
+              "name": "a4"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 455,
+              "end": 478,
+              "loc": {
+                "start": {
+                  "line": 16,
+                  "column": 9
+                },
+                "end": {
+                  "line": 16,
+                  "column": 32
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 455,
+                "end": 469,
+                "loc": {
+                  "start": {
+                    "line": 16,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 16,
+                    "column": 23
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "SpreadElement",
+                    "start": 456,
+                    "end": 468,
+                    "loc": {
+                      "start": {
+                        "line": 16,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 16,
+                        "column": 22
+                      }
+                    },
+                    "argument": {
+                      "type": "ArrayExpression",
+                      "start": 459,
+                      "end": 468,
+                      "loc": {
+                        "start": {
+                          "line": 16,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 16,
+                          "column": 22
+                        }
+                      },
+                      "elements": [
+                        {
+                          "type": "NumericLiteral",
+                          "start": 460,
+                          "end": 461,
+                          "loc": {
+                            "start": {
+                              "line": 16,
+                              "column": 14
+                            },
+                            "end": {
+                              "line": 16,
+                              "column": 15
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 1,
+                            "raw": "1"
+                          },
+                          "value": 1
+                        },
+                        {
+                          "type": "NumericLiteral",
+                          "start": 463,
+                          "end": 464,
+                          "loc": {
+                            "start": {
+                              "line": 16,
+                              "column": 17
+                            },
+                            "end": {
+                              "line": 16,
+                              "column": 18
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 2,
+                            "raw": "2"
+                          },
+                          "value": 2
+                        },
+                        {
+                          "type": "NumericLiteral",
+                          "start": 466,
+                          "end": 467,
+                          "loc": {
+                            "start": {
+                              "line": 16,
+                              "column": 20
+                            },
+                            "end": {
+                              "line": 16,
+                              "column": 21
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 3,
+                            "raw": "3"
+                          },
+                          "value": 3
+                        }
+                      ]
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 473,
+                "end": 478,
+                "loc": {
+                  "start": {
+                    "line": 16,
+                    "column": 27
+                  },
+                  "end": {
+                    "line": 16,
+                    "column": 32
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 473,
+                  "end": 478,
+                  "loc": {
+                    "start": {
+                      "line": 16,
+                      "column": 27
+                    },
+                    "end": {
+                      "line": 16,
+                      "column": 32
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 480,
+        "end": 499,
+        "loc": {
+          "start": {
+            "line": 17,
+            "column": 0
+          },
+          "end": {
+            "line": 17,
+            "column": 19
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 484,
+            "end": 498,
+            "loc": {
+              "start": {
+                "line": 17,
+                "column": 4
+              },
+              "end": {
+                "line": 17,
+                "column": 18
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 484,
+              "end": 486,
+              "loc": {
+                "start": {
+                  "line": 17,
+                  "column": 4
+                },
+                "end": {
+                  "line": 17,
+                  "column": 6
+                },
+                "identifierName": "a5"
+              },
+              "name": "a5"
+            },
+            "init": {
+              "type": "ArrayExpression",
+              "start": 489,
+              "end": 498,
+              "loc": {
+                "start": {
+                  "line": 17,
+                  "column": 9
+                },
+                "end": {
+                  "line": 17,
+                  "column": 18
+                }
+              },
+              "elements": [
+                {
+                  "type": "NumericLiteral",
+                  "start": 490,
+                  "end": 491,
+                  "loc": {
+                    "start": {
+                      "line": 17,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 17,
+                      "column": 11
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
+                  "value": 1
+                },
+                {
+                  "type": "NumericLiteral",
+                  "start": 493,
+                  "end": 494,
+                  "loc": {
+                    "start": {
+                      "line": 17,
+                      "column": 13
+                    },
+                    "end": {
+                      "line": 17,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 2,
+                    "raw": "2"
+                  },
+                  "value": 2
+                },
+                {
+                  "type": "NumericLiteral",
+                  "start": 496,
+                  "end": 497,
+                  "loc": {
+                    "start": {
+                      "line": 17,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 17,
+                      "column": 17
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 3,
+                    "raw": "3"
+                  },
+                  "value": 3
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 500,
+        "end": 526,
+        "loc": {
+          "start": {
+            "line": 18,
+            "column": 0
+          },
+          "end": {
+            "line": 18,
+            "column": 26
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 504,
+            "end": 525,
+            "loc": {
+              "start": {
+                "line": 18,
+                "column": 4
+              },
+              "end": {
+                "line": 18,
+                "column": 25
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 504,
+              "end": 506,
+              "loc": {
+                "start": {
+                  "line": 18,
+                  "column": 4
+                },
+                "end": {
+                  "line": 18,
+                  "column": 6
+                },
+                "identifierName": "a6"
+              },
+              "name": "a6"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 509,
+              "end": 525,
+              "loc": {
+                "start": {
+                  "line": 18,
+                  "column": 9
+                },
+                "end": {
+                  "line": 18,
+                  "column": 25
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 509,
+                "end": 516,
+                "loc": {
+                  "start": {
+                    "line": 18,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 18,
+                    "column": 16
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "SpreadElement",
+                    "start": 510,
+                    "end": 515,
+                    "loc": {
+                      "start": {
+                        "line": 18,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 18,
+                        "column": 15
+                      }
+                    },
+                    "argument": {
+                      "type": "Identifier",
+                      "start": 513,
+                      "end": 515,
+                      "loc": {
+                        "start": {
+                          "line": 18,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 18,
+                          "column": 15
+                        },
+                        "identifierName": "a5"
+                      },
+                      "name": "a5"
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 520,
+                "end": 525,
+                "loc": {
+                  "start": {
+                    "line": 18,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 18,
+                    "column": 25
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 520,
+                  "end": 525,
+                  "loc": {
+                    "start": {
+                      "line": 18,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 18,
+                      "column": 25
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 527,
+        "end": 560,
+        "loc": {
+          "start": {
+            "line": 19,
+            "column": 0
+          },
+          "end": {
+            "line": 19,
+            "column": 33
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 531,
+            "end": 559,
+            "loc": {
+              "start": {
+                "line": 19,
+                "column": 4
+              },
+              "end": {
+                "line": 19,
+                "column": 32
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 531,
+              "end": 533,
+              "loc": {
+                "start": {
+                  "line": 19,
+                  "column": 4
+                },
+                "end": {
+                  "line": 19,
+                  "column": 6
+                },
+                "identifierName": "a8"
+              },
+              "name": "a8"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 536,
+              "end": 559,
+              "loc": {
+                "start": {
+                  "line": 19,
+                  "column": 9
+                },
+                "end": {
+                  "line": 19,
+                  "column": 32
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 536,
+                "end": 550,
+                "loc": {
+                  "start": {
+                    "line": 19,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 19,
+                    "column": 23
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "StringLiteral",
+                    "start": 537,
+                    "end": 542,
+                    "loc": {
+                      "start": {
+                        "line": 19,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 19,
+                        "column": 15
+                      }
+                    },
+                    "extra": {
+                      "rawValue": "abc",
+                      "raw": "'abc'"
+                    },
+                    "value": "abc"
+                  },
+                  {
+                    "type": "SpreadElement",
+                    "start": 544,
+                    "end": 549,
+                    "loc": {
+                      "start": {
+                        "line": 19,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 19,
+                        "column": 22
+                      }
+                    },
+                    "argument": {
+                      "type": "Identifier",
+                      "start": 547,
+                      "end": 549,
+                      "loc": {
+                        "start": {
+                          "line": 19,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 19,
+                          "column": 22
+                        },
+                        "identifierName": "a7"
+                      },
+                      "name": "a7"
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 554,
+                "end": 559,
+                "loc": {
+                  "start": {
+                    "line": 19,
+                    "column": 27
+                  },
+                  "end": {
+                    "line": 19,
+                    "column": 32
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 554,
+                  "end": 559,
+                  "loc": {
+                    "start": {
+                      "line": 19,
+                      "column": 27
+                    },
+                    "end": {
+                      "line": 19,
+                      "column": 32
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 562,
+        "end": 597,
+        "loc": {
+          "start": {
+            "line": 21,
+            "column": 0
+          },
+          "end": {
+            "line": 21,
+            "column": 35
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 566,
+            "end": 596,
+            "loc": {
+              "start": {
+                "line": 21,
+                "column": 4
+              },
+              "end": {
+                "line": 21,
+                "column": 34
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 566,
+              "end": 568,
+              "loc": {
+                "start": {
+                  "line": 21,
+                  "column": 4
+                },
+                "end": {
+                  "line": 21,
+                  "column": 6
+                },
+                "identifierName": "o1"
+              },
+              "name": "o1"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 571,
+              "end": 596,
+              "loc": {
+                "start": {
+                  "line": 21,
+                  "column": 9
+                },
+                "end": {
+                  "line": 21,
+                  "column": 34
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 571,
+                "end": 587,
+                "loc": {
+                  "start": {
+                    "line": 21,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 21,
+                    "column": 25
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 573,
+                    "end": 578,
+                    "loc": {
+                      "start": {
+                        "line": 21,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 21,
+                        "column": 16
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 573,
+                      "end": 574,
+                      "loc": {
+                        "start": {
+                          "line": 21,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 21,
+                          "column": 12
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 576,
+                      "end": 578,
+                      "loc": {
+                        "start": {
+                          "line": 21,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 21,
+                          "column": 16
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 10,
+                        "raw": "10"
+                      },
+                      "value": 10
+                    }
+                  },
+                  {
+                    "type": "ObjectProperty",
+                    "start": 580,
+                    "end": 585,
+                    "loc": {
+                      "start": {
+                        "line": 21,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 21,
+                        "column": 23
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 580,
+                      "end": 581,
+                      "loc": {
+                        "start": {
+                          "line": 21,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 21,
+                          "column": 19
+                        },
+                        "identifierName": "y"
+                      },
+                      "name": "y"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 583,
+                      "end": 585,
+                      "loc": {
+                        "start": {
+                          "line": 21,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 21,
+                          "column": 23
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 20,
+                        "raw": "20"
+                      },
+                      "value": 20
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 591,
+                "end": 596,
+                "loc": {
+                  "start": {
+                    "line": 21,
+                    "column": 29
+                  },
+                  "end": {
+                    "line": 21,
+                    "column": 34
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 591,
+                  "end": 596,
+                  "loc": {
+                    "start": {
+                      "line": 21,
+                      "column": 29
+                    },
+                    "end": {
+                      "line": 21,
+                      "column": 34
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 598,
+        "end": 666,
+        "loc": {
+          "start": {
+            "line": 22,
+            "column": 0
+          },
+          "end": {
+            "line": 22,
+            "column": 68
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 602,
+            "end": 665,
+            "loc": {
+              "start": {
+                "line": 22,
+                "column": 4
+              },
+              "end": {
+                "line": 22,
+                "column": 67
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 602,
+              "end": 604,
+              "loc": {
+                "start": {
+                  "line": 22,
+                  "column": 4
+                },
+                "end": {
+                  "line": 22,
+                  "column": 6
+                },
+                "identifierName": "o2"
+              },
+              "name": "o2"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 607,
+              "end": 665,
+              "loc": {
+                "start": {
+                  "line": 22,
+                  "column": 9
+                },
+                "end": {
+                  "line": 22,
+                  "column": 67
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 607,
+                "end": 656,
+                "loc": {
+                  "start": {
+                    "line": 22,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 22,
+                    "column": 58
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 609,
+                    "end": 613,
+                    "loc": {
+                      "start": {
+                        "line": 22,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 22,
+                        "column": 15
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 609,
+                      "end": 610,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 12
+                        },
+                        "identifierName": "a"
+                      },
+                      "name": "a"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 612,
+                      "end": 613,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 15
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 1,
+                        "raw": "1"
+                      },
+                      "value": 1
+                    }
+                  },
+                  {
+                    "type": "ObjectProperty",
+                    "start": 615,
+                    "end": 621,
+                    "loc": {
+                      "start": {
+                        "line": 22,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 22,
+                        "column": 23
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "StringLiteral",
+                      "start": 615,
+                      "end": 618,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 17
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 20
+                        }
+                      },
+                      "extra": {
+                        "rawValue": "b",
+                        "raw": "'b'"
+                      },
+                      "value": "b"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 620,
+                      "end": 621,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 22
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 23
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 2,
+                        "raw": "2"
+                      },
+                      "value": 2
+                    }
+                  },
+                  {
+                    "type": "ObjectProperty",
+                    "start": 623,
+                    "end": 631,
+                    "loc": {
+                      "start": {
+                        "line": 22,
+                        "column": 25
+                      },
+                      "end": {
+                        "line": 22,
+                        "column": 33
+                      }
+                    },
+                    "method": false,
+                    "computed": true,
+                    "key": {
+                      "type": "StringLiteral",
+                      "start": 624,
+                      "end": 627,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 26
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 29
+                        }
+                      },
+                      "extra": {
+                        "rawValue": "c",
+                        "raw": "'c'"
+                      },
+                      "value": "c"
+                    },
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 630,
+                      "end": 631,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 32
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 33
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 3,
+                        "raw": "3"
+                      },
+                      "value": 3
+                    }
+                  },
+                  {
+                    "type": "ObjectMethod",
+                    "start": 633,
+                    "end": 639,
+                    "loc": {
+                      "start": {
+                        "line": 22,
+                        "column": 35
+                      },
+                      "end": {
+                        "line": 22,
+                        "column": 41
+                      }
+                    },
+                    "method": true,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 633,
+                      "end": 634,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 35
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 36
+                        },
+                        "identifierName": "d"
+                      },
+                      "name": "d"
+                    },
+                    "computed": false,
+                    "kind": "method",
+                    "id": null,
+                    "generator": false,
+                    "async": false,
+                    "params": [],
+                    "body": {
+                      "type": "BlockStatement",
+                      "start": 637,
+                      "end": 639,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 39
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 41
+                        }
+                      },
+                      "body": [],
+                      "directives": []
+                    }
+                  },
+                  {
+                    "type": "ObjectProperty",
+                    "start": 641,
+                    "end": 654,
+                    "loc": {
+                      "start": {
+                        "line": 22,
+                        "column": 43
+                      },
+                      "end": {
+                        "line": 22,
+                        "column": 56
+                      }
+                    },
+                    "method": false,
+                    "computed": true,
+                    "key": {
+                      "type": "BinaryExpression",
+                      "start": 642,
+                      "end": 650,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 44
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 52
+                        }
+                      },
+                      "left": {
+                        "type": "StringLiteral",
+                        "start": 642,
+                        "end": 645,
+                        "loc": {
+                          "start": {
+                            "line": 22,
+                            "column": 44
+                          },
+                          "end": {
+                            "line": 22,
+                            "column": 47
+                          }
+                        },
+                        "extra": {
+                          "rawValue": "e",
+                          "raw": "'e'"
+                        },
+                        "value": "e"
+                      },
+                      "operator": "+",
+                      "right": {
+                        "type": "StringLiteral",
+                        "start": 648,
+                        "end": 650,
+                        "loc": {
+                          "start": {
+                            "line": 22,
+                            "column": 50
+                          },
+                          "end": {
+                            "line": 22,
+                            "column": 52
+                          }
+                        },
+                        "extra": {
+                          "rawValue": "",
+                          "raw": "''"
+                        },
+                        "value": ""
+                      }
+                    },
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 653,
+                      "end": 654,
+                      "loc": {
+                        "start": {
+                          "line": 22,
+                          "column": 55
+                        },
+                        "end": {
+                          "line": 22,
+                          "column": 56
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 4,
+                        "raw": "4"
+                      },
+                      "value": 4
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 660,
+                "end": 665,
+                "loc": {
+                  "start": {
+                    "line": 22,
+                    "column": 62
+                  },
+                  "end": {
+                    "line": 22,
+                    "column": 67
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 660,
+                  "end": 665,
+                  "loc": {
+                    "start": {
+                      "line": 22,
+                      "column": 62
+                    },
+                    "end": {
+                      "line": 22,
+                      "column": 67
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 667,
+        "end": 702,
+        "loc": {
+          "start": {
+            "line": 23,
+            "column": 0
+          },
+          "end": {
+            "line": 23,
+            "column": 35
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 671,
+            "end": 701,
+            "loc": {
+              "start": {
+                "line": 23,
+                "column": 4
+              },
+              "end": {
+                "line": 23,
+                "column": 34
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 671,
+              "end": 673,
+              "loc": {
+                "start": {
+                  "line": 23,
+                  "column": 4
+                },
+                "end": {
+                  "line": 23,
+                  "column": 6
+                },
+                "identifierName": "o3"
+              },
+              "name": "o3"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 676,
+              "end": 701,
+              "loc": {
+                "start": {
+                  "line": 23,
+                  "column": 9
+                },
+                "end": {
+                  "line": 23,
+                  "column": 34
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 676,
+                "end": 692,
+                "loc": {
+                  "start": {
+                    "line": 23,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 23,
+                    "column": 25
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "SpreadElement",
+                    "start": 678,
+                    "end": 683,
+                    "loc": {
+                      "start": {
+                        "line": 23,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 23,
+                        "column": 16
+                      }
+                    },
+                    "argument": {
+                      "type": "Identifier",
+                      "start": 681,
+                      "end": 683,
+                      "loc": {
+                        "start": {
+                          "line": 23,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 23,
+                          "column": 16
+                        },
+                        "identifierName": "o1"
+                      },
+                      "name": "o1"
+                    }
+                  },
+                  {
+                    "type": "SpreadElement",
+                    "start": 685,
+                    "end": 690,
+                    "loc": {
+                      "start": {
+                        "line": 23,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 23,
+                        "column": 23
+                      }
+                    },
+                    "argument": {
+                      "type": "Identifier",
+                      "start": 688,
+                      "end": 690,
+                      "loc": {
+                        "start": {
+                          "line": 23,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 23,
+                          "column": 23
+                        },
+                        "identifierName": "o2"
+                      },
+                      "name": "o2"
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 696,
+                "end": 701,
+                "loc": {
+                  "start": {
+                    "line": 23,
+                    "column": 29
+                  },
+                  "end": {
+                    "line": 23,
+                    "column": 34
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 696,
+                  "end": 701,
+                  "loc": {
+                    "start": {
+                      "line": 23,
+                      "column": 29
+                    },
+                    "end": {
+                      "line": 23,
+                      "column": 34
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 703,
+        "end": 731,
+        "loc": {
+          "start": {
+            "line": 24,
+            "column": 0
+          },
+          "end": {
+            "line": 24,
+            "column": 28
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 707,
+            "end": 730,
+            "loc": {
+              "start": {
+                "line": 24,
+                "column": 4
+              },
+              "end": {
+                "line": 24,
+                "column": 27
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 707,
+              "end": 709,
+              "loc": {
+                "start": {
+                  "line": 24,
+                  "column": 4
+                },
+                "end": {
+                  "line": 24,
+                  "column": 6
+                },
+                "identifierName": "o5"
+              },
+              "name": "o5"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 712,
+              "end": 730,
+              "loc": {
+                "start": {
+                  "line": 24,
+                  "column": 9
+                },
+                "end": {
+                  "line": 24,
+                  "column": 27
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 712,
+                "end": 721,
+                "loc": {
+                  "start": {
+                    "line": 24,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 24,
+                    "column": 18
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "SpreadElement",
+                    "start": 714,
+                    "end": 719,
+                    "loc": {
+                      "start": {
+                        "line": 24,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 24,
+                        "column": 16
+                      }
+                    },
+                    "argument": {
+                      "type": "Identifier",
+                      "start": 717,
+                      "end": 719,
+                      "loc": {
+                        "start": {
+                          "line": 24,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 24,
+                          "column": 16
+                        },
+                        "identifierName": "o4"
+                      },
+                      "name": "o4"
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 725,
+                "end": 730,
+                "loc": {
+                  "start": {
+                    "line": 24,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 24,
+                    "column": 27
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 725,
+                  "end": 730,
+                  "loc": {
+                    "start": {
+                      "line": 24,
+                      "column": 22
+                    },
+                    "end": {
+                      "line": 24,
+                      "column": 27
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 732,
+        "end": 759,
+        "loc": {
+          "start": {
+            "line": 25,
+            "column": 0
+          },
+          "end": {
+            "line": 25,
+            "column": 27
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 736,
+            "end": 758,
+            "loc": {
+              "start": {
+                "line": 25,
+                "column": 4
+              },
+              "end": {
+                "line": 25,
+                "column": 26
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 736,
+              "end": 738,
+              "loc": {
+                "start": {
+                  "line": 25,
+                  "column": 4
+                },
+                "end": {
+                  "line": 25,
+                  "column": 6
+                },
+                "identifierName": "o7"
+              },
+              "name": "o7"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 741,
+              "end": 758,
+              "loc": {
+                "start": {
+                  "line": 25,
+                  "column": 9
+                },
+                "end": {
+                  "line": 25,
+                  "column": 26
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 741,
+                "end": 749,
+                "loc": {
+                  "start": {
+                    "line": 25,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 25,
+                    "column": 17
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "SpreadElement",
+                    "start": 743,
+                    "end": 747,
+                    "loc": {
+                      "start": {
+                        "line": 25,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 25,
+                        "column": 15
+                      }
+                    },
+                    "argument": {
+                      "type": "Identifier",
+                      "start": 746,
+                      "end": 747,
+                      "loc": {
+                        "start": {
+                          "line": 25,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 25,
+                          "column": 15
+                        },
+                        "identifierName": "d"
+                      },
+                      "name": "d"
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 753,
+                "end": 758,
+                "loc": {
+                  "start": {
+                    "line": 25,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 25,
+                    "column": 26
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 753,
+                  "end": 758,
+                  "loc": {
+                    "start": {
+                      "line": 25,
+                      "column": 21
+                    },
+                    "end": {
+                      "line": 25,
+                      "column": 26
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 760,
+        "end": 811,
+        "loc": {
+          "start": {
+            "line": 26,
+            "column": 0
+          },
+          "end": {
+            "line": 26,
+            "column": 51
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 764,
+            "end": 810,
+            "loc": {
+              "start": {
+                "line": 26,
+                "column": 4
+              },
+              "end": {
+                "line": 26,
+                "column": 50
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 764,
+              "end": 766,
+              "loc": {
+                "start": {
+                  "line": 26,
+                  "column": 4
+                },
+                "end": {
+                  "line": 26,
+                  "column": 6
+                },
+                "identifierName": "o9"
+              },
+              "name": "o9"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 769,
+              "end": 810,
+              "loc": {
+                "start": {
+                  "line": 26,
+                  "column": 9
+                },
+                "end": {
+                  "line": 26,
+                  "column": 50
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 769,
+                "end": 801,
+                "loc": {
+                  "start": {
+                    "line": 26,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 26,
+                    "column": 41
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 771,
+                    "end": 776,
+                    "loc": {
+                      "start": {
+                        "line": 26,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 26,
+                        "column": 16
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 771,
+                      "end": 772,
+                      "loc": {
+                        "start": {
+                          "line": 26,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 26,
+                          "column": 12
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 774,
+                      "end": 776,
+                      "loc": {
+                        "start": {
+                          "line": 26,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 26,
+                          "column": 16
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 10,
+                        "raw": "10"
+                      },
+                      "value": 10
+                    }
+                  },
+                  {
+                    "type": "ObjectMethod",
+                    "start": 778,
+                    "end": 799,
+                    "loc": {
+                      "start": {
+                        "line": 26,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 26,
+                        "column": 39
+                      }
+                    },
+                    "method": true,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 778,
+                      "end": 781,
+                      "loc": {
+                        "start": {
+                          "line": 26,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 26,
+                          "column": 21
+                        },
+                        "identifierName": "foo"
+                      },
+                      "name": "foo"
+                    },
+                    "computed": false,
+                    "kind": "method",
+                    "id": null,
+                    "generator": false,
+                    "async": false,
+                    "params": [],
+                    "body": {
+                      "type": "BlockStatement",
+                      "start": 784,
+                      "end": 799,
+                      "loc": {
+                        "start": {
+                          "line": 26,
+                          "column": 24
+                        },
+                        "end": {
+                          "line": 26,
+                          "column": 39
+                        }
+                      },
+                      "body": [
+                        {
+                          "type": "ExpressionStatement",
+                          "start": 786,
+                          "end": 797,
+                          "loc": {
+                            "start": {
+                              "line": 26,
+                              "column": 26
+                            },
+                            "end": {
+                              "line": 26,
+                              "column": 37
+                            }
+                          },
+                          "expression": {
+                            "type": "AssignmentExpression",
+                            "start": 786,
+                            "end": 797,
+                            "loc": {
+                              "start": {
+                                "line": 26,
+                                "column": 26
+                              },
+                              "end": {
+                                "line": 26,
+                                "column": 37
+                              }
+                            },
+                            "operator": "=",
+                            "left": {
+                              "type": "MemberExpression",
+                              "start": 786,
+                              "end": 792,
+                              "loc": {
+                                "start": {
+                                  "line": 26,
+                                  "column": 26
+                                },
+                                "end": {
+                                  "line": 26,
+                                  "column": 32
+                                }
+                              },
+                              "object": {
+                                "type": "ThisExpression",
+                                "start": 786,
+                                "end": 790,
+                                "loc": {
+                                  "start": {
+                                    "line": 26,
+                                    "column": 26
+                                  },
+                                  "end": {
+                                    "line": 26,
+                                    "column": 30
+                                  }
+                                }
+                              },
+                              "property": {
+                                "type": "Identifier",
+                                "start": 791,
+                                "end": 792,
+                                "loc": {
+                                  "start": {
+                                    "line": 26,
+                                    "column": 31
+                                  },
+                                  "end": {
+                                    "line": 26,
+                                    "column": 32
+                                  },
+                                  "identifierName": "x"
+                                },
+                                "name": "x"
+                              },
+                              "computed": false
+                            },
+                            "right": {
+                              "type": "NumericLiteral",
+                              "start": 795,
+                              "end": 797,
+                              "loc": {
+                                "start": {
+                                  "line": 26,
+                                  "column": 35
+                                },
+                                "end": {
+                                  "line": 26,
+                                  "column": 37
+                                }
+                              },
+                              "extra": {
+                                "rawValue": 20,
+                                "raw": "20"
+                              },
+                              "value": 20
+                            }
+                          }
+                        }
+                      ],
+                      "directives": []
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 805,
+                "end": 810,
+                "loc": {
+                  "start": {
+                    "line": 26,
+                    "column": 45
+                  },
+                  "end": {
+                    "line": 26,
+                    "column": 50
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 805,
+                  "end": 810,
+                  "loc": {
+                    "start": {
+                      "line": 26,
+                      "column": 45
+                    },
+                    "end": {
+                      "line": 26,
+                      "column": 50
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let",
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": " Error",
+            "start": 813,
+            "end": 821,
+            "loc": {
+              "start": {
+                "line": 26,
+                "column": 53
+              },
+              "end": {
+                "line": 26,
+                "column": 61
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 823,
+        "end": 846,
+        "loc": {
+          "start": {
+            "line": 28,
+            "column": 0
+          },
+          "end": {
+            "line": 28,
+            "column": 23
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 827,
+            "end": 845,
+            "loc": {
+              "start": {
+                "line": 28,
+                "column": 4
+              },
+              "end": {
+                "line": 28,
+                "column": 22
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 827,
+              "end": 829,
+              "loc": {
+                "start": {
+                  "line": 28,
+                  "column": 4
+                },
+                "end": {
+                  "line": 28,
+                  "column": 6
+                },
+                "identifierName": "p1"
+              },
+              "name": "p1"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 832,
+              "end": 845,
+              "loc": {
+                "start": {
+                  "line": 28,
+                  "column": 9
+                },
+                "end": {
+                  "line": 28,
+                  "column": 22
+                }
+              },
+              "expression": {
+                "type": "NumericLiteral",
+                "start": 833,
+                "end": 835,
+                "loc": {
+                  "start": {
+                    "line": 28,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 28,
+                    "column": 12
+                  }
+                },
+                "extra": {
+                  "rawValue": 10,
+                  "raw": "10",
+                  "parenthesized": true,
+                  "parenStart": 832
+                },
+                "value": 10
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 840,
+                "end": 845,
+                "loc": {
+                  "start": {
+                    "line": 28,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 28,
+                    "column": 22
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 840,
+                  "end": 845,
+                  "loc": {
+                    "start": {
+                      "line": 28,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 28,
+                      "column": 22
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let",
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " Error",
+            "start": 813,
+            "end": 821,
+            "loc": {
+              "start": {
+                "line": 26,
+                "column": 53
+              },
+              "end": {
+                "line": 26,
+                "column": 61
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 847,
+        "end": 873,
+        "loc": {
+          "start": {
+            "line": 29,
+            "column": 0
+          },
+          "end": {
+            "line": 29,
+            "column": 26
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 851,
+            "end": 872,
+            "loc": {
+              "start": {
+                "line": 29,
+                "column": 4
+              },
+              "end": {
+                "line": 29,
+                "column": 25
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 851,
+              "end": 853,
+              "loc": {
+                "start": {
+                  "line": 29,
+                  "column": 4
+                },
+                "end": {
+                  "line": 29,
+                  "column": 6
+                },
+                "identifierName": "p2"
+              },
+              "name": "p2"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 856,
+              "end": 872,
+              "loc": {
+                "start": {
+                  "line": 29,
+                  "column": 9
+                },
+                "end": {
+                  "line": 29,
+                  "column": 25
+                }
+              },
+              "expression": {
+                "type": "UnaryExpression",
+                "start": 858,
+                "end": 861,
+                "loc": {
+                  "start": {
+                    "line": 29,
+                    "column": 11
+                  },
+                  "end": {
+                    "line": 29,
+                    "column": 14
+                  }
+                },
+                "operator": "-",
+                "prefix": true,
+                "argument": {
+                  "type": "NumericLiteral",
+                  "start": 859,
+                  "end": 861,
+                  "loc": {
+                    "start": {
+                      "line": 29,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 29,
+                      "column": 14
+                    }
+                  },
+                  "extra": {
+                    "rawValue": 10,
+                    "raw": "10"
+                  },
+                  "value": 10
+                },
+                "extra": {
+                  "parenthesized": true,
+                  "parenStart": 856
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 867,
+                "end": 872,
+                "loc": {
+                  "start": {
+                    "line": 29,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 29,
+                    "column": 25
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 867,
+                  "end": 872,
+                  "loc": {
+                    "start": {
+                      "line": 29,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 29,
+                      "column": 25
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 874,
+        "end": 901,
+        "loc": {
+          "start": {
+            "line": 30,
+            "column": 0
+          },
+          "end": {
+            "line": 30,
+            "column": 27
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 878,
+            "end": 900,
+            "loc": {
+              "start": {
+                "line": 30,
+                "column": 4
+              },
+              "end": {
+                "line": 30,
+                "column": 26
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 878,
+              "end": 880,
+              "loc": {
+                "start": {
+                  "line": 30,
+                  "column": 4
+                },
+                "end": {
+                  "line": 30,
+                  "column": 6
+                },
+                "identifierName": "p3"
+              },
+              "name": "p3"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 883,
+              "end": 900,
+              "loc": {
+                "start": {
+                  "line": 30,
+                  "column": 9
+                },
+                "end": {
+                  "line": 30,
+                  "column": 26
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 884,
+                "end": 890,
+                "loc": {
+                  "start": {
+                    "line": 30,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 30,
+                    "column": 16
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "NumericLiteral",
+                    "start": 886,
+                    "end": 888,
+                    "loc": {
+                      "start": {
+                        "line": 30,
+                        "column": 12
+                      },
+                      "end": {
+                        "line": 30,
+                        "column": 14
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 10,
+                      "raw": "10",
+                      "parenthesized": true,
+                      "parenStart": 885
+                    },
+                    "value": 10
+                  }
+                ],
+                "extra": {
+                  "parenthesized": true,
+                  "parenStart": 883
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 895,
+                "end": 900,
+                "loc": {
+                  "start": {
+                    "line": 30,
+                    "column": 21
+                  },
+                  "end": {
+                    "line": 30,
+                    "column": 26
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 895,
+                  "end": 900,
+                  "loc": {
+                    "start": {
+                      "line": 30,
+                      "column": 21
+                    },
+                    "end": {
+                      "line": 30,
+                      "column": 26
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 902,
+        "end": 931,
+        "loc": {
+          "start": {
+            "line": 31,
+            "column": 0
+          },
+          "end": {
+            "line": 31,
+            "column": 29
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 906,
+            "end": 930,
+            "loc": {
+              "start": {
+                "line": 31,
+                "column": 4
+              },
+              "end": {
+                "line": 31,
+                "column": 28
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 906,
+              "end": 908,
+              "loc": {
+                "start": {
+                  "line": 31,
+                  "column": 4
+                },
+                "end": {
+                  "line": 31,
+                  "column": 6
+                },
+                "identifierName": "p4"
+              },
+              "name": "p4"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 911,
+              "end": 930,
+              "loc": {
+                "start": {
+                  "line": 31,
+                  "column": 9
+                },
+                "end": {
+                  "line": 31,
+                  "column": 28
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 911,
+                "end": 921,
+                "loc": {
+                  "start": {
+                    "line": 31,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 31,
+                    "column": 19
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "ArrayExpression",
+                    "start": 912,
+                    "end": 920,
+                    "loc": {
+                      "start": {
+                        "line": 31,
+                        "column": 10
+                      },
+                      "end": {
+                        "line": 31,
+                        "column": 18
+                      }
+                    },
+                    "elements": [
+                      {
+                        "type": "ArrayExpression",
+                        "start": 913,
+                        "end": 919,
+                        "loc": {
+                          "start": {
+                            "line": 31,
+                            "column": 11
+                          },
+                          "end": {
+                            "line": 31,
+                            "column": 17
+                          }
+                        },
+                        "elements": [
+                          {
+                            "type": "ArrayExpression",
+                            "start": 914,
+                            "end": 918,
+                            "loc": {
+                              "start": {
+                                "line": 31,
+                                "column": 12
+                              },
+                              "end": {
+                                "line": 31,
+                                "column": 16
+                              }
+                            },
+                            "elements": [
+                              {
+                                "type": "NumericLiteral",
+                                "start": 915,
+                                "end": 917,
+                                "loc": {
+                                  "start": {
+                                    "line": 31,
+                                    "column": 13
+                                  },
+                                  "end": {
+                                    "line": 31,
+                                    "column": 15
+                                  }
+                                },
+                                "extra": {
+                                  "rawValue": 10,
+                                  "raw": "10"
+                                },
+                                "value": 10
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 925,
+                "end": 930,
+                "loc": {
+                  "start": {
+                    "line": 31,
+                    "column": 23
+                  },
+                  "end": {
+                    "line": 31,
+                    "column": 28
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 925,
+                  "end": 930,
+                  "loc": {
+                    "start": {
+                      "line": 31,
+                      "column": 23
+                    },
+                    "end": {
+                      "line": 31,
+                      "column": 28
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 933,
+        "end": 995,
+        "loc": {
+          "start": {
+            "line": 33,
+            "column": 0
+          },
+          "end": {
+            "line": 33,
+            "column": 62
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 937,
+            "end": 994,
+            "loc": {
+              "start": {
+                "line": 33,
+                "column": 4
+              },
+              "end": {
+                "line": 33,
+                "column": 61
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 937,
+              "end": 939,
+              "loc": {
+                "start": {
+                  "line": 33,
+                  "column": 4
+                },
+                "end": {
+                  "line": 33,
+                  "column": 6
+                },
+                "identifierName": "x1"
+              },
+              "name": "x1"
+            },
+            "init": {
+              "type": "TSAsExpression",
+              "start": 942,
+              "end": 994,
+              "loc": {
+                "start": {
+                  "line": 33,
+                  "column": 9
+                },
+                "end": {
+                  "line": 33,
+                  "column": 61
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 942,
+                "end": 985,
+                "loc": {
+                  "start": {
+                    "line": 33,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 33,
+                    "column": 52
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 944,
+                    "end": 949,
+                    "loc": {
+                      "start": {
+                        "line": 33,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 33,
+                        "column": 16
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 944,
+                      "end": 945,
+                      "loc": {
+                        "start": {
+                          "line": 33,
+                          "column": 11
+                        },
+                        "end": {
+                          "line": 33,
+                          "column": 12
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 947,
+                      "end": 949,
+                      "loc": {
+                        "start": {
+                          "line": 33,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 33,
+                          "column": 16
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 10,
+                        "raw": "10"
+                      },
+                      "value": 10
+                    }
+                  },
+                  {
+                    "type": "ObjectProperty",
+                    "start": 951,
+                    "end": 962,
+                    "loc": {
+                      "start": {
+                        "line": 33,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 33,
+                        "column": 29
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 951,
+                      "end": 952,
+                      "loc": {
+                        "start": {
+                          "line": 33,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 33,
+                          "column": 19
+                        },
+                        "identifierName": "y"
+                      },
+                      "name": "y"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "ArrayExpression",
+                      "start": 954,
+                      "end": 962,
+                      "loc": {
+                        "start": {
+                          "line": 33,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 33,
+                          "column": 29
+                        }
+                      },
+                      "elements": [
+                        {
+                          "type": "NumericLiteral",
+                          "start": 955,
+                          "end": 957,
+                          "loc": {
+                            "start": {
+                              "line": 33,
+                              "column": 22
+                            },
+                            "end": {
+                              "line": 33,
+                              "column": 24
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 20,
+                            "raw": "20"
+                          },
+                          "value": 20
+                        },
+                        {
+                          "type": "NumericLiteral",
+                          "start": 959,
+                          "end": 961,
+                          "loc": {
+                            "start": {
+                              "line": 33,
+                              "column": 26
+                            },
+                            "end": {
+                              "line": 33,
+                              "column": 28
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 30,
+                            "raw": "30"
+                          },
+                          "value": 30
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "type": "ObjectProperty",
+                    "start": 964,
+                    "end": 983,
+                    "loc": {
+                      "start": {
+                        "line": 33,
+                        "column": 31
+                      },
+                      "end": {
+                        "line": 33,
+                        "column": 50
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 964,
+                      "end": 965,
+                      "loc": {
+                        "start": {
+                          "line": 33,
+                          "column": 31
+                        },
+                        "end": {
+                          "line": 33,
+                          "column": 32
+                        },
+                        "identifierName": "z"
+                      },
+                      "name": "z"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "ObjectExpression",
+                      "start": 967,
+                      "end": 983,
+                      "loc": {
+                        "start": {
+                          "line": 33,
+                          "column": 34
+                        },
+                        "end": {
+                          "line": 33,
+                          "column": 50
+                        }
+                      },
+                      "properties": [
+                        {
+                          "type": "ObjectProperty",
+                          "start": 969,
+                          "end": 981,
+                          "loc": {
+                            "start": {
+                              "line": 33,
+                              "column": 36
+                            },
+                            "end": {
+                              "line": 33,
+                              "column": 48
+                            }
+                          },
+                          "method": false,
+                          "key": {
+                            "type": "Identifier",
+                            "start": 969,
+                            "end": 970,
+                            "loc": {
+                              "start": {
+                                "line": 33,
+                                "column": 36
+                              },
+                              "end": {
+                                "line": 33,
+                                "column": 37
+                              },
+                              "identifierName": "a"
+                            },
+                            "name": "a"
+                          },
+                          "computed": false,
+                          "shorthand": false,
+                          "value": {
+                            "type": "ObjectExpression",
+                            "start": 972,
+                            "end": 981,
+                            "loc": {
+                              "start": {
+                                "line": 33,
+                                "column": 39
+                              },
+                              "end": {
+                                "line": 33,
+                                "column": 48
+                              }
+                            },
+                            "properties": [
+                              {
+                                "type": "ObjectProperty",
+                                "start": 974,
+                                "end": 979,
+                                "loc": {
+                                  "start": {
+                                    "line": 33,
+                                    "column": 41
+                                  },
+                                  "end": {
+                                    "line": 33,
+                                    "column": 46
+                                  }
+                                },
+                                "method": false,
+                                "key": {
+                                  "type": "Identifier",
+                                  "start": 974,
+                                  "end": 975,
+                                  "loc": {
+                                    "start": {
+                                      "line": 33,
+                                      "column": 41
+                                    },
+                                    "end": {
+                                      "line": 33,
+                                      "column": 42
+                                    },
+                                    "identifierName": "b"
+                                  },
+                                  "name": "b"
+                                },
+                                "computed": false,
+                                "shorthand": false,
+                                "value": {
+                                  "type": "NumericLiteral",
+                                  "start": 977,
+                                  "end": 979,
+                                  "loc": {
+                                    "start": {
+                                      "line": 33,
+                                      "column": 44
+                                    },
+                                    "end": {
+                                      "line": 33,
+                                      "column": 46
+                                    }
+                                  },
+                                  "extra": {
+                                    "rawValue": 42,
+                                    "raw": "42"
+                                  },
+                                  "value": 42
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 989,
+                "end": 994,
+                "loc": {
+                  "start": {
+                    "line": 33,
+                    "column": 56
+                  },
+                  "end": {
+                    "line": 33,
+                    "column": 61
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 989,
+                  "end": 994,
+                  "loc": {
+                    "start": {
+                      "line": 33,
+                      "column": 56
+                    },
+                    "end": {
+                      "line": 33,
+                      "column": 61
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 997,
+        "end": 1017,
+        "loc": {
+          "start": {
+            "line": 35,
+            "column": 0
+          },
+          "end": {
+            "line": 35,
+            "column": 20
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 1001,
+            "end": 1016,
+            "loc": {
+              "start": {
+                "line": 35,
+                "column": 4
+              },
+              "end": {
+                "line": 35,
+                "column": 19
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 1001,
+              "end": 1003,
+              "loc": {
+                "start": {
+                  "line": 35,
+                  "column": 4
+                },
+                "end": {
+                  "line": 35,
+                  "column": 6
+                },
+                "identifierName": "q1"
+              },
+              "name": "q1"
+            },
+            "init": {
+              "type": "TSTypeAssertion",
+              "start": 1006,
+              "end": 1016,
+              "loc": {
+                "start": {
+                  "line": 35,
+                  "column": 9
+                },
+                "end": {
+                  "line": 35,
+                  "column": 19
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 1007,
+                "end": 1012,
+                "loc": {
+                  "start": {
+                    "line": 35,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 35,
+                    "column": 15
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 1007,
+                  "end": 1012,
+                  "loc": {
+                    "start": {
+                      "line": 35,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 35,
+                      "column": 15
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              },
+              "expression": {
+                "type": "NumericLiteral",
+                "start": 1014,
+                "end": 1016,
+                "loc": {
+                  "start": {
+                    "line": 35,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 35,
+                    "column": 19
+                  }
+                },
+                "extra": {
+                  "rawValue": 10,
+                  "raw": "10"
+                },
+                "value": 10
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 1018,
+        "end": 1041,
+        "loc": {
+          "start": {
+            "line": 36,
+            "column": 0
+          },
+          "end": {
+            "line": 36,
+            "column": 23
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 1022,
+            "end": 1040,
+            "loc": {
+              "start": {
+                "line": 36,
+                "column": 4
+              },
+              "end": {
+                "line": 36,
+                "column": 22
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 1022,
+              "end": 1024,
+              "loc": {
+                "start": {
+                  "line": 36,
+                  "column": 4
+                },
+                "end": {
+                  "line": 36,
+                  "column": 6
+                },
+                "identifierName": "q2"
+              },
+              "name": "q2"
+            },
+            "init": {
+              "type": "TSTypeAssertion",
+              "start": 1027,
+              "end": 1040,
+              "loc": {
+                "start": {
+                  "line": 36,
+                  "column": 9
+                },
+                "end": {
+                  "line": 36,
+                  "column": 22
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 1028,
+                "end": 1033,
+                "loc": {
+                  "start": {
+                    "line": 36,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 36,
+                    "column": 15
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 1028,
+                  "end": 1033,
+                  "loc": {
+                    "start": {
+                      "line": 36,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 36,
+                      "column": 15
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              },
+              "expression": {
+                "type": "StringLiteral",
+                "start": 1035,
+                "end": 1040,
+                "loc": {
+                  "start": {
+                    "line": 36,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 36,
+                    "column": 22
+                  }
+                },
+                "extra": {
+                  "rawValue": "abc",
+                  "raw": "'abc'"
+                },
+                "value": "abc"
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 1042,
+        "end": 1064,
+        "loc": {
+          "start": {
+            "line": 37,
+            "column": 0
+          },
+          "end": {
+            "line": 37,
+            "column": 22
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 1046,
+            "end": 1063,
+            "loc": {
+              "start": {
+                "line": 37,
+                "column": 4
+              },
+              "end": {
+                "line": 37,
+                "column": 21
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 1046,
+              "end": 1048,
+              "loc": {
+                "start": {
+                  "line": 37,
+                  "column": 4
+                },
+                "end": {
+                  "line": 37,
+                  "column": 6
+                },
+                "identifierName": "q3"
+              },
+              "name": "q3"
+            },
+            "init": {
+              "type": "TSTypeAssertion",
+              "start": 1051,
+              "end": 1063,
+              "loc": {
+                "start": {
+                  "line": 37,
+                  "column": 9
+                },
+                "end": {
+                  "line": 37,
+                  "column": 21
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 1052,
+                "end": 1057,
+                "loc": {
+                  "start": {
+                    "line": 37,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 37,
+                    "column": 15
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 1052,
+                  "end": 1057,
+                  "loc": {
+                    "start": {
+                      "line": 37,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 37,
+                      "column": 15
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              },
+              "expression": {
+                "type": "BooleanLiteral",
+                "start": 1059,
+                "end": 1063,
+                "loc": {
+                  "start": {
+                    "line": 37,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 37,
+                    "column": 21
+                  }
+                },
+                "value": true
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 1065,
+        "end": 1092,
+        "loc": {
+          "start": {
+            "line": 38,
+            "column": 0
+          },
+          "end": {
+            "line": 38,
+            "column": 27
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 1069,
+            "end": 1091,
+            "loc": {
+              "start": {
+                "line": 38,
+                "column": 4
+              },
+              "end": {
+                "line": 38,
+                "column": 26
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 1069,
+              "end": 1071,
+              "loc": {
+                "start": {
+                  "line": 38,
+                  "column": 4
+                },
+                "end": {
+                  "line": 38,
+                  "column": 6
+                },
+                "identifierName": "q4"
+              },
+              "name": "q4"
+            },
+            "init": {
+              "type": "TSTypeAssertion",
+              "start": 1074,
+              "end": 1091,
+              "loc": {
+                "start": {
+                  "line": 38,
+                  "column": 9
+                },
+                "end": {
+                  "line": 38,
+                  "column": 26
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 1075,
+                "end": 1080,
+                "loc": {
+                  "start": {
+                    "line": 38,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 38,
+                    "column": 15
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 1075,
+                  "end": 1080,
+                  "loc": {
+                    "start": {
+                      "line": 38,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 38,
+                      "column": 15
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              },
+              "expression": {
+                "type": "ArrayExpression",
+                "start": 1082,
+                "end": 1091,
+                "loc": {
+                  "start": {
+                    "line": 38,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 38,
+                    "column": 26
+                  }
+                },
+                "elements": [
+                  {
+                    "type": "NumericLiteral",
+                    "start": 1083,
+                    "end": 1084,
+                    "loc": {
+                      "start": {
+                        "line": 38,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 38,
+                        "column": 19
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 1,
+                      "raw": "1"
+                    },
+                    "value": 1
+                  },
+                  {
+                    "type": "NumericLiteral",
+                    "start": 1086,
+                    "end": 1087,
+                    "loc": {
+                      "start": {
+                        "line": 38,
+                        "column": 21
+                      },
+                      "end": {
+                        "line": 38,
+                        "column": 22
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 2,
+                      "raw": "2"
+                    },
+                    "value": 2
+                  },
+                  {
+                    "type": "NumericLiteral",
+                    "start": 1089,
+                    "end": 1090,
+                    "loc": {
+                      "start": {
+                        "line": 38,
+                        "column": 24
+                      },
+                      "end": {
+                        "line": 38,
+                        "column": 25
+                      }
+                    },
+                    "extra": {
+                      "rawValue": 3,
+                      "raw": "3"
+                    },
+                    "value": 3
+                  }
+                ]
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 1093,
+        "end": 1127,
+        "loc": {
+          "start": {
+            "line": 39,
+            "column": 0
+          },
+          "end": {
+            "line": 39,
+            "column": 34
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 1097,
+            "end": 1126,
+            "loc": {
+              "start": {
+                "line": 39,
+                "column": 4
+              },
+              "end": {
+                "line": 39,
+                "column": 33
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 1097,
+              "end": 1099,
+              "loc": {
+                "start": {
+                  "line": 39,
+                  "column": 4
+                },
+                "end": {
+                  "line": 39,
+                  "column": 6
+                },
+                "identifierName": "q5"
+              },
+              "name": "q5"
+            },
+            "init": {
+              "type": "TSTypeAssertion",
+              "start": 1102,
+              "end": 1126,
+              "loc": {
+                "start": {
+                  "line": 39,
+                  "column": 9
+                },
+                "end": {
+                  "line": 39,
+                  "column": 33
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTypeReference",
+                "start": 1103,
+                "end": 1108,
+                "loc": {
+                  "start": {
+                    "line": 39,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 39,
+                    "column": 15
+                  }
+                },
+                "typeName": {
+                  "type": "Identifier",
+                  "start": 1103,
+                  "end": 1108,
+                  "loc": {
+                    "start": {
+                      "line": 39,
+                      "column": 10
+                    },
+                    "end": {
+                      "line": 39,
+                      "column": 15
+                    },
+                    "identifierName": "const"
+                  },
+                  "name": "const"
+                }
+              },
+              "expression": {
+                "type": "ObjectExpression",
+                "start": 1110,
+                "end": 1126,
+                "loc": {
+                  "start": {
+                    "line": 39,
+                    "column": 17
+                  },
+                  "end": {
+                    "line": 39,
+                    "column": 33
+                  }
+                },
+                "properties": [
+                  {
+                    "type": "ObjectProperty",
+                    "start": 1112,
+                    "end": 1117,
+                    "loc": {
+                      "start": {
+                        "line": 39,
+                        "column": 19
+                      },
+                      "end": {
+                        "line": 39,
+                        "column": 24
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 1112,
+                      "end": 1113,
+                      "loc": {
+                        "start": {
+                          "line": 39,
+                          "column": 19
+                        },
+                        "end": {
+                          "line": 39,
+                          "column": 20
+                        },
+                        "identifierName": "x"
+                      },
+                      "name": "x"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 1115,
+                      "end": 1117,
+                      "loc": {
+                        "start": {
+                          "line": 39,
+                          "column": 22
+                        },
+                        "end": {
+                          "line": 39,
+                          "column": 24
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 10,
+                        "raw": "10"
+                      },
+                      "value": 10
+                    }
+                  },
+                  {
+                    "type": "ObjectProperty",
+                    "start": 1119,
+                    "end": 1124,
+                    "loc": {
+                      "start": {
+                        "line": 39,
+                        "column": 26
+                      },
+                      "end": {
+                        "line": 39,
+                        "column": 31
+                      }
+                    },
+                    "method": false,
+                    "key": {
+                      "type": "Identifier",
+                      "start": 1119,
+                      "end": 1120,
+                      "loc": {
+                        "start": {
+                          "line": 39,
+                          "column": 26
+                        },
+                        "end": {
+                          "line": 39,
+                          "column": 27
+                        },
+                        "identifierName": "y"
+                      },
+                      "name": "y"
+                    },
+                    "computed": false,
+                    "shorthand": false,
+                    "value": {
+                      "type": "NumericLiteral",
+                      "start": 1122,
+                      "end": 1124,
+                      "loc": {
+                        "start": {
+                          "line": 39,
+                          "column": 29
+                        },
+                        "end": {
+                          "line": 39,
+                          "column": 31
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 20,
+                        "raw": "20"
+                      },
+                      "value": 20
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " Copied over from TypeScript's test case",
+      "start": 0,
+      "end": 42,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 42
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " https://github.com/Microsoft/TypeScript/blob/master/tests/baselines/reference/constAssertions.js",
+      "start": 43,
+      "end": 142,
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 0
+        },
+        "end": {
+          "line": 2,
+          "column": 99
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " Error",
+      "start": 813,
+      "end": 821,
+      "loc": {
+        "start": {
+          "line": 26,
+          "column": 53
+        },
+        "end": {
+          "line": 26,
+          "column": 61
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/as/input.js b/packages/babel-parser/test/fixtures/typescript/cast/as/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/as/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/as/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/assert-and-assign/input.js b/packages/babel-parser/test/fixtures/typescript/cast/assert-and-assign/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/assert-and-assign/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/assert-and-assign/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/false-positive/input.js b/packages/babel-parser/test/fixtures/typescript/cast/false-positive/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/false-positive/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/false-positive/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/multiple-assert-and-assign/input.js b/packages/babel-parser/test/fixtures/typescript/cast/multiple-assert-and-assign/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/multiple-assert-and-assign/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/multiple-assert-and-assign/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/input.js b/packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/output.json b/packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/output.json
index 8895830ae739..bb02e0d6956a 100644
--- a/packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/cast/need-parentheses/output.json
@@ -59,12 +59,12 @@
           },
           "object": {
             "type": "TSTypeAssertion",
-            "start": 2,
+            "start": 1,
             "end": 6,
             "loc": {
               "start": {
                 "line": 1,
-                "column": 2
+                "column": 1
               },
               "end": {
                 "line": 1,
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-2/input.js b/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-2/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/null-assertion-2/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/null-assertion-2/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-3/input.js b/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-3/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/null-assertion-3/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/null-assertion-3/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign-2/input.js b/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign-2/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign-2/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign-2/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign/input.js b/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/null-assertion-and-assign/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-false-positive/input.js b/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-false-positive/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/null-assertion-false-positive/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/null-assertion-false-positive/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-then-property-access/input.js b/packages/babel-parser/test/fixtures/typescript/cast/null-assertion-then-property-access/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/null-assertion-then-property-access/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/null-assertion-then-property-access/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/null-assertion/input.js b/packages/babel-parser/test/fixtures/typescript/cast/null-assertion/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/null-assertion/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/null-assertion/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/input.js b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/output.json b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/output.json
index 8f2d74a4e5fa..f8020782bcc6 100644
--- a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-after-operator/output.json
@@ -80,12 +80,12 @@
           "operator": "+",
           "right": {
             "type": "TSTypeAssertion",
-            "start": 5,
+            "start": 4,
             "end": 14,
             "loc": {
               "start": {
                 "line": 1,
-                "column": 5
+                "column": 4
               },
               "end": {
                 "line": 1,
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/input.js b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/output.json b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/output.json
index 84ad7e4d64d0..964e552cfc5f 100644
--- a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-and-assign/output.json
@@ -60,12 +60,12 @@
           "operator": "+=",
           "left": {
             "type": "TSTypeAssertion",
-            "start": 2,
+            "start": 1,
             "end": 11,
             "loc": {
               "start": {
                 "line": 1,
-                "column": 2
+                "column": 1
               },
               "end": {
                 "line": 1,
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/input.js b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/output.json b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/output.json
index 1599d9ec1425..34f750336a37 100644
--- a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion-before-operator/output.json
@@ -59,12 +59,12 @@
           },
           "left": {
             "type": "TSTypeAssertion",
-            "start": 1,
+            "start": 0,
             "end": 10,
             "loc": {
               "start": {
                 "line": 1,
-                "column": 1
+                "column": 0
               },
               "end": {
                 "line": 1,
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion/input.js b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/cast/type-assertion/input.js
rename to packages/babel-parser/test/fixtures/typescript/cast/type-assertion/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion/output.json b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion/output.json
index 5d5a05d21acf..0da048e7ef02 100644
--- a/packages/babel-parser/test/fixtures/typescript/cast/type-assertion/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/cast/type-assertion/output.json
@@ -45,12 +45,12 @@
         },
         "expression": {
           "type": "TSTypeAssertion",
-          "start": 1,
+          "start": 0,
           "end": 10,
           "loc": {
             "start": {
               "line": 1,
-              "column": 1
+              "column": 0
             },
             "end": {
               "line": 1,
diff --git a/packages/babel-parser/test/fixtures/typescript/class/abstract-false-positive/input.js b/packages/babel-parser/test/fixtures/typescript/class/abstract-false-positive/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/abstract-false-positive/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/abstract-false-positive/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/abstract-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/class/abstract-new-line/input.ts
new file mode 100644
index 000000000000..7c56988be397
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/abstract-new-line/input.ts
@@ -0,0 +1,2 @@
+abstract
+class B {}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/abstract-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/class/abstract-new-line/output.json
new file mode 100644
index 000000000000..08760bb11d2b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/abstract-new-line/output.json
@@ -0,0 +1,116 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 8,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 8
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            },
+            "identifierName": "abstract"
+          },
+          "name": "abstract"
+        }
+      },
+      {
+        "type": "ClassDeclaration",
+        "start": 9,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 10
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 15,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 7
+            },
+            "identifierName": "B"
+          },
+          "name": "B"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 17,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 8
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/class/abstract/input.js b/packages/babel-parser/test/fixtures/typescript/class/abstract/input.js
deleted file mode 100644
index c0a5ad4b67a7..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/class/abstract/input.js
+++ /dev/null
@@ -1,7 +0,0 @@
-abstract class C {}
-declare abstract class C {}
-export abstract class C {}
-// `export abstract class {}` is not valid TypeScript.
-export default abstract class { }
-export default abstract class C { }
-// `abstract class` is not valid as an expression.
diff --git a/packages/babel-parser/test/fixtures/typescript/class/abstract/input.ts b/packages/babel-parser/test/fixtures/typescript/class/abstract/input.ts
new file mode 100644
index 000000000000..33cc20fa9113
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/abstract/input.ts
@@ -0,0 +1,7 @@
+abstract class C1 {}
+declare abstract class C2 {}
+export abstract class C3 {}
+// `export abstract class {}` is not valid TypeScript.
+export default abstract class { }
+export default abstract class C4 { }
+// `abstract class` is not valid as an expression.
diff --git a/packages/babel-parser/test/fixtures/typescript/class/abstract/output.json b/packages/babel-parser/test/fixtures/typescript/class/abstract/output.json
index 2a025f917fc0..779c334d8f43 100644
--- a/packages/babel-parser/test/fixtures/typescript/class/abstract/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/class/abstract/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 250,
+  "end": 254,
   "loc": {
     "start": {
       "line": 1,
@@ -15,7 +15,7 @@
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 250,
+    "end": 254,
     "loc": {
       "start": {
         "line": 1,
@@ -32,7 +32,7 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 19,
+        "end": 20,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 19
+            "column": 20
           }
         },
         "abstract": true,
         "id": {
           "type": "Identifier",
           "start": 15,
-          "end": 16,
+          "end": 17,
           "loc": {
             "start": {
               "line": 1,
@@ -55,25 +55,25 @@
             },
             "end": {
               "line": 1,
-              "column": 16
+              "column": 17
             },
-            "identifierName": "C"
+            "identifierName": "C1"
           },
-          "name": "C"
+          "name": "C1"
         },
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 17,
-          "end": 19,
+          "start": 18,
+          "end": 20,
           "loc": {
             "start": {
               "line": 1,
-              "column": 17
+              "column": 18
             },
             "end": {
               "line": 1,
-              "column": 19
+              "column": 20
             }
           },
           "body": []
@@ -81,8 +81,8 @@
       },
       {
         "type": "ClassDeclaration",
-        "start": 20,
-        "end": 47,
+        "start": 21,
+        "end": 49,
         "loc": {
           "start": {
             "line": 2,
@@ -90,14 +90,14 @@
           },
           "end": {
             "line": 2,
-            "column": 27
+            "column": 28
           }
         },
         "abstract": true,
         "id": {
           "type": "Identifier",
-          "start": 43,
-          "end": 44,
+          "start": 44,
+          "end": 46,
           "loc": {
             "start": {
               "line": 2,
@@ -105,25 +105,25 @@
             },
             "end": {
               "line": 2,
-              "column": 24
+              "column": 25
             },
-            "identifierName": "C"
+            "identifierName": "C2"
           },
-          "name": "C"
+          "name": "C2"
         },
         "superClass": null,
         "body": {
           "type": "ClassBody",
-          "start": 45,
-          "end": 47,
+          "start": 47,
+          "end": 49,
           "loc": {
             "start": {
               "line": 2,
-              "column": 25
+              "column": 26
             },
             "end": {
               "line": 2,
-              "column": 27
+              "column": 28
             }
           },
           "body": []
@@ -132,8 +132,8 @@
       },
       {
         "type": "ExportNamedDeclaration",
-        "start": 48,
-        "end": 74,
+        "start": 50,
+        "end": 77,
         "loc": {
           "start": {
             "line": 3,
@@ -141,15 +141,15 @@
           },
           "end": {
             "line": 3,
-            "column": 26
+            "column": 27
           }
         },
         "specifiers": [],
         "source": null,
         "declaration": {
           "type": "ClassDeclaration",
-          "start": 55,
-          "end": 74,
+          "start": 57,
+          "end": 77,
           "loc": {
             "start": {
               "line": 3,
@@ -157,14 +157,14 @@
             },
             "end": {
               "line": 3,
-              "column": 26
+              "column": 27
             }
           },
           "abstract": true,
           "id": {
             "type": "Identifier",
-            "start": 70,
-            "end": 71,
+            "start": 72,
+            "end": 74,
             "loc": {
               "start": {
                 "line": 3,
@@ -172,25 +172,25 @@
               },
               "end": {
                 "line": 3,
-                "column": 23
+                "column": 24
               },
-              "identifierName": "C"
+              "identifierName": "C3"
             },
-            "name": "C"
+            "name": "C3"
           },
           "superClass": null,
           "body": {
             "type": "ClassBody",
-            "start": 72,
-            "end": 74,
+            "start": 75,
+            "end": 77,
             "loc": {
               "start": {
                 "line": 3,
-                "column": 24
+                "column": 25
               },
               "end": {
                 "line": 3,
-                "column": 26
+                "column": 27
               }
             },
             "body": []
@@ -200,8 +200,8 @@
           {
             "type": "CommentLine",
             "value": " `export abstract class {}` is not valid TypeScript.",
-            "start": 75,
-            "end": 129,
+            "start": 78,
+            "end": 132,
             "loc": {
               "start": {
                 "line": 4,
@@ -217,8 +217,8 @@
       },
       {
         "type": "ExportDefaultDeclaration",
-        "start": 130,
-        "end": 163,
+        "start": 133,
+        "end": 166,
         "loc": {
           "start": {
             "line": 5,
@@ -231,8 +231,8 @@
         },
         "declaration": {
           "type": "ClassDeclaration",
-          "start": 145,
-          "end": 163,
+          "start": 148,
+          "end": 166,
           "loc": {
             "start": {
               "line": 5,
@@ -247,8 +247,8 @@
           "superClass": null,
           "body": {
             "type": "ClassBody",
-            "start": 160,
-            "end": 163,
+            "start": 163,
+            "end": 166,
             "loc": {
               "start": {
                 "line": 5,
@@ -267,8 +267,8 @@
           {
             "type": "CommentLine",
             "value": " `export abstract class {}` is not valid TypeScript.",
-            "start": 75,
-            "end": 129,
+            "start": 78,
+            "end": 132,
             "loc": {
               "start": {
                 "line": 4,
@@ -284,8 +284,8 @@
       },
       {
         "type": "ExportDefaultDeclaration",
-        "start": 164,
-        "end": 199,
+        "start": 167,
+        "end": 203,
         "loc": {
           "start": {
             "line": 6,
@@ -293,13 +293,13 @@
           },
           "end": {
             "line": 6,
-            "column": 35
+            "column": 36
           }
         },
         "declaration": {
           "type": "ClassDeclaration",
-          "start": 179,
-          "end": 199,
+          "start": 182,
+          "end": 203,
           "loc": {
             "start": {
               "line": 6,
@@ -307,13 +307,13 @@
             },
             "end": {
               "line": 6,
-              "column": 35
+              "column": 36
             }
           },
           "id": {
             "type": "Identifier",
-            "start": 194,
-            "end": 195,
+            "start": 197,
+            "end": 199,
             "loc": {
               "start": {
                 "line": 6,
@@ -321,25 +321,25 @@
               },
               "end": {
                 "line": 6,
-                "column": 31
+                "column": 32
               },
-              "identifierName": "C"
+              "identifierName": "C4"
             },
-            "name": "C"
+            "name": "C4"
           },
           "superClass": null,
           "body": {
             "type": "ClassBody",
-            "start": 196,
-            "end": 199,
+            "start": 200,
+            "end": 203,
             "loc": {
               "start": {
                 "line": 6,
-                "column": 32
+                "column": 33
               },
               "end": {
                 "line": 6,
-                "column": 35
+                "column": 36
               }
             },
             "body": []
@@ -350,8 +350,8 @@
           {
             "type": "CommentLine",
             "value": " `abstract class` is not valid as an expression.",
-            "start": 200,
-            "end": 250,
+            "start": 204,
+            "end": 254,
             "loc": {
               "start": {
                 "line": 7,
@@ -372,8 +372,8 @@
     {
       "type": "CommentLine",
       "value": " `export abstract class {}` is not valid TypeScript.",
-      "start": 75,
-      "end": 129,
+      "start": 78,
+      "end": 132,
       "loc": {
         "start": {
           "line": 4,
@@ -388,8 +388,8 @@
     {
       "type": "CommentLine",
       "value": " `abstract class` is not valid as an expression.",
-      "start": 200,
-      "end": 250,
+      "start": 204,
+      "end": 254,
       "loc": {
         "start": {
           "line": 7,
diff --git a/packages/babel-parser/test/fixtures/typescript/class/constructor-with-modifier-names/input.js b/packages/babel-parser/test/fixtures/typescript/class/constructor-with-modifier-names/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/constructor-with-modifier-names/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/constructor-with-modifier-names/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/constructor/input.js b/packages/babel-parser/test/fixtures/typescript/class/constructor/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/constructor/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/constructor/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/declare-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/class/declare-new-line/input.ts
new file mode 100644
index 000000000000..2710f781ffdb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/declare-new-line/input.ts
@@ -0,0 +1,2 @@
+declare
+class B {}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/declare-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/class/declare-new-line/output.json
new file mode 100644
index 000000000000..764a3d2f7efa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/declare-new-line/output.json
@@ -0,0 +1,116 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "declare"
+          },
+          "name": "declare"
+        }
+      },
+      {
+        "type": "ClassDeclaration",
+        "start": 8,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 10
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 14,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 7
+            },
+            "identifierName": "B"
+          },
+          "name": "B"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 16,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 8
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/class/declare/input.js b/packages/babel-parser/test/fixtures/typescript/class/declare/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/declare/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/declare/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/declare/output.json b/packages/babel-parser/test/fixtures/typescript/class/declare/output.json
index 9c183f96b858..f52b40639e43 100644
--- a/packages/babel-parser/test/fixtures/typescript/class/declare/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/class/declare/output.json
@@ -94,7 +94,7 @@
                 {
                   "type": "Identifier",
                   "start": 23,
-                  "end": 24,
+                  "end": 32,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -102,19 +102,19 @@
                     },
                     "end": {
                       "line": 2,
-                      "column": 6
+                      "column": 14
                     },
                     "identifierName": "x"
                   },
                   "name": "x",
                   "typeAnnotation": {
                     "type": "TSTypeAnnotation",
-                    "start": 26,
+                    "start": 24,
                     "end": 32,
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 8
+                        "column": 6
                       },
                       "end": {
                         "line": 2,
diff --git a/packages/babel-parser/test/fixtures/typescript/class/expression-extends-implements/input.js b/packages/babel-parser/test/fixtures/typescript/class/expression-extends-implements/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/expression-extends-implements/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/expression-extends-implements/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/expression-extends/input.js b/packages/babel-parser/test/fixtures/typescript/class/expression-extends/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/expression-extends/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/expression-extends/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/expression-generic/input.js b/packages/babel-parser/test/fixtures/typescript/class/expression-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/expression-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/expression-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/expression-implements/input.js b/packages/babel-parser/test/fixtures/typescript/class/expression-implements/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/expression-implements/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/expression-implements/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/extends-empty/input.ts b/packages/babel-parser/test/fixtures/typescript/class/extends-empty/input.ts
new file mode 100644
index 000000000000..8b826e7919db
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/extends-empty/input.ts
@@ -0,0 +1,2 @@
+interface foo extends {
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/extends-empty/options.json b/packages/babel-parser/test/fixtures/typescript/class/extends-empty/options.json
new file mode 100644
index 000000000000..3de0ab8596c4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/extends-empty/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'extends' list cannot be empty. (1:22)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/extends-implements-empty/input.ts b/packages/babel-parser/test/fixtures/typescript/class/extends-implements-empty/input.ts
new file mode 100644
index 000000000000..aa9ed6dca28c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/extends-implements-empty/input.ts
@@ -0,0 +1,2 @@
+class Foo extends Bar implements {
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/extends-implements-empty/options.json b/packages/babel-parser/test/fixtures/typescript/class/extends-implements-empty/options.json
new file mode 100644
index 000000000000..950506446835
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/extends-implements-empty/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'implements' list cannot be empty. (1:33)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/extends-implements/input.js b/packages/babel-parser/test/fixtures/typescript/class/extends-implements/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/extends-implements/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/extends-implements/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/extends/input.js b/packages/babel-parser/test/fixtures/typescript/class/extends/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/extends/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/extends/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/generic/input.js b/packages/babel-parser/test/fixtures/typescript/class/generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/get-generic/input.js b/packages/babel-parser/test/fixtures/typescript/class/get-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/get-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/get-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/implements-empty/input.ts b/packages/babel-parser/test/fixtures/typescript/class/implements-empty/input.ts
new file mode 100644
index 000000000000..f72f480995bd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/implements-empty/input.ts
@@ -0,0 +1,2 @@
+class Foo implements {
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/implements-empty/options.json b/packages/babel-parser/test/fixtures/typescript/class/implements-empty/options.json
new file mode 100644
index 000000000000..6751fbcc5443
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/implements-empty/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "'implements' list cannot be empty. (1:21)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/implements/input.js b/packages/babel-parser/test/fixtures/typescript/class/implements/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/implements/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/implements/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/index-signature/input.js b/packages/babel-parser/test/fixtures/typescript/class/index-signature/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/index-signature/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/index-signature/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/index-signature/output.json b/packages/babel-parser/test/fixtures/typescript/class/index-signature/output.json
index 64364c101560..b1b3fd1a3517 100644
--- a/packages/babel-parser/test/fixtures/typescript/class/index-signature/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/class/index-signature/output.json
@@ -94,7 +94,7 @@
                 {
                   "type": "Identifier",
                   "start": 15,
-                  "end": 16,
+                  "end": 24,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -102,19 +102,19 @@
                     },
                     "end": {
                       "line": 2,
-                      "column": 6
+                      "column": 14
                     },
                     "identifierName": "x"
                   },
                   "name": "x",
                   "typeAnnotation": {
                     "type": "TSTypeAnnotation",
-                    "start": 18,
+                    "start": 16,
                     "end": 24,
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 8
+                        "column": 6
                       },
                       "end": {
                         "line": 2,
@@ -189,7 +189,7 @@
                 {
                   "type": "Identifier",
                   "start": 46,
-                  "end": 47,
+                  "end": 55,
                   "loc": {
                     "start": {
                       "line": 3,
@@ -197,19 +197,19 @@
                     },
                     "end": {
                       "line": 3,
-                      "column": 15
+                      "column": 23
                     },
                     "identifierName": "x"
                   },
                   "name": "x",
                   "typeAnnotation": {
                     "type": "TSTypeAnnotation",
-                    "start": 49,
+                    "start": 47,
                     "end": 55,
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 17
+                        "column": 15
                       },
                       "end": {
                         "line": 3,
diff --git a/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/input.js b/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/input.js
deleted file mode 100644
index cbf422a3838d..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-class C {
-    public(): void;
-    public static(): void;
-    readonly = 0;
-    async<T>(): void;
-}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/input.ts b/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/input.ts
new file mode 100644
index 000000000000..97ead10b46c6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/input.ts
@@ -0,0 +1,7 @@
+class C {
+    public(): void;
+    public static(): void;
+    readonly = 0;
+    async<T>(): void;
+    abstract!:void;
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/output.json b/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/output.json
index 47c282e3984b..bcd481d869bd 100644
--- a/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/class/members-with-modifier-names/output.json
@@ -1,28 +1,28 @@
 {
   "type": "File",
   "start": 0,
-  "end": 98,
+  "end": 118,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 6,
+      "line": 7,
       "column": 1
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 98,
+    "end": 118,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 6,
+        "line": 7,
         "column": 1
       }
     },
@@ -32,14 +32,14 @@
       {
         "type": "ClassDeclaration",
         "start": 0,
-        "end": 98,
+        "end": 118,
         "loc": {
           "start": {
             "line": 1,
             "column": 0
           },
           "end": {
-            "line": 6,
+            "line": 7,
             "column": 1
           }
         },
@@ -64,14 +64,14 @@
         "body": {
           "type": "ClassBody",
           "start": 8,
-          "end": 98,
+          "end": 118,
           "loc": {
             "start": {
               "line": 1,
               "column": 8
             },
             "end": {
-              "line": 6,
+              "line": 7,
               "column": 1
             }
           },
@@ -370,6 +370,72 @@
                   }
                 }
               }
+            },
+            {
+              "type": "ClassProperty",
+              "start": 101,
+              "end": 116,
+              "loc": {
+                "start": {
+                  "line": 6,
+                  "column": 4
+                },
+                "end": {
+                  "line": 6,
+                  "column": 19
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 101,
+                "end": 109,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 12
+                  },
+                  "identifierName": "abstract"
+                },
+                "name": "abstract"
+              },
+              "computed": false,
+              "definite": true,
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 110,
+                "end": 115,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 18
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSVoidKeyword",
+                  "start": 111,
+                  "end": 115,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 14
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 18
+                    }
+                  }
+                }
+              },
+              "value": null
             }
           ]
         }
diff --git a/packages/babel-parser/test/fixtures/typescript/class/members-with-reserved-names/input.js b/packages/babel-parser/test/fixtures/typescript/class/members-with-reserved-names/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/members-with-reserved-names/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/members-with-reserved-names/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-computed/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-computed/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-computed/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-computed/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-generic/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-no-body/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-no-body/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-no-body/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-no-body/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-optional/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-optional/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-optional/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-optional/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-readonly/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-readonly/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-readonly/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-readonly/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-return-type/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-return-type/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-return-type/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-return-type/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-with-newline-with-body/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-with-newline-with-body/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-with-newline-with-body/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-with-newline-with-body/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/method-with-newline-without-body/input.js b/packages/babel-parser/test/fixtures/typescript/class/method-with-newline-without-body/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/method-with-newline-without-body/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/method-with-newline-without-body/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/modifiers-accessors/input.js b/packages/babel-parser/test/fixtures/typescript/class/modifiers-accessors/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/modifiers-accessors/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/modifiers-accessors/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/modifiers-methods-async/input.js b/packages/babel-parser/test/fixtures/typescript/class/modifiers-methods-async/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/modifiers-methods-async/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/modifiers-methods-async/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/modifiers-properties/input.js b/packages/babel-parser/test/fixtures/typescript/class/modifiers-properties/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/modifiers-properties/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/modifiers-properties/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/input.js b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/options.json b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/options.json
index 63132875c9cc..b84b0421721a 100644
--- a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/options.json
+++ b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-binding-patterns/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "A parameter property may not be declared using a binding pattern. (2:23)"
+  "throws": "A parameter property may not be declared using a binding pattern. (2:16)"
 }
diff --git a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/input.js b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/output.json b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/output.json
index 22072d89e474..a131ac8e6978 100644
--- a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties-with-decorators/output.json
@@ -116,12 +116,12 @@
               "params": [
                 {
                   "type": "TSParameterProperty",
-                  "start": 40,
+                  "start": 31,
                   "end": 49,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 30
+                      "column": 21
                     },
                     "end": {
                       "line": 2,
diff --git a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties/input.js b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/parameter-properties/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/parameter-properties/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties/output.json b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties/output.json
index 8b9473031680..219e2a2a60b7 100644
--- a/packages/babel-parser/test/fixtures/typescript/class/parameter-properties/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/class/parameter-properties/output.json
@@ -116,12 +116,12 @@
               "params": [
                 {
                   "type": "TSParameterProperty",
-                  "start": 44,
+                  "start": 35,
                   "end": 45,
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 17
+                      "column": 8
                     },
                     "end": {
                       "line": 3,
@@ -149,12 +149,12 @@
                 },
                 {
                   "type": "TSParameterProperty",
-                  "start": 62,
+                  "start": 55,
                   "end": 72,
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 15
+                      "column": 8
                     },
                     "end": {
                       "line": 4,
@@ -212,12 +212,12 @@
                 },
                 {
                   "type": "TSParameterProperty",
-                  "start": 92,
+                  "start": 82,
                   "end": 95,
                   "loc": {
                     "start": {
                       "line": 5,
-                      "column": 18
+                      "column": 8
                     },
                     "end": {
                       "line": 5,
@@ -246,12 +246,12 @@
                 },
                 {
                   "type": "TSParameterProperty",
-                  "start": 113,
+                  "start": 105,
                   "end": 124,
                   "loc": {
                     "start": {
                       "line": 6,
-                      "column": 16
+                      "column": 8
                     },
                     "end": {
                       "line": 6,
@@ -310,12 +310,12 @@
                 },
                 {
                   "type": "TSParameterProperty",
-                  "start": 150,
+                  "start": 134,
                   "end": 153,
                   "loc": {
                     "start": {
                       "line": 7,
-                      "column": 24
+                      "column": 8
                     },
                     "end": {
                       "line": 7,
@@ -344,12 +344,12 @@
                 },
                 {
                   "type": "TSParameterProperty",
-                  "start": 215,
+                  "start": 206,
                   "end": 220,
                   "loc": {
                     "start": {
                       "line": 9,
-                      "column": 17
+                      "column": 8
                     },
                     "end": {
                       "line": 9,
@@ -430,12 +430,12 @@
                 },
                 {
                   "type": "TSParameterProperty",
-                  "start": 237,
+                  "start": 230,
                   "end": 251,
                   "loc": {
                     "start": {
                       "line": 10,
-                      "column": 15
+                      "column": 8
                     },
                     "end": {
                       "line": 10,
diff --git a/packages/babel-parser/test/fixtures/typescript/class/predicate-types/input.ts b/packages/babel-parser/test/fixtures/typescript/class/predicate-types/input.ts
new file mode 100644
index 000000000000..5a4be8de8ab7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/predicate-types/input.ts
@@ -0,0 +1,6 @@
+class Foo {
+  isBar(): this is string {
+  }
+  isBaz = (): this is string => {
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/class/predicate-types/output.json b/packages/babel-parser/test/fixtures/typescript/class/predicate-types/output.json
new file mode 100644
index 000000000000..a0f7f5f5f39b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/class/predicate-types/output.json
@@ -0,0 +1,361 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 83,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 6,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 83,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 6,
+        "column": 1
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 83,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 10,
+          "end": 83,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 6,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassMethod",
+              "start": 14,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 3,
+                  "column": 3
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 19,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 7
+                  },
+                  "identifierName": "isBar"
+                },
+                "name": "isBar"
+              },
+              "computed": false,
+              "kind": "method",
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "returnType": {
+                "type": "TSTypeAnnotation",
+                "start": 21,
+                "end": 37,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 25
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTypePredicate",
+                  "start": 23,
+                  "end": 37,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 25
+                    }
+                  },
+                  "parameterName": {
+                    "type": "TSThisType",
+                    "start": 23,
+                    "end": 27,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 15
+                      }
+                    }
+                  },
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "start": 31,
+                    "end": 37,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 19
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 25
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "TSStringKeyword",
+                      "start": 31,
+                      "end": 37,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 19
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 25
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 38,
+                "end": 43,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 26
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 3
+                  }
+                },
+                "body": [],
+                "directives": []
+              }
+            },
+            {
+              "type": "ClassProperty",
+              "start": 46,
+              "end": 81,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 2
+                },
+                "end": {
+                  "line": 5,
+                  "column": 3
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 46,
+                "end": 51,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 7
+                  },
+                  "identifierName": "isBaz"
+                },
+                "name": "isBaz"
+              },
+              "computed": false,
+              "value": {
+                "type": "ArrowFunctionExpression",
+                "start": 54,
+                "end": 81,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 3
+                  }
+                },
+                "returnType": {
+                  "type": "TSTypeAnnotation",
+                  "start": 56,
+                  "end": 72,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 12
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 28
+                    }
+                  },
+                  "typeAnnotation": {
+                    "type": "TSTypePredicate",
+                    "start": 58,
+                    "end": 72,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 28
+                      }
+                    },
+                    "parameterName": {
+                      "type": "TSThisType",
+                      "start": 58,
+                      "end": 62,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 14
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 18
+                        }
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "TSTypeAnnotation",
+                      "start": 66,
+                      "end": 72,
+                      "loc": {
+                        "start": {
+                          "line": 4,
+                          "column": 22
+                        },
+                        "end": {
+                          "line": 4,
+                          "column": 28
+                        }
+                      },
+                      "typeAnnotation": {
+                        "type": "TSStringKeyword",
+                        "start": 66,
+                        "end": 72,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 22
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 28
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "id": null,
+                "generator": false,
+                "async": false,
+                "params": [],
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 76,
+                  "end": 81,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 32
+                    },
+                    "end": {
+                      "line": 5,
+                      "column": 3
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/class/properties/input.js b/packages/babel-parser/test/fixtures/typescript/class/properties/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/properties/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/properties/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/property-computed/input.js b/packages/babel-parser/test/fixtures/typescript/class/property-computed/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/property-computed/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/property-computed/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/property-optional-definite-assignment-not-allowed/input.js b/packages/babel-parser/test/fixtures/typescript/class/property-optional-definite-assignment-not-allowed/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/property-optional-definite-assignment-not-allowed/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/property-optional-definite-assignment-not-allowed/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/class/static/input.js b/packages/babel-parser/test/fixtures/typescript/class/static/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/class/static/input.js
rename to packages/babel-parser/test/fixtures/typescript/class/static/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/const/no-initializer/input.js b/packages/babel-parser/test/fixtures/typescript/const/no-initializer/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/const/no-initializer/input.js
rename to packages/babel-parser/test/fixtures/typescript/const/no-initializer/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/const/reserved-word/input.ts b/packages/babel-parser/test/fixtures/typescript/const/reserved-word/input.ts
new file mode 100644
index 000000000000..4b38ddaddcb3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/const/reserved-word/input.ts
@@ -0,0 +1 @@
+const b: const;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/const/reserved-word/options.json b/packages/babel-parser/test/fixtures/typescript/const/reserved-word/options.json
new file mode 100644
index 000000000000..93db7641c75b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/const/reserved-word/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token (1:9)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/const-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/declare/const-new-line/input.ts
new file mode 100644
index 000000000000..f8d2e9cb8ae9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/const-new-line/input.ts
@@ -0,0 +1,2 @@
+declare
+const x: number, y: string;
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/const-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/declare/const-new-line/output.json
new file mode 100644
index 000000000000..4d58e741f456
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/const-new-line/output.json
@@ -0,0 +1,211 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 35,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 27
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 35,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 27
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "declare"
+          },
+          "name": "declare"
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 8,
+        "end": 35,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 27
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 14,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 6
+              },
+              "end": {
+                "line": 2,
+                "column": 15
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 14,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 6
+                },
+                "end": {
+                  "line": 2,
+                  "column": 15
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 15,
+                "end": 23,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 7
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 15
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSNumberKeyword",
+                  "start": 17,
+                  "end": 23,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 9
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 15
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          },
+          {
+            "type": "VariableDeclarator",
+            "start": 25,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 17
+              },
+              "end": {
+                "line": 2,
+                "column": 26
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 25,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 17
+                },
+                "end": {
+                  "line": 2,
+                  "column": 26
+                },
+                "identifierName": "y"
+              },
+              "name": "y",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 26,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 26
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSStringKeyword",
+                  "start": 28,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 26
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/const/input.js b/packages/babel-parser/test/fixtures/typescript/declare/const/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/declare/const/input.js
rename to packages/babel-parser/test/fixtures/typescript/declare/const/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/destructure-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/declare/destructure-new-line/input.ts
new file mode 100644
index 000000000000..0a7a9c97706c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/destructure-new-line/input.ts
@@ -0,0 +1,2 @@
+declare
+const { x, y }: { x: number, y: number };
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/destructure-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/declare/destructure-new-line/output.json
new file mode 100644
index 000000000000..a4ed43a77f94
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/destructure-new-line/output.json
@@ -0,0 +1,386 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 49,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 41
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 49,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 41
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "declare"
+          },
+          "name": "declare"
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 8,
+        "end": 49,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 41
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 14,
+            "end": 48,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 6
+              },
+              "end": {
+                "line": 2,
+                "column": 40
+              }
+            },
+            "id": {
+              "type": "ObjectPattern",
+              "start": 14,
+              "end": 48,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 6
+                },
+                "end": {
+                  "line": 2,
+                  "column": 40
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 16,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 9
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 16,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 9
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 16,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 9
+                      },
+                      "identifierName": "x"
+                    },
+                    "name": "x"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                },
+                {
+                  "type": "ObjectProperty",
+                  "start": 19,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 12
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 19,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 12
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 19,
+                    "end": 20,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 12
+                      },
+                      "identifierName": "y"
+                    },
+                    "name": "y"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                }
+              ],
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 22,
+                "end": 48,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 40
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTypeLiteral",
+                  "start": 24,
+                  "end": 48,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 16
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 40
+                    }
+                  },
+                  "members": [
+                    {
+                      "type": "TSPropertySignature",
+                      "start": 26,
+                      "end": 36,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 28
+                        }
+                      },
+                      "key": {
+                        "type": "Identifier",
+                        "start": 26,
+                        "end": 27,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 19
+                          },
+                          "identifierName": "x"
+                        },
+                        "name": "x"
+                      },
+                      "computed": false,
+                      "typeAnnotation": {
+                        "type": "TSTypeAnnotation",
+                        "start": 27,
+                        "end": 35,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 19
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 27
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSNumberKeyword",
+                          "start": 29,
+                          "end": 35,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 21
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 27
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "type": "TSPropertySignature",
+                      "start": 37,
+                      "end": 46,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 29
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 38
+                        }
+                      },
+                      "key": {
+                        "type": "Identifier",
+                        "start": 37,
+                        "end": 38,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 29
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 30
+                          },
+                          "identifierName": "y"
+                        },
+                        "name": "y"
+                      },
+                      "computed": false,
+                      "typeAnnotation": {
+                        "type": "TSTypeAnnotation",
+                        "start": 38,
+                        "end": 46,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 30
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 38
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSNumberKeyword",
+                          "start": 40,
+                          "end": 46,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 32
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 38
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/destructure/input.js b/packages/babel-parser/test/fixtures/typescript/declare/destructure/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/declare/destructure/input.js
rename to packages/babel-parser/test/fixtures/typescript/declare/destructure/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/interface-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/declare/interface-new-line/input.ts
new file mode 100644
index 000000000000..ba761fb2190e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/interface-new-line/input.ts
@@ -0,0 +1,2 @@
+declare
+interface I {}
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/interface-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/declare/interface-new-line/output.json
new file mode 100644
index 000000000000..249423eab47e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/interface-new-line/output.json
@@ -0,0 +1,115 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 22,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 22,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "declare"
+          },
+          "name": "declare"
+        }
+      },
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 8,
+        "end": 22,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 18,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "I"
+          },
+          "name": "I"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 20,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/interface/input.js b/packages/babel-parser/test/fixtures/typescript/declare/interface/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/declare/interface/input.js
rename to packages/babel-parser/test/fixtures/typescript/declare/interface/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/let-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/declare/let-new-line/input.ts
new file mode 100644
index 000000000000..900228beaa82
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/let-new-line/input.ts
@@ -0,0 +1,2 @@
+declare
+let x;
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/let-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/declare/let-new-line/output.json
new file mode 100644
index 000000000000..2b7786be2c95
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/let-new-line/output.json
@@ -0,0 +1,118 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "declare"
+          },
+          "name": "declare"
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 8,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 12,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 12,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/let/input.js b/packages/babel-parser/test/fixtures/typescript/declare/let/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/declare/let/input.js
rename to packages/babel-parser/test/fixtures/typescript/declare/let/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/var-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/declare/var-new-line/input.ts
new file mode 100644
index 000000000000..7baf8686e1fd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/var-new-line/input.ts
@@ -0,0 +1,5 @@
+declare
+var x;
+
+declare
+var x: any;
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/var-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/declare/var-new-line/output.json
new file mode 100644
index 000000000000..63eaea000fef
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/declare/var-new-line/output.json
@@ -0,0 +1,231 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 35,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 35,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 11
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "declare"
+          },
+          "name": "declare"
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 8,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 12,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 12,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "x"
+              },
+              "name": "x"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 16,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 16,
+          "end": 23,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 0
+            },
+            "end": {
+              "line": 4,
+              "column": 7
+            },
+            "identifierName": "declare"
+          },
+          "name": "declare"
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 24,
+        "end": 35,
+        "loc": {
+          "start": {
+            "line": 5,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 11
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 28,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 5,
+                "column": 4
+              },
+              "end": {
+                "line": 5,
+                "column": 10
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 28,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 4
+                },
+                "end": {
+                  "line": 5,
+                  "column": 10
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 29,
+                "end": 34,
+                "loc": {
+                  "start": {
+                    "line": 5,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 5,
+                    "column": 10
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSAnyKeyword",
+                  "start": 31,
+                  "end": 34,
+                  "loc": {
+                    "start": {
+                      "line": 5,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 5,
+                      "column": 10
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/declare/var/input.js b/packages/babel-parser/test/fixtures/typescript/declare/var/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/declare/var/input.js
rename to packages/babel-parser/test/fixtures/typescript/declare/var/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/input.ts b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/input.ts
new file mode 100644
index 000000000000..5a4b902e4d80
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/input.ts
@@ -0,0 +1,2 @@
+@decorator<string>
+class Test {}
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/options.json b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/options.json
new file mode 100644
index 000000000000..2ec42ddaf53c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments-invalid/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["typescript", ["decorators", { "decoratorsBeforeExport": true }]],
+  "throws": "Unexpected token, expected \"(\" (2:0)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/input.ts b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/input.ts
new file mode 100644
index 000000000000..cb1c5dd44784
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/input.ts
@@ -0,0 +1,2 @@
+@decorator<string>()
+class Test {}
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/options.json b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/options.json
new file mode 100644
index 000000000000..6e9dea51e823
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["typescript", ["decorators", { "decoratorsBeforeExport": true }]]
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/output.json b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/output.json
new file mode 100644
index 000000000000..91add31ed156
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/decorators/type-arguments/output.json
@@ -0,0 +1,166 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 13
+          }
+        },
+        "decorators": [
+          {
+            "type": "Decorator",
+            "start": 0,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "expression": {
+              "type": "CallExpression",
+              "start": 1,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 1,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "identifierName": "decorator"
+                },
+                "name": "decorator"
+              },
+              "arguments": [],
+              "typeParameters": {
+                "type": "TSTypeParameterInstantiation",
+                "start": 10,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "params": [
+                  {
+                    "type": "TSStringKeyword",
+                    "start": 11,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ],
+        "id": {
+          "type": "Identifier",
+          "start": 27,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            },
+            "identifierName": "Test"
+          },
+          "name": "Test"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 32,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 11
+            },
+            "end": {
+              "line": 2,
+              "column": 13
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/const/input.js b/packages/babel-parser/test/fixtures/typescript/enum/const/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/const/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/const/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/declare-const/input.js b/packages/babel-parser/test/fixtures/typescript/enum/declare-const/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/declare-const/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/declare-const/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/declare/input.js b/packages/babel-parser/test/fixtures/typescript/enum/declare/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/declare/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/declare/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/export-const/input.js b/packages/babel-parser/test/fixtures/typescript/enum/export-const/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/export-const/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/export-const/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/input.js b/packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/output.json b/packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/output.json
index 1e1638d1caf4..d0a529fa2711 100644
--- a/packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/enum/export-declare-const/output.json
@@ -47,12 +47,12 @@
         "source": null,
         "declaration": {
           "type": "TSEnumDeclaration",
-          "start": 15,
+          "start": 7,
           "end": 30,
           "loc": {
             "start": {
               "line": 1,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 1,
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/export/input.js b/packages/babel-parser/test/fixtures/typescript/enum/export/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/export/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/export/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/members-reserved-words/input.js b/packages/babel-parser/test/fixtures/typescript/enum/members-reserved-words/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/members-reserved-words/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/members-reserved-words/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/members-strings/input.js b/packages/babel-parser/test/fixtures/typescript/enum/members-strings/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/members-strings/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/members-strings/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma-with-initializer/input.js b/packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma-with-initializer/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma-with-initializer/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma-with-initializer/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma/input.js b/packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/members-trailing-comma/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/enum/members/input.js b/packages/babel-parser/test/fixtures/typescript/enum/members/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/enum/members/input.js
rename to packages/babel-parser/test/fixtures/typescript/enum/members/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/estree-compat/shorthand-ambient-module/input.js b/packages/babel-parser/test/fixtures/typescript/estree-compat/shorthand-ambient-module/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/estree-compat/shorthand-ambient-module/input.js
rename to packages/babel-parser/test/fixtures/typescript/estree-compat/shorthand-ambient-module/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/export/as-namespace/input.js b/packages/babel-parser/test/fixtures/typescript/export/as-namespace/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/export/as-namespace/input.js
rename to packages/babel-parser/test/fixtures/typescript/export/as-namespace/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/export/declare/input.js b/packages/babel-parser/test/fixtures/typescript/export/declare/input.js
deleted file mode 100644
index 58d3f7937e9e..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/export/declare/input.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export declare const x: number;
-export declare function f(): void;
-export declare class C {}
-export declare interface I {}
-export declare type T = number;
-export declare module M {}
-export declare namespace N {}
diff --git a/packages/babel-parser/test/fixtures/typescript/export/declare/input.ts b/packages/babel-parser/test/fixtures/typescript/export/declare/input.ts
new file mode 100644
index 000000000000..e269282a91de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/export/declare/input.ts
@@ -0,0 +1,8 @@
+export declare const x: number;
+export declare function f(): void;
+export declare class C {}
+export declare interface I {}
+export declare type T = number;
+export declare module M {}
+export declare namespace N {}
+export declare enum foo {}
diff --git a/packages/babel-parser/test/fixtures/typescript/export/declare/output.json b/packages/babel-parser/test/fixtures/typescript/export/declare/output.json
index 5d93c9e8b1c5..bd75590c3bd1 100644
--- a/packages/babel-parser/test/fixtures/typescript/export/declare/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/export/declare/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 211,
+  "end": 238,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 7,
-      "column": 29
+      "line": 8,
+      "column": 26
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 211,
+    "end": 238,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 7,
-        "column": 29
+        "line": 8,
+        "column": 26
       }
     },
     "sourceType": "module",
@@ -47,12 +47,12 @@
         "source": null,
         "declaration": {
           "type": "VariableDeclaration",
-          "start": 15,
+          "start": 7,
           "end": 31,
           "loc": {
             "start": {
               "line": 1,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 1,
@@ -146,12 +146,12 @@
         "source": null,
         "declaration": {
           "type": "TSDeclareFunction",
-          "start": 47,
+          "start": 39,
           "end": 66,
           "loc": {
             "start": {
               "line": 2,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 2,
@@ -229,12 +229,12 @@
         "source": null,
         "declaration": {
           "type": "ClassDeclaration",
-          "start": 82,
+          "start": 74,
           "end": 92,
           "loc": {
             "start": {
               "line": 3,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 3,
@@ -296,12 +296,12 @@
         "source": null,
         "declaration": {
           "type": "TSInterfaceDeclaration",
-          "start": 108,
+          "start": 100,
           "end": 122,
           "loc": {
             "start": {
               "line": 4,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 4,
@@ -362,12 +362,12 @@
         "source": null,
         "declaration": {
           "type": "TSTypeAliasDeclaration",
-          "start": 138,
+          "start": 130,
           "end": 154,
           "loc": {
             "start": {
               "line": 5,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 5,
@@ -427,12 +427,12 @@
         "source": null,
         "declaration": {
           "type": "TSModuleDeclaration",
-          "start": 170,
+          "start": 162,
           "end": 181,
           "loc": {
             "start": {
               "line": 6,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 6,
@@ -493,12 +493,12 @@
         "source": null,
         "declaration": {
           "type": "TSModuleDeclaration",
-          "start": 197,
+          "start": 189,
           "end": 211,
           "loc": {
             "start": {
               "line": 7,
-              "column": 15
+              "column": 7
             },
             "end": {
               "line": 7,
@@ -540,6 +540,57 @@
           },
           "declare": true
         }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 212,
+        "end": 238,
+        "loc": {
+          "start": {
+            "line": 8,
+            "column": 0
+          },
+          "end": {
+            "line": 8,
+            "column": 26
+          }
+        },
+        "specifiers": [],
+        "source": null,
+        "declaration": {
+          "type": "TSEnumDeclaration",
+          "start": 219,
+          "end": 238,
+          "loc": {
+            "start": {
+              "line": 8,
+              "column": 7
+            },
+            "end": {
+              "line": 8,
+              "column": 26
+            }
+          },
+          "id": {
+            "type": "Identifier",
+            "start": 232,
+            "end": 235,
+            "loc": {
+              "start": {
+                "line": 8,
+                "column": 20
+              },
+              "end": {
+                "line": 8,
+                "column": 23
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "members": [],
+          "declare": true
+        }
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/typescript/export/equals/input.js b/packages/babel-parser/test/fixtures/typescript/export/equals/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/export/equals/input.js
rename to packages/babel-parser/test/fixtures/typescript/export/equals/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/export/nested-same-name/input.js b/packages/babel-parser/test/fixtures/typescript/export/nested-same-name/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/export/nested-same-name/input.js
rename to packages/babel-parser/test/fixtures/typescript/export/nested-same-name/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/function/annotated/input.js b/packages/babel-parser/test/fixtures/typescript/function/annotated/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/function/annotated/input.js
rename to packages/babel-parser/test/fixtures/typescript/function/annotated/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/function/anonymous/input.js b/packages/babel-parser/test/fixtures/typescript/function/anonymous/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/function/anonymous/input.js
rename to packages/babel-parser/test/fixtures/typescript/function/anonymous/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/function/declare/input.js b/packages/babel-parser/test/fixtures/typescript/function/declare/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/function/declare/input.js
rename to packages/babel-parser/test/fixtures/typescript/function/declare/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/function/export-default/input.js b/packages/babel-parser/test/fixtures/typescript/function/export-default/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/function/export-default/input.js
rename to packages/babel-parser/test/fixtures/typescript/function/export-default/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/function/getter-setter/input.ts b/packages/babel-parser/test/fixtures/typescript/function/getter-setter/input.ts
new file mode 100644
index 000000000000..2a14042c1f49
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/function/getter-setter/input.ts
@@ -0,0 +1,6 @@
+const g = {
+  get m(this: {}) {}
+};
+const s = {
+  set m(this: {}, value) {}
+};
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/function/getter-setter/output.json b/packages/babel-parser/test/fixtures/typescript/function/getter-setter/output.json
new file mode 100644
index 000000000000..ba424efc68ae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/function/getter-setter/output.json
@@ -0,0 +1,396 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 78,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 6,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 78,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 6,
+        "column": 2
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 35,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 2
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 34,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 3,
+                "column": 1
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "g"
+              },
+              "name": "g"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 10,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 3,
+                  "column": 1
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectMethod",
+                  "start": 14,
+                  "end": 32,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 20
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 18,
+                    "end": 19,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      },
+                      "identifierName": "m"
+                    },
+                    "name": "m"
+                  },
+                  "computed": false,
+                  "kind": "get",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 20,
+                      "end": 28,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 16
+                        },
+                        "identifierName": "this"
+                      },
+                      "name": "this",
+                      "typeAnnotation": {
+                        "type": "TSTypeAnnotation",
+                        "start": 24,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 12
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 16
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeLiteral",
+                          "start": 26,
+                          "end": 28,
+                          "loc": {
+                            "start": {
+                              "line": 2,
+                              "column": 14
+                            },
+                            "end": {
+                              "line": 2,
+                              "column": 16
+                            }
+                          },
+                          "members": []
+                        }
+                      }
+                    }
+                  ],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 30,
+                    "end": 32,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 18
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 20
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "const"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 36,
+        "end": 78,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 2
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 42,
+            "end": 77,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 6
+              },
+              "end": {
+                "line": 6,
+                "column": 1
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 42,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 6
+                },
+                "end": {
+                  "line": 4,
+                  "column": 7
+                },
+                "identifierName": "s"
+              },
+              "name": "s"
+            },
+            "init": {
+              "type": "ObjectExpression",
+              "start": 46,
+              "end": 77,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 10
+                },
+                "end": {
+                  "line": 6,
+                  "column": 1
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectMethod",
+                  "start": 50,
+                  "end": 75,
+                  "loc": {
+                    "start": {
+                      "line": 5,
+                      "column": 2
+                    },
+                    "end": {
+                      "line": 5,
+                      "column": 27
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 54,
+                    "end": 55,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 7
+                      },
+                      "identifierName": "m"
+                    },
+                    "name": "m"
+                  },
+                  "computed": false,
+                  "kind": "set",
+                  "id": null,
+                  "generator": false,
+                  "async": false,
+                  "params": [
+                    {
+                      "type": "Identifier",
+                      "start": 56,
+                      "end": 64,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 16
+                        },
+                        "identifierName": "this"
+                      },
+                      "name": "this",
+                      "typeAnnotation": {
+                        "type": "TSTypeAnnotation",
+                        "start": 60,
+                        "end": 64,
+                        "loc": {
+                          "start": {
+                            "line": 5,
+                            "column": 12
+                          },
+                          "end": {
+                            "line": 5,
+                            "column": 16
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSTypeLiteral",
+                          "start": 62,
+                          "end": 64,
+                          "loc": {
+                            "start": {
+                              "line": 5,
+                              "column": 14
+                            },
+                            "end": {
+                              "line": 5,
+                              "column": 16
+                            }
+                          },
+                          "members": []
+                        }
+                      }
+                    },
+                    {
+                      "type": "Identifier",
+                      "start": 66,
+                      "end": 71,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 18
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 23
+                        },
+                        "identifierName": "value"
+                      },
+                      "name": "value"
+                    }
+                  ],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 73,
+                    "end": 75,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 25
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 27
+                      }
+                    },
+                    "body": [],
+                    "directives": []
+                  }
+                }
+              ]
+            }
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/function/overloads/input.js b/packages/babel-parser/test/fixtures/typescript/function/overloads/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/function/overloads/input.js
rename to packages/babel-parser/test/fixtures/typescript/function/overloads/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/input.js b/packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/input.js
rename to packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/options.json b/packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/options.json
index fd783ce26e13..fb2831d6188b 100644
--- a/packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/options.json
+++ b/packages/babel-parser/test/fixtures/typescript/function/pattern-parameters/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "A binding pattern parameter cannot be optional in an implementation signature. (1:11)"
+  "throws": "A binding pattern parameter cannot be optional in an implementation signature. (1:11)"
 }
diff --git a/packages/babel-parser/test/fixtures/typescript/function/predicate-types/input.js b/packages/babel-parser/test/fixtures/typescript/function/predicate-types/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/function/predicate-types/input.js
rename to packages/babel-parser/test/fixtures/typescript/function/predicate-types/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/import/equals-require/input.js b/packages/babel-parser/test/fixtures/typescript/import/equals-require/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/import/equals-require/input.js
rename to packages/babel-parser/test/fixtures/typescript/import/equals-require/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/import/equals/input.js b/packages/babel-parser/test/fixtures/typescript/import/equals/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/import/equals/input.js
rename to packages/babel-parser/test/fixtures/typescript/import/equals/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/import/export-import-require/input.js b/packages/babel-parser/test/fixtures/typescript/import/export-import-require/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/import/export-import-require/input.js
rename to packages/babel-parser/test/fixtures/typescript/import/export-import-require/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/import/export-import/input.js b/packages/babel-parser/test/fixtures/typescript/import/export-import/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/import/export-import/input.js
rename to packages/babel-parser/test/fixtures/typescript/import/export-import/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/import/not-top-level/input.js b/packages/babel-parser/test/fixtures/typescript/import/not-top-level/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/import/not-top-level/input.js
rename to packages/babel-parser/test/fixtures/typescript/import/not-top-level/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/call-signature/input.js b/packages/babel-parser/test/fixtures/typescript/interface/call-signature/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/call-signature/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/call-signature/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/construct-signature/input.js b/packages/babel-parser/test/fixtures/typescript/interface/construct-signature/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/construct-signature/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/construct-signature/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/export-abstract-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/interface/export-abstract-interface/input.ts
new file mode 100644
index 000000000000..0649b6e082dc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/interface/export-abstract-interface/input.ts
@@ -0,0 +1,3 @@
+export abstract interface I {
+
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/export-abstract-interface/options.json b/packages/babel-parser/test/fixtures/typescript/interface/export-abstract-interface/options.json
new file mode 100644
index 000000000000..e94c31509714
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/interface/export-abstract-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \"class\" (1:16)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/export/input.js b/packages/babel-parser/test/fixtures/typescript/interface/export/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/export/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/export/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/extends/input.js b/packages/babel-parser/test/fixtures/typescript/interface/extends/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/extends/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/extends/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/generic/input.js b/packages/babel-parser/test/fixtures/typescript/interface/generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/index-signature/input.js b/packages/babel-parser/test/fixtures/typescript/interface/index-signature/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/index-signature/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/index-signature/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/index-signature/output.json b/packages/babel-parser/test/fixtures/typescript/interface/index-signature/output.json
index e34dff90a1a2..6a4a98afb573 100644
--- a/packages/babel-parser/test/fixtures/typescript/interface/index-signature/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/interface/index-signature/output.json
@@ -93,7 +93,7 @@
                 {
                   "type": "Identifier",
                   "start": 19,
-                  "end": 20,
+                  "end": 28,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -101,19 +101,19 @@
                     },
                     "end": {
                       "line": 2,
-                      "column": 6
+                      "column": 14
                     },
                     "identifierName": "s"
                   },
                   "name": "s",
                   "typeAnnotation": {
                     "type": "TSTypeAnnotation",
-                    "start": 22,
+                    "start": 20,
                     "end": 28,
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 8
+                        "column": 6
                       },
                       "end": {
                         "line": 2,
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/method-computed/input.js b/packages/babel-parser/test/fixtures/typescript/interface/method-computed/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/method-computed/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/method-computed/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/method-generic/input.js b/packages/babel-parser/test/fixtures/typescript/interface/method-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/method-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/method-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/method-optional/input.js b/packages/babel-parser/test/fixtures/typescript/interface/method-optional/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/method-optional/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/method-optional/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/method-plain/input.js b/packages/babel-parser/test/fixtures/typescript/interface/method-plain/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/method-plain/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/method-plain/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/modifiers/input.js b/packages/babel-parser/test/fixtures/typescript/interface/modifiers/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/modifiers/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/modifiers/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/new-line-error/input.ts b/packages/babel-parser/test/fixtures/typescript/interface/new-line-error/input.ts
new file mode 100644
index 000000000000..707fdd6cfe2c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/interface/new-line-error/input.ts
@@ -0,0 +1,2 @@
+interface
+F {}
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/new-line-error/options.json b/packages/babel-parser/test/fixtures/typescript/interface/new-line-error/options.json
new file mode 100644
index 000000000000..d36d386ca060
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/interface/new-line-error/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (2:2)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/interface/new-line/input.ts
new file mode 100644
index 000000000000..2c77ad6a91ed
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/interface/new-line/input.ts
@@ -0,0 +1,3 @@
+interface
+F
+{}
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/new-line/output.json b/packages/babel-parser/test/fixtures/typescript/interface/new-line/output.json
new file mode 100644
index 000000000000..56e109b261fa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/interface/new-line/output.json
@@ -0,0 +1,116 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 2
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 9,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 9
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            },
+            "identifierName": "interface"
+          },
+          "name": "interface"
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 10,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 1
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 1
+            },
+            "identifierName": "F"
+          },
+          "name": "F"
+        }
+      },
+      {
+        "type": "BlockStatement",
+        "start": 12,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 2
+          }
+        },
+        "body": [],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/properties/input.js b/packages/babel-parser/test/fixtures/typescript/interface/properties/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/properties/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/properties/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/property-computed/input.js b/packages/babel-parser/test/fixtures/typescript/interface/property-computed/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/property-computed/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/property-computed/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/property-named-public/input.js b/packages/babel-parser/test/fixtures/typescript/interface/property-named-public/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/property-named-public/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/property-named-public/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/reserved-method-name/input.js b/packages/babel-parser/test/fixtures/typescript/interface/reserved-method-name/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/reserved-method-name/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/reserved-method-name/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/interface/separators/input.js b/packages/babel-parser/test/fixtures/typescript/interface/separators/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/interface/separators/input.js
rename to packages/babel-parser/test/fixtures/typescript/interface/separators/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/abstract-class/input.js b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/abstract-class/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/decorators/abstract-class/input.js
rename to packages/babel-parser/test/fixtures/typescript/legacy-decorators/abstract-class/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/abstract-class/options.json b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/abstract-class/options.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/decorators/abstract-class/options.json
rename to packages/babel-parser/test/fixtures/typescript/legacy-decorators/abstract-class/options.json
diff --git a/packages/babel-parser/test/fixtures/typescript/decorators/abstract-class/output.json b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/abstract-class/output.json
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/decorators/abstract-class/output.json
rename to packages/babel-parser/test/fixtures/typescript/legacy-decorators/abstract-class/output.json
diff --git a/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/input.ts b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/input.ts
new file mode 100644
index 000000000000..cb1c5dd44784
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/input.ts
@@ -0,0 +1,2 @@
+@decorator<string>()
+class Test {}
diff --git a/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/options.json b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/options.json
new file mode 100644
index 000000000000..b95c143bc24f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["typescript", "decorators-legacy"]
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/output.json b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/output.json
new file mode 100644
index 000000000000..91add31ed156
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/legacy-decorators/type-arguments/output.json
@@ -0,0 +1,166 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 34,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 34,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 34,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 13
+          }
+        },
+        "decorators": [
+          {
+            "type": "Decorator",
+            "start": 0,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 20
+              }
+            },
+            "expression": {
+              "type": "CallExpression",
+              "start": 1,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 1,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 1
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "identifierName": "decorator"
+                },
+                "name": "decorator"
+              },
+              "arguments": [],
+              "typeParameters": {
+                "type": "TSTypeParameterInstantiation",
+                "start": 10,
+                "end": 18,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 18
+                  }
+                },
+                "params": [
+                  {
+                    "type": "TSStringKeyword",
+                    "start": 11,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ],
+        "id": {
+          "type": "Identifier",
+          "start": 27,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            },
+            "identifierName": "Test"
+          },
+          "name": "Test"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 32,
+          "end": 34,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 11
+            },
+            "end": {
+              "line": 2,
+              "column": 13
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/body-declare/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/body-declare/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/body-declare/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/body-declare/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested-declare/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested-declare/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested-declare/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested-declare/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/body-nested/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/body/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/body/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/body/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/body/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/declare-shorthand/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/declare-shorthand/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/declare-shorthand/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/declare-shorthand/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/global-in-module/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/global-in-module/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/global-in-module/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/global-in-module/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/head-declare/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/head-declare/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/head-declare/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/head-declare/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/head-export/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/head-export/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/head-export/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/head-export/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/head/input.js b/packages/babel-parser/test/fixtures/typescript/module-namespace/head/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/module-namespace/head/input.js
rename to packages/babel-parser/test/fixtures/typescript/module-namespace/head/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line-error/input.ts b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line-error/input.ts
new file mode 100644
index 000000000000..999e730ad0a2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line-error/input.ts
@@ -0,0 +1,2 @@
+module
+Foo {}
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line-error/options.json b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line-error/options.json
new file mode 100644
index 000000000000..cd6a9c1b1a0a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line-error/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line/input.ts
new file mode 100644
index 000000000000..f3a399f41cb7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line/input.ts
@@ -0,0 +1,3 @@
+module
+Foo
+{}
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line/output.json
new file mode 100644
index 000000000000..bee3b058a55a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/module-new-line/output.json
@@ -0,0 +1,116 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 2
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "module"
+          },
+          "name": "module"
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 7,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 7,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 3
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        }
+      },
+      {
+        "type": "BlockStatement",
+        "start": 11,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 2
+          }
+        },
+        "body": [],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line-error/input.ts b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line-error/input.ts
new file mode 100644
index 000000000000..20f300ac2e1a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line-error/input.ts
@@ -0,0 +1,2 @@
+namespace
+Foo {}
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line-error/options.json b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line-error/options.json
new file mode 100644
index 000000000000..cd6a9c1b1a0a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line-error/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Unexpected token, expected \";\" (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line/input.ts
new file mode 100644
index 000000000000..65385432e336
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line/input.ts
@@ -0,0 +1,3 @@
+namespace
+Foo
+{}
diff --git a/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line/output.json b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line/output.json
new file mode 100644
index 000000000000..eadadded2851
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/module-namespace/namespace-new-line/output.json
@@ -0,0 +1,116 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 16,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 2
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 16,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 2
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 9,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 9
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 9,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 9
+            },
+            "identifierName": "namespace"
+          },
+          "name": "namespace"
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 10,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 3
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        }
+      },
+      {
+        "type": "BlockStatement",
+        "start": 14,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 2
+          }
+        },
+        "body": [],
+        "directives": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/input.ts b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/input.ts
new file mode 100644
index 000000000000..2f1c5ce9190a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/input.ts
@@ -0,0 +1,8 @@
+class Cl {
+  a = async<T>() => {
+    await 0;
+  };
+
+  b = async<T>() => {
+  };
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/options.json b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/options.json
new file mode 100644
index 000000000000..fb92dc3bde16
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["typescript", "classProperties"]
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/output.json b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/output.json
new file mode 100644
index 000000000000..8cbb94861b92
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/async-arrow-generic-9560/output.json
@@ -0,0 +1,342 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 80,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 8,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 80,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 8,
+        "column": 1
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 80,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 8,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            },
+            "identifierName": "Cl"
+          },
+          "name": "Cl"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 9,
+          "end": 80,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 8,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ClassProperty",
+              "start": 13,
+              "end": 50,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 2
+                },
+                "end": {
+                  "line": 4,
+                  "column": 4
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 3
+                  },
+                  "identifierName": "a"
+                },
+                "name": "a"
+              },
+              "computed": false,
+              "value": {
+                "type": "ArrowFunctionExpression",
+                "start": 17,
+                "end": 49,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 3
+                  }
+                },
+                "typeParameters": {
+                  "type": "TSTypeParameterDeclaration",
+                  "start": 22,
+                  "end": 25,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 14
+                    }
+                  },
+                  "params": [
+                    {
+                      "type": "TSTypeParameter",
+                      "start": 23,
+                      "end": 24,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 13
+                        }
+                      },
+                      "name": "T"
+                    }
+                  ]
+                },
+                "params": [],
+                "id": null,
+                "generator": false,
+                "async": true,
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 31,
+                  "end": 49,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 3
+                    }
+                  },
+                  "body": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 37,
+                      "end": 45,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 4
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 12
+                        }
+                      },
+                      "expression": {
+                        "type": "AwaitExpression",
+                        "start": 37,
+                        "end": 44,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 11
+                          }
+                        },
+                        "argument": {
+                          "type": "NumericLiteral",
+                          "start": 43,
+                          "end": 44,
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 10
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 11
+                            }
+                          },
+                          "extra": {
+                            "rawValue": 0,
+                            "raw": "0"
+                          },
+                          "value": 0
+                        }
+                      }
+                    }
+                  ],
+                  "directives": []
+                }
+              }
+            },
+            {
+              "type": "ClassProperty",
+              "start": 54,
+              "end": 78,
+              "loc": {
+                "start": {
+                  "line": 6,
+                  "column": 2
+                },
+                "end": {
+                  "line": 7,
+                  "column": 4
+                }
+              },
+              "static": false,
+              "key": {
+                "type": "Identifier",
+                "start": 54,
+                "end": 55,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 2
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 3
+                  },
+                  "identifierName": "b"
+                },
+                "name": "b"
+              },
+              "computed": false,
+              "value": {
+                "type": "ArrowFunctionExpression",
+                "start": 58,
+                "end": 77,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 7,
+                    "column": 3
+                  }
+                },
+                "typeParameters": {
+                  "type": "TSTypeParameterDeclaration",
+                  "start": 63,
+                  "end": 66,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 14
+                    }
+                  },
+                  "params": [
+                    {
+                      "type": "TSTypeParameter",
+                      "start": 64,
+                      "end": 65,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 13
+                        }
+                      },
+                      "name": "T"
+                    }
+                  ]
+                },
+                "params": [],
+                "id": null,
+                "generator": false,
+                "async": true,
+                "body": {
+                  "type": "BlockStatement",
+                  "start": 72,
+                  "end": 77,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 20
+                    },
+                    "end": {
+                      "line": 7,
+                      "column": 3
+                    }
+                  },
+                  "body": [],
+                  "directives": []
+                }
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/comments-disappearing/input.ts b/packages/babel-parser/test/fixtures/typescript/regression/comments-disappearing/input.ts
new file mode 100644
index 000000000000..2e643a01d844
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/comments-disappearing/input.ts
@@ -0,0 +1,6 @@
+let fun = () => {
+    // one
+    // two
+    // three
+    return (1);
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/comments-disappearing/output.json b/packages/babel-parser/test/fixtures/typescript/regression/comments-disappearing/output.json
new file mode 100644
index 000000000000..29dfe9b55540
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/comments-disappearing/output.json
@@ -0,0 +1,259 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 70,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 6,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 70,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 6,
+        "column": 1
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 70,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 6,
+            "column": 1
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 70,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 6,
+                "column": 1
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "fun"
+              },
+              "name": "fun"
+            },
+            "init": {
+              "type": "ArrowFunctionExpression",
+              "start": 10,
+              "end": 70,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 6,
+                  "column": 1
+                }
+              },
+              "id": null,
+              "generator": false,
+              "async": false,
+              "params": [],
+              "body": {
+                "type": "BlockStatement",
+                "start": 16,
+                "end": 70,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 16
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 1
+                  }
+                },
+                "body": [
+                  {
+                    "type": "ReturnStatement",
+                    "start": 57,
+                    "end": 68,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 15
+                      }
+                    },
+                    "argument": {
+                      "type": "NumericLiteral",
+                      "start": 65,
+                      "end": 66,
+                      "loc": {
+                        "start": {
+                          "line": 5,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 5,
+                          "column": 13
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 1,
+                        "raw": "1",
+                        "parenthesized": true,
+                        "parenStart": 64
+                      },
+                      "value": 1
+                    },
+                    "leadingComments": [
+                      {
+                        "type": "CommentLine",
+                        "value": " one",
+                        "start": 22,
+                        "end": 28,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 10
+                          }
+                        }
+                      },
+                      {
+                        "type": "CommentLine",
+                        "value": " two",
+                        "start": 33,
+                        "end": 39,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 10
+                          }
+                        }
+                      },
+                      {
+                        "type": "CommentLine",
+                        "value": " three",
+                        "start": 44,
+                        "end": 52,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 4
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 12
+                          }
+                        }
+                      }
+                    ]
+                  }
+                ],
+                "directives": []
+              }
+            }
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " one",
+      "start": 22,
+      "end": 28,
+      "loc": {
+        "start": {
+          "line": 2,
+          "column": 4
+        },
+        "end": {
+          "line": 2,
+          "column": 10
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " two",
+      "start": 33,
+      "end": 39,
+      "loc": {
+        "start": {
+          "line": 3,
+          "column": 4
+        },
+        "end": {
+          "line": 3,
+          "column": 10
+        }
+      }
+    },
+    {
+      "type": "CommentLine",
+      "value": " three",
+      "start": 44,
+      "end": 52,
+      "loc": {
+        "start": {
+          "line": 4,
+          "column": 4
+        },
+        "end": {
+          "line": 4,
+          "column": 12
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/input.ts b/packages/babel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/input.ts
new file mode 100644
index 000000000000..56f3b25d967e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/input.ts
@@ -0,0 +1,3 @@
+type MyType = ({ theme }: any) => any
+
+type AnotherType = ([a]: any) => any
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/output.json b/packages/babel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/output.json
new file mode 100644
index 000000000000..38916a842653
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/destructuring-in-function-type/output.json
@@ -0,0 +1,359 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 75,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 75,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 36
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 0,
+        "end": 37,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 37
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "MyType"
+          },
+          "name": "MyType"
+        },
+        "typeAnnotation": {
+          "type": "TSFunctionType",
+          "start": 14,
+          "end": 37,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 14
+            },
+            "end": {
+              "line": 1,
+              "column": 37
+            }
+          },
+          "parameters": [
+            {
+              "type": "ObjectPattern",
+              "start": 15,
+              "end": 29,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 15
+                },
+                "end": {
+                  "line": 1,
+                  "column": 29
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 17,
+                  "end": 22,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 22
+                    }
+                  },
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 17,
+                    "end": 22,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 22
+                      },
+                      "identifierName": "theme"
+                    },
+                    "name": "theme"
+                  },
+                  "computed": false,
+                  "shorthand": true,
+                  "value": {
+                    "type": "Identifier",
+                    "start": 17,
+                    "end": 22,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 22
+                      },
+                      "identifierName": "theme"
+                    },
+                    "name": "theme"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                }
+              ],
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 24,
+                "end": 29,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 24
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 29
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSAnyKeyword",
+                  "start": 26,
+                  "end": 29,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 26
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 29
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "typeAnnotation": {
+            "type": "TSTypeAnnotation",
+            "start": 31,
+            "end": 37,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 31
+              },
+              "end": {
+                "line": 1,
+                "column": 37
+              }
+            },
+            "typeAnnotation": {
+              "type": "TSAnyKeyword",
+              "start": 34,
+              "end": 37,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 34
+                },
+                "end": {
+                  "line": 1,
+                  "column": 37
+                }
+              }
+            }
+          }
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 39,
+        "end": 75,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 36
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 44,
+          "end": 55,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 5
+            },
+            "end": {
+              "line": 3,
+              "column": 16
+            },
+            "identifierName": "AnotherType"
+          },
+          "name": "AnotherType"
+        },
+        "typeAnnotation": {
+          "type": "TSFunctionType",
+          "start": 58,
+          "end": 75,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 19
+            },
+            "end": {
+              "line": 3,
+              "column": 36
+            }
+          },
+          "parameters": [
+            {
+              "type": "ArrayPattern",
+              "start": 59,
+              "end": 67,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 20
+                },
+                "end": {
+                  "line": 3,
+                  "column": 28
+                }
+              },
+              "elements": [
+                {
+                  "type": "Identifier",
+                  "start": 60,
+                  "end": 61,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 21
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 22
+                    },
+                    "identifierName": "a"
+                  },
+                  "name": "a"
+                }
+              ],
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 62,
+                "end": 67,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 23
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 28
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSAnyKeyword",
+                  "start": 64,
+                  "end": 67,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 25
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 28
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "typeAnnotation": {
+            "type": "TSTypeAnnotation",
+            "start": 69,
+            "end": 75,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 30
+              },
+              "end": {
+                "line": 3,
+                "column": 36
+              }
+            },
+            "typeAnnotation": {
+              "type": "TSAnyKeyword",
+              "start": 72,
+              "end": 75,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 33
+                },
+                "end": {
+                  "line": 3,
+                  "column": 36
+                }
+              }
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/is-default-export/input.js b/packages/babel-parser/test/fixtures/typescript/regression/is-default-export/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/regression/is-default-export/input.js
rename to packages/babel-parser/test/fixtures/typescript/regression/is-default-export/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/input.ts b/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/input.ts
new file mode 100644
index 000000000000..f347dca73764
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/input.ts
@@ -0,0 +1,3 @@
+interface Foo<G> {
+    <T>(bar: G): T;
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/options.json b/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/options.json
new file mode 100644
index 000000000000..a0f82d16f05f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["typescript", "jsx"]
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/output.json b/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/output.json
new file mode 100644
index 000000000000..ad154a88fd59
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/issue-7742/output.json
@@ -0,0 +1,278 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 0,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "typeParameters": {
+          "type": "TSTypeParameterDeclaration",
+          "start": 13,
+          "end": 16,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 16
+            }
+          },
+          "params": [
+            {
+              "type": "TSTypeParameter",
+              "start": 14,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                }
+              },
+              "name": "G"
+            }
+          ]
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 17,
+          "end": 40,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "TSCallSignatureDeclaration",
+              "start": 23,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 19
+                }
+              },
+              "typeParameters": {
+                "type": "TSTypeParameterDeclaration",
+                "start": 23,
+                "end": 26,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 7
+                  }
+                },
+                "params": [
+                  {
+                    "type": "TSTypeParameter",
+                    "start": 24,
+                    "end": 25,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 5
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 6
+                      }
+                    },
+                    "name": "T"
+                  }
+                ]
+              },
+              "parameters": [
+                {
+                  "type": "Identifier",
+                  "start": 27,
+                  "end": 33,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 14
+                    },
+                    "identifierName": "bar"
+                  },
+                  "name": "bar",
+                  "typeAnnotation": {
+                    "type": "TSTypeAnnotation",
+                    "start": 30,
+                    "end": 33,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 11
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 14
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "TSTypeReference",
+                      "start": 32,
+                      "end": 33,
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 14
+                        }
+                      },
+                      "typeName": {
+                        "type": "Identifier",
+                        "start": 32,
+                        "end": 33,
+                        "loc": {
+                          "start": {
+                            "line": 2,
+                            "column": 13
+                          },
+                          "end": {
+                            "line": 2,
+                            "column": 14
+                          },
+                          "identifierName": "G"
+                        },
+                        "name": "G"
+                      }
+                    }
+                  }
+                }
+              ],
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 34,
+                "end": 37,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 18
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTypeReference",
+                  "start": 36,
+                  "end": 37,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 17
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 18
+                    }
+                  },
+                  "typeName": {
+                    "type": "Identifier",
+                    "start": 36,
+                    "end": 37,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 18
+                      },
+                      "identifierName": "T"
+                    },
+                    "name": "T"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/input.ts b/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/input.ts
new file mode 100644
index 000000000000..b8f5e0648003
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/input.ts
@@ -0,0 +1,3 @@
+for (let i = 0; i < require('foo').bar; i++) {
+    x(i);
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/options.json b/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/options.json
new file mode 100644
index 000000000000..a0f82d16f05f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "plugins": ["typescript", "jsx"]
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/output.json b/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/output.json
new file mode 100644
index 000000000000..d11131105469
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/regression/less-than-edge-case/output.json
@@ -0,0 +1,358 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 58,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 1
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 58,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 1
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ForStatement",
+        "start": 0,
+        "end": 58,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 1
+          }
+        },
+        "init": {
+          "type": "VariableDeclaration",
+          "start": 5,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "declarations": [
+            {
+              "type": "VariableDeclarator",
+              "start": 9,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "id": {
+                "type": "Identifier",
+                "start": 9,
+                "end": 10,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 9
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 10
+                  },
+                  "identifierName": "i"
+                },
+                "name": "i"
+              },
+              "init": {
+                "type": "NumericLiteral",
+                "start": 13,
+                "end": 14,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 13
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 14
+                  }
+                },
+                "extra": {
+                  "rawValue": 0,
+                  "raw": "0"
+                },
+                "value": 0
+              }
+            }
+          ],
+          "kind": "let"
+        },
+        "test": {
+          "type": "BinaryExpression",
+          "start": 16,
+          "end": 38,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 1,
+              "column": 38
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 16,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 16
+              },
+              "end": {
+                "line": 1,
+                "column": 17
+              },
+              "identifierName": "i"
+            },
+            "name": "i"
+          },
+          "operator": "<",
+          "right": {
+            "type": "MemberExpression",
+            "start": 20,
+            "end": 38,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 20
+              },
+              "end": {
+                "line": 1,
+                "column": 38
+              }
+            },
+            "object": {
+              "type": "CallExpression",
+              "start": 20,
+              "end": 34,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 20
+                },
+                "end": {
+                  "line": 1,
+                  "column": 34
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 20,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 20
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 27
+                  },
+                  "identifierName": "require"
+                },
+                "name": "require"
+              },
+              "arguments": [
+                {
+                  "type": "StringLiteral",
+                  "start": 28,
+                  "end": 33,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 28
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 33
+                    }
+                  },
+                  "extra": {
+                    "rawValue": "foo",
+                    "raw": "'foo'"
+                  },
+                  "value": "foo"
+                }
+              ]
+            },
+            "property": {
+              "type": "Identifier",
+              "start": 35,
+              "end": 38,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 35
+                },
+                "end": {
+                  "line": 1,
+                  "column": 38
+                },
+                "identifierName": "bar"
+              },
+              "name": "bar"
+            },
+            "computed": false
+          }
+        },
+        "update": {
+          "type": "UpdateExpression",
+          "start": 40,
+          "end": 43,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 40
+            },
+            "end": {
+              "line": 1,
+              "column": 43
+            }
+          },
+          "operator": "++",
+          "prefix": false,
+          "argument": {
+            "type": "Identifier",
+            "start": 40,
+            "end": 41,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 40
+              },
+              "end": {
+                "line": 1,
+                "column": 41
+              },
+              "identifierName": "i"
+            },
+            "name": "i"
+          }
+        },
+        "body": {
+          "type": "BlockStatement",
+          "start": 45,
+          "end": 58,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 45
+            },
+            "end": {
+              "line": 3,
+              "column": 1
+            }
+          },
+          "body": [
+            {
+              "type": "ExpressionStatement",
+              "start": 51,
+              "end": 56,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 9
+                }
+              },
+              "expression": {
+                "type": "CallExpression",
+                "start": 51,
+                "end": 55,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 8
+                  }
+                },
+                "callee": {
+                  "type": "Identifier",
+                  "start": 51,
+                  "end": 52,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 5
+                    },
+                    "identifierName": "x"
+                  },
+                  "name": "x"
+                },
+                "arguments": [
+                  {
+                    "type": "Identifier",
+                    "start": 53,
+                    "end": 54,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 6
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 7
+                      },
+                      "identifierName": "i"
+                    },
+                    "name": "i"
+                  }
+                ]
+              }
+            }
+          ],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/enum-block-scoped/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/enum-block-scoped/input.ts
new file mode 100644
index 000000000000..50183fe6db62
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/enum-block-scoped/input.ts
@@ -0,0 +1,2 @@
+{ enum Foo {} }
+let Foo;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/enum-block-scoped/output.json b/packages/babel-parser/test/fixtures/typescript/scope/enum-block-scoped/output.json
new file mode 100644
index 000000000000..ddaa635e8f86
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/enum-block-scoped/output.json
@@ -0,0 +1,137 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 8
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 8
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "BlockStatement",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "body": [
+          {
+            "type": "TSEnumDeclaration",
+            "start": 2,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 2
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 7,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "Foo"
+              },
+              "name": "Foo"
+            },
+            "members": []
+          }
+        ],
+        "directives": []
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 16,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 8
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 20,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 7
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 20,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 7
+                },
+                "identifierName": "Foo"
+              },
+              "name": "Foo"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-after/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-after/input.ts
new file mode 100644
index 000000000000..a746b10360a1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-after/input.ts
@@ -0,0 +1,3 @@
+declare function foo(): void;
+
+export { foo };
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-after/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-after/output.json
new file mode 100644
index 000000000000..c207baa1677a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-after/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 15
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSDeclareFunction",
+        "start": 0,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 29
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 1,
+              "column": 20
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "returnType": {
+          "type": "TSTypeAnnotation",
+          "start": 22,
+          "end": 28,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 22
+            },
+            "end": {
+              "line": 1,
+              "column": 28
+            }
+          },
+          "typeAnnotation": {
+            "type": "TSVoidKeyword",
+            "start": 24,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 24
+              },
+              "end": {
+                "line": 1,
+                "column": 28
+              }
+            }
+          }
+        },
+        "declare": true
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 31,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 15
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 40,
+            "end": 43,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 9
+              },
+              "end": {
+                "line": 3,
+                "column": 12
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 40,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 12
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 40,
+              "end": 43,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 12
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-before/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-before/input.ts
new file mode 100644
index 000000000000..cfd46f8a2f9b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-before/input.ts
@@ -0,0 +1,3 @@
+export { foo };
+
+declare function foo(): void;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-before/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-before/output.json
new file mode 100644
index 000000000000..b7071b10e90f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-declare-function-before/output.json
@@ -0,0 +1,169 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 46,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 29
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 46,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 29
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "TSDeclareFunction",
+        "start": 17,
+        "end": 46,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 29
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 34,
+          "end": 37,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 17
+            },
+            "end": {
+              "line": 3,
+              "column": 20
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "returnType": {
+          "type": "TSTypeAnnotation",
+          "start": 39,
+          "end": 45,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 22
+            },
+            "end": {
+              "line": 3,
+              "column": 28
+            }
+          },
+          "typeAnnotation": {
+            "type": "TSVoidKeyword",
+            "start": 41,
+            "end": 45,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 24
+              },
+              "end": {
+                "line": 3,
+                "column": 28
+              }
+            }
+          }
+        },
+        "declare": true
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-enum-after/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-after/input.ts
new file mode 100644
index 000000000000..0149829f731a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-after/input.ts
@@ -0,0 +1,5 @@
+// https://github.com/babel/babel/issues/9763
+
+enum Test {}
+
+export { Test as default }
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-enum-after/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-after/output.json
new file mode 100644
index 000000000000..c8738ce00309
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-after/output.json
@@ -0,0 +1,172 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 87,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 26
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 87,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 26
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSEnumDeclaration",
+        "start": 47,
+        "end": 59,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 12
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 52,
+          "end": 56,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 5
+            },
+            "end": {
+              "line": 3,
+              "column": 9
+            },
+            "identifierName": "Test"
+          },
+          "name": "Test"
+        },
+        "members": [],
+        "leadingComments": [
+          {
+            "type": "CommentLine",
+            "value": " https://github.com/babel/babel/issues/9763",
+            "start": 0,
+            "end": 45,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 45
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 61,
+        "end": 87,
+        "loc": {
+          "start": {
+            "line": 5,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 26
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 70,
+            "end": 85,
+            "loc": {
+              "start": {
+                "line": 5,
+                "column": 9
+              },
+              "end": {
+                "line": 5,
+                "column": 24
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 70,
+              "end": 74,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 9
+                },
+                "end": {
+                  "line": 5,
+                  "column": 13
+                },
+                "identifierName": "Test"
+              },
+              "name": "Test"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 78,
+              "end": 85,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 17
+                },
+                "end": {
+                  "line": 5,
+                  "column": 24
+                },
+                "identifierName": "default"
+              },
+              "name": "default"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": " https://github.com/babel/babel/issues/9763",
+      "start": 0,
+      "end": 45,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 45
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-enum-before/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-before/input.ts
new file mode 100644
index 000000000000..c159ad2975fb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-before/input.ts
@@ -0,0 +1,3 @@
+export { Test as default }
+
+enum Test {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-enum-before/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-before/output.json
new file mode 100644
index 000000000000..43ce8b85cb55
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-enum-before/output.json
@@ -0,0 +1,136 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 40,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 12
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 40,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 12
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 26,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 26
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 13,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 13
+                },
+                "identifierName": "Test"
+              },
+              "name": "Test"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 17,
+              "end": 24,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 17
+                },
+                "end": {
+                  "line": 1,
+                  "column": 24
+                },
+                "identifierName": "default"
+              },
+              "name": "default"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "TSEnumDeclaration",
+        "start": 28,
+        "end": 40,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 12
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 33,
+          "end": 37,
+          "loc": {
+            "start": {
+              "line": 3,
+              "column": 5
+            },
+            "end": {
+              "line": 3,
+              "column": 9
+            },
+            "identifierName": "Test"
+          },
+          "name": "Test"
+        },
+        "members": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-interface-after/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-after/input.ts
new file mode 100644
index 000000000000..65fbb4ee3942
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-after/input.ts
@@ -0,0 +1,2 @@
+interface A {}
+export { A };
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-interface-after/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-after/output.json
new file mode 100644
index 000000000000..9e575d18d39e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-after/output.json
@@ -0,0 +1,151 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 15,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 24,
+            "end": 25,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 24,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 9
+                },
+                "end": {
+                  "line": 2,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 24,
+              "end": 25,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 9
+                },
+                "end": {
+                  "line": 2,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-interface-before/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-before/input.ts
new file mode 100644
index 000000000000..26bd9bebfe1f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-before/input.ts
@@ -0,0 +1,2 @@
+export { A };
+interface A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-interface-before/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-before/output.json
new file mode 100644
index 000000000000..dd48538d82d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-interface-before/output.json
@@ -0,0 +1,151 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 14,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 24,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 26,
+          "end": 28,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-namespace/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-namespace/input.ts
new file mode 100644
index 000000000000..905dda6dc297
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-namespace/input.ts
@@ -0,0 +1,3 @@
+namespace N {}
+
+export { N };
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-namespace/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-namespace/output.json
new file mode 100644
index 000000000000..ec2b4c8349b5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-namespace/output.json
@@ -0,0 +1,151 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 29,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 29,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSModuleDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "N"
+          },
+          "name": "N"
+        },
+        "body": {
+          "type": "TSModuleBlock",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 16,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 25,
+            "end": 26,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 9
+              },
+              "end": {
+                "line": 3,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 25,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 10
+                },
+                "identifierName": "N"
+              },
+              "name": "N"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 25,
+              "end": 26,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 10
+                },
+                "identifierName": "N"
+              },
+              "name": "N"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-type-after/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-type-after/input.ts
new file mode 100644
index 000000000000..f971b8e6dad4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-type-after/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+export { A };
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-type-after/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-type-after/output.json
new file mode 100644
index 000000000000..d4259d15a749
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-type-after/output.json
@@ -0,0 +1,150 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 9,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          }
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 17,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 26,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 9
+              },
+              "end": {
+                "line": 2,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 26,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 9
+                },
+                "end": {
+                  "line": 2,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 26,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 9
+                },
+                "end": {
+                  "line": 2,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-type-before/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/export-type-before/input.ts
new file mode 100644
index 000000000000..1e925d4d28de
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-type-before/input.ts
@@ -0,0 +1,2 @@
+export { A };
+type A = number;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/export-type-before/output.json b/packages/babel-parser/test/fixtures/typescript/scope/export-type-before/output.json
new file mode 100644
index 000000000000..5086f1f05376
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/export-type-before/output.json
@@ -0,0 +1,150 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 16
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 14,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 19,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 23,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/function-type-before-declaration/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/function-type-before-declaration/input.ts
new file mode 100644
index 000000000000..9f9694abe675
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/function-type-before-declaration/input.ts
@@ -0,0 +1,4 @@
+function f(): void;
+function f() {}
+
+export { f };
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/function-type-before-declaration/output.json b/packages/babel-parser/test/fixtures/typescript/scope/function-type-before-declaration/output.json
new file mode 100644
index 000000000000..c17c84eca906
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/function-type-before-declaration/output.json
@@ -0,0 +1,220 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 50,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 50,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSDeclareFunction",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "returnType": {
+          "type": "TSTypeAnnotation",
+          "start": 12,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 18
+            }
+          },
+          "typeAnnotation": {
+            "type": "TSVoidKeyword",
+            "start": 14,
+            "end": 18,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 14
+              },
+              "end": {
+                "line": 1,
+                "column": 18
+              }
+            }
+          }
+        }
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 20,
+        "end": 35,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 29,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            },
+            "identifierName": "f"
+          },
+          "name": "f"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 33,
+          "end": 35,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 13
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 37,
+        "end": 50,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 13
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 46,
+            "end": 47,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 9
+              },
+              "end": {
+                "line": 4,
+                "column": 10
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 46,
+              "end": 47,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 9
+                },
+                "end": {
+                  "line": 4,
+                  "column": 10
+                },
+                "identifierName": "f"
+              },
+              "name": "f"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 46,
+              "end": 47,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 9
+                },
+                "end": {
+                  "line": 4,
+                  "column": 10
+                },
+                "identifierName": "f"
+              },
+              "name": "f"
+            }
+          }
+        ],
+        "source": null,
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-class/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-class/input.ts
new file mode 100644
index 000000000000..b27d4a43b2e5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-class/input.ts
@@ -0,0 +1,2 @@
+class A {}
+class A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-class/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-class/options.json
new file mode 100644
index 000000000000..336686170eb0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-enum/input.ts
new file mode 100644
index 000000000000..beafeb8dcb86
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-enum/input.ts
@@ -0,0 +1,2 @@
+class A {}
+enum A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-enum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-enum/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-enum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-interface/input.ts
new file mode 100644
index 000000000000..1628d05ed1a4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-interface/input.ts
@@ -0,0 +1,2 @@
+class A {}
+interface A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-interface/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-interface/output.json
new file mode 100644
index 000000000000..b44cc7caf564
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-interface/output.json
@@ -0,0 +1,132 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 8,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 8
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 11,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 21,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 23,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-type/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-type/input.ts
new file mode 100644
index 000000000000..4361a93e710b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-type/input.ts
@@ -0,0 +1,2 @@
+class A {}
+type A = number;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-type/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-type/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-class-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-const-type/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-const-type/input.ts
new file mode 100644
index 000000000000..62acca05efa0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-const-type/input.ts
@@ -0,0 +1,2 @@
+const X = "";
+type X = number;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-const-type/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-const-type/output.json
new file mode 100644
index 000000000000..b51eb30f5c6c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-const-type/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 16
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 6,
+              "end": 7,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7
+                },
+                "identifierName": "X"
+              },
+              "name": "X"
+            },
+            "init": {
+              "type": "StringLiteral",
+              "start": 10,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 10
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                }
+              },
+              "extra": {
+                "rawValue": "",
+                "raw": "\"\""
+              },
+              "value": ""
+            }
+          }
+        ],
+        "kind": "const"
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 14,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 19,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            },
+            "identifierName": "X"
+          },
+          "name": "X"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 23,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-constenum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-constenum/input.ts
new file mode 100644
index 000000000000..cb487f9b6b22
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-constenum/input.ts
@@ -0,0 +1,2 @@
+const enum Foo {}
+const enum Foo {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-constenum/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-constenum/output.json
new file mode 100644
index 000000000000..2120fa78e381
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-constenum/output.json
@@ -0,0 +1,103 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 35,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 17
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 35,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 17
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSEnumDeclaration",
+        "start": 0,
+        "end": 17,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 17
+          }
+        },
+        "const": true,
+        "id": {
+          "type": "Identifier",
+          "start": 11,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 11
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "members": []
+      },
+      {
+        "type": "TSEnumDeclaration",
+        "start": 18,
+        "end": 35,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 17
+          }
+        },
+        "const": true,
+        "id": {
+          "type": "Identifier",
+          "start": 29,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 11
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "members": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-enum/input.ts
new file mode 100644
index 000000000000..860bf512749f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-enum/input.ts
@@ -0,0 +1,2 @@
+const enum X {}
+enum X {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-enum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-enum/options.json
new file mode 100644
index 000000000000..ee82975e59a3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-constenum-enum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'X' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-class/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-class/input.ts
new file mode 100644
index 000000000000..4ecea177edbc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-class/input.ts
@@ -0,0 +1,2 @@
+enum X {}
+class X {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-class/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-class/options.json
new file mode 100644
index 000000000000..69462b29a995
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'X' has already been declared (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-constenum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-constenum/input.ts
new file mode 100644
index 000000000000..1b224627f1e8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-constenum/input.ts
@@ -0,0 +1,2 @@
+enum X {}
+const enum X {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-constenum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-constenum/options.json
new file mode 100644
index 000000000000..c77fcb7927ac
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-constenum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'X' has already been declared (2:11)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-enum/input.ts
new file mode 100644
index 000000000000..30775d873feb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-enum/input.ts
@@ -0,0 +1,2 @@
+enum Foo {}
+enum Foo {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-enum/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-enum/output.json
new file mode 100644
index 000000000000..a270131731fb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-enum/output.json
@@ -0,0 +1,101 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 11
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSEnumDeclaration",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 8,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 8
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "members": []
+      },
+      {
+        "type": "TSEnumDeclaration",
+        "start": 12,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 11
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 20,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 8
+            },
+            "identifierName": "Foo"
+          },
+          "name": "Foo"
+        },
+        "members": []
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-function/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-function/input.ts
new file mode 100644
index 000000000000..124177c8a916
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-function/input.ts
@@ -0,0 +1,2 @@
+enum Foo {}
+function Foo() {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-function/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-function/options.json
new file mode 100644
index 000000000000..ee47ddce75a8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-function/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'Foo' has already been declared (2:9)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-interface/input.ts
new file mode 100644
index 000000000000..f4284204e36f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-interface/input.ts
@@ -0,0 +1,2 @@
+enum X {}
+interface X {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-interface/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-interface/options.json
new file mode 100644
index 000000000000..a5f623f4e212
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'X' has already been declared (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-let/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-let/input.ts
new file mode 100644
index 000000000000..408ec7d99305
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-let/input.ts
@@ -0,0 +1,2 @@
+enum Foo {}
+let Foo;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-let/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-let/options.json
new file mode 100644
index 000000000000..4172f917bdb1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-let/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'Foo' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-type/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-type/input.ts
new file mode 100644
index 000000000000..14a488bc4bf8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-type/input.ts
@@ -0,0 +1,2 @@
+enum X {}
+type X = number;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-type/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-type/options.json
new file mode 100644
index 000000000000..ee82975e59a3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'X' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-var/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-var/input.ts
new file mode 100644
index 000000000000..408ec7d99305
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-var/input.ts
@@ -0,0 +1,2 @@
+enum Foo {}
+let Foo;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-var/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-var/options.json
new file mode 100644
index 000000000000..4172f917bdb1
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-enum-var/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'Foo' has already been declared (2:4)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-enum/input.ts
new file mode 100644
index 000000000000..9cc11112f632
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-enum/input.ts
@@ -0,0 +1,2 @@
+function Foo() {}
+enum Foo {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-enum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-enum/options.json
new file mode 100644
index 000000000000..92349410e8cf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-enum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'Foo' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-interface/input.ts
new file mode 100644
index 000000000000..723647a42528
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-interface/input.ts
@@ -0,0 +1,2 @@
+function A() {}
+interface A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-interface/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-interface/output.json
new file mode 100644
index 000000000000..13e97e869b2d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-interface/output.json
@@ -0,0 +1,135 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 13,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 16,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 26,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 28,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-type/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-type/input.ts
new file mode 100644
index 000000000000..13c1a11b111c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-type/input.ts
@@ -0,0 +1,2 @@
+function A() {}
+type A = number;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-type/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-type/output.json
new file mode 100644
index 000000000000..4258090807ff
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-function-type/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 16
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 15,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 10,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 10
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 13,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 16,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 21,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 25,
+          "end": 31,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-class/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-class/input.ts
new file mode 100644
index 000000000000..42dc0ec40d98
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-class/input.ts
@@ -0,0 +1,2 @@
+interface A {}
+class A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-class/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-class/output.json
new file mode 100644
index 000000000000..5b0af1060cbb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-class/output.json
@@ -0,0 +1,132 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "ClassDeclaration",
+        "start": 15,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 10
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 21,
+          "end": 22,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 6
+            },
+            "end": {
+              "line": 2,
+              "column": 7
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 23,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 8
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-enum/input.ts
new file mode 100644
index 000000000000..9fe5fc6a0b98
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-enum/input.ts
@@ -0,0 +1,2 @@
+interface X {}
+enum X {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-enum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-enum/options.json
new file mode 100644
index 000000000000..ee82975e59a3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-enum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'X' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-function/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-function/input.ts
new file mode 100644
index 000000000000..953d2b186c4c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-function/input.ts
@@ -0,0 +1,2 @@
+interface A {}
+function A() {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-function/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-function/output.json
new file mode 100644
index 000000000000..166403881b86
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-function/output.json
@@ -0,0 +1,135 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 15
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 15,
+        "end": 30,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 24,
+          "end": 25,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 28,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 13
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-interface/input.ts
new file mode 100644
index 000000000000..96072b8fa3d9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-interface/input.ts
@@ -0,0 +1,2 @@
+interface A {}
+interface A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-interface/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-interface/output.json
new file mode 100644
index 000000000000..598f4999cfbc
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-interface/output.json
@@ -0,0 +1,131 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 29,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 29,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 15,
+        "end": 29,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 25,
+          "end": 26,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 27,
+          "end": 29,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-let/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-let/input.ts
new file mode 100644
index 000000000000..1c40c966835e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-let/input.ts
@@ -0,0 +1,2 @@
+interface A {}
+let A;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-let/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-let/output.json
new file mode 100644
index 000000000000..0c96b1cd892a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-let/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 15,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 19,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 19,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-var/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-var/input.ts
new file mode 100644
index 000000000000..d8dba1e43619
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-var/input.ts
@@ -0,0 +1,2 @@
+interface A {}
+var A;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-var/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-var/output.json
new file mode 100644
index 000000000000..e353b5cd0b83
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-interface-var/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 10,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 15,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 19,
+            "end": 20,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 19,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-enum/input.ts
new file mode 100644
index 000000000000..fdac34ea9209
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-enum/input.ts
@@ -0,0 +1,2 @@
+let Foo;
+enum Foo {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-enum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-enum/options.json
new file mode 100644
index 000000000000..92349410e8cf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-enum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'Foo' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-interface/input.ts
new file mode 100644
index 000000000000..60fd53cfea0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-interface/input.ts
@@ -0,0 +1,2 @@
+let A;
+interface A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-interface/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-interface/output.json
new file mode 100644
index 000000000000..d1833f641360
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-interface/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 7,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 19,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-type/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-type/input.ts
new file mode 100644
index 000000000000..fe2809ad6b22
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-type/input.ts
@@ -0,0 +1,2 @@
+let X = "";
+type X = number;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-type/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-type/output.json
new file mode 100644
index 000000000000..8c157d8a364d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-let-type/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 16
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "X"
+              },
+              "name": "X"
+            },
+            "init": {
+              "type": "StringLiteral",
+              "start": 8,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                }
+              },
+              "extra": {
+                "rawValue": "",
+                "raw": "\"\""
+              },
+              "value": ""
+            }
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 12,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            },
+            "identifierName": "X"
+          },
+          "name": "X"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 21,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-class/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-class/input.ts
new file mode 100644
index 000000000000..b0d3dd1355cd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-class/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+class A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-class/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-class/options.json
new file mode 100644
index 000000000000..336686170eb0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-class/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:6)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-enum/input.ts
new file mode 100644
index 000000000000..c35f067241e4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-enum/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+enum A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-enum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-enum/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-enum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-function/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-function/input.ts
new file mode 100644
index 000000000000..a26333d0f21b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-function/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+function A() {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-function/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-function/output.json
new file mode 100644
index 000000000000..805839ca3c76
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-function/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 15
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 15
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 9,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          }
+        }
+      },
+      {
+        "type": "FunctionDeclaration",
+        "start": 17,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 15
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 26,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 10
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "generator": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 30,
+          "end": 32,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 13
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-interface/input.ts
new file mode 100644
index 000000000000..e8c0c5b91811
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-interface/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+interface A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-interface/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-interface/options.json
new file mode 100644
index 000000000000..04242bd1565b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-interface/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:10)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-let/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-let/input.ts
new file mode 100644
index 000000000000..00cfb4b05eca
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-let/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+let A;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-let/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-let/output.json
new file mode 100644
index 000000000000..fb4fc242eac9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-let/output.json
@@ -0,0 +1,133 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 9,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          }
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 17,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 21,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 21,
+              "end": 22,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-type/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-type/input.ts
new file mode 100644
index 000000000000..ade472fa3747
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-type/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+type A = string;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-type/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-type/options.json
new file mode 100644
index 000000000000..1eed93f49a0e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-type/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'A' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-var/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-var/input.ts
new file mode 100644
index 000000000000..8d6c5741d857
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-var/input.ts
@@ -0,0 +1,2 @@
+type A = number;
+var A;
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-var/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-var/output.json
new file mode 100644
index 000000000000..8a2375272f10
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-type-var/output.json
@@ -0,0 +1,133 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 23,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 6
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 23,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 6
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 0,
+        "end": 16,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 5,
+          "end": 6,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 5
+            },
+            "end": {
+              "line": 1,
+              "column": 6
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 9,
+          "end": 15,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 15
+            }
+          }
+        }
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 17,
+        "end": 23,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 21,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 21,
+              "end": 22,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 5
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-enum/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-enum/input.ts
new file mode 100644
index 000000000000..fdac34ea9209
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-enum/input.ts
@@ -0,0 +1,2 @@
+let Foo;
+enum Foo {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-enum/options.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-enum/options.json
new file mode 100644
index 000000000000..92349410e8cf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-enum/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Identifier 'Foo' has already been declared (2:5)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-interface/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-interface/input.ts
new file mode 100644
index 000000000000..80f8b82d0eae
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-interface/input.ts
@@ -0,0 +1,2 @@
+var A;
+interface A {}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-interface/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-interface/output.json
new file mode 100644
index 000000000000..068b9e0779a4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-interface/output.json
@@ -0,0 +1,134 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 21,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 21,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 14
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 6,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 6
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "A"
+              },
+              "name": "A"
+            },
+            "init": null
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "TSInterfaceDeclaration",
+        "start": 7,
+        "end": 21,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 10
+            },
+            "end": {
+              "line": 2,
+              "column": 11
+            },
+            "identifierName": "A"
+          },
+          "name": "A"
+        },
+        "body": {
+          "type": "TSInterfaceBody",
+          "start": 19,
+          "end": 21,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 12
+            },
+            "end": {
+              "line": 2,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-type/input.ts b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-type/input.ts
new file mode 100644
index 000000000000..856d8ef6f308
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-type/input.ts
@@ -0,0 +1,2 @@
+var X = "";
+type X = number;
diff --git a/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-type/output.json b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-type/output.json
new file mode 100644
index 000000000000..6cfc11c09339
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/scope/redeclaration-var-type/output.json
@@ -0,0 +1,152 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 16
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 16
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 10,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 10
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 5,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 5
+                },
+                "identifierName": "X"
+              },
+              "name": "X"
+            },
+            "init": {
+              "type": "StringLiteral",
+              "start": 8,
+              "end": 10,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 10
+                }
+              },
+              "extra": {
+                "rawValue": "",
+                "raw": "\"\""
+              },
+              "value": ""
+            }
+          }
+        ],
+        "kind": "var"
+      },
+      {
+        "type": "TSTypeAliasDeclaration",
+        "start": 12,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 16
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 17,
+          "end": 18,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 5
+            },
+            "end": {
+              "line": 2,
+              "column": 6
+            },
+            "identifierName": "X"
+          },
+          "name": "X"
+        },
+        "typeAnnotation": {
+          "type": "TSNumberKeyword",
+          "start": 21,
+          "end": 27,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 9
+            },
+            "end": {
+              "line": 2,
+              "column": 15
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/tsx/brace-is-block/input.js b/packages/babel-parser/test/fixtures/typescript/tsx/brace-is-block/input.tsx
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/tsx/brace-is-block/input.js
rename to packages/babel-parser/test/fixtures/typescript/tsx/brace-is-block/input.tsx
diff --git a/packages/babel-parser/test/fixtures/typescript/tsx/type-arguments/input.js b/packages/babel-parser/test/fixtures/typescript/tsx/type-arguments/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/tsx/type-arguments/input.js
rename to packages/babel-parser/test/fixtures/typescript/tsx/type-arguments/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/tsx/type-parameters/input.js b/packages/babel-parser/test/fixtures/typescript/tsx/type-parameters/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/tsx/type-parameters/input.js
rename to packages/babel-parser/test/fixtures/typescript/tsx/type-parameters/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/declare/input.js b/packages/babel-parser/test/fixtures/typescript/type-alias/declare/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-alias/declare/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-alias/declare/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/export/input.js b/packages/babel-parser/test/fixtures/typescript/type-alias/export/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-alias/export/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-alias/export/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/generic-complex/input.js b/packages/babel-parser/test/fixtures/typescript/type-alias/generic-complex/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-alias/generic-complex/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-alias/generic-complex/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/generic/input.js b/packages/babel-parser/test/fixtures/typescript/type-alias/generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-alias/generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-alias/generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-alias/plain/input.js b/packages/babel-parser/test/fixtures/typescript/type-alias/plain/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-alias/plain/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-alias/plain/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/call/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/call/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/call/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/call/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty/input.ts
new file mode 100644
index 000000000000..63cf8bbeecd8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty/input.ts
@@ -0,0 +1 @@
+foo<>()
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/empty/output.json b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty/output.json
new file mode 100644
index 000000000000..ce11198360c5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/type-arguments/empty/output.json
@@ -0,0 +1,99 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 7,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 7
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 7,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 7
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 7,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 7
+          }
+        },
+        "expression": {
+          "type": "CallExpression",
+          "start": 0,
+          "end": 7,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 7
+            }
+          },
+          "callee": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "arguments": [],
+          "typeParameters": {
+            "type": "TSTypeParameterInstantiation",
+            "start": 3,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 3
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              }
+            },
+            "params": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive-2/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive-2/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive-2/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive-2/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/new-false-positive/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/new/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/new/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/new/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/new/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template-no-asi/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template-no-asi/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template-no-asi/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template-no-asi/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/tagged-template/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/tsx/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/tsx/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/tsx/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/tsx/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/whitespace/input.js b/packages/babel-parser/test/fixtures/typescript/type-arguments/whitespace/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/type-arguments/whitespace/input.js
rename to packages/babel-parser/test/fixtures/typescript/type-arguments/whitespace/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/array/input.js b/packages/babel-parser/test/fixtures/typescript/types/array/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/array/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/array/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/conditional-infer/input.js b/packages/babel-parser/test/fixtures/typescript/types/conditional-infer/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/conditional-infer/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/conditional-infer/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/conditional/input.js b/packages/babel-parser/test/fixtures/typescript/types/conditional/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/conditional/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/conditional/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/function-generic/input.js b/packages/babel-parser/test/fixtures/typescript/types/function-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/function-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/function-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/function-in-generic/input.js b/packages/babel-parser/test/fixtures/typescript/types/function-in-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/function-in-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/function-in-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/function-with-this/input.js b/packages/babel-parser/test/fixtures/typescript/types/function-with-this/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/function-with-this/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/function-with-this/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/function/input.js b/packages/babel-parser/test/fixtures/typescript/types/function/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/function/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/function/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/import/input.ts b/packages/babel-parser/test/fixtures/typescript/types/import/input.ts
new file mode 100644
index 000000000000..7bae7e8301b3
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/import/input.ts
@@ -0,0 +1,3 @@
+let x: typeof import('./x');
+let Y: import('./y').Y;
+let z: import("/z").foo.bar<string>;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/import/output.json b/packages/babel-parser/test/fixtures/typescript/types/import/output.json
new file mode 100644
index 000000000000..a3aa6c8c537b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/import/output.json
@@ -0,0 +1,451 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 89,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 3,
+      "column": 36
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 89,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 3,
+        "column": 36
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 28
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 5,
+                "end": 27,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 27
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTypeQuery",
+                  "start": 7,
+                  "end": 27,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 27
+                    }
+                  },
+                  "exprName": {
+                    "type": "TSImportType",
+                    "start": 14,
+                    "end": 27,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 27
+                      }
+                    },
+                    "argument": {
+                      "type": "StringLiteral",
+                      "start": 21,
+                      "end": 26,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 21
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 26
+                        }
+                      },
+                      "extra": {
+                        "rawValue": "./x",
+                        "raw": "'./x'"
+                      },
+                      "value": "./x"
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 29,
+        "end": 52,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 23
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 33,
+            "end": 51,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 4
+              },
+              "end": {
+                "line": 2,
+                "column": 22
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 33,
+              "end": 51,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 22
+                },
+                "identifierName": "Y"
+              },
+              "name": "Y",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 34,
+                "end": 51,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 22
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSImportType",
+                  "start": 36,
+                  "end": 51,
+                  "loc": {
+                    "start": {
+                      "line": 2,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 2,
+                      "column": 22
+                    }
+                  },
+                  "argument": {
+                    "type": "StringLiteral",
+                    "start": 43,
+                    "end": 48,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 19
+                      }
+                    },
+                    "extra": {
+                      "rawValue": "./y",
+                      "raw": "'./y'"
+                    },
+                    "value": "./y"
+                  },
+                  "qualifier": {
+                    "type": "Identifier",
+                    "start": 50,
+                    "end": 51,
+                    "loc": {
+                      "start": {
+                        "line": 2,
+                        "column": 21
+                      },
+                      "end": {
+                        "line": 2,
+                        "column": 22
+                      },
+                      "identifierName": "Y"
+                    },
+                    "name": "Y"
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 53,
+        "end": 89,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 36
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 57,
+            "end": 88,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 4
+              },
+              "end": {
+                "line": 3,
+                "column": 35
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 57,
+              "end": 88,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 35
+                },
+                "identifierName": "z"
+              },
+              "name": "z",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 58,
+                "end": 88,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 35
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSImportType",
+                  "start": 60,
+                  "end": 88,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 35
+                    }
+                  },
+                  "argument": {
+                    "type": "StringLiteral",
+                    "start": 67,
+                    "end": 71,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 14
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 18
+                      }
+                    },
+                    "extra": {
+                      "rawValue": "/z",
+                      "raw": "\"/z\""
+                    },
+                    "value": "/z"
+                  },
+                  "qualifier": {
+                    "type": "TSQualifiedName",
+                    "start": 73,
+                    "end": 80,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 20
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 27
+                      }
+                    },
+                    "left": {
+                      "type": "Identifier",
+                      "start": 73,
+                      "end": 76,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 20
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 23
+                        },
+                        "identifierName": "foo"
+                      },
+                      "name": "foo"
+                    },
+                    "right": {
+                      "type": "Identifier",
+                      "start": 77,
+                      "end": 80,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 24
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 27
+                        },
+                        "identifierName": "bar"
+                      },
+                      "name": "bar"
+                    }
+                  },
+                  "typeParameters": {
+                    "type": "TSTypeParameterInstantiation",
+                    "start": 80,
+                    "end": 88,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 27
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 35
+                      }
+                    },
+                    "params": [
+                      {
+                        "type": "TSStringKeyword",
+                        "start": 81,
+                        "end": 87,
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 28
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 34
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/indexed/input.js b/packages/babel-parser/test/fixtures/typescript/types/indexed/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/indexed/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/indexed/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/keywords/input.js b/packages/babel-parser/test/fixtures/typescript/types/keywords/input.js
deleted file mode 100644
index d2ddfb94bbc6..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/types/keywords/input.js
+++ /dev/null
@@ -1,10 +0,0 @@
-let a: any;
-let b: boolean;
-let ne: never;
-let nul: null;
-let num: number;
-let o: object;
-let st: string;
-let sy: symbol;
-let u: undefined;
-let v: void;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/keywords/input.ts b/packages/babel-parser/test/fixtures/typescript/types/keywords/input.ts
new file mode 100644
index 000000000000..e75b629a04cd
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/keywords/input.ts
@@ -0,0 +1,12 @@
+let a: any;
+let un: unknown;
+let b: boolean;
+let ne: never;
+let nul: null;
+let num: number;
+let o: object;
+let st: string;
+let sy: symbol;
+let u: undefined;
+let v: void;
+let n: bigint;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/keywords/output.json b/packages/babel-parser/test/fixtures/typescript/types/keywords/output.json
index 3057fdf2b2a8..4c6e48290b18 100644
--- a/packages/babel-parser/test/fixtures/typescript/types/keywords/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/types/keywords/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 152,
+  "end": 184,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 10,
-      "column": 12
+      "line": 12,
+      "column": 14
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 152,
+    "end": 184,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 10,
-        "column": 12
+        "line": 12,
+        "column": 14
       }
     },
     "sourceType": "module",
@@ -113,7 +113,7 @@
       {
         "type": "VariableDeclaration",
         "start": 12,
-        "end": 27,
+        "end": 28,
         "loc": {
           "start": {
             "line": 2,
@@ -121,14 +121,14 @@
           },
           "end": {
             "line": 2,
-            "column": 15
+            "column": 16
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 16,
-            "end": 26,
+            "end": 27,
             "loc": {
               "start": {
                 "line": 2,
@@ -136,13 +136,13 @@
               },
               "end": {
                 "line": 2,
-                "column": 14
+                "column": 15
               }
             },
             "id": {
               "type": "Identifier",
               "start": 16,
-              "end": 26,
+              "end": 27,
               "loc": {
                 "start": {
                   "line": 2,
@@ -150,37 +150,37 @@
                 },
                 "end": {
                   "line": 2,
-                  "column": 14
+                  "column": 15
                 },
-                "identifierName": "b"
+                "identifierName": "un"
               },
-              "name": "b",
+              "name": "un",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 17,
-                "end": 26,
+                "start": 18,
+                "end": 27,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 5
+                    "column": 6
                   },
                   "end": {
                     "line": 2,
-                    "column": 14
+                    "column": 15
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSBooleanKeyword",
-                  "start": 19,
-                  "end": 26,
+                  "type": "TSUnknownKeyword",
+                  "start": 20,
+                  "end": 27,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 7
+                      "column": 8
                     },
                     "end": {
                       "line": 2,
-                      "column": 14
+                      "column": 15
                     }
                   }
                 }
@@ -193,8 +193,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 28,
-        "end": 42,
+        "start": 29,
+        "end": 44,
         "loc": {
           "start": {
             "line": 3,
@@ -202,14 +202,14 @@
           },
           "end": {
             "line": 3,
-            "column": 14
+            "column": 15
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 32,
-            "end": 41,
+            "start": 33,
+            "end": 43,
             "loc": {
               "start": {
                 "line": 3,
@@ -217,13 +217,13 @@
               },
               "end": {
                 "line": 3,
-                "column": 13
+                "column": 14
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 32,
-              "end": 41,
+              "start": 33,
+              "end": 43,
               "loc": {
                 "start": {
                   "line": 3,
@@ -231,37 +231,37 @@
                 },
                 "end": {
                   "line": 3,
-                  "column": 13
+                  "column": 14
                 },
-                "identifierName": "ne"
+                "identifierName": "b"
               },
-              "name": "ne",
+              "name": "b",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
                 "start": 34,
-                "end": 41,
+                "end": 43,
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 6
+                    "column": 5
                   },
                   "end": {
                     "line": 3,
-                    "column": 13
+                    "column": 14
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSNeverKeyword",
+                  "type": "TSBooleanKeyword",
                   "start": 36,
-                  "end": 41,
+                  "end": 43,
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 8
+                      "column": 7
                     },
                     "end": {
                       "line": 3,
-                      "column": 13
+                      "column": 14
                     }
                   }
                 }
@@ -274,8 +274,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 43,
-        "end": 57,
+        "start": 45,
+        "end": 59,
         "loc": {
           "start": {
             "line": 4,
@@ -289,8 +289,8 @@
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 47,
-            "end": 56,
+            "start": 49,
+            "end": 58,
             "loc": {
               "start": {
                 "line": 4,
@@ -303,8 +303,8 @@
             },
             "id": {
               "type": "Identifier",
-              "start": 47,
-              "end": 56,
+              "start": 49,
+              "end": 58,
               "loc": {
                 "start": {
                   "line": 4,
@@ -314,17 +314,17 @@
                   "line": 4,
                   "column": 13
                 },
-                "identifierName": "nul"
+                "identifierName": "ne"
               },
-              "name": "nul",
+              "name": "ne",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 50,
-                "end": 56,
+                "start": 51,
+                "end": 58,
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 7
+                    "column": 6
                   },
                   "end": {
                     "line": 4,
@@ -332,13 +332,13 @@
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSNullKeyword",
-                  "start": 52,
-                  "end": 56,
+                  "type": "TSNeverKeyword",
+                  "start": 53,
+                  "end": 58,
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 9
+                      "column": 8
                     },
                     "end": {
                       "line": 4,
@@ -355,7 +355,7 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 58,
+        "start": 60,
         "end": 74,
         "loc": {
           "start": {
@@ -364,13 +364,13 @@
           },
           "end": {
             "line": 5,
-            "column": 16
+            "column": 14
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 62,
+            "start": 64,
             "end": 73,
             "loc": {
               "start": {
@@ -379,12 +379,12 @@
               },
               "end": {
                 "line": 5,
-                "column": 15
+                "column": 13
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 62,
+              "start": 64,
               "end": 73,
               "loc": {
                 "start": {
@@ -393,14 +393,14 @@
                 },
                 "end": {
                   "line": 5,
-                  "column": 15
+                  "column": 13
                 },
-                "identifierName": "num"
+                "identifierName": "nul"
               },
-              "name": "num",
+              "name": "nul",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 65,
+                "start": 67,
                 "end": 73,
                 "loc": {
                   "start": {
@@ -409,12 +409,12 @@
                   },
                   "end": {
                     "line": 5,
-                    "column": 15
+                    "column": 13
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSNumberKeyword",
-                  "start": 67,
+                  "type": "TSNullKeyword",
+                  "start": 69,
                   "end": 73,
                   "loc": {
                     "start": {
@@ -423,7 +423,7 @@
                     },
                     "end": {
                       "line": 5,
-                      "column": 15
+                      "column": 13
                     }
                   }
                 }
@@ -437,7 +437,7 @@
       {
         "type": "VariableDeclaration",
         "start": 75,
-        "end": 89,
+        "end": 91,
         "loc": {
           "start": {
             "line": 6,
@@ -445,14 +445,14 @@
           },
           "end": {
             "line": 6,
-            "column": 14
+            "column": 16
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 79,
-            "end": 88,
+            "end": 90,
             "loc": {
               "start": {
                 "line": 6,
@@ -460,13 +460,13 @@
               },
               "end": {
                 "line": 6,
-                "column": 13
+                "column": 15
               }
             },
             "id": {
               "type": "Identifier",
               "start": 79,
-              "end": 88,
+              "end": 90,
               "loc": {
                 "start": {
                   "line": 6,
@@ -474,37 +474,37 @@
                 },
                 "end": {
                   "line": 6,
-                  "column": 13
+                  "column": 15
                 },
-                "identifierName": "o"
+                "identifierName": "num"
               },
-              "name": "o",
+              "name": "num",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 80,
-                "end": 88,
+                "start": 82,
+                "end": 90,
                 "loc": {
                   "start": {
                     "line": 6,
-                    "column": 5
+                    "column": 7
                   },
                   "end": {
                     "line": 6,
-                    "column": 13
+                    "column": 15
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSObjectKeyword",
-                  "start": 82,
-                  "end": 88,
+                  "type": "TSNumberKeyword",
+                  "start": 84,
+                  "end": 90,
                   "loc": {
                     "start": {
                       "line": 6,
-                      "column": 7
+                      "column": 9
                     },
                     "end": {
                       "line": 6,
-                      "column": 13
+                      "column": 15
                     }
                   }
                 }
@@ -517,8 +517,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 90,
-        "end": 105,
+        "start": 92,
+        "end": 106,
         "loc": {
           "start": {
             "line": 7,
@@ -526,14 +526,14 @@
           },
           "end": {
             "line": 7,
-            "column": 15
+            "column": 14
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 94,
-            "end": 104,
+            "start": 96,
+            "end": 105,
             "loc": {
               "start": {
                 "line": 7,
@@ -541,13 +541,13 @@
               },
               "end": {
                 "line": 7,
-                "column": 14
+                "column": 13
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 94,
-              "end": 104,
+              "start": 96,
+              "end": 105,
               "loc": {
                 "start": {
                   "line": 7,
@@ -555,37 +555,37 @@
                 },
                 "end": {
                   "line": 7,
-                  "column": 14
+                  "column": 13
                 },
-                "identifierName": "st"
+                "identifierName": "o"
               },
-              "name": "st",
+              "name": "o",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 96,
-                "end": 104,
+                "start": 97,
+                "end": 105,
                 "loc": {
                   "start": {
                     "line": 7,
-                    "column": 6
+                    "column": 5
                   },
                   "end": {
                     "line": 7,
-                    "column": 14
+                    "column": 13
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSStringKeyword",
-                  "start": 98,
-                  "end": 104,
+                  "type": "TSObjectKeyword",
+                  "start": 99,
+                  "end": 105,
                   "loc": {
                     "start": {
                       "line": 7,
-                      "column": 8
+                      "column": 7
                     },
                     "end": {
                       "line": 7,
-                      "column": 14
+                      "column": 13
                     }
                   }
                 }
@@ -598,8 +598,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 106,
-        "end": 121,
+        "start": 107,
+        "end": 122,
         "loc": {
           "start": {
             "line": 8,
@@ -613,8 +613,8 @@
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 110,
-            "end": 120,
+            "start": 111,
+            "end": 121,
             "loc": {
               "start": {
                 "line": 8,
@@ -627,8 +627,8 @@
             },
             "id": {
               "type": "Identifier",
-              "start": 110,
-              "end": 120,
+              "start": 111,
+              "end": 121,
               "loc": {
                 "start": {
                   "line": 8,
@@ -638,13 +638,13 @@
                   "line": 8,
                   "column": 14
                 },
-                "identifierName": "sy"
+                "identifierName": "st"
               },
-              "name": "sy",
+              "name": "st",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 112,
-                "end": 120,
+                "start": 113,
+                "end": 121,
                 "loc": {
                   "start": {
                     "line": 8,
@@ -656,9 +656,9 @@
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSSymbolKeyword",
-                  "start": 114,
-                  "end": 120,
+                  "type": "TSStringKeyword",
+                  "start": 115,
+                  "end": 121,
                   "loc": {
                     "start": {
                       "line": 8,
@@ -679,8 +679,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 122,
-        "end": 139,
+        "start": 123,
+        "end": 138,
         "loc": {
           "start": {
             "line": 9,
@@ -688,14 +688,14 @@
           },
           "end": {
             "line": 9,
-            "column": 17
+            "column": 15
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 126,
-            "end": 138,
+            "start": 127,
+            "end": 137,
             "loc": {
               "start": {
                 "line": 9,
@@ -703,13 +703,13 @@
               },
               "end": {
                 "line": 9,
-                "column": 16
+                "column": 14
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 126,
-              "end": 138,
+              "start": 127,
+              "end": 137,
               "loc": {
                 "start": {
                   "line": 9,
@@ -717,37 +717,37 @@
                 },
                 "end": {
                   "line": 9,
-                  "column": 16
+                  "column": 14
                 },
-                "identifierName": "u"
+                "identifierName": "sy"
               },
-              "name": "u",
+              "name": "sy",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 127,
-                "end": 138,
+                "start": 129,
+                "end": 137,
                 "loc": {
                   "start": {
                     "line": 9,
-                    "column": 5
+                    "column": 6
                   },
                   "end": {
                     "line": 9,
-                    "column": 16
+                    "column": 14
                   }
                 },
                 "typeAnnotation": {
-                  "type": "TSUndefinedKeyword",
-                  "start": 129,
-                  "end": 138,
+                  "type": "TSSymbolKeyword",
+                  "start": 131,
+                  "end": 137,
                   "loc": {
                     "start": {
                       "line": 9,
-                      "column": 7
+                      "column": 8
                     },
                     "end": {
                       "line": 9,
-                      "column": 16
+                      "column": 14
                     }
                   }
                 }
@@ -760,8 +760,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 140,
-        "end": 152,
+        "start": 139,
+        "end": 156,
         "loc": {
           "start": {
             "line": 10,
@@ -769,14 +769,14 @@
           },
           "end": {
             "line": 10,
-            "column": 12
+            "column": 17
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 144,
-            "end": 151,
+            "start": 143,
+            "end": 155,
             "loc": {
               "start": {
                 "line": 10,
@@ -784,13 +784,13 @@
               },
               "end": {
                 "line": 10,
-                "column": 11
+                "column": 16
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 144,
-              "end": 151,
+              "start": 143,
+              "end": 155,
               "loc": {
                 "start": {
                   "line": 10,
@@ -798,6 +798,87 @@
                 },
                 "end": {
                   "line": 10,
+                  "column": 16
+                },
+                "identifierName": "u"
+              },
+              "name": "u",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 144,
+                "end": 155,
+                "loc": {
+                  "start": {
+                    "line": 10,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 10,
+                    "column": 16
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSUndefinedKeyword",
+                  "start": 146,
+                  "end": 155,
+                  "loc": {
+                    "start": {
+                      "line": 10,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 10,
+                      "column": 16
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 157,
+        "end": 169,
+        "loc": {
+          "start": {
+            "line": 11,
+            "column": 0
+          },
+          "end": {
+            "line": 11,
+            "column": 12
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 161,
+            "end": 168,
+            "loc": {
+              "start": {
+                "line": 11,
+                "column": 4
+              },
+              "end": {
+                "line": 11,
+                "column": 11
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 161,
+              "end": 168,
+              "loc": {
+                "start": {
+                  "line": 11,
+                  "column": 4
+                },
+                "end": {
+                  "line": 11,
                   "column": 11
                 },
                 "identifierName": "v"
@@ -805,29 +886,29 @@
               "name": "v",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 145,
-                "end": 151,
+                "start": 162,
+                "end": 168,
                 "loc": {
                   "start": {
-                    "line": 10,
+                    "line": 11,
                     "column": 5
                   },
                   "end": {
-                    "line": 10,
+                    "line": 11,
                     "column": 11
                   }
                 },
                 "typeAnnotation": {
                   "type": "TSVoidKeyword",
-                  "start": 147,
-                  "end": 151,
+                  "start": 164,
+                  "end": 168,
                   "loc": {
                     "start": {
-                      "line": 10,
+                      "line": 11,
                       "column": 7
                     },
                     "end": {
-                      "line": 10,
+                      "line": 11,
                       "column": 11
                     }
                   }
@@ -838,6 +919,87 @@
           }
         ],
         "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 170,
+        "end": 184,
+        "loc": {
+          "start": {
+            "line": 12,
+            "column": 0
+          },
+          "end": {
+            "line": 12,
+            "column": 14
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 174,
+            "end": 183,
+            "loc": {
+              "start": {
+                "line": 12,
+                "column": 4
+              },
+              "end": {
+                "line": 12,
+                "column": 13
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 174,
+              "end": 183,
+              "loc": {
+                "start": {
+                  "line": 12,
+                  "column": 4
+                },
+                "end": {
+                  "line": 12,
+                  "column": 13
+                },
+                "identifierName": "n"
+              },
+              "name": "n",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 175,
+                "end": 183,
+                "loc": {
+                  "start": {
+                    "line": 12,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 12,
+                    "column": 13
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSBigIntKeyword",
+                  "start": 177,
+                  "end": 183,
+                  "loc": {
+                    "start": {
+                      "line": 12,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 12,
+                      "column": 13
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/input.js b/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/input.js
deleted file mode 100644
index d2cea8ee69cc..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/input.js
+++ /dev/null
@@ -1,2 +0,0 @@
-let x: true;
-let x: false;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/input.ts b/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/input.ts
new file mode 100644
index 000000000000..cdde314da1cf
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/input.ts
@@ -0,0 +1,2 @@
+let x1: true;
+let x2: false;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/output.json b/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/output.json
index 9364a60d3a55..44bc4f2acb1f 100644
--- a/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/types/literal-boolean/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 26,
+  "end": 28,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 2,
-      "column": 13
+      "column": 14
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 26,
+    "end": 28,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 2,
-        "column": 13
+        "column": 14
       }
     },
     "sourceType": "module",
@@ -32,7 +32,7 @@
       {
         "type": "VariableDeclaration",
         "start": 0,
-        "end": 12,
+        "end": 13,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 12
+            "column": 13
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 4,
-            "end": 11,
+            "end": 12,
             "loc": {
               "start": {
                 "line": 1,
@@ -55,13 +55,13 @@
               },
               "end": {
                 "line": 1,
-                "column": 11
+                "column": 12
               }
             },
             "id": {
               "type": "Identifier",
               "start": 4,
-              "end": 11,
+              "end": 12,
               "loc": {
                 "start": {
                   "line": 1,
@@ -69,51 +69,51 @@
                 },
                 "end": {
                   "line": 1,
-                  "column": 11
+                  "column": 12
                 },
-                "identifierName": "x"
+                "identifierName": "x1"
               },
-              "name": "x",
+              "name": "x1",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 5,
-                "end": 11,
+                "start": 6,
+                "end": 12,
                 "loc": {
                   "start": {
                     "line": 1,
-                    "column": 5
+                    "column": 6
                   },
                   "end": {
                     "line": 1,
-                    "column": 11
+                    "column": 12
                   }
                 },
                 "typeAnnotation": {
                   "type": "TSLiteralType",
-                  "start": 7,
-                  "end": 11,
+                  "start": 8,
+                  "end": 12,
                   "loc": {
                     "start": {
                       "line": 1,
-                      "column": 7
+                      "column": 8
                     },
                     "end": {
                       "line": 1,
-                      "column": 11
+                      "column": 12
                     }
                   },
                   "literal": {
                     "type": "BooleanLiteral",
-                    "start": 7,
-                    "end": 11,
+                    "start": 8,
+                    "end": 12,
                     "loc": {
                       "start": {
                         "line": 1,
-                        "column": 7
+                        "column": 8
                       },
                       "end": {
                         "line": 1,
-                        "column": 11
+                        "column": 12
                       }
                     },
                     "value": true
@@ -128,8 +128,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 13,
-        "end": 26,
+        "start": 14,
+        "end": 28,
         "loc": {
           "start": {
             "line": 2,
@@ -137,14 +137,14 @@
           },
           "end": {
             "line": 2,
-            "column": 13
+            "column": 14
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 17,
-            "end": 25,
+            "start": 18,
+            "end": 27,
             "loc": {
               "start": {
                 "line": 2,
@@ -152,13 +152,13 @@
               },
               "end": {
                 "line": 2,
-                "column": 12
+                "column": 13
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 17,
-              "end": 25,
+              "start": 18,
+              "end": 27,
               "loc": {
                 "start": {
                   "line": 2,
@@ -166,51 +166,51 @@
                 },
                 "end": {
                   "line": 2,
-                  "column": 12
+                  "column": 13
                 },
-                "identifierName": "x"
+                "identifierName": "x2"
               },
-              "name": "x",
+              "name": "x2",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 18,
-                "end": 25,
+                "start": 20,
+                "end": 27,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 5
+                    "column": 6
                   },
                   "end": {
                     "line": 2,
-                    "column": 12
+                    "column": 13
                   }
                 },
                 "typeAnnotation": {
                   "type": "TSLiteralType",
-                  "start": 20,
-                  "end": 25,
+                  "start": 22,
+                  "end": 27,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 7
+                      "column": 8
                     },
                     "end": {
                       "line": 2,
-                      "column": 12
+                      "column": 13
                     }
                   },
                   "literal": {
                     "type": "BooleanLiteral",
-                    "start": 20,
-                    "end": 25,
+                    "start": 22,
+                    "end": 27,
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 7
+                        "column": 8
                       },
                       "end": {
                         "line": 2,
-                        "column": 12
+                        "column": 13
                       }
                     },
                     "value": false
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/input.js b/packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/output.json b/packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/output.json
index c6b4a8b0384b..70e16143508f 100644
--- a/packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/types/literal-number-negative/output.json
@@ -103,7 +103,7 @@
                     }
                   },
                   "literal": {
-                    "type": "NumericLiteral",
+                    "type": "UnaryExpression",
                     "start": 7,
                     "end": 9,
                     "loc": {
@@ -116,11 +116,28 @@
                         "column": 9
                       }
                     },
-                    "extra": {
-                      "rawValue": -1,
-                      "raw": "-1"
-                    },
-                    "value": -1
+                    "operator": "-",
+                    "prefix": true,
+                    "argument": {
+                      "type": "NumericLiteral",
+                      "start": 8,
+                      "end": 9,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 9
+                        }
+                      },
+                      "extra": {
+                        "rawValue": 1,
+                        "raw": "1"
+                      },
+                      "value": 1
+                    }
                   }
                 }
               }
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-number/input.js b/packages/babel-parser/test/fixtures/typescript/types/literal-number/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/literal-number/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/literal-number/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-string-1/input.ts b/packages/babel-parser/test/fixtures/typescript/types/literal-string-1/input.ts
new file mode 100644
index 000000000000..089ff63ba1d8
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/literal-string-1/input.ts
@@ -0,0 +1 @@
+let x: `foo`;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-string-1/output.json b/packages/babel-parser/test/fixtures/typescript/types/literal-string-1/output.json
new file mode 100644
index 000000000000..a153fb364a09
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/literal-string-1/output.json
@@ -0,0 +1,154 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 13,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 13,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 13,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 13
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 12,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 12
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 12,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 12
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 5,
+                "end": 12,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 12
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSLiteralType",
+                  "start": 7,
+                  "end": 12,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 12
+                    }
+                  },
+                  "literal": {
+                    "type": "TemplateLiteral",
+                    "start": 7,
+                    "end": 12,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 7
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 12
+                      }
+                    },
+                    "expressions": [],
+                    "quasis": [
+                      {
+                        "type": "TemplateElement",
+                        "start": 8,
+                        "end": 11,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 8
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 11
+                          }
+                        },
+                        "value": {
+                          "raw": "foo",
+                          "cooked": "foo"
+                        },
+                        "tail": true
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-string-2/input.ts b/packages/babel-parser/test/fixtures/typescript/types/literal-string-2/input.ts
new file mode 100644
index 000000000000..e21e6a4d4b08
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/literal-string-2/input.ts
@@ -0,0 +1 @@
+let x: `foo-${bar}`;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-string-2/options.json b/packages/babel-parser/test/fixtures/typescript/types/literal-string-2/options.json
new file mode 100644
index 000000000000..3c001f6afda6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/literal-string-2/options.json
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "typescript"
+  ],
+  "throws": "Template literal types cannot have any substitution (1:14)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/literal-string/input.js b/packages/babel-parser/test/fixtures/typescript/types/literal-string/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/literal-string/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/literal-string/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/mapped/input.js b/packages/babel-parser/test/fixtures/typescript/types/mapped/input.js
deleted file mode 100644
index d07cdba17f9a..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/types/mapped/input.js
+++ /dev/null
@@ -1,4 +0,0 @@
-let map: { [P in string]: number; };
-let map: { readonly [P in string]?: number; };
-let map: { +readonly [P in string]+?: number; };
-let map: { -readonly [P in string]-?: number };
diff --git a/packages/babel-parser/test/fixtures/typescript/types/mapped/input.ts b/packages/babel-parser/test/fixtures/typescript/types/mapped/input.ts
new file mode 100644
index 000000000000..4ea2b0c8a9a4
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/mapped/input.ts
@@ -0,0 +1,4 @@
+let map1: { [P in string]: number; };
+let map2: { readonly [P in string]?: number; };
+let map3: { +readonly [P in string]+?: number; };
+let map4: { -readonly [P in string]-?: number };
diff --git a/packages/babel-parser/test/fixtures/typescript/types/mapped/output.json b/packages/babel-parser/test/fixtures/typescript/types/mapped/output.json
index 97836b31913c..5cde8240b24f 100644
--- a/packages/babel-parser/test/fixtures/typescript/types/mapped/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/types/mapped/output.json
@@ -1,7 +1,7 @@
 {
   "type": "File",
   "start": 0,
-  "end": 180,
+  "end": 184,
   "loc": {
     "start": {
       "line": 1,
@@ -9,13 +9,13 @@
     },
     "end": {
       "line": 4,
-      "column": 47
+      "column": 48
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 180,
+    "end": 184,
     "loc": {
       "start": {
         "line": 1,
@@ -23,7 +23,7 @@
       },
       "end": {
         "line": 4,
-        "column": 47
+        "column": 48
       }
     },
     "sourceType": "module",
@@ -32,7 +32,7 @@
       {
         "type": "VariableDeclaration",
         "start": 0,
-        "end": 36,
+        "end": 37,
         "loc": {
           "start": {
             "line": 1,
@@ -40,14 +40,14 @@
           },
           "end": {
             "line": 1,
-            "column": 36
+            "column": 37
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
             "start": 4,
-            "end": 35,
+            "end": 36,
             "loc": {
               "start": {
                 "line": 1,
@@ -55,13 +55,13 @@
               },
               "end": {
                 "line": 1,
-                "column": 35
+                "column": 36
               }
             },
             "id": {
               "type": "Identifier",
               "start": 4,
-              "end": 35,
+              "end": 36,
               "loc": {
                 "start": {
                   "line": 1,
@@ -69,82 +69,82 @@
                 },
                 "end": {
                   "line": 1,
-                  "column": 35
+                  "column": 36
                 },
-                "identifierName": "map"
+                "identifierName": "map1"
               },
-              "name": "map",
+              "name": "map1",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 7,
-                "end": 35,
+                "start": 8,
+                "end": 36,
                 "loc": {
                   "start": {
                     "line": 1,
-                    "column": 7
+                    "column": 8
                   },
                   "end": {
                     "line": 1,
-                    "column": 35
+                    "column": 36
                   }
                 },
                 "typeAnnotation": {
                   "type": "TSMappedType",
-                  "start": 9,
-                  "end": 35,
+                  "start": 10,
+                  "end": 36,
                   "loc": {
                     "start": {
                       "line": 1,
-                      "column": 9
+                      "column": 10
                     },
                     "end": {
                       "line": 1,
-                      "column": 35
+                      "column": 36
                     }
                   },
                   "typeParameter": {
                     "type": "TSTypeParameter",
-                    "start": 12,
-                    "end": 23,
+                    "start": 13,
+                    "end": 24,
                     "loc": {
                       "start": {
                         "line": 1,
-                        "column": 12
+                        "column": 13
                       },
                       "end": {
                         "line": 1,
-                        "column": 23
+                        "column": 24
                       }
                     },
                     "name": "P",
                     "constraint": {
                       "type": "TSStringKeyword",
-                      "start": 17,
-                      "end": 23,
+                      "start": 18,
+                      "end": 24,
                       "loc": {
                         "start": {
                           "line": 1,
-                          "column": 17
+                          "column": 18
                         },
                         "end": {
                           "line": 1,
-                          "column": 23
+                          "column": 24
                         }
                       }
                     }
                   },
                   "typeAnnotation": {
                     "type": "TSNumberKeyword",
-                    "start": 26,
-                    "end": 32,
+                    "start": 27,
+                    "end": 33,
                     "loc": {
                       "start": {
                         "line": 1,
-                        "column": 26
+                        "column": 27
                       },
                       "end": {
                         "line": 1,
-                        "column": 32
+                        "column": 33
                       }
                     }
                   }
@@ -158,8 +158,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 37,
-        "end": 83,
+        "start": 38,
+        "end": 85,
         "loc": {
           "start": {
             "line": 2,
@@ -167,14 +167,14 @@
           },
           "end": {
             "line": 2,
-            "column": 46
+            "column": 47
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 41,
-            "end": 82,
+            "start": 42,
+            "end": 84,
             "loc": {
               "start": {
                 "line": 2,
@@ -182,13 +182,13 @@
               },
               "end": {
                 "line": 2,
-                "column": 45
+                "column": 46
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 41,
-              "end": 82,
+              "start": 42,
+              "end": 84,
               "loc": {
                 "start": {
                   "line": 2,
@@ -196,67 +196,67 @@
                 },
                 "end": {
                   "line": 2,
-                  "column": 45
+                  "column": 46
                 },
-                "identifierName": "map"
+                "identifierName": "map2"
               },
-              "name": "map",
+              "name": "map2",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 44,
-                "end": 82,
+                "start": 46,
+                "end": 84,
                 "loc": {
                   "start": {
                     "line": 2,
-                    "column": 7
+                    "column": 8
                   },
                   "end": {
                     "line": 2,
-                    "column": 45
+                    "column": 46
                   }
                 },
                 "typeAnnotation": {
                   "type": "TSMappedType",
-                  "start": 46,
-                  "end": 82,
+                  "start": 48,
+                  "end": 84,
                   "loc": {
                     "start": {
                       "line": 2,
-                      "column": 9
+                      "column": 10
                     },
                     "end": {
                       "line": 2,
-                      "column": 45
+                      "column": 46
                     }
                   },
                   "readonly": true,
                   "typeParameter": {
                     "type": "TSTypeParameter",
-                    "start": 58,
-                    "end": 69,
+                    "start": 60,
+                    "end": 71,
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 21
+                        "column": 22
                       },
                       "end": {
                         "line": 2,
-                        "column": 32
+                        "column": 33
                       }
                     },
                     "name": "P",
                     "constraint": {
                       "type": "TSStringKeyword",
-                      "start": 63,
-                      "end": 69,
+                      "start": 65,
+                      "end": 71,
                       "loc": {
                         "start": {
                           "line": 2,
-                          "column": 26
+                          "column": 27
                         },
                         "end": {
                           "line": 2,
-                          "column": 32
+                          "column": 33
                         }
                       }
                     }
@@ -264,16 +264,16 @@
                   "optional": true,
                   "typeAnnotation": {
                     "type": "TSNumberKeyword",
-                    "start": 73,
-                    "end": 79,
+                    "start": 75,
+                    "end": 81,
                     "loc": {
                       "start": {
                         "line": 2,
-                        "column": 36
+                        "column": 37
                       },
                       "end": {
                         "line": 2,
-                        "column": 42
+                        "column": 43
                       }
                     }
                   }
@@ -287,8 +287,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 84,
-        "end": 132,
+        "start": 86,
+        "end": 135,
         "loc": {
           "start": {
             "line": 3,
@@ -296,14 +296,14 @@
           },
           "end": {
             "line": 3,
-            "column": 48
+            "column": 49
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 88,
-            "end": 131,
+            "start": 90,
+            "end": 134,
             "loc": {
               "start": {
                 "line": 3,
@@ -311,13 +311,13 @@
               },
               "end": {
                 "line": 3,
-                "column": 47
+                "column": 48
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 88,
-              "end": 131,
+              "start": 90,
+              "end": 134,
               "loc": {
                 "start": {
                   "line": 3,
@@ -325,67 +325,67 @@
                 },
                 "end": {
                   "line": 3,
-                  "column": 47
+                  "column": 48
                 },
-                "identifierName": "map"
+                "identifierName": "map3"
               },
-              "name": "map",
+              "name": "map3",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 91,
-                "end": 131,
+                "start": 94,
+                "end": 134,
                 "loc": {
                   "start": {
                     "line": 3,
-                    "column": 7
+                    "column": 8
                   },
                   "end": {
                     "line": 3,
-                    "column": 47
+                    "column": 48
                   }
                 },
                 "typeAnnotation": {
                   "type": "TSMappedType",
-                  "start": 93,
-                  "end": 131,
+                  "start": 96,
+                  "end": 134,
                   "loc": {
                     "start": {
                       "line": 3,
-                      "column": 9
+                      "column": 10
                     },
                     "end": {
                       "line": 3,
-                      "column": 47
+                      "column": 48
                     }
                   },
                   "readonly": "+",
                   "typeParameter": {
                     "type": "TSTypeParameter",
-                    "start": 106,
-                    "end": 117,
+                    "start": 109,
+                    "end": 120,
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 22
+                        "column": 23
                       },
                       "end": {
                         "line": 3,
-                        "column": 33
+                        "column": 34
                       }
                     },
                     "name": "P",
                     "constraint": {
                       "type": "TSStringKeyword",
-                      "start": 111,
-                      "end": 117,
+                      "start": 114,
+                      "end": 120,
                       "loc": {
                         "start": {
                           "line": 3,
-                          "column": 27
+                          "column": 28
                         },
                         "end": {
                           "line": 3,
-                          "column": 33
+                          "column": 34
                         }
                       }
                     }
@@ -393,16 +393,16 @@
                   "optional": "+",
                   "typeAnnotation": {
                     "type": "TSNumberKeyword",
-                    "start": 122,
-                    "end": 128,
+                    "start": 125,
+                    "end": 131,
                     "loc": {
                       "start": {
                         "line": 3,
-                        "column": 38
+                        "column": 39
                       },
                       "end": {
                         "line": 3,
-                        "column": 44
+                        "column": 45
                       }
                     }
                   }
@@ -416,8 +416,8 @@
       },
       {
         "type": "VariableDeclaration",
-        "start": 133,
-        "end": 180,
+        "start": 136,
+        "end": 184,
         "loc": {
           "start": {
             "line": 4,
@@ -425,14 +425,14 @@
           },
           "end": {
             "line": 4,
-            "column": 47
+            "column": 48
           }
         },
         "declarations": [
           {
             "type": "VariableDeclarator",
-            "start": 137,
-            "end": 179,
+            "start": 140,
+            "end": 183,
             "loc": {
               "start": {
                 "line": 4,
@@ -440,13 +440,13 @@
               },
               "end": {
                 "line": 4,
-                "column": 46
+                "column": 47
               }
             },
             "id": {
               "type": "Identifier",
-              "start": 137,
-              "end": 179,
+              "start": 140,
+              "end": 183,
               "loc": {
                 "start": {
                   "line": 4,
@@ -454,67 +454,67 @@
                 },
                 "end": {
                   "line": 4,
-                  "column": 46
+                  "column": 47
                 },
-                "identifierName": "map"
+                "identifierName": "map4"
               },
-              "name": "map",
+              "name": "map4",
               "typeAnnotation": {
                 "type": "TSTypeAnnotation",
-                "start": 140,
-                "end": 179,
+                "start": 144,
+                "end": 183,
                 "loc": {
                   "start": {
                     "line": 4,
-                    "column": 7
+                    "column": 8
                   },
                   "end": {
                     "line": 4,
-                    "column": 46
+                    "column": 47
                   }
                 },
                 "typeAnnotation": {
                   "type": "TSMappedType",
-                  "start": 142,
-                  "end": 179,
+                  "start": 146,
+                  "end": 183,
                   "loc": {
                     "start": {
                       "line": 4,
-                      "column": 9
+                      "column": 10
                     },
                     "end": {
                       "line": 4,
-                      "column": 46
+                      "column": 47
                     }
                   },
                   "readonly": "-",
                   "typeParameter": {
                     "type": "TSTypeParameter",
-                    "start": 155,
-                    "end": 166,
+                    "start": 159,
+                    "end": 170,
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 22
+                        "column": 23
                       },
                       "end": {
                         "line": 4,
-                        "column": 33
+                        "column": 34
                       }
                     },
                     "name": "P",
                     "constraint": {
                       "type": "TSStringKeyword",
-                      "start": 160,
-                      "end": 166,
+                      "start": 164,
+                      "end": 170,
                       "loc": {
                         "start": {
                           "line": 4,
-                          "column": 27
+                          "column": 28
                         },
                         "end": {
                           "line": 4,
-                          "column": 33
+                          "column": 34
                         }
                       }
                     }
@@ -522,16 +522,16 @@
                   "optional": "-",
                   "typeAnnotation": {
                     "type": "TSNumberKeyword",
-                    "start": 171,
-                    "end": 177,
+                    "start": 175,
+                    "end": 181,
                     "loc": {
                       "start": {
                         "line": 4,
-                        "column": 38
+                        "column": 39
                       },
                       "end": {
                         "line": 4,
-                        "column": 44
+                        "column": 45
                       }
                     }
                   }
diff --git a/packages/babel-parser/test/fixtures/typescript/types/new-line/input.ts b/packages/babel-parser/test/fixtures/typescript/types/new-line/input.ts
new file mode 100644
index 000000000000..24e7eba5895e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/new-line/input.ts
@@ -0,0 +1,2 @@
+type
+Foo = string;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/new-line/output.json b/packages/babel-parser/test/fixtures/typescript/types/new-line/output.json
new file mode 100644
index 000000000000..7acae4a0d346
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/new-line/output.json
@@ -0,0 +1,132 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 18,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 13
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 18,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 13
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 4,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 4
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 4,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 4
+            },
+            "identifierName": "type"
+          },
+          "name": "type"
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start": 5,
+        "end": 18,
+        "loc": {
+          "start": {
+            "line": 2,
+            "column": 0
+          },
+          "end": {
+            "line": 2,
+            "column": 13
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 5,
+          "end": 17,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 0
+            },
+            "end": {
+              "line": 2,
+              "column": 12
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 5,
+            "end": 8,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 0
+              },
+              "end": {
+                "line": 2,
+                "column": 3
+              },
+              "identifierName": "Foo"
+            },
+            "name": "Foo"
+          },
+          "right": {
+            "type": "Identifier",
+            "start": 11,
+            "end": 17,
+            "loc": {
+              "start": {
+                "line": 2,
+                "column": 6
+              },
+              "end": {
+                "line": 2,
+                "column": 12
+              },
+              "identifierName": "string"
+            },
+            "name": "string"
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/object-shorthand/input.js b/packages/babel-parser/test/fixtures/typescript/types/object-shorthand/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/object-shorthand/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/object-shorthand/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/parenthesized/input.js b/packages/babel-parser/test/fixtures/typescript/types/parenthesized/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/parenthesized/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/parenthesized/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-1/input.ts b/packages/babel-parser/test/fixtures/typescript/types/read-only-1/input.ts
new file mode 100644
index 000000000000..5fa006c80bac
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-1/input.ts
@@ -0,0 +1 @@
+type T30 = readonly string;  // Error
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-1/options.json b/packages/babel-parser/test/fixtures/typescript/types/read-only-1/options.json
new file mode 100644
index 000000000000..0a91d0015278
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-1/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["typescript"],
+  "throws": "'readonly' type modifier is only permitted on array and tuple literal types. (1:11)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-2/input.ts b/packages/babel-parser/test/fixtures/typescript/types/read-only-2/input.ts
new file mode 100644
index 000000000000..94eb468bffa9
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-2/input.ts
@@ -0,0 +1 @@
+type T31 = readonly T;  // Error
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-2/options.json b/packages/babel-parser/test/fixtures/typescript/types/read-only-2/options.json
new file mode 100644
index 000000000000..cdb818eee9b2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-2/options.json
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "typescript"
+  ],
+  "throws": "'readonly' type modifier is only permitted on array and tuple literal types. (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-3/input.ts b/packages/babel-parser/test/fixtures/typescript/types/read-only-3/input.ts
new file mode 100644
index 000000000000..a2fa9e1204b0
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-3/input.ts
@@ -0,0 +1 @@
+type T32 = readonly readonly string[];  // Error
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-3/options.json b/packages/babel-parser/test/fixtures/typescript/types/read-only-3/options.json
new file mode 100644
index 000000000000..cdb818eee9b2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-3/options.json
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "typescript"
+  ],
+  "throws": "'readonly' type modifier is only permitted on array and tuple literal types. (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-4/input.ts b/packages/babel-parser/test/fixtures/typescript/types/read-only-4/input.ts
new file mode 100644
index 000000000000..940ffd7b8a4d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-4/input.ts
@@ -0,0 +1 @@
+type T33 = readonly Array<string>;  // Error
diff --git a/packages/babel-parser/test/fixtures/typescript/types/read-only-4/options.json b/packages/babel-parser/test/fixtures/typescript/types/read-only-4/options.json
new file mode 100644
index 000000000000..cdb818eee9b2
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/read-only-4/options.json
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "typescript"
+  ],
+  "throws": "'readonly' type modifier is only permitted on array and tuple literal types. (1:11)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/reference-generic-nested/input.js b/packages/babel-parser/test/fixtures/typescript/types/reference-generic-nested/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/reference-generic-nested/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/reference-generic-nested/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/reference-generic/input.js b/packages/babel-parser/test/fixtures/typescript/types/reference-generic/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/reference-generic/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/reference-generic/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/reference/input.js b/packages/babel-parser/test/fixtures/typescript/types/reference/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/reference/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/reference/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-empty/input.ts b/packages/babel-parser/test/fixtures/typescript/types/tuple-empty/input.ts
new file mode 100644
index 000000000000..f7cd7b5a0e25
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-empty/input.ts
@@ -0,0 +1 @@
+let x: [];
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-empty/output.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-empty/output.json
new file mode 100644
index 000000000000..667ffcb301f5
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-empty/output.json
@@ -0,0 +1,117 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 10,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 10
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 10,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 10
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 10,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 10
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 9,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 9
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 9
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 5,
+                "end": 9,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 9
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTupleType",
+                  "start": 7,
+                  "end": 9,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 9
+                    }
+                  },
+                  "elementTypes": []
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/input.ts b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/input.ts
new file mode 100644
index 000000000000..6a4e23361c7e
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/input.ts
@@ -0,0 +1 @@
+let x: [string?, number]
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/options.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/options.json
new file mode 100644
index 000000000000..15111b29065f
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional-invalid/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["typescript"],
+  "throws": "A required element cannot follow an optional element. (1:17)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-optional/input.ts b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional/input.ts
new file mode 100644
index 000000000000..3b8d21ba958c
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional/input.ts
@@ -0,0 +1 @@
+let x: [string, number?, (string | number)?]
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-optional/output.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional/output.json
new file mode 100644
index 000000000000..90aaa9bc8aac
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-optional/output.json
@@ -0,0 +1,240 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 44,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 44
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 44,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 44
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 44,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 44
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 44,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 44
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 44
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 5,
+                "end": 44,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 44
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTupleType",
+                  "start": 7,
+                  "end": 44,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 44
+                    }
+                  },
+                  "elementTypes": [
+                    {
+                      "type": "TSStringKeyword",
+                      "start": 8,
+                      "end": 14,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 14
+                        }
+                      }
+                    },
+                    {
+                      "type": "TSOptionalType",
+                      "start": 16,
+                      "end": 23,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 23
+                        }
+                      },
+                      "typeAnnotation": {
+                        "type": "TSNumberKeyword",
+                        "start": 16,
+                        "end": 22,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 16
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 22
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "type": "TSOptionalType",
+                      "start": 25,
+                      "end": 43,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 25
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 43
+                        }
+                      },
+                      "typeAnnotation": {
+                        "type": "TSParenthesizedType",
+                        "start": 25,
+                        "end": 42,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 25
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 42
+                          }
+                        },
+                        "typeAnnotation": {
+                          "type": "TSUnionType",
+                          "start": 26,
+                          "end": 41,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 26
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 41
+                            }
+                          },
+                          "types": [
+                            {
+                              "type": "TSStringKeyword",
+                              "start": 26,
+                              "end": 32,
+                              "loc": {
+                                "start": {
+                                  "line": 1,
+                                  "column": 26
+                                },
+                                "end": {
+                                  "line": 1,
+                                  "column": 32
+                                }
+                              }
+                            },
+                            {
+                              "type": "TSNumberKeyword",
+                              "start": 35,
+                              "end": 41,
+                              "loc": {
+                                "start": {
+                                  "line": 1,
+                                  "column": 35
+                                },
+                                "end": {
+                                  "line": 1,
+                                  "column": 41
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-after-optional/input.ts b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-after-optional/input.ts
new file mode 100644
index 000000000000..954c72a82aaa
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-after-optional/input.ts
@@ -0,0 +1 @@
+function foo(...args: [number, string?, ...number[]]) {}
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-after-optional/output.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-after-optional/output.json
new file mode 100644
index 000000000000..1d71afdaae49
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-after-optional/output.json
@@ -0,0 +1,242 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 56,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 56
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 56,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 56
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 56,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 56
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "async": false,
+        "params": [
+          {
+            "type": "RestElement",
+            "start": 13,
+            "end": 52,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 52
+              }
+            },
+            "argument": {
+              "type": "Identifier",
+              "start": 16,
+              "end": 20,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 16
+                },
+                "end": {
+                  "line": 1,
+                  "column": 20
+                },
+                "identifierName": "args"
+              },
+              "name": "args"
+            },
+            "typeAnnotation": {
+              "type": "TSTypeAnnotation",
+              "start": 20,
+              "end": 52,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 20
+                },
+                "end": {
+                  "line": 1,
+                  "column": 52
+                }
+              },
+              "typeAnnotation": {
+                "type": "TSTupleType",
+                "start": 22,
+                "end": 52,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 52
+                  }
+                },
+                "elementTypes": [
+                  {
+                    "type": "TSNumberKeyword",
+                    "start": 23,
+                    "end": 29,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 23
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 29
+                      }
+                    }
+                  },
+                  {
+                    "type": "TSOptionalType",
+                    "start": 31,
+                    "end": 38,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 31
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 38
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "TSStringKeyword",
+                      "start": 31,
+                      "end": 37,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 31
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 37
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "type": "TSRestType",
+                    "start": 40,
+                    "end": 51,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 40
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 51
+                      }
+                    },
+                    "typeAnnotation": {
+                      "type": "TSArrayType",
+                      "start": 43,
+                      "end": 51,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 43
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 51
+                        }
+                      },
+                      "elementType": {
+                        "type": "TSNumberKeyword",
+                        "start": 43,
+                        "end": 49,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 43
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 49
+                          }
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ],
+        "body": {
+          "type": "BlockStatement",
+          "start": 54,
+          "end": 56,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 54
+            },
+            "end": {
+              "line": 1,
+              "column": 56
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/input.ts b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/input.ts
new file mode 100644
index 000000000000..2bfeae2e87eb
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/input.ts
@@ -0,0 +1 @@
+let x: [...number[], string]
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json
new file mode 100644
index 000000000000..82b4f09fc940
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest-invalid/options.json
@@ -0,0 +1,5 @@
+{
+  "sourceType": "module",
+  "plugins": ["typescript"],
+  "throws": "Rest element must be last element (1:19)"
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest/input.ts b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest/input.ts
new file mode 100644
index 000000000000..d7719b2cb4e6
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest/input.ts
@@ -0,0 +1 @@
+let x: [string, ...number[]]
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple-rest/output.json b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest/output.json
new file mode 100644
index 000000000000..fd5b5999c51a
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple-rest/output.json
@@ -0,0 +1,178 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 28
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 28
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 28
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 28,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 28
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 28,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 28
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 5,
+                "end": 28,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 28
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTupleType",
+                  "start": 7,
+                  "end": 28,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 28
+                    }
+                  },
+                  "elementTypes": [
+                    {
+                      "type": "TSStringKeyword",
+                      "start": 8,
+                      "end": 14,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 14
+                        }
+                      }
+                    },
+                    {
+                      "type": "TSRestType",
+                      "start": 16,
+                      "end": 27,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 27
+                        }
+                      },
+                      "typeAnnotation": {
+                        "type": "TSArrayType",
+                        "start": 19,
+                        "end": 27,
+                        "loc": {
+                          "start": {
+                            "line": 1,
+                            "column": 19
+                          },
+                          "end": {
+                            "line": 1,
+                            "column": 27
+                          }
+                        },
+                        "elementType": {
+                          "type": "TSNumberKeyword",
+                          "start": 19,
+                          "end": 25,
+                          "loc": {
+                            "start": {
+                              "line": 1,
+                              "column": 19
+                            },
+                            "end": {
+                              "line": 1,
+                              "column": 25
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple/input.ts b/packages/babel-parser/test/fixtures/typescript/types/tuple/input.ts
new file mode 100644
index 000000000000..53c8e72ec952
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple/input.ts
@@ -0,0 +1 @@
+let x: [number, number, number];
diff --git a/packages/babel-parser/test/fixtures/typescript/types/tuple/output.json b/packages/babel-parser/test/fixtures/typescript/types/tuple/output.json
new file mode 100644
index 000000000000..5b6c0e2cffd7
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/tuple/output.json
@@ -0,0 +1,163 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 32,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 32
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 32,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 32
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 32,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 32
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 4,
+            "end": 31,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 31
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 4,
+              "end": 31,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 4
+                },
+                "end": {
+                  "line": 1,
+                  "column": 31
+                },
+                "identifierName": "x"
+              },
+              "name": "x",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 5,
+                "end": 31,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 31
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTupleType",
+                  "start": 7,
+                  "end": 31,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 31
+                    }
+                  },
+                  "elementTypes": [
+                    {
+                      "type": "TSNumberKeyword",
+                      "start": 8,
+                      "end": 14,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 8
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 14
+                        }
+                      }
+                    },
+                    {
+                      "type": "TSNumberKeyword",
+                      "start": 16,
+                      "end": 22,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 22
+                        }
+                      }
+                    },
+                    {
+                      "type": "TSNumberKeyword",
+                      "start": 24,
+                      "end": 30,
+                      "loc": {
+                        "start": {
+                          "line": 1,
+                          "column": 24
+                        },
+                        "end": {
+                          "line": 1,
+                          "column": 30
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/typescript/types/type-literal/input.js b/packages/babel-parser/test/fixtures/typescript/types/type-literal/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/type-literal/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/type-literal/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/type-operator/input.js b/packages/babel-parser/test/fixtures/typescript/types/type-operator/input.js
deleted file mode 100644
index 1d23f962ef05..000000000000
--- a/packages/babel-parser/test/fixtures/typescript/types/type-operator/input.js
+++ /dev/null
@@ -1,2 +0,0 @@
-let x: keyof T;
-let y: unique symbol;
diff --git a/packages/babel-parser/test/fixtures/typescript/types/type-operator/input.ts b/packages/babel-parser/test/fixtures/typescript/types/type-operator/input.ts
new file mode 100644
index 000000000000..386c859ca95d
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/typescript/types/type-operator/input.ts
@@ -0,0 +1,4 @@
+let x: keyof T;
+let y: unique symbol;
+let z: readonly number[];
+let z1: readonly [number, number];
diff --git a/packages/babel-parser/test/fixtures/typescript/types/type-operator/output.json b/packages/babel-parser/test/fixtures/typescript/types/type-operator/output.json
index 8439bf99200e..4f8b2fb7589c 100644
--- a/packages/babel-parser/test/fixtures/typescript/types/type-operator/output.json
+++ b/packages/babel-parser/test/fixtures/typescript/types/type-operator/output.json
@@ -1,29 +1,29 @@
 {
   "type": "File",
   "start": 0,
-  "end": 37,
+  "end": 98,
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 21
+      "line": 4,
+      "column": 34
     }
   },
   "program": {
     "type": "Program",
     "start": 0,
-    "end": 37,
+    "end": 98,
     "loc": {
       "start": {
         "line": 1,
         "column": 0
       },
       "end": {
-        "line": 2,
-        "column": 21
+        "line": 4,
+        "column": 34
       }
     },
     "sourceType": "module",
@@ -239,6 +239,247 @@
           }
         ],
         "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 38,
+        "end": 63,
+        "loc": {
+          "start": {
+            "line": 3,
+            "column": 0
+          },
+          "end": {
+            "line": 3,
+            "column": 25
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 42,
+            "end": 62,
+            "loc": {
+              "start": {
+                "line": 3,
+                "column": 4
+              },
+              "end": {
+                "line": 3,
+                "column": 24
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 42,
+              "end": 62,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 4
+                },
+                "end": {
+                  "line": 3,
+                  "column": 24
+                },
+                "identifierName": "z"
+              },
+              "name": "z",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 43,
+                "end": 62,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 5
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 24
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTypeOperator",
+                  "start": 45,
+                  "end": 62,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 7
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 24
+                    }
+                  },
+                  "operator": "readonly",
+                  "typeAnnotation": {
+                    "type": "TSArrayType",
+                    "start": 54,
+                    "end": 62,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 16
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 24
+                      }
+                    },
+                    "elementType": {
+                      "type": "TSNumberKeyword",
+                      "start": 54,
+                      "end": 60,
+                      "loc": {
+                        "start": {
+                          "line": 3,
+                          "column": 16
+                        },
+                        "end": {
+                          "line": 3,
+                          "column": 22
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
+      },
+      {
+        "type": "VariableDeclaration",
+        "start": 64,
+        "end": 98,
+        "loc": {
+          "start": {
+            "line": 4,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 34
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 68,
+            "end": 97,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 4
+              },
+              "end": {
+                "line": 4,
+                "column": 33
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 68,
+              "end": 97,
+              "loc": {
+                "start": {
+                  "line": 4,
+                  "column": 4
+                },
+                "end": {
+                  "line": 4,
+                  "column": 33
+                },
+                "identifierName": "z1"
+              },
+              "name": "z1",
+              "typeAnnotation": {
+                "type": "TSTypeAnnotation",
+                "start": 70,
+                "end": 97,
+                "loc": {
+                  "start": {
+                    "line": 4,
+                    "column": 6
+                  },
+                  "end": {
+                    "line": 4,
+                    "column": 33
+                  }
+                },
+                "typeAnnotation": {
+                  "type": "TSTypeOperator",
+                  "start": 72,
+                  "end": 97,
+                  "loc": {
+                    "start": {
+                      "line": 4,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 4,
+                      "column": 33
+                    }
+                  },
+                  "operator": "readonly",
+                  "typeAnnotation": {
+                    "type": "TSTupleType",
+                    "start": 81,
+                    "end": 97,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 17
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 33
+                      }
+                    },
+                    "elementTypes": [
+                      {
+                        "type": "TSNumberKeyword",
+                        "start": 82,
+                        "end": 88,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 18
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 24
+                          }
+                        }
+                      },
+                      {
+                        "type": "TSNumberKeyword",
+                        "start": 90,
+                        "end": 96,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 26
+                          },
+                          "end": {
+                            "line": 4,
+                            "column": 32
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            "init": null
+          }
+        ],
+        "kind": "let"
       }
     ],
     "directives": []
diff --git a/packages/babel-parser/test/fixtures/typescript/types/typeof/input.js b/packages/babel-parser/test/fixtures/typescript/types/typeof/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/typeof/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/typeof/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/types/union-intersection/input.js b/packages/babel-parser/test/fixtures/typescript/types/union-intersection/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/types/union-intersection/input.js
rename to packages/babel-parser/test/fixtures/typescript/types/union-intersection/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment-not-allowed/input.js b/packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment-not-allowed/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment-not-allowed/input.js
rename to packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment-not-allowed/input.ts
diff --git a/packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment/input.js b/packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment/input.ts
similarity index 100%
rename from packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment/input.js
rename to packages/babel-parser/test/fixtures/typescript/variable-declarator/definite-assignment/input.ts
diff --git a/packages/babel-parser/test/helpers/runFixtureTests.js b/packages/babel-parser/test/helpers/runFixtureTests.js
index c910d6af1547..9e97ee46f727 100644
--- a/packages/babel-parser/test/helpers/runFixtureTests.js
+++ b/packages/babel-parser/test/helpers/runFixtureTests.js
@@ -1,7 +1,46 @@
 import { multiple as getFixtures } from "@babel/helper-fixtures";
+import { codeFrameColumns } from "@babel/code-frame";
 import fs from "fs";
 import path from "path";
 
+const rootPath = path.join(__dirname, "../../../..");
+
+class FixtureError extends Error {
+  constructor(previousError, fixturePath, code) {
+    super(previousError.message);
+    const messageLines = (previousError.message.match(/\n/g) || []).length + 1;
+
+    let fixtureStackFrame = "";
+    if (previousError.loc) {
+      fixtureStackFrame =
+        codeFrameColumns(
+          code,
+          {
+            start: {
+              line: previousError.loc.line,
+              column: previousError.loc.column + 1,
+            },
+          },
+          { highlightCode: true },
+        ) +
+        "\n" +
+        `at fixture (${fixturePath}:${previousError.loc.line}:${previousError
+          .loc.column + 1})\n`;
+    }
+
+    this.stack =
+      previousError.constructor.name +
+      ": " +
+      previousError.message +
+      "\n" +
+      fixtureStackFrame +
+      previousError.stack
+        .split("\n")
+        .slice(messageLines)
+        .join("\n");
+  }
+}
+
 export function runFixtureTests(fixturesPath, parseFunction) {
   const fixtures = getFixtures(fixturesPath);
 
@@ -26,9 +65,11 @@ export function runFixtureTests(fixturesPath, parseFunction) {
               }
             }
 
-            err.message =
-              name + "/" + task.actual.filename + ": " + err.message;
-            throw err;
+            const fixturePath = `${path.relative(
+              rootPath,
+              fixturesPath,
+            )}/${name}/${task.actual.filename}`;
+            throw new FixtureError(err, fixturePath, task.actual.code);
           }
         });
       });
@@ -53,9 +94,11 @@ export function runThrowTestsWithEstree(fixturesPath, parseFunction) {
           try {
             runTest(task, parseFunction);
           } catch (err) {
-            err.message =
-              name + "/" + task.actual.filename + ": " + err.message;
-            throw err;
+            const fixturePath = `${path.relative(
+              rootPath,
+              fixturesPath,
+            )}/${name}/${task.actual.filename}`;
+            throw new FixtureError(err, fixturePath, task.actual.code);
           }
         });
       });
@@ -88,6 +131,14 @@ function runTest(test, parseFunction) {
       if (err.message === opts.throws) {
         return;
       } else {
+        if (process.env.OVERWRITE) {
+          const fn = path.dirname(test.expect.loc) + "/options.json";
+          test.options = test.options || {};
+          test.options.throws = err.message;
+          fs.writeFileSync(fn, JSON.stringify(test.options, null, "  "));
+          return;
+        }
+
         err.message =
           "Expected error message: " +
           opts.throws +
@@ -115,6 +166,9 @@ function runTest(test, parseFunction) {
     const mis = misMatch(JSON.parse(test.expect.code), ast);
 
     if (mis) {
+      if (process.env.OVERWRITE) {
+        return save(test, ast);
+      }
       throw new Error(mis);
     }
   }
@@ -126,7 +180,7 @@ function ppJSON(v) {
 }
 
 function addPath(str, pt) {
-  if (str.charAt(str.length - 1) == ")") {
+  if (str.charAt(str.length - 1) === ")") {
     return str.slice(0, str.length - 1) + "/" + pt + ")";
   } else {
     return str + " (" + pt + ")";
@@ -152,12 +206,12 @@ function misMatch(exp, act) {
       return ppJSON(exp) + " !== " + ppJSON(act);
     }
   } else {
-    for (const prop in exp) {
+    for (const prop of Object.keys(exp)) {
       const mis = misMatch(exp[prop], act[prop]);
       if (mis) return addPath(mis, prop);
     }
 
-    for (const prop in act) {
+    for (const prop of Object.keys(act)) {
       if (typeof act[prop] === "function") {
         continue;
       }
diff --git a/packages/babel-parser/test/unit/util/identifier.js b/packages/babel-parser/test/unit/util/identifier.js
new file mode 100644
index 000000000000..420971a577e9
--- /dev/null
+++ b/packages/babel-parser/test/unit/util/identifier.js
@@ -0,0 +1,42 @@
+import {
+  isKeyword,
+  keywordRelationalOperator,
+} from "../../../src/util/identifier";
+
+describe("identifier", () => {
+  describe("isKeyword", () => {
+    it("break is a keyword", () => {
+      expect(isKeyword("break")).toBe(true);
+    });
+    it("const is a keyword", () => {
+      expect(isKeyword("const")).toBe(true);
+    });
+    it("super is a keyword", () => {
+      expect(isKeyword("super")).toBe(true);
+    });
+    it("let is not a keyword", () => {
+      expect(isKeyword("let")).toBe(false);
+    });
+    it("abc is not a keyword", () => {
+      expect(isKeyword("abc")).toBe(false);
+    });
+  });
+
+  describe("keywordRelationalOperator", () => {
+    it("in is true", () => {
+      expect(keywordRelationalOperator.test("in")).toBe(true);
+    });
+    it("instanceof is true", () => {
+      expect(keywordRelationalOperator.test("instanceof")).toBe(true);
+    });
+    it("stanceof is false", () => {
+      expect(keywordRelationalOperator.test("stanceof")).toBe(false);
+    });
+    it("instance is false", () => {
+      expect(keywordRelationalOperator.test("instance")).toBe(false);
+    });
+    it("abc is false", () => {
+      expect(keywordRelationalOperator.test("abc")).toBe(false);
+    });
+  });
+});
diff --git a/packages/babel-parser/test/unit/util/location.js b/packages/babel-parser/test/unit/util/location.js
new file mode 100644
index 000000000000..f66d3a3204eb
--- /dev/null
+++ b/packages/babel-parser/test/unit/util/location.js
@@ -0,0 +1,38 @@
+import { getLineInfo } from "../../../src/util/location";
+
+describe("getLineInfo", () => {
+  const input = "a\nb\nc\nd\ne\nf\ng\nh\ni";
+
+  it("reports correct position", () => {
+    expect(getLineInfo(input, 7)).toEqual({
+      column: 1,
+      line: 4,
+    });
+  });
+
+  it("reports correct position for first line", () => {
+    expect(getLineInfo(input, 0)).toEqual({
+      column: 0,
+      line: 1,
+    });
+  });
+
+  const inputArray = ["a", "b", "c", "d", "e", "f", "g", "h", "i"];
+  const singleCharLineEndings = ["\n", "\r", "\u2028", "\u2029"];
+
+  singleCharLineEndings.forEach(ending => {
+    it(`supports ${escape(ending)} line ending`, () => {
+      expect(getLineInfo(inputArray.join(ending), 7)).toEqual({
+        column: 1,
+        line: 4,
+      });
+    });
+  });
+
+  it(`supports ${escape("\r\n")} line ending`, () => {
+    expect(getLineInfo(inputArray.join("\r\n"), 7)).toEqual({
+      column: 1,
+      line: 3,
+    });
+  });
+});
diff --git a/packages/babel-parser/typings/babel-parser.d.ts b/packages/babel-parser/typings/babel-parser.d.ts
index 752fc365f010..deba6be0e6a7 100644
--- a/packages/babel-parser/typings/babel-parser.d.ts
+++ b/packages/babel-parser/typings/babel-parser.d.ts
@@ -78,6 +78,14 @@ export interface ParserOptions {
      * Adds all parsed tokens to a tokens property on the File node.
      */
     tokens?: boolean;
+
+    /**
+     * By default, the parser adds information about parentheses by setting
+     * `extra.parenthesized` to `true` as needed.
+     * When this option is `true` the parser creates `ParenthesizedExpression`
+     * AST nodes instead of using the `extra` property.
+     */
+    createParenthesizedExpressions?: boolean;
 }
 
 export type ParserPlugin =
@@ -106,4 +114,22 @@ export type ParserPlugin =
     'optionalCatchBinding' |
     'throwExpressions' |
     'pipelineOperator' |
-    'nullishCoalescingOperator';
+    'nullishCoalescingOperator' |
+    ParserPluginWithOptions;
+
+export type ParserPluginWithOptions =
+    ['decorators', DecoratorsPluginOptions] |
+    ['pipelineOperator', PipelineOperatorPluginOptions] |
+    ['flow', FlowPluginOptions];
+
+export interface DecoratorsPluginOptions {
+    decoratorsBeforeExport?: boolean;
+}
+
+export interface PipelineOperatorPluginOptions {
+    proposal: 'minimal' | 'smart';
+}
+
+export interface FlowPluginOptions {
+    all?: boolean;
+}
diff --git a/packages/babel-plugin-external-helpers/package.json b/packages/babel-plugin-external-helpers/package.json
index ab266e231cc0..7a4bd988941c 100644
--- a/packages/babel-plugin-external-helpers/package.json
+++ b/packages/babel-plugin-external-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-external-helpers",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "This plugin contains helper functions that’ll be placed at the top of the generated code",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-external-helpers",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-external-helpers/src/index.js b/packages/babel-plugin-external-helpers/src/index.js
index 089986cd248e..8ca1526bca9b 100644
--- a/packages/babel-plugin-external-helpers/src/index.js
+++ b/packages/babel-plugin-external-helpers/src/index.js
@@ -18,6 +18,7 @@ export default declare((api, options) => {
   const helperWhitelist = whitelist ? new Set(whitelist) : null;
 
   return {
+    name: "external-helpers",
     pre(file) {
       file.set("helperGenerator", name => {
         // If the helper didn't exist yet at the version given, we bail
diff --git a/packages/babel-plugin-proposal-async-generator-functions/package.json b/packages/babel-plugin-proposal-async-generator-functions/package.json
index a83971f738cd..81db9bcc3d53 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/package.json
+++ b/packages/babel-plugin-proposal-async-generator-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-async-generator-functions",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Turn async generator functions into ES2015 generators",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-async-generator-functions",
   "license": "MIT",
@@ -14,13 +14,13 @@
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
     "@babel/helper-remap-async-to-generator": "^7.1.0",
-    "@babel/plugin-syntax-async-generators": "^7.0.0"
+    "@babel/plugin-syntax-async-generators": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-async-generator-functions/src/index.js b/packages/babel-plugin-proposal-async-generator-functions/src/index.js
index f68cdaa6a282..82bfa1d32a86 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/src/index.js
+++ b/packages/babel-plugin-proposal-async-generator-functions/src/index.js
@@ -78,7 +78,9 @@ export default declare(api => {
   };
 
   return {
+    name: "proposal-async-generator-functions",
     inherits: syntaxAsyncGenerators,
+
     visitor: {
       Program(path, state) {
         // We need to traverse the ast here (instead of just vising Function
diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/expression/output.js b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/expression/output.js
index 4f0a62ea8267..de01998b51cb 100644
--- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/expression/output.js
+++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/expression/output.js
@@ -7,7 +7,9 @@
     return 3;
   });
 
-  return function agf() {
+  function agf() {
     return _agf.apply(this, arguments);
-  };
+  }
+
+  return agf;
 })();
diff --git a/packages/babel-plugin-proposal-class-properties/package.json b/packages/babel-plugin-proposal-class-properties/package.json
index 02d1fe8f257e..9a11e1c822a6 100644
--- a/packages/babel-plugin-proposal-class-properties/package.json
+++ b/packages/babel-plugin-proposal-class-properties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-class-properties",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "This plugin transforms static class properties as well as properties declared with the property initializer syntax",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-class-properties",
   "license": "MIT",
@@ -12,18 +12,14 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/helper-function-name": "^7.1.0",
-    "@babel/helper-member-expression-to-functions": "^7.0.0",
-    "@babel/helper-optimise-call-expression": "^7.0.0",
-    "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-replace-supers": "^7.1.0",
-    "@babel/plugin-syntax-class-properties": "^7.0.0"
+    "@babel/helper-create-class-features-plugin": "^7.5.5",
+    "@babel/helper-plugin-utils": "^7.0.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-class-properties/src/index.js b/packages/babel-plugin-proposal-class-properties/src/index.js
index 70a21da85416..89c016dbca54 100644
--- a/packages/babel-plugin-proposal-class-properties/src/index.js
+++ b/packages/babel-plugin-proposal-class-properties/src/index.js
@@ -1,524 +1,22 @@
+/* eslint-disable @babel/development/plugin-name */
+
 import { declare } from "@babel/helper-plugin-utils";
-import nameFunction from "@babel/helper-function-name";
-import syntaxClassProperties from "@babel/plugin-syntax-class-properties";
-import { template, traverse, types as t } from "@babel/core";
-import { environmentVisitor } from "@babel/helper-replace-supers";
-import memberExpressionToFunctions from "@babel/helper-member-expression-to-functions";
-import optimiseCall from "@babel/helper-optimise-call-expression";
+import {
+  createClassFeaturePlugin,
+  FEATURES,
+} from "@babel/helper-create-class-features-plugin";
 
 export default declare((api, options) => {
   api.assertVersion(7);
 
-  const { loose } = options;
-
-  const findBareSupers = traverse.visitors.merge([
-    {
-      Super(path) {
-        const { node, parentPath } = path;
-        if (parentPath.isCallExpression({ callee: node })) {
-          this.push(parentPath);
-        }
-      },
-    },
-    environmentVisitor,
-  ]);
-
-  const referenceVisitor = {
-    "TSTypeAnnotation|TypeAnnotation"(path) {
-      path.skip();
-    },
-
-    ReferencedIdentifier(path) {
-      if (this.scope.hasOwnBinding(path.node.name)) {
-        this.scope.rename(path.node.name);
-        path.skip();
-      }
-    },
-  };
-
-  const classFieldDefinitionEvaluationTDZVisitor = traverse.visitors.merge([
-    {
-      ReferencedIdentifier(path) {
-        if (
-          this.classBinding &&
-          this.classBinding === path.scope.getBinding(path.node.name)
-        ) {
-          const classNameTDZError = this.file.addHelper("classNameTDZError");
-          const throwNode = t.callExpression(classNameTDZError, [
-            t.stringLiteral(path.node.name),
-          ]);
-
-          path.replaceWith(t.sequenceExpression([throwNode, path.node]));
-          path.skip();
-        }
-      },
-    },
-    environmentVisitor,
-  ]);
-
-  // Traverses the class scope, handling private name references.  If an inner
-  // class redeclares the same private name, it will hand off traversal to the
-  // restricted visitor (which doesn't traverse the inner class's inner scope).
-  const privateNameVisitor = {
-    PrivateName(path) {
-      const { name } = this;
-      const { node, parentPath } = path;
-
-      if (!parentPath.isMemberExpression({ property: node })) return;
-      if (node.id.name !== name) return;
-      this.handle(parentPath);
-    },
-
-    Class(path) {
-      const { name } = this;
-      const body = path.get("body.body");
-
-      for (const prop of body) {
-        if (!prop.isClassPrivateProperty()) continue;
-        if (prop.node.key.id.name !== name) continue;
-
-        // This class redeclares the private name.
-        // So, we can only evaluate the things in the outer scope.
-        path.traverse(privateNameInnerVisitor, this);
-        path.skip();
-        break;
-      }
-    },
-  };
-
-  // Traverses the outer portion of a class, without touching the class's inner
-  // scope, for private names.
-  const privateNameInnerVisitor = traverse.visitors.merge([
-    {
-      PrivateName: privateNameVisitor.PrivateName,
-    },
-    environmentVisitor,
-  ]);
-
-  const privateNameHandlerSpec = {
-    memoise(member, count) {
-      const { scope } = member;
-      const { object } = member.node;
-
-      const memo = scope.maybeGenerateMemoised(object);
-      if (!memo) {
-        return;
-      }
-
-      this.memoiser.set(object, memo, count);
-    },
-
-    receiver(member) {
-      const { object } = member.node;
-
-      if (this.memoiser.has(object)) {
-        return t.cloneNode(this.memoiser.get(object));
-      }
-
-      return t.cloneNode(object);
-    },
-
-    get(member) {
-      const { map, file } = this;
-
-      return t.callExpression(file.addHelper("classPrivateFieldGet"), [
-        this.receiver(member),
-        t.cloneNode(map),
-      ]);
-    },
-
-    set(member, value) {
-      const { map, file } = this;
-
-      return t.callExpression(file.addHelper("classPrivateFieldSet"), [
-        this.receiver(member),
-        t.cloneNode(map),
-        value,
-      ]);
-    },
-
-    call(member, args) {
-      // The first access (the get) should do the memo assignment.
-      this.memoise(member, 1);
-
-      return optimiseCall(this.get(member), this.receiver(member), args);
-    },
-  };
-
-  const privateNameHandlerLoose = {
-    handle(member) {
-      const { prop, file } = this;
-      const { object } = member.node;
-
-      member.replaceWith(
-        template.expression`BASE(REF, PROP)[PROP]`({
-          BASE: file.addHelper("classPrivateFieldLooseBase"),
-          REF: object,
-          PROP: prop,
-        }),
-      );
-    },
-  };
-
-  const staticPrivatePropertyHandlerSpec = {
-    ...privateNameHandlerSpec,
-
-    get(member) {
-      const { file, privateId, classRef } = this;
-
-      return t.callExpression(
-        file.addHelper("classStaticPrivateFieldSpecGet"),
-        [this.receiver(member), t.cloneNode(classRef), t.cloneNode(privateId)],
-      );
-    },
-
-    set(member, value) {
-      const { file, privateId, classRef } = this;
-
-      return t.callExpression(
-        file.addHelper("classStaticPrivateFieldSpecSet"),
-        [
-          this.receiver(member),
-          t.cloneNode(classRef),
-          t.cloneNode(privateId),
-          value,
-        ],
-      );
-    },
-  };
-
-  function buildClassPropertySpec(ref, path, state) {
-    const { scope } = path;
-    const { key, value, computed } = path.node;
-    return t.expressionStatement(
-      t.callExpression(state.addHelper("defineProperty"), [
-        ref,
-        computed || t.isLiteral(key) ? key : t.stringLiteral(key.name),
-        value || scope.buildUndefinedNode(),
-      ]),
-    );
-  }
-
-  function buildClassPropertyLoose(ref, path) {
-    const { scope } = path;
-    const { key, value, computed } = path.node;
-    return t.expressionStatement(
-      t.assignmentExpression(
-        "=",
-        t.memberExpression(ref, key, computed || t.isLiteral(key)),
-        value || scope.buildUndefinedNode(),
-      ),
-    );
-  }
-
-  function buildClassPrivatePropertySpec(ref, path, initNodes, state) {
-    const { parentPath, scope } = path;
-    const { name } = path.node.key.id;
-
-    const map = scope.generateUidIdentifier(name);
-    memberExpressionToFunctions(parentPath, privateNameVisitor, {
-      name,
-      map,
-      file: state,
-      ...privateNameHandlerSpec,
-    });
-
-    initNodes.push(
-      template.statement`var MAP = new WeakMap();`({
-        MAP: map,
-      }),
-    );
-
-    // Must be late evaluated in case it references another private field.
-    return () =>
-      template.statement`
-        MAP.set(REF, {
-          // configurable is always false for private elements
-          // enumerable is always false for private elements
-          writable: true,
-          value: VALUE
-        });
-      `({
-        MAP: map,
-        REF: ref,
-        VALUE: path.node.value || scope.buildUndefinedNode(),
-      });
-  }
-
-  function buildClassPrivatePropertyLooseHelper(ref, path, state) {
-    const { parentPath, scope } = path;
-    const { name } = path.node.key.id;
-
-    const prop = scope.generateUidIdentifier(name);
-
-    parentPath.traverse(privateNameVisitor, {
-      name,
-      prop,
-      file: state,
-      ...privateNameHandlerLoose,
-    });
-
-    return {
-      keyDecl: template.statement`var PROP = HELPER(NAME);`({
-        PROP: prop,
-        HELPER: state.addHelper("classPrivateFieldLooseKey"),
-        NAME: t.stringLiteral(name),
-      }),
-      // Must be late evaluated in case it references another private field.
-      buildInit: () =>
-        template.statement.ast`
-          Object.defineProperty(${ref}, ${prop}, {
-            // configurable is false by default
-            // enumerable is false by default
-            writable: true,
-            value: ${path.node.value || scope.buildUndefinedNode()}
-          });
-        `,
-    };
-  }
-
-  function buildClassInstancePrivatePropertyLoose(ref, path, initNodes, state) {
-    const { keyDecl, buildInit } = buildClassPrivatePropertyLooseHelper(
-      ref,
-      path,
-      state,
-    );
-
-    initNodes.push(keyDecl);
-    return buildInit;
-  }
-
-  function buildClassStaticPrivatePropertyLoose(ref, path, state) {
-    const { keyDecl, buildInit } = buildClassPrivatePropertyLooseHelper(
-      ref,
-      path,
-      state,
-    );
-
-    return [keyDecl, buildInit()];
-  }
-
-  function buildClassStaticPrivatePropertySpec(ref, path, state) {
-    const { parentPath, scope } = path;
-    const { name } = path.node.key.id;
-
-    const privateId = scope.generateUidIdentifier(name);
-    memberExpressionToFunctions(parentPath, privateNameVisitor, {
-      name,
-      privateId,
-      classRef: ref,
-      file: state,
-      ...staticPrivatePropertyHandlerSpec,
-    });
-
-    return [
-      template.statement.ast`
-        var ${privateId} = {
-          // configurable is always false for private elements
-          // enumerable is always false for private elements
-          writable: true,
-          value: ${path.node.value || scope.buildUndefinedNode()}
-        }
-      `,
-    ];
-  }
-
-  const buildClassProperty = loose
-    ? buildClassPropertyLoose
-    : buildClassPropertySpec;
-
-  const buildClassPrivateProperty = loose
-    ? buildClassInstancePrivatePropertyLoose
-    : buildClassPrivatePropertySpec;
-
-  const buildClassStaticPrivateProperty = loose
-    ? buildClassStaticPrivatePropertyLoose
-    : buildClassStaticPrivatePropertySpec;
-
-  return {
-    inherits: syntaxClassProperties,
-
-    visitor: {
-      Class(path, state) {
-        const isDerived = !!path.node.superClass;
-        let constructor;
-        const props = [];
-        const computedPaths = [];
-        const privateNames = new Set();
-        const body = path.get("body");
-
-        for (const path of body.get("body")) {
-          const { computed, decorators } = path.node;
-          if (computed) {
-            computedPaths.push(path);
-          }
-          if (decorators && decorators.length > 0) {
-            throw path.buildCodeFrameError(
-              "Decorators transform is necessary.",
-            );
-          }
-
-          if (path.isClassPrivateProperty()) {
-            const {
-              key: {
-                id: { name },
-              },
-            } = path.node;
-
-            if (privateNames.has(name)) {
-              throw path.buildCodeFrameError("Duplicate private field");
-            }
-            privateNames.add(name);
-          }
-
-          if (path.isProperty()) {
-            props.push(path);
-          } else if (path.isClassMethod({ kind: "constructor" })) {
-            constructor = path;
-          }
-        }
-
-        if (!props.length) return;
-
-        let ref;
-        if (path.isClassExpression() || !path.node.id) {
-          nameFunction(path);
-          ref = path.scope.generateUidIdentifier("class");
-        } else {
-          // path.isClassDeclaration() && path.node.id
-          ref = path.node.id;
-        }
-
-        const computedNodes = [];
-        const staticNodes = [];
-        const instanceBody = [];
-
-        for (const computedPath of computedPaths) {
-          computedPath.traverse(classFieldDefinitionEvaluationTDZVisitor, {
-            classBinding:
-              path.node.id && path.scope.getBinding(path.node.id.name),
-            file: this.file,
-          });
-
-          const computedNode = computedPath.node;
-          // Make sure computed property names are only evaluated once (upon class definition)
-          // and in the right order in combination with static properties
-          if (!computedPath.get("key").isConstantExpression()) {
-            const ident = path.scope.generateUidIdentifierBasedOnNode(
-              computedNode.key,
-            );
-            computedNodes.push(
-              t.variableDeclaration("var", [
-                t.variableDeclarator(ident, computedNode.key),
-              ]),
-            );
-            computedNode.key = t.cloneNode(ident);
-          }
-        }
-
-        // Transform private props before publics.
-        const privateMaps = [];
-        const privateMapInits = [];
-        for (const prop of props) {
-          if (prop.isPrivate() && !prop.node.static) {
-            const inits = [];
-            privateMapInits.push(inits);
-
-            privateMaps.push(
-              buildClassPrivateProperty(t.thisExpression(), prop, inits, state),
-            );
-          }
-        }
-        let p = 0;
-        for (const prop of props) {
-          if (prop.node.static) {
-            if (prop.isPrivate()) {
-              staticNodes.push(
-                ...buildClassStaticPrivateProperty(
-                  t.cloneNode(ref),
-                  prop,
-                  state,
-                ),
-              );
-            } else {
-              staticNodes.push(
-                buildClassProperty(t.cloneNode(ref), prop, state),
-              );
-            }
-          } else if (prop.isPrivate()) {
-            instanceBody.push(privateMaps[p]());
-            staticNodes.push(...privateMapInits[p]);
-            p++;
-          } else {
-            instanceBody.push(
-              buildClassProperty(t.thisExpression(), prop, state),
-            );
-          }
-        }
-
-        if (instanceBody.length) {
-          if (!constructor) {
-            const newConstructor = t.classMethod(
-              "constructor",
-              t.identifier("constructor"),
-              [],
-              t.blockStatement([]),
-            );
-            if (isDerived) {
-              newConstructor.params = [t.restElement(t.identifier("args"))];
-              newConstructor.body.body.push(
-                t.expressionStatement(
-                  t.callExpression(t.super(), [
-                    t.spreadElement(t.identifier("args")),
-                  ]),
-                ),
-              );
-            }
-            [constructor] = body.unshiftContainer("body", newConstructor);
-          }
-
-          const state = { scope: constructor.scope };
-          for (const prop of props) {
-            if (prop.node.static) continue;
-            prop.traverse(referenceVisitor, state);
-          }
-
-          //
-
-          if (isDerived) {
-            const bareSupers = [];
-            constructor.traverse(findBareSupers, bareSupers);
-            for (const bareSuper of bareSupers) {
-              bareSuper.insertAfter(instanceBody);
-            }
-          } else {
-            constructor.get("body").unshiftContainer("body", instanceBody);
-          }
-        }
-
-        for (const prop of props) {
-          prop.remove();
-        }
-
-        if (computedNodes.length === 0 && staticNodes.length === 0) return;
-
-        if (path.isClassExpression()) {
-          path.scope.push({ id: ref });
-          path.replaceWith(
-            t.assignmentExpression("=", t.cloneNode(ref), path.node),
-          );
-        } else if (!path.node.id) {
-          // Anonymous class declaration
-          path.node.id = ref;
-        }
+  return createClassFeaturePlugin({
+    name: "proposal-class-properties",
 
-        path.insertBefore(computedNodes);
-        path.insertAfter(staticNodes);
-      },
+    feature: FEATURES.fields,
+    loose: options.loose,
 
-      PrivateName(path) {
-        throw path.buildCodeFrameError(`Unknown PrivateName "${path}"`);
-      },
+    manipulateOptions(opts, parserOpts) {
+      parserOpts.plugins.push("classProperties", "classPrivateProperties");
     },
-  };
+  });
 });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/wrong-order/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/wrong-order/input.js
new file mode 100644
index 000000000000..248eee836d59
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/wrong-order/input.js
@@ -0,0 +1,2 @@
+@deco
+class Foo {}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/wrong-order/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/wrong-order/options.json
new file mode 100644
index 000000000000..64fd0cbcea65
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/wrong-order/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    ["proposal-class-properties", { "loose": true }],
+    ["proposal-decorators", { "legacy": true }]
+  ],
+  "throws": "Decorators are not enabled."
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-key/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-key/output.js
index 2ded153f1e81..117802306abc 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-key/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-key/output.js
@@ -16,11 +16,12 @@ function (_Hello) {
   babelHelpers.inherits(Outer, _Hello);
 
   function Outer() {
+    let _this2;
+
     var _this;
 
     babelHelpers.classCallCheck(this, Outer);
-
-    var _this2 = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Outer).call(this));
+    _this2 = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Outer).call(this));
 
     let Inner = function Inner() {
       babelHelpers.classCallCheck(this, Inner);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-key/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-key/output.js
index 6df7880cd395..ba9e8dd36f5e 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-key/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-key/output.js
@@ -22,12 +22,13 @@ function (_Hello) {
   babelHelpers.inherits(Outer, _Hello);
 
   function Outer() {
+    let _babelHelpers$get$cal;
+
     var _this;
 
     babelHelpers.classCallCheck(this, Outer);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Outer).call(this));
-
-    var _babelHelpers$get$cal = babelHelpers.get(babelHelpers.getPrototypeOf(Outer.prototype), "toString", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this));
+    _babelHelpers$get$cal = babelHelpers.get(babelHelpers.getPrototypeOf(Outer.prototype), "toString", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this));
 
     let Inner = function Inner() {
       babelHelpers.classCallCheck(this, Inner);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js
index 899fff234157..47386a7981d4 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js
@@ -3,7 +3,7 @@ var Point =
 function () {
   "use strict";
 
-  function Point(_x2 = 0, _y2 = 0) {
+  function Point(x = 0, y = 0) {
     babelHelpers.classCallCheck(this, Point);
     Object.defineProperty(this, _x, {
       writable: true,
@@ -13,8 +13,8 @@ function () {
       writable: true,
       value: void 0
     });
-    babelHelpers.classPrivateFieldLooseBase(this, _x)[_x] = +_x2;
-    babelHelpers.classPrivateFieldLooseBase(this, _y)[_y] = +_y2;
+    babelHelpers.classPrivateFieldLooseBase(this, _x)[_x] = +x;
+    babelHelpers.classPrivateFieldLooseBase(this, _y)[_y] = +y;
   }
 
   babelHelpers.createClass(Point, [{
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js
index c6f6c9ecc347..c9e24a3826e3 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js
@@ -12,13 +12,13 @@ function (_Bar) {
 
     if (condition) {
       _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
-      Object.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))), _bar, {
+      Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
         writable: true,
         value: "foo"
       });
     } else {
       _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
-      Object.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))), _bar, {
+      Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
         writable: true,
         value: "foo"
       });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js
index 01ba0c6cdf87..b008861733c2 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js
@@ -22,7 +22,7 @@ function (_Foo) {
 
     babelHelpers.classCallCheck(this, Bar);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Bar).call(this, ...args));
-    Object.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), _prop2, {
+    Object.defineProperty(babelHelpers.assertThisInitialized(_this), _prop2, {
       writable: true,
       value: "bar"
     });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/exec.js
new file mode 100644
index 000000000000..e9b210909117
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/exec.js
@@ -0,0 +1,17 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 1;
+    ;([this.x = this.#client, this.#client, this.y = this.#client] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo([undefined, 'bar']);
+expect(foo.getClient()).toBe('bar');
+expect(foo.x).toBe(1);
+expect(foo.y).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/input.js
new file mode 100644
index 000000000000..fa30cf5cf1e4
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/input.js
@@ -0,0 +1,8 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 1;
+    ([this.x = this.#client, this.#client, this.y = this.#client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/output.js
new file mode 100644
index 000000000000..125c49f49cd1
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/output.js
@@ -0,0 +1,13 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = 1;
+  [this.x = babelHelpers.classPrivateFieldLooseBase(this, _client)[_client], babelHelpers.classPrivateFieldLooseBase(this, _client)[_client], this.y = babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]] = props;
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/exec.js
new file mode 100644
index 000000000000..c502fd3c3dc0
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/exec.js
@@ -0,0 +1,15 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    let x;
+    ;([x, ...this.#client] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo(['foo', 'bar', 'baz', 'quu']);
+expect(foo.getClient()).toEqual(['bar', 'baz', 'quu']);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/input.js
new file mode 100644
index 000000000000..e04fee2eb915
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([x, ...this.#client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/output.js
new file mode 100644
index 000000000000..9b6c4ea89d62
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/output.js
@@ -0,0 +1,12 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  [x, ...babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]] = props;
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/exec.js
new file mode 100644
index 000000000000..1882aa63236d
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([this.#client = 5] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo([]);
+expect(foo.getClient()).toEqual(5);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/input.js
new file mode 100644
index 000000000000..1a5a134409e6
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([this.#client = 5] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/output.js
new file mode 100644
index 000000000000..a784a6b0f3df
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/output.js
@@ -0,0 +1,12 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  [babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = 5] = props;
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/exec.js
new file mode 100644
index 000000000000..33310d6da0ca
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ;([this.#client] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo(['bar']);
+expect(foo.getClient()).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/input.js
new file mode 100644
index 000000000000..264e1bc6ef27
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([this.#client] = props);
+  }
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/output.js
new file mode 100644
index 000000000000..6d27b1b7faf0
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/output.js
@@ -0,0 +1,12 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  [babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]] = props;
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/exec.js
new file mode 100644
index 000000000000..64797efce7c9
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/exec.js
@@ -0,0 +1,17 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 'foo';
+    ;({ x: this.x = this.#client, y: this.#client, z: this.z = this.#client } = props)
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({ y: 'bar' });
+expect(foo.getClient()).toBe('bar');
+expect(foo.x).toBe('foo');
+expect(foo.z).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/input.js
new file mode 100644
index 000000000000..bd3bbacb8cdc
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/input.js
@@ -0,0 +1,8 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 'foo';
+    ({ x: this.x = this.#client, y: this.#client, z: this.z = this.#client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/output.js
new file mode 100644
index 000000000000..c4738101c521
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/output.js
@@ -0,0 +1,17 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = 'foo';
+  ({
+    x: this.x = babelHelpers.classPrivateFieldLooseBase(this, _client)[_client],
+    y: babelHelpers.classPrivateFieldLooseBase(this, _client)[_client],
+    z: this.z = babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]
+  } = props);
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/exec.js
new file mode 100644
index 000000000000..944db11a8f3e
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/exec.js
@@ -0,0 +1,15 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    let x;
+    ;({ x, ...this.#client } = props)
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({ x: 'foo', y: 'bar', z: 'baz' });
+expect(foo.getClient()).toEqual({ y: 'bar', z: 'baz' });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/options.json
new file mode 100644
index 000000000000..4a36349a0499
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/options.json
@@ -0,0 +1,15 @@
+{
+  "plugins": [
+    "transform-destructuring",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.4.4"
+      }
+    ],
+    "proposal-class-properties",
+    "transform-classes",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/input.js
new file mode 100644
index 000000000000..9c020dcd126f
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({ x, ...this.#client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/output.js
new file mode 100644
index 000000000000..9786b38d6210
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/output.js
@@ -0,0 +1,15 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  ({
+    x,
+    ...babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]
+  } = props);
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/exec.js
new file mode 100644
index 000000000000..109ea2b6c62b
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({ client: this.#client = 5 } = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({});
+expect(foo.getClient()).toEqual(5);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/input.js
new file mode 100644
index 000000000000..6f43a4ba0171
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({ client: this.#client = 5 } = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/output.js
new file mode 100644
index 000000000000..e4ed8b749f51
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/output.js
@@ -0,0 +1,14 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  ({
+    client: babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = 5
+  } = props);
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/exec.js
new file mode 100644
index 000000000000..97a5263bdfb8
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ;({ client: this.#client } = props)
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({ client: 'bar' });
+expect(foo.getClient()).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/input.js
new file mode 100644
index 000000000000..b46622eeb3e8
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({ client: this.#client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/output.js
new file mode 100644
index 000000000000..989cacb99791
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/output.js
@@ -0,0 +1,14 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+  Object.defineProperty(this, _client, {
+    writable: true,
+    value: void 0
+  });
+  ({
+    client: babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]
+  } = props);
+};
+
+var _client = babelHelpers.classPrivateFieldLooseKey("client");
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js
index d4a49a383ca8..c28687635b83 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js
@@ -10,7 +10,7 @@ function (_Parent) {
 
     babelHelpers.classCallCheck(this, Child);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Child).call(this));
-    Object.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), _scopedFunctionWithThis, {
+    Object.defineProperty(babelHelpers.assertThisInitialized(_this), _scopedFunctionWithThis, {
       writable: true,
       value: function value() {
         _this.name = {};
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js
index 33bfbfeff1b6..fb965472f6d7 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js
@@ -18,13 +18,12 @@ class Foo {
 
 var _foo = babelHelpers.classPrivateFieldLooseKey("foo");
 
+var _bar = babelHelpers.classPrivateFieldLooseKey("bar");
+
 Object.defineProperty(Foo, _foo, {
   writable: true,
   value: "foo"
 });
-
-var _bar = babelHelpers.classPrivateFieldLooseKey("bar");
-
 var f = new Foo();
 expect("foo" in Foo).toBe(false);
 expect("bar" in f).toBe(false);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/exec.js
new file mode 100644
index 000000000000..9eee96e79f6d
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/exec.js
@@ -0,0 +1,13 @@
+class A {
+  static #self = this;
+  static #getA = () => this;
+
+  static extract() {
+    return { self: A.#self, getA: A.#getA };
+  }
+}
+
+const { self, getA } = A.extract();
+
+expect(self).toBe(A);
+expect(getA()).toBe(A);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/input.js
new file mode 100644
index 000000000000..bdfaf4424dfa
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/input.js
@@ -0,0 +1,4 @@
+class A {
+  static #self = this;
+  static #getA = () => this;
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/output.js
new file mode 100644
index 000000000000..d0c5da7be84f
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/output.js
@@ -0,0 +1,18 @@
+var A = function A() {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, A);
+};
+
+var _self = babelHelpers.classPrivateFieldLooseKey("self");
+
+var _getA = babelHelpers.classPrivateFieldLooseKey("getA");
+
+Object.defineProperty(A, _self, {
+  writable: true,
+  value: A
+});
+Object.defineProperty(A, _getA, {
+  writable: true,
+  value: () => A
+});
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js
index a21817fed296..70cd36e5258a 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js
@@ -9,7 +9,7 @@ function (_Bar) {
     var _temp, _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), Object.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), _bar, {
+    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
       writable: true,
       value: "foo"
     }), _temp));
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js
index bf1561a9da39..c0f57c4a3319 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js
@@ -10,7 +10,7 @@ function (_Bar) {
 
     babelHelpers.classCallCheck(this, Foo);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
-    Object.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), _bar, {
+    Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
       writable: true,
       value: "foo"
     });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js
index 4c9d083cefdc..b9c9ab8067bb 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js
@@ -3,7 +3,7 @@ var Point =
 function () {
   "use strict";
 
-  function Point(_x2 = 0, _y2 = 0) {
+  function Point(x = 0, y = 0) {
     babelHelpers.classCallCheck(this, Point);
 
     _x.set(this, {
@@ -16,8 +16,8 @@ function () {
       value: void 0
     });
 
-    babelHelpers.classPrivateFieldSet(this, _x, +_x2);
-    babelHelpers.classPrivateFieldSet(this, _y, +_y2);
+    babelHelpers.classPrivateFieldSet(this, _x, +x);
+    babelHelpers.classPrivateFieldSet(this, _y, +y);
   }
 
   babelHelpers.createClass(Point, [{
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js
index 9b46f9b9e4b1..e69db438db4e 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js
@@ -13,14 +13,14 @@ function (_Bar) {
     if (condition) {
       _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
 
-      _bar.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))), {
+      _bar.set(babelHelpers.assertThisInitialized(_this), {
         writable: true,
         value: "foo"
       });
     } else {
       _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
 
-      _bar.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))), {
+      _bar.set(babelHelpers.assertThisInitialized(_this), {
         writable: true,
         value: "foo"
       });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived/output.js
index c21d6c318652..e963676ac346 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived/output.js
@@ -24,7 +24,7 @@ function (_Foo) {
     babelHelpers.classCallCheck(this, Bar);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Bar).call(this, ...args));
 
-    _prop2.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), {
+    _prop2.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,
       value: "bar"
     });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/exec.js
new file mode 100644
index 000000000000..e9b210909117
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/exec.js
@@ -0,0 +1,17 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 1;
+    ;([this.x = this.#client, this.#client, this.y = this.#client] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo([undefined, 'bar']);
+expect(foo.getClient()).toBe('bar');
+expect(foo.x).toBe(1);
+expect(foo.y).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/input.js
new file mode 100644
index 000000000000..fa30cf5cf1e4
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/input.js
@@ -0,0 +1,8 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 1;
+    ([this.x = this.#client, this.#client, this.y = this.#client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/output.js
new file mode 100644
index 000000000000..50ee938ef1bb
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/output.js
@@ -0,0 +1,15 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  babelHelpers.classPrivateFieldSet(this, _client, 1);
+  [this.x = babelHelpers.classPrivateFieldGet(this, _client), babelHelpers.classPrivateFieldDestructureSet(this, _client).value, this.y = babelHelpers.classPrivateFieldGet(this, _client)] = props;
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/exec.js
new file mode 100644
index 000000000000..c502fd3c3dc0
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/exec.js
@@ -0,0 +1,15 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    let x;
+    ;([x, ...this.#client] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo(['foo', 'bar', 'baz', 'quu']);
+expect(foo.getClient()).toEqual(['bar', 'baz', 'quu']);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/input.js
new file mode 100644
index 000000000000..e04fee2eb915
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([x, ...this.#client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/output.js
new file mode 100644
index 000000000000..6e66641ab3a7
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/output.js
@@ -0,0 +1,14 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  [x, ...babelHelpers.classPrivateFieldDestructureSet(this, _client).value] = props;
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/exec.js
new file mode 100644
index 000000000000..1882aa63236d
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([this.#client = 5] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo([]);
+expect(foo.getClient()).toEqual(5);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/input.js
new file mode 100644
index 000000000000..1a5a134409e6
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([this.#client = 5] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/output.js
new file mode 100644
index 000000000000..e7426334167a
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/output.js
@@ -0,0 +1,14 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  [babelHelpers.classPrivateFieldDestructureSet(this, _client).value = 5] = props;
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/exec.js
new file mode 100644
index 000000000000..33310d6da0ca
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ;([this.#client] = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo(['bar']);
+expect(foo.getClient()).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/input.js
new file mode 100644
index 000000000000..264e1bc6ef27
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ([this.#client] = props);
+  }
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/output.js
new file mode 100644
index 000000000000..8cfd77e1e36f
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/output.js
@@ -0,0 +1,14 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  [babelHelpers.classPrivateFieldDestructureSet(this, _client).value] = props;
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/exec.js
new file mode 100644
index 000000000000..64797efce7c9
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/exec.js
@@ -0,0 +1,17 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 'foo';
+    ;({ x: this.x = this.#client, y: this.#client, z: this.z = this.#client } = props)
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({ y: 'bar' });
+expect(foo.getClient()).toBe('bar');
+expect(foo.x).toBe('foo');
+expect(foo.z).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/input.js
new file mode 100644
index 000000000000..bd3bbacb8cdc
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/input.js
@@ -0,0 +1,8 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    this.#client = 'foo';
+    ({ x: this.x = this.#client, y: this.#client, z: this.z = this.#client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/output.js
new file mode 100644
index 000000000000..a9623d18db3d
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/output.js
@@ -0,0 +1,19 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  babelHelpers.classPrivateFieldSet(this, _client, 'foo');
+  ({
+    x: this.x = babelHelpers.classPrivateFieldGet(this, _client),
+    y: babelHelpers.classPrivateFieldDestructureSet(this, _client).value,
+    z: this.z = babelHelpers.classPrivateFieldGet(this, _client)
+  } = props);
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/exec.js
new file mode 100644
index 000000000000..944db11a8f3e
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/exec.js
@@ -0,0 +1,15 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    let x;
+    ;({ x, ...this.#client } = props)
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({ x: 'foo', y: 'bar', z: 'baz' });
+expect(foo.getClient()).toEqual({ y: 'bar', z: 'baz' });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/options.json
new file mode 100644
index 000000000000..4a36349a0499
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/options.json
@@ -0,0 +1,15 @@
+{
+  "plugins": [
+    "transform-destructuring",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.4.4"
+      }
+    ],
+    "proposal-class-properties",
+    "transform-classes",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/input.js
new file mode 100644
index 000000000000..9c020dcd126f
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({ x, ...this.#client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/output.js
new file mode 100644
index 000000000000..22b58fd39617
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/output.js
@@ -0,0 +1,17 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  ({
+    x,
+    ...babelHelpers.classPrivateFieldDestructureSet(this, _client).value
+  } = props);
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/exec.js
new file mode 100644
index 000000000000..60fab21660a3
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({x: this.#client = 5} = props);
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({});
+expect(foo.getClient()).toEqual(5);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/input.js
new file mode 100644
index 000000000000..47a6958c0145
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({x: this.#client = 5} = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/output.js
new file mode 100644
index 000000000000..3509915f38a5
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/output.js
@@ -0,0 +1,16 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  ({
+    x: babelHelpers.classPrivateFieldDestructureSet(this, _client).value = 5
+  } = props);
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/exec.js
new file mode 100644
index 000000000000..97a5263bdfb8
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/exec.js
@@ -0,0 +1,14 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ;({ client: this.#client } = props)
+  }
+
+  getClient() {
+    return this.#client;
+  }
+}
+
+const foo = new Foo({ client: 'bar' });
+expect(foo.getClient()).toBe('bar');
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/input.js
new file mode 100644
index 000000000000..b46622eeb3e8
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/input.js
@@ -0,0 +1,7 @@
+class Foo {
+  #client
+
+  constructor(props) {
+    ({ client: this.#client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/output.js
new file mode 100644
index 000000000000..e49b06dd952c
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/output.js
@@ -0,0 +1,16 @@
+var Foo = function Foo(props) {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, Foo);
+
+  _client.set(this, {
+    writable: true,
+    value: void 0
+  });
+
+  ({
+    client: babelHelpers.classPrivateFieldDestructureSet(this, _client).value
+  } = props);
+};
+
+var _client = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/foobar/output.js
index f5185121331b..75191222819f 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/foobar/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/foobar/output.js
@@ -11,7 +11,7 @@ function (_Parent) {
     babelHelpers.classCallCheck(this, Child);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Child).call(this));
 
-    _scopedFunctionWithThis.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), {
+    _scopedFunctionWithThis.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,
       value: () => {
         _this.name = {};
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js
index 72ca92a92bbf..fc70fa14fb8a 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js
@@ -16,9 +16,9 @@ class Foo {
 
 }
 
+var _bar = new WeakMap();
+
 var _foo = {
   writable: true,
   value: "foo"
 };
-
-var _bar = new WeakMap();
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json
index beb3d1d5c569..5e2180d412eb 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json
@@ -3,7 +3,7 @@
     [
       "external-helpers",
       {
-        "helperVersion": "7.0.2"
+        "helperVersion": "7.4.4"
       }
     ],
     "proposal-class-properties",
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs
index 7afab860194f..183240a1c2a0 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs
@@ -1,5 +1,3 @@
-var _class;
-
 class MyClass {
   constructor() {
     var _this = this;
@@ -22,7 +20,7 @@ class MyClass {
 
 var _myAsyncMethod = new WeakMap();
 
-_class = class MyClass2 {
+(class MyClass2 {
   constructor() {
     var _this2 = this;
 
@@ -40,7 +38,7 @@ _class = class MyClass2 {
     });
   }
 
-};
+});
 
 var _myAsyncMethod2 = new WeakMap();
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/exec.js
new file mode 100644
index 000000000000..9eee96e79f6d
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/exec.js
@@ -0,0 +1,13 @@
+class A {
+  static #self = this;
+  static #getA = () => this;
+
+  static extract() {
+    return { self: A.#self, getA: A.#getA };
+  }
+}
+
+const { self, getA } = A.extract();
+
+expect(self).toBe(A);
+expect(getA()).toBe(A);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/input.js
new file mode 100644
index 000000000000..bdfaf4424dfa
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/input.js
@@ -0,0 +1,4 @@
+class A {
+  static #self = this;
+  static #getA = () => this;
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/output.js
new file mode 100644
index 000000000000..75e42cd43f2b
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-this/output.js
@@ -0,0 +1,14 @@
+var A = function A() {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, A);
+};
+
+var _self = {
+  writable: true,
+  value: A
+};
+var _getA = {
+  writable: true,
+  value: () => A
+};
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-call/output.js
index 09e9c4b9e156..460fc4c6bea8 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-call/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-call/output.js
@@ -29,7 +29,7 @@ function (_A) {
     babelHelpers.classCallCheck(this, B);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).call(this, ...args));
 
-    _foo.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), {
+    _foo.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,
       value: babelHelpers.get(babelHelpers.getPrototypeOf(B.prototype), "foo", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this))
     });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js
index c887562842bf..f4bce1d75894 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js
@@ -9,7 +9,7 @@ function (_Bar) {
     var _temp, _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), _bar.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), {
+    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), _bar.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,
       value: "foo"
     }), _temp));
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js
index ecb55ffde580..df484a2a1c7a 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js
@@ -11,7 +11,7 @@ function (_Bar) {
     babelHelpers.classCallCheck(this, Foo);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
 
-    _bar.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), {
+    _bar.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,
       value: "foo"
     });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/output.js
index 0cd7c14b4559..20509438f6a1 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/output.js
@@ -1,24 +1,19 @@
+var _one, _ref, _undefined, _computed, _computed2, _ref2, _ref3, _baz, _ref4;
+
 var foo = "foo";
 
 var bar = () => {};
 
 var four = 4;
-
-var _one = one();
-
-var _ref = 2 * four + seven;
-
-var _undefined = undefined;
-
-var _computed = computed();
-
-var _computed2 = computed();
-
-var _ref2 = "test" + one;
-
-var _ref3 = /regex/;
-var _baz = baz;
-var _ref4 = `template${expression}`;
+_one = one();
+_ref = 2 * four + seven;
+_undefined = undefined;
+_computed = computed();
+_computed2 = computed();
+_ref2 = "test" + one;
+_ref3 = /regex/;
+_baz = baz;
+_ref4 = `template${expression}`;
 
 var MyClass =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/output.js
index 0e98b482c741..c7e13f2d1b6e 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/output.js
@@ -1,5 +1,7 @@
 function test(x) {
-  var _x = x;
+  var _x;
+
+  _x = x;
 
   var F = function F() {
     "use strict";
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/exec.js
new file mode 100644
index 000000000000..4b4e3fcf1a36
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/exec.js
@@ -0,0 +1,15 @@
+class A {
+  static prop = 1;
+}
+
+class B extends A {
+  static prop = 2;
+  static propA = super.prop;
+  static getPropA = () => super.prop;
+}
+
+const { prop, propA, getPropA } = B;
+
+expect(prop).toBe(2);
+expect(propA).toBe(1);
+expect(getPropA()).toBe(1);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/input.js
new file mode 100644
index 000000000000..9f649ab392bc
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/input.js
@@ -0,0 +1,9 @@
+class A {
+  static prop = 1;
+}
+
+class B extends A {
+  static prop = 2;
+  static propA = super.prop;
+  static getPropA = () => super.prop;
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/output.js
new file mode 100644
index 000000000000..d41e2ff85106
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-super/output.js
@@ -0,0 +1,27 @@
+var A = function A() {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, A);
+};
+
+A.prop = 1;
+
+var B =
+/*#__PURE__*/
+function (_A) {
+  "use strict";
+
+  babelHelpers.inherits(B, _A);
+
+  function B() {
+    babelHelpers.classCallCheck(this, B);
+    return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).apply(this, arguments));
+  }
+
+  return B;
+}(A);
+
+B.prop = 2;
+B.propA = A.prop;
+
+B.getPropA = () => A.prop;
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/exec.js
new file mode 100644
index 000000000000..0dbdf7491878
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/exec.js
@@ -0,0 +1,9 @@
+class A {
+  static self = this;
+  static getA = () => this;
+}
+
+const { self, getA } = A;
+
+expect(self).toBe(A);
+expect(getA()).toBe(A);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/input.js
new file mode 100644
index 000000000000..59f5c38c2c3e
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/input.js
@@ -0,0 +1,4 @@
+class A {
+  static self = this;
+  static getA = () => this;
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/output.js
new file mode 100644
index 000000000000..4b6e55a118e9
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-this/output.js
@@ -0,0 +1,9 @@
+var A = function A() {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, A);
+};
+
+A.self = A;
+
+A.getA = () => A;
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/exec.js
new file mode 100644
index 000000000000..40eee7319366
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/exec.js
@@ -0,0 +1,5 @@
+const createClass = (k) => class { [k()] = 2 };
+
+const clazz = createClass(() => 'foo');
+const instance = new clazz();
+expect(instance.foo).toBe(2);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/input.js
new file mode 100644
index 000000000000..4b2d583d4ec6
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/input.js
@@ -0,0 +1 @@
+const createClass = (k) => class { [k()] = 2 };
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/output.js
new file mode 100644
index 000000000000..535a47955ecf
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-without-block/output.js
@@ -0,0 +1,18 @@
+var createClass = k => {
+  var _temp;
+
+  var _k;
+
+  return _temp = (_k = k(),
+  /*#__PURE__*/
+  function () {
+    "use strict";
+
+    function _class2() {
+      babelHelpers.classCallCheck(this, _class2);
+      babelHelpers.defineProperty(this, _k, 2);
+    }
+
+    return _class2;
+  }()), _temp;
+};
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/output.js
index bc9a90b21252..259d3c96476d 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/output.js
@@ -1,24 +1,19 @@
+var _one, _ref, _undefined, _computed, _computed2, _ref2, _ref3, _baz, _ref4;
+
 var foo = "foo";
 
 var bar = () => {};
 
 var four = 4;
-
-var _one = one();
-
-var _ref = 2 * four + seven;
-
-var _undefined = undefined;
-
-var _computed = computed();
-
-var _computed2 = computed();
-
-var _ref2 = "test" + one;
-
-var _ref3 = /regex/;
-var _baz = baz;
-var _ref4 = `template${expression}`;
+_one = one();
+_ref = 2 * four + seven;
+_undefined = undefined;
+_computed = computed();
+_computed2 = computed();
+_ref2 = "test" + one;
+_ref3 = /regex/;
+_baz = baz;
+_ref4 = `template${expression}`;
 
 var MyClass =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-multiple-supers/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-multiple-supers/output.js
index 7b4d565978d5..cb9e03767bc4 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-multiple-supers/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-multiple-supers/output.js
@@ -12,10 +12,10 @@ function (_Bar) {
 
     if (condition) {
       _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
-      babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))), "bar", "foo");
+      babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "bar", "foo");
     } else {
       _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
-      babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))), "bar", "foo");
+      babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "bar", "foo");
     }
 
     return babelHelpers.possibleConstructorReturn(_this);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/output.js
index 24da3aeebd6f..ebfcf1faa2b7 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/output.js
@@ -10,7 +10,7 @@ function (_Bar) {
 
     babelHelpers.classCallCheck(this, Foo);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, ...args));
-    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "bar", "foo");
+    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "bar", "foo");
     return _this;
   }
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js
index beb7b9f196bb..3e89c9938bf8 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js
@@ -10,7 +10,7 @@ function (_Parent) {
 
     babelHelpers.classCallCheck(this, Child);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Child).call(this));
-    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "scopedFunctionWithThis", function () {
+    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "scopedFunctionWithThis", function () {
       _this.name = {};
     });
     return _this;
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/output.js
index 79bfad744af4..5a311f2ad9d4 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/output.js
@@ -1,5 +1,7 @@
 function test(x) {
-  var _x = x;
+  var _x;
+
+  _x = x;
 
   var F = function F() {
     "use strict";
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/exec.js
new file mode 100644
index 000000000000..4b4e3fcf1a36
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/exec.js
@@ -0,0 +1,15 @@
+class A {
+  static prop = 1;
+}
+
+class B extends A {
+  static prop = 2;
+  static propA = super.prop;
+  static getPropA = () => super.prop;
+}
+
+const { prop, propA, getPropA } = B;
+
+expect(prop).toBe(2);
+expect(propA).toBe(1);
+expect(getPropA()).toBe(1);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/input.js
new file mode 100644
index 000000000000..9f649ab392bc
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/input.js
@@ -0,0 +1,9 @@
+class A {
+  static prop = 1;
+}
+
+class B extends A {
+  static prop = 2;
+  static propA = super.prop;
+  static getPropA = () => super.prop;
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/output.js
new file mode 100644
index 000000000000..bb05940c9083
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-super/output.js
@@ -0,0 +1,26 @@
+var A = function A() {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, A);
+};
+
+babelHelpers.defineProperty(A, "prop", 1);
+
+var B =
+/*#__PURE__*/
+function (_A) {
+  "use strict";
+
+  babelHelpers.inherits(B, _A);
+
+  function B() {
+    babelHelpers.classCallCheck(this, B);
+    return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).apply(this, arguments));
+  }
+
+  return B;
+}(A);
+
+babelHelpers.defineProperty(B, "prop", 2);
+babelHelpers.defineProperty(B, "propA", babelHelpers.get(babelHelpers.getPrototypeOf(B), "prop", B));
+babelHelpers.defineProperty(B, "getPropA", () => babelHelpers.get(babelHelpers.getPrototypeOf(B), "prop", B));
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/exec.js
new file mode 100644
index 000000000000..0dbdf7491878
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/exec.js
@@ -0,0 +1,9 @@
+class A {
+  static self = this;
+  static getA = () => this;
+}
+
+const { self, getA } = A;
+
+expect(self).toBe(A);
+expect(getA()).toBe(A);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/input.js
new file mode 100644
index 000000000000..59f5c38c2c3e
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/input.js
@@ -0,0 +1,4 @@
+class A {
+  static self = this;
+  static getA = () => this;
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/output.js
new file mode 100644
index 000000000000..282c9e3442b4
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-this/output.js
@@ -0,0 +1,8 @@
+var A = function A() {
+  "use strict";
+
+  babelHelpers.classCallCheck(this, A);
+};
+
+babelHelpers.defineProperty(A, "self", A);
+babelHelpers.defineProperty(A, "getA", () => A);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/output.js
index 800414215c48..08bb0b4d9bbc 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/output.js
@@ -28,7 +28,7 @@ function (_A) {
 
     babelHelpers.classCallCheck(this, B);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).call(this, ...args));
-    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "foo", babelHelpers.get(babelHelpers.getPrototypeOf(B.prototype), "foo", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this)));
+    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "foo", babelHelpers.get(babelHelpers.getPrototypeOf(B.prototype), "foo", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this)));
     return _this;
   }
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/input.js
new file mode 100644
index 000000000000..bc8f7e6aa311
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;([x, ...super.client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/options.json
new file mode 100644
index 000000000000..d9d73e427633
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "proposal-class-properties",
+    "transform-classes",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/input.js
new file mode 100644
index 000000000000..aa6fb16c74d4
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;([super.client] = props);
+  }
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/options.json
new file mode 100644
index 000000000000..d9d73e427633
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "proposal-class-properties",
+    "transform-classes",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/input.js
new file mode 100644
index 000000000000..19705340451c
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;({ x, ...super.client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/options.json
new file mode 100644
index 000000000000..d9d73e427633
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "proposal-class-properties",
+    "transform-classes",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/input.js
new file mode 100644
index 000000000000..45845d4e16b5
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;({ client: super.client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/options.json
new file mode 100644
index 000000000000..d9d73e427633
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "proposal-class-properties",
+    "transform-classes",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/output.js
index a2eab2f89b53..be7f0ef6822f 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/output.js
@@ -9,7 +9,7 @@ function (_Bar) {
     var _temp, _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "bar", "foo"), _temp));
+    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "bar", "foo"), _temp));
     return _this;
   }
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/output.js
index be84c7614537..ef101c0bee33 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/output.js
@@ -10,7 +10,7 @@ function (_Bar) {
 
     babelHelpers.classCallCheck(this, Foo);
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
-    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "bar", "foo");
+    babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "bar", "foo");
     return _this;
   }
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/output.js
index 6212f5c3d7e6..0fdb59a7573c 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/output.js
@@ -1,19 +1,17 @@
-var _this = this;
-
 (function () {
   class Foo {
     constructor() {
-      var _this2 = this;
+      var _this = this;
 
       babelHelpers.defineProperty(this, "fn", function () {
-        return console.log(_this2);
+        return console.log(_this);
       });
     }
 
   }
 
   babelHelpers.defineProperty(Foo, "fn", function () {
-    return console.log(_this);
+    return console.log(Foo);
   });
 });
 
@@ -22,25 +20,25 @@ var _this = this;
 
   return _temp = _class = class Bar {
     constructor() {
-      var _this3 = this;
+      var _this2 = this;
 
       babelHelpers.defineProperty(this, "fn", function () {
-        return console.log(_this3);
+        return console.log(_this2);
       });
     }
 
   }, babelHelpers.defineProperty(_class, "fn", function () {
-    return console.log(_this);
+    return console.log(_class);
   }), _temp;
 });
 
 (function () {
   class Baz {
     constructor(_force) {
-      var _this4 = this;
+      var _this3 = this;
 
       babelHelpers.defineProperty(this, "fn", function () {
-        return console.log(_this4);
+        return console.log(_this3);
       });
       babelHelpers.defineProperty(this, "force", force);
     }
@@ -48,25 +46,23 @@ var _this = this;
   }
 
   babelHelpers.defineProperty(Baz, "fn", function () {
-    return console.log(_this);
+    return console.log(Baz);
   });
 });
 
 var qux = function () {
-  var _this6 = this;
-
   class Qux {
     constructor() {
-      var _this5 = this;
+      var _this4 = this;
 
       babelHelpers.defineProperty(this, "fn", function () {
-        return console.log(_this5);
+        return console.log(_this4);
       });
     }
 
   }
 
   babelHelpers.defineProperty(Qux, "fn", function () {
-    return console.log(_this6);
+    return console.log(Qux);
   });
 }.bind(this);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js
index 54b3b6861598..6c8d4cd1a2f5 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js
@@ -2,15 +2,11 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
 
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
 
@@ -18,11 +14,13 @@ function _superPropBase(object, property) { while (!Object.prototype.hasOwnPrope
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
 var Test = function Test() {
   "use strict";
 
-  var _this2 = this;
-
   _classCallCheck(this, Test);
 
   var Other =
@@ -43,7 +41,7 @@ var Test = function Test() {
 
       _this = _possibleConstructorReturn(this, (_getPrototypeOf2 = _getPrototypeOf(Other)).call.apply(_getPrototypeOf2, [this].concat(args)));
 
-      _defineProperty(_assertThisInitialized(_assertThisInitialized(_this)), "a", function () {
+      _defineProperty(_assertThisInitialized(_this), "a", function () {
         return _get(_getPrototypeOf(Other.prototype), "test", _assertThisInitialized(_this));
       });
 
@@ -54,6 +52,6 @@ var Test = function Test() {
   }(Test);
 
   _defineProperty(Other, "a", function () {
-    return _get(_getPrototypeOf(Test.prototype), "test", _this2);
+    return _get(_getPrototypeOf(Other), "test", Other);
   });
 };
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/output.js
index 5c6ac57eeba1..0e8cc4e60e0e 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/output.js
@@ -75,9 +75,11 @@ new ComputedMethod(); // ensure ComputedKey Field is still transformed
 
 class ComputedField extends Obj {
   constructor() {
+    let _ref;
+
     var _temp3;
 
-    var _ref = (_temp3 = super(), babelHelpers.defineProperty(this, "field", 1), _temp3);
+    _ref = (_temp3 = super(), babelHelpers.defineProperty(this, "field", 1), _temp3);
 
     class B extends Obj {
       constructor() {
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/exec.js
new file mode 100644
index 000000000000..a16b8048dcaf
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/exec.js
@@ -0,0 +1,23 @@
+const classes = [];
+for (let i = 0; i <= 10; ++i) {
+  classes.push(
+    class A {
+      [i] = `computed field ${i}`;
+      static foo = `static field ${i}`;
+      #bar = `private field ${i}`;
+      getBar() {
+        return this.#bar;
+      }
+    }
+  );
+}
+
+for(let i=0; i<= 10; ++i) {
+  const clazz = classes[i];
+  expect(clazz.foo).toBe('static field ' + i);
+  
+  const instance = new clazz();
+  expect(Object.getOwnPropertyNames(instance)).toEqual([String(i)])
+  expect(instance[i]).toBe('computed field ' + i);
+  expect(instance.getBar()).toBe('private field ' + i);
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/input.js
new file mode 100644
index 000000000000..f7ca46cc407d
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/input.js
@@ -0,0 +1,13 @@
+const classes = [];
+for (let i = 0; i <= 10; ++i) {
+  classes.push(
+    class A {
+      [i] = `computed field ${i}`;
+      static foo = `static field ${i}`;
+      #bar = `private field ${i}`;
+      getBar() {
+        return this.#bar;
+      }
+    }
+  );
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/options.json
new file mode 100644
index 000000000000..9d30185b9bff
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["external-helpers", "proposal-class-properties"]
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/output.js
new file mode 100644
index 000000000000..deac2db7fd23
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/output.js
@@ -0,0 +1,23 @@
+const classes = [];
+
+for (let i = 0; i <= 10; ++i) {
+  var _class, _temp, _bar;
+
+  let _i;
+
+  classes.push((_temp = (_i = i, _class = class A {
+    constructor() {
+      babelHelpers.defineProperty(this, _i, `computed field ${i}`);
+
+      _bar.set(this, {
+        writable: true,
+        value: `private field ${i}`
+      });
+    }
+
+    getBar() {
+      return babelHelpers.classPrivateFieldGet(this, _bar);
+    }
+
+  }), _bar = new WeakMap(), babelHelpers.defineProperty(_class, "foo", `static field ${i}`), _temp));
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js
index 70334680ced4..2cd978b722c9 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js
@@ -1,4 +1,6 @@
-var _class, _descriptor, _class2, _Symbol$search, _temp;
+let _Symbol$search;
+
+var _class, _descriptor, _temp;
 
 function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 
@@ -8,13 +10,13 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object['ke' + 'ys'](descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object['define' + 'Property'](target, property, desc); desc = null; } return desc; }
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 
 function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and set to use loose mode. ' + 'To use proposal-class-properties in spec mode with decorators, wait for ' + 'the next major version of decorators in stage 2.'); }
 
 function dec() {}
 
-let A = (_class = (_temp = (_Symbol$search = Symbol.search, _class2 =
+let A = (_class = (_temp = (_Symbol$search = Symbol.search,
 /*#__PURE__*/
 function () {
   "use strict";
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js
index c3fc9ecd57e0..f87ef987e6a4 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js
@@ -1,10 +1,12 @@
+let _x$x;
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _classNameTDZError(name) { throw new Error("Class \"" + name + "\" cannot be referenced in computed property keys."); }
 
-var _x$x = {
+_x$x = {
   x: (_classNameTDZError("A"), A) || 0
 }.x;
 
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js
index 21c823a89aae..024a8241721c 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js
@@ -1,10 +1,12 @@
+let _ref;
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _classNameTDZError(name) { throw new Error("Class \"" + name + "\" cannot be referenced in computed property keys."); }
 
-var _ref = (_classNameTDZError("C"), C) + 3;
+_ref = (_classNameTDZError("C"), C) + 3;
 
 let C = function C() {
   "use strict";
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js
index a6acc92159f9..9ab3df7368f7 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js
@@ -1,6 +1,8 @@
+let _ref;
+
 function _classNameTDZError(name) { throw new Error("Class \"" + name + "\" cannot be referenced in computed property keys."); }
 
-var _ref = (_classNameTDZError("C"), C) + 3;
+_ref = (_classNameTDZError("C"), C) + 3;
 
 class C {}
 
diff --git a/packages/babel-plugin-proposal-decorators/package.json b/packages/babel-plugin-proposal-decorators/package.json
index 6ab1831a08cf..bc14d4ebea01 100644
--- a/packages/babel-plugin-proposal-decorators/package.json
+++ b/packages/babel-plugin-proposal-decorators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-decorators",
-  "version": "7.1.0",
+  "version": "7.4.4",
   "author": "Logan Smyth <loganfsmyth@gmail.com>",
   "license": "MIT",
   "publishConfig": {
@@ -15,16 +15,15 @@
     "decorators"
   ],
   "dependencies": {
+    "@babel/helper-create-class-features-plugin": "^7.4.4",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-replace-supers": "^7.1.0",
-    "@babel/helper-split-export-declaration": "^7.0.0",
-    "@babel/plugin-syntax-decorators": "^7.1.0"
+    "@babel/plugin-syntax-decorators": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-decorators/src/index.js b/packages/babel-plugin-proposal-decorators/src/index.js
index 5467f115ebaa..879de5f04703 100644
--- a/packages/babel-plugin-proposal-decorators/src/index.js
+++ b/packages/babel-plugin-proposal-decorators/src/index.js
@@ -1,6 +1,11 @@
+/* eslint-disable @babel/development/plugin-name */
+
 import { declare } from "@babel/helper-plugin-utils";
 import syntaxDecorators from "@babel/plugin-syntax-decorators";
-import visitor from "./transformer";
+import {
+  createClassFeaturePlugin,
+  FEATURES,
+} from "@babel/helper-create-class-features-plugin";
 import legacyVisitor from "./transformer-legacy";
 
 export default declare((api, options) => {
@@ -31,13 +36,26 @@ export default declare((api, options) => {
     }
   }
 
-  return {
-    inherits: syntaxDecorators,
+  if (legacy) {
+    return {
+      name: "proposal-decorators",
+      inherits: syntaxDecorators,
+      manipulateOptions({ generatorOpts }) {
+        generatorOpts.decoratorsBeforeExport = decoratorsBeforeExport;
+      },
+      visitor: legacyVisitor,
+    };
+  }
+
+  return createClassFeaturePlugin({
+    name: "proposal-decorators",
 
-    manipulateOptions({ generatorOpts }) {
+    feature: FEATURES.decorators,
+    // loose: options.loose, Not supported
+
+    manipulateOptions({ generatorOpts, parserOpts }) {
+      parserOpts.plugins.push(["decorators", { decoratorsBeforeExport }]);
       generatorOpts.decoratorsBeforeExport = decoratorsBeforeExport;
     },
-
-    visitor: legacy ? legacyVisitor : visitor,
-  };
+  });
 });
diff --git a/packages/babel-plugin-proposal-decorators/src/transformer.js b/packages/babel-plugin-proposal-decorators/src/transformer.js
deleted file mode 100644
index 3ed8f71a3fe8..000000000000
--- a/packages/babel-plugin-proposal-decorators/src/transformer.js
+++ /dev/null
@@ -1,232 +0,0 @@
-import { types as t, template } from "@babel/core";
-import splitExportDeclaration from "@babel/helper-split-export-declaration";
-import ReplaceSupers from "@babel/helper-replace-supers";
-
-function prop(key, value) {
-  if (!value) return null;
-  return t.objectProperty(t.identifier(key), value);
-}
-
-function value(body, params = []) {
-  return t.objectMethod("method", t.identifier("value"), params, body);
-}
-
-function hasDecorators({ node }) {
-  if (node.decorators && node.decorators.length > 0) return true;
-
-  const body = node.body.body;
-  for (let i = 0; i < body.length; i++) {
-    const method = body[i];
-    if (method.decorators && method.decorators.length > 0) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-function takeDecorators({ node }) {
-  let result;
-  if (node.decorators && node.decorators.length > 0) {
-    result = t.arrayExpression(
-      node.decorators.map(decorator => decorator.expression),
-    );
-  }
-  node.decorators = undefined;
-  return result;
-}
-
-function getKey(node) {
-  if (node.computed) {
-    return node.key;
-  } else if (t.isIdentifier(node.key)) {
-    return t.stringLiteral(node.key.name);
-  } else {
-    return t.stringLiteral(String(node.key.value));
-  }
-}
-
-function getSingleElementDefinition(path, superRef, classRef, file) {
-  const { node, scope } = path;
-  const isMethod = path.isClassMethod();
-
-  if (path.isPrivate()) {
-    throw path.buildCodeFrameError(
-      `Private ${
-        isMethod ? "methods" : "fields"
-      } in decorated classes are not supported yet.`,
-    );
-  }
-
-  new ReplaceSupers(
-    {
-      methodPath: path,
-      methodNode: node,
-      objectRef: classRef,
-      isStatic: node.static,
-      superRef,
-      scope,
-      file,
-    },
-    true,
-  ).replace();
-
-  const properties = [
-    prop("kind", t.stringLiteral(isMethod ? node.kind : "field")),
-    prop("decorators", takeDecorators(path)),
-    prop("static", node.static && t.booleanLiteral(true)),
-    prop("key", getKey(node)),
-    isMethod
-      ? value(node.body, node.params)
-      : node.value
-        ? value(template.ast`{ return ${node.value} }`)
-        : prop("value", scope.buildUndefinedNode()),
-  ].filter(Boolean);
-
-  return t.objectExpression(properties);
-}
-
-function getElementsDefinitions(path, fId, file) {
-  const elements = [];
-  for (const p of path.get("body.body")) {
-    if (!p.isClassMethod({ kind: "constructor" })) {
-      elements.push(
-        getSingleElementDefinition(p, path.node.superClass, fId, file),
-      );
-      p.remove();
-    }
-  }
-
-  return t.arrayExpression(elements);
-}
-
-function getConstructorPath(path) {
-  return path
-    .get("body.body")
-    .find(path => path.isClassMethod({ kind: "constructor" }));
-}
-
-const bareSupersVisitor = {
-  CallExpression(path, { initializeInstanceElements }) {
-    if (path.get("callee").isSuper()) {
-      path.insertAfter(t.cloneNode(initializeInstanceElements));
-    }
-  },
-  Function(path) {
-    if (!path.isArrowFunctionExpression()) path.skip();
-  },
-};
-
-function insertInitializeInstanceElements(path, initializeInstanceId) {
-  const isBase = !path.node.superClass;
-  const initializeInstanceElements = t.callExpression(initializeInstanceId, [
-    t.thisExpression(),
-  ]);
-
-  const constructorPath = getConstructorPath(path);
-  if (constructorPath) {
-    if (isBase) {
-      constructorPath
-        .get("body")
-        .unshiftContainer("body", [
-          t.expressionStatement(initializeInstanceElements),
-        ]);
-    } else {
-      constructorPath.traverse(bareSupersVisitor, {
-        initializeInstanceElements,
-      });
-    }
-  } else {
-    const constructor = isBase
-      ? t.classMethod(
-          "constructor",
-          t.identifier("constructor"),
-          [],
-          t.blockStatement([t.expressionStatement(initializeInstanceElements)]),
-        )
-      : t.classMethod(
-          "constructor",
-          t.identifier("constructor"),
-          [t.restElement(t.identifier("args"))],
-          t.blockStatement([
-            t.expressionStatement(
-              t.callExpression(t.Super(), [
-                t.spreadElement(t.identifier("args")),
-              ]),
-            ),
-            t.expressionStatement(initializeInstanceElements),
-          ]),
-        );
-    path.node.body.body.push(constructor);
-  }
-}
-
-function transformClass(path, file) {
-  const isDeclaration = path.node.id && path.isDeclaration();
-  const isStrict = path.isInStrictMode();
-  const { superClass } = path.node;
-
-  path.node.type = "ClassDeclaration";
-  if (!path.node.id) path.node.id = path.scope.generateUidIdentifier("class");
-
-  const initializeId = path.scope.generateUidIdentifier("initialize");
-  const superId =
-    superClass &&
-    path.scope.generateUidIdentifierBasedOnNode(path.node.superClass, "super");
-
-  if (superClass) path.node.superClass = superId;
-
-  const classDecorators = takeDecorators(path);
-  const definitions = getElementsDefinitions(path, path.node.id, file);
-
-  insertInitializeInstanceElements(path, initializeId);
-
-  const expr = template.expression.ast`
-      ${addDecorateHelper(file)}(
-        ${classDecorators || t.nullLiteral()},
-        function (${initializeId}, ${superClass ? superId : null}) {
-          ${path.node}
-          return { F: ${t.cloneNode(path.node.id)}, d: ${definitions} };
-        },
-        ${superClass}
-      )
-    `;
-  if (!isStrict) {
-    expr.arguments[1].body.directives.push(
-      t.directive(t.directiveLiteral("use strict")),
-    );
-  }
-
-  return isDeclaration ? template.ast`let ${path.node.id} = ${expr}` : expr;
-}
-
-function addDecorateHelper(file) {
-  try {
-    return file.addHelper("decorate");
-  } catch (err) {
-    if (err.code === "BABEL_HELPER_UNKNOWN") {
-      err.message +=
-        "\n  '@babel/plugin-transform-decorators' in non-legacy mode" +
-        " requires '@babel/core' version ^7.0.2 and you appear to be using" +
-        " an older version.";
-    }
-    throw err;
-  }
-}
-
-export default {
-  ExportDefaultDeclaration(path) {
-    let decl = path.get("declaration");
-    if (!decl.isClassDeclaration() || !hasDecorators(decl)) return;
-
-    if (decl.node.id) decl = splitExportDeclaration(path);
-
-    decl.replaceWith(transformClass(decl, this.file));
-  },
-
-  Class(path) {
-    if (hasDecorators(path)) {
-      path.replaceWith(transformClass(path, this.file));
-    }
-  },
-};
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-ast/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-ast/output.js
index a08d2e1db86d..99ce59522cb1 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-ast/output.js
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-ast/output.js
@@ -13,19 +13,15 @@ let Foo = babelHelpers.decorate([_ => desc = _], function (_initialize) {
     d: [{
       kind: "method",
       key: getKey(),
-
-      value() {
+      value: function () {
         return 1;
       }
-
     }, {
       kind: "method",
       key: getKey(),
-
-      value() {
+      value: function () {
         return 2;
       }
-
     }]
   };
 });
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-value/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-value/output.js
index bffa9e17a1d9..a4f7d0e22920 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-value/output.js
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/computed-keys-same-value/output.js
@@ -13,19 +13,15 @@ let Foo = babelHelpers.decorate([_ => desc = _], function (_initialize) {
     d: [{
       kind: "method",
       key: getKeyI(),
-
-      value() {
+      value: function () {
         return 1;
       }
-
     }, {
       kind: "method",
       key: getKeyJ(),
-
-      value() {
+      value: function () {
         return 2;
       }
-
     }]
   };
 });
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json
index 3c8fc3716843..0fbe73eecd01 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json
@@ -5,7 +5,7 @@
     [
       "external-helpers",
       {
-        "helperVersion": "7.0.2"
+        "helperVersion": "7.1.5"
       }
     ]
   ]
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json
index 3c8fc3716843..0fbe73eecd01 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json
@@ -5,7 +5,7 @@
     [
       "external-helpers",
       {
-        "helperVersion": "7.0.2"
+        "helperVersion": "7.1.5"
       }
     ]
   ]
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field-without-initiailzer/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field-without-initiailzer/exec.js
index ea1b5dd9843a..1fbbbebda729 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field-without-initiailzer/exec.js
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field-without-initiailzer/exec.js
@@ -10,7 +10,7 @@ expect(el).toEqual(Object.defineProperty({
   key: "foo",
   placement: "own",
   descriptor: {
-    enumerable: false,
+    enumerable: true,
     configurable: true,
     writable: true,
   },
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field/exec.js
index 7c823735e55f..b71f4551c25e 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field/exec.js
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-own-field/exec.js
@@ -11,7 +11,7 @@ expect(el).toEqual(Object.defineProperty({
   key: "foo",
   placement: "own",
   descriptor: {
-    enumerable: false,
+    enumerable: true,
     configurable: true,
     writable: true,
   },
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-static-field/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-static-field/exec.js
index 4855b30f1b37..01a66d0842d1 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-static-field/exec.js
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/original-static-field/exec.js
@@ -11,7 +11,7 @@ expect(el).toEqual(Object.defineProperty({
   key: "foo",
   placement: "static",
   descriptor: {
-    enumerable: false,
+    enumerable: true,
     configurable: true,
     writable: true,
   },
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json
index 3c8fc3716843..0fbe73eecd01 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json
@@ -5,7 +5,7 @@
     [
       "external-helpers",
       {
-        "helperVersion": "7.0.2"
+        "helperVersion": "7.1.5"
       }
     ]
   ]
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs
index 27b119115378..4db262f67a2a 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs
@@ -1,6 +1,6 @@
 var _class, _class2;
 
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object['ke' + 'ys'](descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object['define' + 'Property'](target, property, desc); desc = null; } return desc; }
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 
 let A = (_class2 = class A {
   foo() {}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs
index f35dc48db9a6..592f7a40d4c8 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs
@@ -1,6 +1,6 @@
 var _class2;
 
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object['ke' + 'ys'](descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object['define' + 'Property'](target, property, desc); desc = null; } return desc; }
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 
 let _class = (_class2 = class {
   bar() {}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/exec.js
new file mode 100644
index 000000000000..b9d3327d304d
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/exec.js
@@ -0,0 +1,13 @@
+function decorator() {}
+
+var method = 1;
+
+@decorator
+class Foo {
+  method() {
+    return method;
+  }
+}
+
+expect(new Foo().method()).toBe(1);
+expect(Foo.prototype.method.name).toBe("method");
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/input.js
new file mode 100644
index 000000000000..ce5f357574c3
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/input.js
@@ -0,0 +1,8 @@
+var method = 1;
+
+@decorator
+class Foo {
+  method() {
+    return method;
+  }
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/output.js
new file mode 100644
index 000000000000..df5e4ae17032
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name-not-shadow/output.js
@@ -0,0 +1,22 @@
+var _method = 1;
+let Foo = babelHelpers.decorate([decorator], function (_initialize) {
+  "use strict";
+
+  class Foo {
+    constructor() {
+      _initialize(this);
+    }
+
+  }
+
+  return {
+    F: Foo,
+    d: [{
+      kind: "method",
+      key: "method",
+      value: function method() {
+        return _method;
+      }
+    }]
+  };
+});
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name/exec.js
new file mode 100644
index 000000000000..5e4dcb98925e
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/method-name/exec.js
@@ -0,0 +1,8 @@
+function decorator() {}
+
+@decorator
+class Foo {
+  method() {}
+}
+
+expect(Foo.prototype.method.name).toBe("method");
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/options.json
new file mode 100644
index 000000000000..0fbe73eecd01
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/options.json
@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    ["proposal-decorators", { "decoratorsBeforeExport": false }],
+    "proposal-class-properties",
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1.5"
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/to-primitive/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/to-primitive/exec.js
new file mode 100644
index 000000000000..698b3e7049bf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/to-primitive/exec.js
@@ -0,0 +1,16 @@
+let calls = 0;
+const baz = {
+  [Symbol.toPrimitive]() {
+    calls++;
+    return "baz";
+  }
+}
+
+function dec() {}
+
+@dec
+class A {
+  [baz]() {}
+}
+
+expect(calls).toBe(1);
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json
index 3c8fc3716843..0fbe73eecd01 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json
@@ -5,7 +5,7 @@
     [
       "external-helpers",
       {
-        "helperVersion": "7.0.2"
+        "helperVersion": "7.1.5"
       }
     ]
   ]
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/arguments/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/arguments/output.js
index d8a47bf3a19c..5be9a05bed5b 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/arguments/output.js
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/arguments/output.js
@@ -14,9 +14,7 @@ let A = babelHelpers.decorate([dec(a, b, ...c)], function (_initialize) {
       kind: "method",
       decorators: [dec(a, b, ...c)],
       key: "method",
-
-      value() {}
-
+      value: function method() {}
     }]
   };
 });
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/input.js
new file mode 100644
index 000000000000..be2fdae25d4b
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/input.js
@@ -0,0 +1,8 @@
+@decorator
+class Foo {
+  async f1() {}
+
+  *f2() {}
+
+  async *f3() {}
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/options.json
new file mode 100644
index 000000000000..a3587a401c6c
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    ["proposal-decorators", { "decoratorsBeforeExport": false }],
+    "proposal-class-properties",
+    "syntax-async-generators",
+    ["external-helpers", { "helperVersion": "7.1.5" }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/output.js
new file mode 100644
index 000000000000..973d53b8620a
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/output.js
@@ -0,0 +1,27 @@
+let Foo = babelHelpers.decorate([decorator], function (_initialize) {
+  "use strict";
+
+  class Foo {
+    constructor() {
+      _initialize(this);
+    }
+
+  }
+
+  return {
+    F: Foo,
+    d: [{
+      kind: "method",
+      key: "f1",
+      value: async function f1() {}
+    }, {
+      kind: "method",
+      key: "f2",
+      value: function* f2() {}
+    }, {
+      kind: "method",
+      key: "f3",
+      value: async function* f3() {}
+    }]
+  };
+});
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json
index 34ff48433b08..7879b5a6675a 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json
@@ -5,7 +5,7 @@
     [
       "external-helpers",
       {
-        "helperVersion": "7.0.2"
+        "helperVersion": "7.1.5"
       }
     ],
     "syntax-async-generators"
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initiailzer-after-super-bug-8808/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initiailzer-after-super-bug-8808/input.js
new file mode 100644
index 000000000000..d664cd62ffe8
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initiailzer-after-super-bug-8808/input.js
@@ -0,0 +1,6 @@
+@decorator(parameter)
+class Sub extends Super {
+  constructor() {
+    super().method();
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initiailzer-after-super-bug-8808/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initiailzer-after-super-bug-8808/output.js
new file mode 100644
index 000000000000..b7707bd53987
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initiailzer-after-super-bug-8808/output.js
@@ -0,0 +1,17 @@
+let Sub = babelHelpers.decorate([decorator(parameter)], function (_initialize, _Super) {
+  "use strict";
+
+  class Sub extends _Super {
+    constructor() {
+      var _temp;
+
+      (_temp = super(), _initialize(this), _temp).method();
+    }
+
+  }
+
+  return {
+    F: Sub,
+    d: []
+  };
+}, Super);
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-bug-8931/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-bug-8931/input.js
new file mode 100644
index 000000000000..77e15bfd1190
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-bug-8931/input.js
@@ -0,0 +1,7 @@
+@dec
+class B extends A {
+  constructor() {
+    super();
+    [];
+  }
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-bug-8931/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-bug-8931/output.js
new file mode 100644
index 000000000000..0de044306931
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-bug-8931/output.js
@@ -0,0 +1,19 @@
+let B = babelHelpers.decorate([dec], function (_initialize, _A) {
+  "use strict";
+
+  class B extends _A {
+    constructor() {
+      super();
+
+      _initialize(this);
+
+      [];
+    }
+
+  }
+
+  return {
+    F: B,
+    d: []
+  };
+}, A);
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-expression/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-expression/input.js
new file mode 100644
index 000000000000..aa9941aeaff7
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-expression/input.js
@@ -0,0 +1,6 @@
+@dec
+class B extends A {
+  constructor() {
+    (0, super());
+  }
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-expression/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-expression/output.js
new file mode 100644
index 000000000000..1c46c7388322
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-expression/output.js
@@ -0,0 +1,17 @@
+let B = babelHelpers.decorate([dec], function (_initialize, _A) {
+  "use strict";
+
+  class B extends _A {
+    constructor() {
+      var _temp;
+
+      0, (_temp = super(), _initialize(this), _temp);
+    }
+
+  }
+
+  return {
+    F: B,
+    d: []
+  };
+}, A);
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-multiple/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-multiple/input.js
new file mode 100644
index 000000000000..33b0fce036d2
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-multiple/input.js
@@ -0,0 +1,14 @@
+@dec
+class B extends A {
+  constructor() {
+    const foo = () => { super(); };
+
+    if (a) { super(); }
+    else { foo(); }
+
+    while (0) { super(); }
+
+    super();
+  }
+}
+
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-multiple/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-multiple/output.js
new file mode 100644
index 000000000000..9f6f173fa645
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-multiple/output.js
@@ -0,0 +1,37 @@
+let B = babelHelpers.decorate([dec], function (_initialize, _A) {
+  "use strict";
+
+  class B extends _A {
+    constructor() {
+      const foo = () => {
+        super();
+
+        _initialize(this);
+      };
+
+      if (a) {
+        super();
+
+        _initialize(this);
+      } else {
+        foo();
+      }
+
+      while (0) {
+        super();
+
+        _initialize(this);
+      }
+
+      super();
+
+      _initialize(this);
+    }
+
+  }
+
+  return {
+    F: B,
+    d: []
+  };
+}, A);
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-statement/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-statement/input.js
new file mode 100644
index 000000000000..1aac9e28d2a0
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-statement/input.js
@@ -0,0 +1,6 @@
+@dec
+class B extends A {
+  constructor() {
+    super();
+  }
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-statement/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-statement/output.js
new file mode 100644
index 000000000000..3c90f9c34448
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/initialize-after-super-statement/output.js
@@ -0,0 +1,17 @@
+let B = babelHelpers.decorate([dec], function (_initialize, _A) {
+  "use strict";
+
+  class B extends _A {
+    constructor() {
+      super();
+
+      _initialize(this);
+    }
+
+  }
+
+  return {
+    F: B,
+    d: []
+  };
+}, A);
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json
index 3c8fc3716843..0fbe73eecd01 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json
@@ -5,7 +5,7 @@
     [
       "external-helpers",
       {
-        "helperVersion": "7.0.2"
+        "helperVersion": "7.1.5"
       }
     ]
   ]
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/strict-directive/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/strict-directive/output.js
index 65f4fbb073ea..e1a4d147adbf 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/strict-directive/output.js
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/strict-directive/output.js
@@ -14,9 +14,7 @@
       d: [{
         kind: "method",
         key: "method",
-
-        value() {}
-
+        value: function method() {}
       }]
     };
   });
@@ -38,9 +36,7 @@
       d: [{
         kind: "method",
         key: "method",
-
-        value() {}
-
+        value: function method() {}
       }]
     };
   });
diff --git a/packages/babel-plugin-proposal-do-expressions/package.json b/packages/babel-plugin-proposal-do-expressions/package.json
index 567e498ca723..8293f38f0326 100644
--- a/packages/babel-plugin-proposal-do-expressions/package.json
+++ b/packages/babel-plugin-proposal-do-expressions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-do-expressions",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Compile do expressions to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-do-expressions",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-do-expressions": "^7.0.0"
+    "@babel/plugin-syntax-do-expressions": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-do-expressions/src/index.js b/packages/babel-plugin-proposal-do-expressions/src/index.js
index b9e8d6180ab9..73a322678976 100644
--- a/packages/babel-plugin-proposal-do-expressions/src/index.js
+++ b/packages/babel-plugin-proposal-do-expressions/src/index.js
@@ -5,6 +5,7 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-do-expressions",
     inherits: syntaxDoExpressions,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/exec.js b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/exec.js
new file mode 100644
index 000000000000..84d1e1cd4962
--- /dev/null
+++ b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/exec.js
@@ -0,0 +1,11 @@
+async function p(x) {
+  const y = do {
+    let z;
+    await x;
+  };
+
+  return y;
+}
+
+const promise = Promise.resolve(5);
+expect(p(promise)).resolves.toBe(5);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/input.js b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/input.js
new file mode 100644
index 000000000000..7b8cb4939a69
--- /dev/null
+++ b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/input.js
@@ -0,0 +1,8 @@
+async function p(x) {
+  const y = do {
+    let z;
+    await x;
+  };
+
+  return y;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/options.json b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/options.json
new file mode 100644
index 000000000000..7edb6d2fc815
--- /dev/null
+++ b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/options.json
@@ -0,0 +1,3 @@
+{
+  "minNodeVersion": "8.0.0"
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/output.js b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/output.js
new file mode 100644
index 000000000000..55ab68b17442
--- /dev/null
+++ b/packages/babel-plugin-proposal-do-expressions/test/fixtures/do-expressions/await/output.js
@@ -0,0 +1,7 @@
+async function p(x) {
+  const y = await async function () {
+    let z;
+    return await x;
+  }();
+  return y;
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/.npmignore b/packages/babel-plugin-proposal-dynamic-import/.npmignore
new file mode 100644
index 000000000000..f9806945836e
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-plugin-proposal-dynamic-import/README.md b/packages/babel-plugin-proposal-dynamic-import/README.md
new file mode 100644
index 000000000000..0f49cf454572
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/README.md
@@ -0,0 +1,19 @@
+# @babel/plugin-proposal-dynamic-import
+
+> Transform import() expressions
+
+See our website [@babel/plugin-proposal-dynamic-import](https://babeljs.io/docs/en/next/babel-plugin-proposal-dynamic-import.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/plugin-proposal-dynamic-import
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/plugin-proposal-dynamic-import --dev
+```
diff --git a/packages/babel-plugin-proposal-dynamic-import/package.json b/packages/babel-plugin-proposal-dynamic-import/package.json
new file mode 100644
index 000000000000..a691155641e4
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@babel/plugin-proposal-dynamic-import",
+  "version": "7.5.0",
+  "description": "Transform import() expressions",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-dynamic-import",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin"
+  ],
+  "dependencies": {
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0-0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.5.0",
+    "@babel/helper-plugin-test-runner": "^7.0.0"
+  }
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/src/index.js b/packages/babel-plugin-proposal-dynamic-import/src/index.js
new file mode 100644
index 000000000000..9482e24514c3
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/src/index.js
@@ -0,0 +1,41 @@
+import { declare } from "@babel/helper-plugin-utils";
+import syntaxDynamicImport from "@babel/plugin-syntax-dynamic-import";
+import { version } from "../package.json";
+
+const SUPPORTED_MODULES = ["commonjs", "amd", "systemjs"];
+
+const MODULES_NOT_FOUND = `\
+@babel/plugin-proposal-dynamic-import depends on a modules
+transform plugin. Supported plugins are:
+ - @babel/plugin-transform-modules-commonjs ^7.4.0
+ - @babel/plugin-transform-modules-amd ^7.4.0
+ - @babel/plugin-transform-modules-systemjs ^7.4.0
+
+If you are using Webpack or Rollup and thus don't want
+Babel to transpile your imports and exports, you can use
+the @babel/plugin-syntax-dynamic-import plugin and let your
+bundler handle dynamic imports.
+`;
+
+export default declare(api => {
+  api.assertVersion(7);
+
+  return {
+    name: "proposal-dynamic-import",
+    inherits: syntaxDynamicImport,
+
+    pre() {
+      this.file.set("@babel/plugin-proposal-dynamic-import", version);
+    },
+
+    visitor: {
+      Program() {
+        const modules = this.file.get("@babel/plugin-transform-modules-*");
+
+        if (!SUPPORTED_MODULES.includes(modules)) {
+          throw new Error(MODULES_NOT_FOUND);
+        }
+      },
+    },
+  };
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/input.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/input.mjs
new file mode 100644
index 000000000000..968ad7d80111
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/input.mjs
@@ -0,0 +1,3 @@
+import "a";
+
+import("b");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json
new file mode 100644
index 000000000000..97137d02166f
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-modules-amd",
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/output.js
new file mode 100644
index 000000000000..90fcfd93e4b2
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/output.js
@@ -0,0 +1,5 @@
+define(["a"], function (_a) {
+  "use strict";
+
+  import("b");
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/module/input.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/module/input.mjs
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/module/input.mjs
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/module/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/module/output.js
new file mode 100644
index 000000000000..e0d86f169580
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/module/output.js
@@ -0,0 +1,5 @@
+define(["require"], function (_require) {
+  "use strict";
+
+  var modP = new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(babelHelpers.interopRequireWildcard(imported)), _reject));
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/input.js
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/input.js
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json
new file mode 100644
index 000000000000..a836fa16475d
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    ["transform-modules-amd", { "noInterop": true }],
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/output.js
new file mode 100644
index 000000000000..96dab9dce6f7
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/output.js
@@ -0,0 +1,3 @@
+define(["require"], function (_require) {
+  var modP = new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(imported), _reject));
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json
new file mode 100644
index 000000000000..48abb31ad806
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    "transform-modules-amd",
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/script/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/script/input.js
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/script/input.js
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/script/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/script/output.js
new file mode 100644
index 000000000000..0b8b11e86a92
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/script/output.js
@@ -0,0 +1,3 @@
+define(["require"], function (_require) {
+  var modP = new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(babelHelpers.interopRequireWildcard(imported)), _reject));
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/input.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/input.mjs
new file mode 100644
index 000000000000..4efa0f423b91
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/input.mjs
@@ -0,0 +1,8 @@
+var mod;
+
+import foo from "foo";
+
+import("mod").then(m => mod = m);
+
+export { mod };
+
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/output.js
new file mode 100644
index 000000000000..d5871c47383f
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/output.js
@@ -0,0 +1,12 @@
+define(["require", "exports", "foo"], function (_require, _exports, _foo) {
+  "use strict";
+
+  Object.defineProperty(_exports, "__esModule", {
+    value: true
+  });
+  _exports.mod = void 0;
+  _foo = babelHelpers.interopRequireDefault(_foo);
+  var mod;
+  _exports.mod = mod;
+  new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(babelHelpers.interopRequireWildcard(imported)), _reject)).then(m => _exports.mod = mod = m);
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/exec.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/exec.js
new file mode 100644
index 000000000000..edd0b1a34742
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/exec.js
@@ -0,0 +1,4 @@
+return import("./mod.js").then(({ default: def, named }) => {
+  expect(def()).toBe("foo");
+  expect(named()).toBe("bar");
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/mod.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/mod.js
new file mode 100644
index 000000000000..d8a2bc2c6ed2
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/mod.js
@@ -0,0 +1,2 @@
+module.exports = () => "foo";
+module.exports.named = () => "bar";
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/options.json
new file mode 100644
index 000000000000..eeebc1a57738
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/options.json
@@ -0,0 +1,5 @@
+{
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/exec.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/exec.js
new file mode 100644
index 000000000000..edd0b1a34742
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/exec.js
@@ -0,0 +1,4 @@
+return import("./mod.js").then(({ default: def, named }) => {
+  expect(def()).toBe("foo");
+  expect(named()).toBe("bar");
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/mod.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/mod.js
new file mode 100644
index 000000000000..799b79e96fd4
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/mod.js
@@ -0,0 +1,5 @@
+module.exports = {
+  __esModule: true,
+  default: () => "foo",
+  named: () => "bar",
+};
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/options.json
new file mode 100644
index 000000000000..eeebc1a57738
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/options.json
@@ -0,0 +1,5 @@
+{
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/input.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/input.mjs
new file mode 100644
index 000000000000..968ad7d80111
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/input.mjs
@@ -0,0 +1,3 @@
+import "a";
+
+import("b");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json
new file mode 100644
index 000000000000..d0f7c55cbaa3
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-modules-commonjs",
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/output.js
new file mode 100644
index 000000000000..cd4478d30e7c
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/output.js
@@ -0,0 +1,5 @@
+"use strict";
+
+require("a");
+
+import("b");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/input.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/input.mjs
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/input.mjs
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js
new file mode 100644
index 000000000000..2c4c89f6cf46
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js
@@ -0,0 +1,3 @@
+"use strict";
+
+var modP = Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("mod")));
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/input.js
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/input.js
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json
new file mode 100644
index 000000000000..31f00509daa2
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    ["transform-modules-commonjs", { "noInterop": true }],
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js
new file mode 100644
index 000000000000..0eee33867600
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js
@@ -0,0 +1 @@
+var modP = Promise.resolve().then(() => require("mod"));
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json
new file mode 100644
index 000000000000..4c26a692007c
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    "transform-modules-commonjs",
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/input.js
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/input.js
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js
new file mode 100644
index 000000000000..c1ee2ebe7ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js
@@ -0,0 +1 @@
+var modP = Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("mod")));
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/input.js
new file mode 100644
index 000000000000..30d0f8b34ab7
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/input.js
@@ -0,0 +1,6 @@
+var require = "foo";
+
+(async function () {
+  var require = "bar";
+  await import("./mod");
+})();
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/output.js
new file mode 100644
index 000000000000..21529855028f
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/output.js
@@ -0,0 +1,6 @@
+var _require2 = "foo";
+
+(async function () {
+  var _require = "bar";
+  await Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("./mod")));
+})();
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/input.js
new file mode 100644
index 000000000000..130d3cafa5cb
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/input.js
@@ -0,0 +1 @@
+import(2);
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js
new file mode 100644
index 000000000000..1babb42d8cec
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js
@@ -0,0 +1 @@
+Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require(`${2}`)));
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/missing-module-transform/missing-module-transform/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/missing-module-transform/missing-module-transform/input.js
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/missing-module-transform/missing-module-transform/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/missing-module-transform/missing-module-transform/options.json
new file mode 100644
index 000000000000..13188d0d10b4
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/missing-module-transform/missing-module-transform/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["proposal-dynamic-import"],
+  "throws": "@babel/plugin-proposal-dynamic-import depends on a modules\ntransform plugin. Supported plugins are:"
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/input.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/input.mjs
new file mode 100644
index 000000000000..646314cddede
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/input.mjs
@@ -0,0 +1,5 @@
+// TODO: This should throw in Babel 8
+
+import "a";
+
+import("b");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json
new file mode 100644
index 000000000000..c4fe39793abd
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-modules-systemjs",
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/output.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/output.mjs
new file mode 100644
index 000000000000..c15bc82fb820
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/output.mjs
@@ -0,0 +1,11 @@
+System.register(["a"], function (_export, _context) {
+  "use strict";
+
+  return {
+    setters: [function (_a) {}],
+    execute: function () {
+      // TODO: This should throw in Babel 8
+      _context.import("b");
+    }
+  };
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/input.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/input.mjs
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/input.mjs
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/output.mjs b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/output.mjs
new file mode 100644
index 000000000000..8570884bf14d
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/output.mjs
@@ -0,0 +1,11 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var modP;
+  return {
+    setters: [],
+    execute: function () {
+      modP = _context.import("mod");
+    }
+  };
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json
new file mode 100644
index 000000000000..8a06445e1342
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    "transform-modules-systemjs",
+    "external-helpers"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/script/input.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/script/input.js
new file mode 100644
index 000000000000..743a74ae3b73
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/script/input.js
@@ -0,0 +1 @@
+var modP = import("mod");
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/script/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/script/output.js
new file mode 100644
index 000000000000..8570884bf14d
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/script/output.js
@@ -0,0 +1,11 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var modP;
+  return {
+    setters: [],
+    execute: function () {
+      modP = _context.import("mod");
+    }
+  };
+});
diff --git a/packages/babel-plugin-proposal-dynamic-import/test/index.js b/packages/babel-plugin-proposal-dynamic-import/test/index.js
new file mode 100644
index 000000000000..1b534b8fc64a
--- /dev/null
+++ b/packages/babel-plugin-proposal-dynamic-import/test/index.js
@@ -0,0 +1,3 @@
+import runner from "@babel/helper-plugin-test-runner";
+
+runner(__dirname);
diff --git a/packages/babel-plugin-proposal-export-default-from/package.json b/packages/babel-plugin-proposal-export-default-from/package.json
index 3513efb416f2..5062421a48ed 100644
--- a/packages/babel-plugin-proposal-export-default-from/package.json
+++ b/packages/babel-plugin-proposal-export-default-from/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-export-default-from",
-  "version": "7.0.0",
+  "version": "7.5.2",
   "description": "Compile export default to ES2015",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-export-default-from",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-export-default-from": "^7.0.0"
+    "@babel/plugin-syntax-export-default-from": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-export-default-from/src/index.js b/packages/babel-plugin-proposal-export-default-from/src/index.js
index 204bdaa2e431..5ddc0ff3f203 100644
--- a/packages/babel-plugin-proposal-export-default-from/src/index.js
+++ b/packages/babel-plugin-proposal-export-default-from/src/index.js
@@ -6,6 +6,7 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-export-default-from",
     inherits: syntaxExportDefaultFrom,
 
     visitor: {
@@ -32,7 +33,8 @@ export default declare(api => {
           nodes.push(node);
         }
 
-        path.replaceWithMultiple(nodes);
+        const [importDeclaration] = path.replaceWithMultiple(nodes);
+        path.scope.registerDeclaration(importDeclaration);
       },
     },
   };
diff --git a/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/input.mjs b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/input.mjs
new file mode 100644
index 000000000000..48783b04663e
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/input.mjs
@@ -0,0 +1 @@
+export foo from "bar";
diff --git a/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/options.json b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/options.json
new file mode 100644
index 000000000000..ca5c6691d301
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["proposal-export-default-from", "transform-typescript"]
+}
diff --git a/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/output.mjs b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/output.mjs
new file mode 100644
index 000000000000..076607d0d743
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/default-typescript/output.mjs
@@ -0,0 +1,2 @@
+import _foo from "bar";
+export { _foo as foo };
diff --git a/packages/babel-plugin-proposal-export-namespace-from/package.json b/packages/babel-plugin-proposal-export-namespace-from/package.json
index 3f3e2982e43e..1f0081f49c38 100644
--- a/packages/babel-plugin-proposal-export-namespace-from/package.json
+++ b/packages/babel-plugin-proposal-export-namespace-from/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-export-namespace-from",
-  "version": "7.0.0",
+  "version": "7.5.2",
   "description": "Compile export namespace to ES2015",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-export-namespace-from",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-export-namespace-from": "^7.0.0"
+    "@babel/plugin-syntax-export-namespace-from": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-export-namespace-from/src/index.js b/packages/babel-plugin-proposal-export-namespace-from/src/index.js
index 3d9e4f48126b..b028abcb721f 100644
--- a/packages/babel-plugin-proposal-export-namespace-from/src/index.js
+++ b/packages/babel-plugin-proposal-export-namespace-from/src/index.js
@@ -6,6 +6,7 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-export-namespace-from",
     inherits: syntaxExportNamespaceFrom,
 
     visitor: {
@@ -42,7 +43,8 @@ export default declare(api => {
           nodes.push(node);
         }
 
-        path.replaceWithMultiple(nodes);
+        const [importDeclaration] = path.replaceWithMultiple(nodes);
+        path.scope.registerDeclaration(importDeclaration);
       },
     },
   };
diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/input.mjs b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/input.mjs
new file mode 100644
index 000000000000..d9d78f9ccdc8
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/input.mjs
@@ -0,0 +1 @@
+export * as foo from "bar";
diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/options.json b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/options.json
new file mode 100644
index 000000000000..ce55287353b6
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["proposal-export-namespace-from", "transform-typescript"]
+}
diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/output.mjs b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/output.mjs
new file mode 100644
index 000000000000..2f4c84d7614c
--- /dev/null
+++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-typescript/output.mjs
@@ -0,0 +1,2 @@
+import * as _foo from "bar";
+export { _foo as foo };
diff --git a/packages/babel-plugin-proposal-function-bind/package.json b/packages/babel-plugin-proposal-function-bind/package.json
index f72052e7c842..177ce26ee514 100644
--- a/packages/babel-plugin-proposal-function-bind/package.json
+++ b/packages/babel-plugin-proposal-function-bind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-function-bind",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Compile function bind operator to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-function-bind",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-function-bind": "^7.0.0"
+    "@babel/plugin-syntax-function-bind": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-function-bind/src/index.js b/packages/babel-plugin-proposal-function-bind/src/index.js
index 57a6a759e350..ea62953863e5 100644
--- a/packages/babel-plugin-proposal-function-bind/src/index.js
+++ b/packages/babel-plugin-proposal-function-bind/src/index.js
@@ -39,6 +39,7 @@ export default declare(api => {
   }
 
   return {
+    name: "proposal-function-bind",
     inherits: syntaxFunctionBind,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-function-sent/README.md b/packages/babel-plugin-proposal-function-sent/README.md
index 98978df840bf..fc9bda8b7e44 100644
--- a/packages/babel-plugin-proposal-function-sent/README.md
+++ b/packages/babel-plugin-proposal-function-sent/README.md
@@ -1,6 +1,6 @@
 # @babel/plugin-proposal-function-sent
 
-> Compile the function.sent meta propety to valid ES2015 code
+> Compile the function.sent meta property to valid ES2015 code
 
 See our website [@babel/plugin-proposal-function-sent](https://babeljs.io/docs/en/next/babel-plugin-proposal-function-sent.html) for more information.
 
diff --git a/packages/babel-plugin-proposal-function-sent/package.json b/packages/babel-plugin-proposal-function-sent/package.json
index 45f8a6f0d45a..0ba394b625af 100644
--- a/packages/babel-plugin-proposal-function-sent/package.json
+++ b/packages/babel-plugin-proposal-function-sent/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@babel/plugin-proposal-function-sent",
-  "version": "7.1.0",
-  "description": "Compile the function.sent meta propety to valid ES2015 code",
+  "version": "7.5.0",
+  "description": "Compile the function.sent meta property to valid ES2015 code",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-function-sent",
   "license": "MIT",
   "publishConfig": {
@@ -13,14 +13,14 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-wrap-function": "^7.1.0",
-    "@babel/plugin-syntax-function-sent": "^7.0.0"
+    "@babel/helper-wrap-function": "^7.2.0",
+    "@babel/plugin-syntax-function-sent": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-function-sent/src/index.js b/packages/babel-plugin-proposal-function-sent/src/index.js
index 16237e0ac40c..959b86c41a53 100644
--- a/packages/babel-plugin-proposal-function-sent/src/index.js
+++ b/packages/babel-plugin-proposal-function-sent/src/index.js
@@ -35,6 +35,7 @@ export default declare(api => {
   };
 
   return {
+    name: "proposal-function-sent",
     inherits: syntaxFunctionSent,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js
index 5218365efa3a..206aa55c314b 100644
--- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js
+++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js
@@ -7,7 +7,9 @@ const foo = function () {
     return _functionSent;
   });
 
-  return function gen() {
+  function gen() {
     return _gen.apply(this, arguments);
-  };
+  }
+
+  return gen;
 }();
diff --git a/packages/babel-plugin-proposal-json-strings/package.json b/packages/babel-plugin-proposal-json-strings/package.json
index 12cf7d55ddd4..421ccf784f36 100644
--- a/packages/babel-plugin-proposal-json-strings/package.json
+++ b/packages/babel-plugin-proposal-json-strings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-json-strings",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Escape U+2028 LINE SEPARATOR and U+2029 PARAGRAPH SEPARATOR in JS strings",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-json-strings",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-json-strings": "^7.0.0"
+    "@babel/plugin-syntax-json-strings": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-json-strings/src/index.js b/packages/babel-plugin-proposal-json-strings/src/index.js
index dd555f98d0bb..3d2cdcaa05ad 100644
--- a/packages/babel-plugin-proposal-json-strings/src/index.js
+++ b/packages/babel-plugin-proposal-json-strings/src/index.js
@@ -15,6 +15,7 @@ export default declare(api => {
   }
 
   return {
+    name: "proposal-json-strings",
     inherits: syntaxJsonStrings,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-logical-assignment-operators/package.json b/packages/babel-plugin-proposal-logical-assignment-operators/package.json
index e5de458d7e3c..ee5957903079 100644
--- a/packages/babel-plugin-proposal-logical-assignment-operators/package.json
+++ b/packages/babel-plugin-proposal-logical-assignment-operators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-logical-assignment-operators",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Transforms logical assignment operators into short-circuited assignments",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-logical-assignment-operators",
   "license": "MIT",
@@ -13,15 +13,15 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-logical-assignment-operators": "^7.0.0"
+    "@babel/plugin-syntax-logical-assignment-operators": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-    "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.2.0",
+    "@babel/plugin-syntax-nullish-coalescing-operator": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-logical-assignment-operators/src/index.js b/packages/babel-plugin-proposal-logical-assignment-operators/src/index.js
index cffeca9a1281..813dcd761f7c 100644
--- a/packages/babel-plugin-proposal-logical-assignment-operators/src/index.js
+++ b/packages/babel-plugin-proposal-logical-assignment-operators/src/index.js
@@ -6,6 +6,7 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-logical-assignment-operators",
     inherits: syntaxLogicalAssignmentOperators,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-nullish-coalescing-operator/package.json b/packages/babel-plugin-proposal-nullish-coalescing-operator/package.json
index 179d4ed42324..dd9e329c3beb 100644
--- a/packages/babel-plugin-proposal-nullish-coalescing-operator/package.json
+++ b/packages/babel-plugin-proposal-nullish-coalescing-operator/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@babel/plugin-proposal-nullish-coalescing-operator",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Remove nullish coalescing operator",
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-nullish-coalescing-opearator",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-nullish-coalescing-operator",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-nullish-coalescing-operator/src/index.js b/packages/babel-plugin-proposal-nullish-coalescing-operator/src/index.js
index 454b4c057a8c..5b3c2a3a4dc3 100644
--- a/packages/babel-plugin-proposal-nullish-coalescing-operator/src/index.js
+++ b/packages/babel-plugin-proposal-nullish-coalescing-operator/src/index.js
@@ -6,6 +6,7 @@ export default declare((api, { loose = false }) => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-nullish-coalescing-operator",
     inherits: syntaxNullishCoalescingOperator,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-numeric-separator/package.json b/packages/babel-plugin-proposal-numeric-separator/package.json
index 6cf59792bc97..275d2b8425a9 100644
--- a/packages/babel-plugin-proposal-numeric-separator/package.json
+++ b/packages/babel-plugin-proposal-numeric-separator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-numeric-separator",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Remove numeric separators from Decimal, Binary, Hex and Octal literals",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-numeric-separator",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-numeric-separator": "^7.0.0"
+    "@babel/plugin-syntax-numeric-separator": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-numeric-separator/src/index.js b/packages/babel-plugin-proposal-numeric-separator/src/index.js
index 822ade1b8c4d..99c29d700e1b 100644
--- a/packages/babel-plugin-proposal-numeric-separator/src/index.js
+++ b/packages/babel-plugin-proposal-numeric-separator/src/index.js
@@ -19,6 +19,7 @@ export default declare(api => {
   }
 
   return {
+    name: "proposal-numeric-separator",
     inherits: syntaxNumericSeparator,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-object-rest-spread/package.json b/packages/babel-plugin-proposal-object-rest-spread/package.json
index 5181f6b0a08f..e2ac2b6934ad 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/package.json
+++ b/packages/babel-plugin-proposal-object-rest-spread/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-object-rest-spread",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Compile object rest and spread to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-object-rest-spread",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-object-rest-spread": "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-object-rest-spread/src/index.js b/packages/babel-plugin-proposal-object-rest-spread/src/index.js
index 0103816a239d..39fcfe42a21c 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/src/index.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/src/index.js
@@ -2,6 +2,17 @@ import { declare } from "@babel/helper-plugin-utils";
 import syntaxObjectRestSpread from "@babel/plugin-syntax-object-rest-spread";
 import { types as t } from "@babel/core";
 
+// TODO: Remove in Babel 8
+// @babel/types <=7.3.3 counts FOO as referenced in var { x: FOO }.
+// We need to detect this bug to know if "unused" means 0 or 1 references.
+const ZERO_REFS = (() => {
+  const node = t.identifier("a");
+  const property = t.objectProperty(t.identifier("key"), node);
+  const pattern = t.objectPattern([property]);
+
+  return t.isReferenced(node, property, pattern) ? 1 : 0;
+})();
+
 export default declare((api, opts) => {
   api.assertVersion(7);
 
@@ -31,8 +42,8 @@ export default declare((api, opts) => {
       Expression(path) {
         const parentType = path.parent.type;
         if (
-          (parentType == "AssignmentPattern" && path.key === "right") ||
-          (parentType == "ObjectProperty" &&
+          (parentType === "AssignmentPattern" && path.key === "right") ||
+          (parentType === "ObjectProperty" &&
             path.parent.computed &&
             path.key === "key")
         ) {
@@ -65,6 +76,8 @@ export default declare((api, opts) => {
       if (t.isIdentifier(prop.key) && !prop.computed) {
         // since a key {a: 3} is equivalent to {"a": 3}, use the latter
         keys.push(t.stringLiteral(prop.key.name));
+      } else if (t.isTemplateLiteral(prop.key)) {
+        keys.push(t.cloneNode(prop.key));
       } else if (t.isLiteral(prop.key)) {
         keys.push(t.stringLiteral(String(prop.key.value)));
       } else {
@@ -98,7 +111,7 @@ export default declare((api, opts) => {
     Object.keys(bindings).forEach(bindingName => {
       const bindingParentPath = bindings[bindingName].parentPath;
       if (
-        path.scope.getBinding(bindingName).references > 1 ||
+        path.scope.getBinding(bindingName).references > ZERO_REFS ||
         !bindingParentPath.isObjectProperty()
       ) {
         return;
@@ -178,6 +191,7 @@ export default declare((api, opts) => {
   }
 
   return {
+    name: "proposal-object-rest-spread",
     inherits: syntaxObjectRestSpread,
 
     visitor: {
@@ -301,7 +315,7 @@ export default declare((api, opts) => {
 
         const specifiers = [];
 
-        for (const name in path.getOuterBindingIdentifiers(path)) {
+        for (const name of Object.keys(path.getOuterBindingIdentifiers(path))) {
           specifiers.push(
             t.exportSpecifier(t.identifier(name), t.identifier(name)),
           );
@@ -376,10 +390,16 @@ export default declare((api, opts) => {
 
           path.ensureBlock();
 
+          if (node.body.body.length === 0 && path.isCompletionRecord()) {
+            node.body.body.unshift(
+              t.expressionStatement(scope.buildUndefinedNode()),
+            );
+          }
+
           node.body.body.unshift(
-            t.variableDeclaration("var", [
-              t.variableDeclarator(left, t.cloneNode(temp)),
-            ]),
+            t.expressionStatement(
+              t.assignmentExpression("=", left, t.cloneNode(temp)),
+            ),
           );
 
           return;
@@ -411,15 +431,10 @@ export default declare((api, opts) => {
         let props = [];
 
         function push() {
-          if (!props.length) return;
           args.push(t.objectExpression(props));
           props = [];
         }
 
-        if (t.isSpreadElement(path.node.properties[0])) {
-          args.push(t.objectExpression([]));
-        }
-
         for (const prop of (path.node.properties: Array)) {
           if (t.isSpreadElement(prop)) {
             push();
@@ -429,13 +444,26 @@ export default declare((api, opts) => {
           }
         }
 
-        push();
+        if (props.length) {
+          push();
+        }
 
         let helper;
         if (loose) {
           helper = getExtendsHelper(file);
         } else {
-          helper = file.addHelper("objectSpread");
+          try {
+            helper = file.addHelper("objectSpread2");
+          } catch {
+            // TODO: This is needed to workaround https://github.com/babel/babel/issues/10187
+            // and https://github.com/babel/babel/issues/10179 for older @babel/core versions
+            // where #10187 isn't fixed.
+            this.file.declarations["objectSpread2"] = null;
+
+            // objectSpread2 has been introduced in v7.5.0
+            // We have to maintain backward compatibility.
+            helper = file.addHelper("objectSpread");
+          }
         }
 
         path.replaceWith(t.callExpression(helper, args));
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x-completion-record/input.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x-completion-record/input.js
new file mode 100644
index 000000000000..30967ff438da
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x-completion-record/input.js
@@ -0,0 +1 @@
+for ({a, ...b} of []) {}
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x-completion-record/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x-completion-record/output.js
new file mode 100644
index 000000000000..01e54fb98a4b
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x-completion-record/output.js
@@ -0,0 +1,9 @@
+for (var _ref of []) {
+  var _ref2 = _ref;
+  ({
+    a
+  } = _ref2);
+  b = babelHelpers.objectWithoutProperties(_ref2, ["a"]);
+  _ref2;
+  void 0;
+}
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x/output.js
index 0e0f03755164..ba843ac52af0 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x/output.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/for-x/output.js
@@ -7,18 +7,22 @@ for (var _ref of []) {
 }
 
 for (var _ref2 of []) {
-  var {
+  var _ref3 = _ref2;
+  ({
     a
-  } = _ref2,
-      b = babelHelpers.objectWithoutProperties(_ref2, ["a"]);
+  } = _ref3);
+  b = babelHelpers.objectWithoutProperties(_ref3, ["a"]);
+  _ref3;
 }
 
 async function a() {
-  for await (var _ref3 of []) {
-    var {
+  for await (var _ref4 of []) {
+    var _ref5 = _ref4;
+    ({
       a
-    } = _ref3,
-        b = babelHelpers.objectWithoutProperties(_ref3, ["a"]);
+    } = _ref5);
+    b = babelHelpers.objectWithoutProperties(_ref5, ["a"]);
+    _ref5;
   }
 } // skip
 
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/impure-computed-exec/exec.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/impure-computed-exec/exec.js
index c422b2ff8ff8..da5288308c3b 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/impure-computed-exec/exec.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/impure-computed-exec/exec.js
@@ -19,3 +19,16 @@ key = 2;
 expect(y).toBe("two");
 expect(x).toEqual({});
 expect(z).toBe("zee");
+
+// rhs evaluated before lhs
+var order = [];
+function left() {
+  order.push("left");
+  return 0;
+}
+function right() {
+  order.push("right");
+  return {};
+}
+var { [left()]: y, ...x} = right();
+expect(order).toEqual(["right", "left"]);
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json
index fc3756652af6..ac791b82acf2 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json
@@ -2,6 +2,6 @@
   "plugins": [
     "syntax-async-generators",
     "proposal-object-rest-spread",
-    "external-helpers"
+    ["external-helpers", { "helperVersion": "7.1.5" }]
   ]
 }
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-false/input.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-false/input.js
new file mode 100644
index 000000000000..66679d7f052d
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-false/input.js
@@ -0,0 +1,10 @@
+const input = {};
+
+const {
+  given_name: givenName,
+  'last_name': lastName,
+  [`country`]: country,
+  [prefix + 'state']: state,
+  [`${prefix}consents`]: consents,
+  ...rest
+} = input;
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-false/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-false/output.js
new file mode 100644
index 000000000000..17b2e9aa9398
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-false/output.js
@@ -0,0 +1,12 @@
+const input = {};
+
+const _ref = prefix + 'state',
+      _ref2 = `${prefix}consents`,
+      {
+  given_name: givenName,
+  'last_name': lastName,
+  [`country`]: country,
+  [_ref]: state,
+  [_ref2]: consents
+} = input,
+      rest = babelHelpers.objectWithoutProperties(input, ["given_name", "last_name", `country`, _ref, _ref2].map(babelHelpers.toPropertyKey));
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-true/input.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-true/input.js
new file mode 100644
index 000000000000..2a85ab9e6665
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-true/input.js
@@ -0,0 +1,8 @@
+const input = {};
+
+const {
+  given_name: givenName,
+  'last_name': lastName,
+  [`country`]: country,
+  ...rest
+} = input;
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-true/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-true/output.js
new file mode 100644
index 000000000000..7dcb94f46a95
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/template-literal-property-allLiterals-true/output.js
@@ -0,0 +1,7 @@
+const input = {};
+const {
+  given_name: givenName,
+  'last_name': lastName,
+  [`country`]: country
+} = input,
+      rest = babelHelpers.objectWithoutProperties(input, ["given_name", "last_name", `country`]);
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js
index 33939f0e4622..bca55509f8df 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js
@@ -1,4 +1,6 @@
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/exec.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/exec.js
new file mode 100644
index 000000000000..439e267c5f24
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/exec.js
@@ -0,0 +1,8 @@
+var log = [];
+
+var a = {
+  ...{ get foo() { log.push(1); } },
+  get bar() { log.push(2); }
+};
+
+expect(log).toEqual([1]);
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/input.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/input.js
index 2fd31d2ffdac..a20f61241b3c 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/input.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/input.js
@@ -4,4 +4,6 @@
 
 ({ ...{ foo: 'bar' } });
 
+({ ...{ foo: 'bar' }, ...{ bar: 'baz' } });
+
 ({ ...{ get foo () { return 'foo' } } });
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js
index 11eb0dfa987d..ba0e5ad1c8e3 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js
@@ -1,4 +1,6 @@
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -16,6 +18,12 @@ _objectSpread({}, {
   foo: 'bar'
 });
 
+_objectSpread({}, {
+  foo: 'bar'
+}, {}, {
+  bar: 'baz'
+});
+
 _objectSpread({}, {
   get foo() {
     return 'foo';
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/no-getOwnPropertyDescriptors/exec.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/no-getOwnPropertyDescriptors/exec.js
new file mode 100644
index 000000000000..0a3b32098cde
--- /dev/null
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/no-getOwnPropertyDescriptors/exec.js
@@ -0,0 +1,6 @@
+const oldGOPDs = Object.getOwnPropertyDescriptors;
+Object.getOwnPropertyDescriptors = null;
+
+({ ...{ a: 1 }, b: 1, ...{} });
+
+Object.getOwnPropertyDescriptors = oldGOPDs;
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js
index 0bfa38715a44..1370408b8354 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js
@@ -1,4 +1,6 @@
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json
index f236fc3b4ceb..a960185fcd97 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json
+++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json
@@ -7,7 +7,8 @@
         "targets": {
           "node": 8
         },
-        "useBuiltIns": "usage"
+        "useBuiltIns": "usage",
+        "corejs": 3
       }
     ]
   ],
diff --git a/packages/babel-plugin-proposal-optional-catch-binding/package.json b/packages/babel-plugin-proposal-optional-catch-binding/package.json
index fd43aef13ae8..86e80fad2678 100644
--- a/packages/babel-plugin-proposal-optional-catch-binding/package.json
+++ b/packages/babel-plugin-proposal-optional-catch-binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-optional-catch-binding",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Compile optional catch bindings",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-optional-catch-binding",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-optional-catch-binding": "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-optional-catch-binding/src/index.js b/packages/babel-plugin-proposal-optional-catch-binding/src/index.js
index f3f0daa99a0e..04c615bb1d26 100644
--- a/packages/babel-plugin-proposal-optional-catch-binding/src/index.js
+++ b/packages/babel-plugin-proposal-optional-catch-binding/src/index.js
@@ -5,6 +5,7 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-optional-catch-binding",
     inherits: syntaxOptionalCatchBinding,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-optional-chaining/package.json b/packages/babel-plugin-proposal-optional-chaining/package.json
index 8a32612fc935..fb71c57cf9a3 100644
--- a/packages/babel-plugin-proposal-optional-chaining/package.json
+++ b/packages/babel-plugin-proposal-optional-chaining/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-optional-chaining",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Transform optional chaining operators into a series of nil checks",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-optional-chaining",
   "license": "MIT",
@@ -13,14 +13,14 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-optional-chaining": "^7.0.0"
+    "@babel/plugin-syntax-optional-chaining": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "@babel/plugin-transform-block-scoping": "^7.0.0"
+    "@babel/plugin-transform-block-scoping": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-optional-chaining/src/index.js b/packages/babel-plugin-proposal-optional-chaining/src/index.js
index 0da7c84238bc..c3e324041520 100644
--- a/packages/babel-plugin-proposal-optional-chaining/src/index.js
+++ b/packages/babel-plugin-proposal-optional-chaining/src/index.js
@@ -7,135 +7,117 @@ export default declare((api, options) => {
 
   const { loose = false } = options;
 
-  function optional(path, replacementPath) {
-    const { scope } = path;
-    const optionals = [];
-
-    let objectPath = path;
-    while (
-      objectPath.isOptionalMemberExpression() ||
-      objectPath.isOptionalCallExpression()
-    ) {
-      const { node } = objectPath;
-      if (node.optional) {
-        optionals.push(node);
-      }
-
-      if (objectPath.isOptionalMemberExpression()) {
-        objectPath.node.type = "MemberExpression";
-        objectPath = objectPath.get("object");
-      } else {
-        objectPath.node.type = "CallExpression";
-        objectPath = objectPath.get("callee");
-      }
-    }
-
-    for (let i = optionals.length - 1; i >= 0; i--) {
-      const node = optionals[i];
-      node.optional = false;
+  return {
+    name: "proposal-optional-chaining",
+    inherits: syntaxOptionalChaining,
 
-      const isCall = t.isCallExpression(node);
-      const replaceKey = isCall ? "callee" : "object";
-      const chain = node[replaceKey];
+    visitor: {
+      "OptionalCallExpression|OptionalMemberExpression"(path) {
+        const { parentPath, scope } = path;
+        const optionals = [];
+
+        let optionalPath = path;
+        while (
+          optionalPath.isOptionalMemberExpression() ||
+          optionalPath.isOptionalCallExpression()
+        ) {
+          const { node } = optionalPath;
+          if (node.optional) {
+            optionals.push(node);
+          }
 
-      let ref;
-      let check;
-      if (loose && isCall) {
-        // If we are using a loose transform (avoiding a Function#call) and we are at the call,
-        // we can avoid a needless memoize.
-        check = ref = chain;
-      } else {
-        ref = scope.maybeGenerateMemoised(chain);
-        if (ref) {
-          check = t.assignmentExpression(
-            "=",
-            t.cloneNode(ref),
-            // Here `chain` MUST NOT be cloned because it could be updated
-            // when generating the memoised context of a call espression
-            chain,
-          );
-          node[replaceKey] = ref;
-        } else {
-          check = ref = chain;
+          if (optionalPath.isOptionalMemberExpression()) {
+            optionalPath.node.type = "MemberExpression";
+            optionalPath = optionalPath.get("object");
+          } else if (optionalPath.isOptionalCallExpression()) {
+            optionalPath.node.type = "CallExpression";
+            optionalPath = optionalPath.get("callee");
+          }
         }
-      }
 
-      // Ensure call expressions have the proper `this`
-      // `foo.bar()` has context `foo`.
-      if (isCall && t.isMemberExpression(chain)) {
-        if (loose) {
-          // To avoid a Function#call, we can instead re-grab the property from the context object.
-          // `a.?b.?()` translates roughly to `_a.b != null && _a.b()`
-          node.callee = chain;
-        } else {
-          // Otherwise, we need to memoize the context object, and change the call into a Function#call.
-          // `a.?b.?()` translates roughly to `(_b = _a.b) != null && _b.call(_a)`
-          const { object } = chain;
-          let context = scope.maybeGenerateMemoised(object);
-          if (context) {
-            chain.object = t.assignmentExpression("=", context, object);
+        let replacementPath = path;
+        if (parentPath.isUnaryExpression({ operator: "delete" })) {
+          replacementPath = parentPath;
+        }
+        for (let i = optionals.length - 1; i >= 0; i--) {
+          const node = optionals[i];
+
+          const isCall = t.isCallExpression(node);
+          const replaceKey = isCall ? "callee" : "object";
+          const chain = node[replaceKey];
+
+          let ref;
+          let check;
+          if (loose && isCall) {
+            // If we are using a loose transform (avoiding a Function#call) and we are at the call,
+            // we can avoid a needless memoize.
+            check = ref = chain;
           } else {
-            context = object;
+            ref = scope.maybeGenerateMemoised(chain);
+            if (ref) {
+              check = t.assignmentExpression(
+                "=",
+                t.cloneNode(ref),
+                // Here `chain` MUST NOT be cloned because it could be updated
+                // when generating the memoised context of a call espression
+                chain,
+              );
+              node[replaceKey] = ref;
+            } else {
+              check = ref = chain;
+            }
           }
 
-          node.arguments.unshift(t.cloneNode(context));
-          node.callee = t.memberExpression(node.callee, t.identifier("call"));
-        }
-      }
-
-      replacementPath.replaceWith(
-        t.conditionalExpression(
-          loose
-            ? t.binaryExpression("==", t.cloneNode(check), t.nullLiteral())
-            : t.logicalExpression(
-                "||",
-                t.binaryExpression("===", t.cloneNode(check), t.nullLiteral()),
-                t.binaryExpression(
-                  "===",
-                  t.cloneNode(ref),
-                  scope.buildUndefinedNode(),
-                ),
-              ),
-          scope.buildUndefinedNode(),
-          replacementPath.node,
-        ),
-      );
-
-      replacementPath = replacementPath.get("alternate");
-    }
-  }
-
-  function findReplacementPath(path) {
-    return path.find(path => {
-      const { parentPath } = path;
-
-      if (path.key == "object" && parentPath.isOptionalMemberExpression()) {
-        return false;
-      }
-      if (path.key == "callee" && parentPath.isOptionalCallExpression()) {
-        return false;
-      }
-      if (
-        path.key == "argument" &&
-        parentPath.isUnaryExpression({ operator: "delete" })
-      ) {
-        return false;
-      }
-
-      return true;
-    });
-  }
+          // Ensure call expressions have the proper `this`
+          // `foo.bar()` has context `foo`.
+          if (isCall && t.isMemberExpression(chain)) {
+            if (loose) {
+              // To avoid a Function#call, we can instead re-grab the property from the context object.
+              // `a.?b.?()` translates roughly to `_a.b != null && _a.b()`
+              node.callee = chain;
+            } else {
+              // Otherwise, we need to memoize the context object, and change the call into a Function#call.
+              // `a.?b.?()` translates roughly to `(_b = _a.b) != null && _b.call(_a)`
+              const { object } = chain;
+              let context = scope.maybeGenerateMemoised(object);
+              if (context) {
+                chain.object = t.assignmentExpression("=", context, object);
+              } else {
+                context = object;
+              }
+
+              node.arguments.unshift(t.cloneNode(context));
+              node.callee = t.memberExpression(
+                node.callee,
+                t.identifier("call"),
+              );
+            }
+          }
 
-  return {
-    inherits: syntaxOptionalChaining,
+          replacementPath.replaceWith(
+            t.conditionalExpression(
+              loose
+                ? t.binaryExpression("==", t.cloneNode(check), t.nullLiteral())
+                : t.logicalExpression(
+                    "||",
+                    t.binaryExpression(
+                      "===",
+                      t.cloneNode(check),
+                      t.nullLiteral(),
+                    ),
+                    t.binaryExpression(
+                      "===",
+                      t.cloneNode(ref),
+                      scope.buildUndefinedNode(),
+                    ),
+                  ),
+              scope.buildUndefinedNode(),
+              replacementPath.node,
+            ),
+          );
 
-    visitor: {
-      "OptionalCallExpression|OptionalMemberExpression"(path) {
-        if (!path.node.optional) {
-          return;
+          replacementPath = replacementPath.get("alternate");
         }
-
-        optional(path, findReplacementPath(path));
       },
     },
   };
diff --git a/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/input.js b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/input.js
new file mode 100644
index 000000000000..6094ab401b98
--- /dev/null
+++ b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/input.js
@@ -0,0 +1,7 @@
+a?.(...args);
+
+a?.b(...args);
+
+a?.b(...args).c;
+
+a?.b(...args).c(...args);
diff --git a/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/options.json b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/options.json
new file mode 100644
index 000000000000..e2efd1fae654
--- /dev/null
+++ b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "external-helpers",
+    "proposal-optional-chaining",
+    "transform-spread"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/output.js b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/output.js
new file mode 100644
index 000000000000..9c180568c58b
--- /dev/null
+++ b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/output.js
@@ -0,0 +1,6 @@
+var _a, _a2, _a3, _a4, _a4$b;
+
+(_a = a) === null || _a === void 0 ? void 0 : _a.apply(void 0, babelHelpers.toConsumableArray(args));
+(_a2 = a) === null || _a2 === void 0 ? void 0 : _a2.b.apply(_a2, babelHelpers.toConsumableArray(args));
+(_a3 = a) === null || _a3 === void 0 ? void 0 : _a3.b.apply(_a3, babelHelpers.toConsumableArray(args)).c;
+(_a4 = a) === null || _a4 === void 0 ? void 0 : (_a4$b = _a4.b.apply(_a4, babelHelpers.toConsumableArray(args))).c.apply(_a4$b, babelHelpers.toConsumableArray(args));
diff --git a/packages/babel-plugin-proposal-partial-application/.npmignore b/packages/babel-plugin-proposal-partial-application/.npmignore
new file mode 100644
index 000000000000..f9806945836e
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-plugin-proposal-partial-application/README.md b/packages/babel-plugin-proposal-partial-application/README.md
new file mode 100644
index 000000000000..0e121707028f
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/README.md
@@ -0,0 +1,19 @@
+# @babel/plugin-proposal-partial-application
+
+> Introduces a new ? token in an argument list which allows for partially applying an argument list to a call expression
+
+See our website [@babel/plugin-proposal-partial-application](https://babeljs.io/docs/en/next/babel-plugin-proposal-partial-application.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/plugin-proposal-partial-application
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/plugin-proposal-partial-application --dev
+```
diff --git a/packages/babel-plugin-proposal-partial-application/package.json b/packages/babel-plugin-proposal-partial-application/package.json
new file mode 100644
index 000000000000..79303c737cc7
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@babel/plugin-proposal-partial-application",
+  "version": "7.4.4",
+  "description": "Introduces a new ? token in an argument list which allows for partially applying an argument list to a call expression",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-partial-application",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin"
+  ],
+  "dependencies": {
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "@babel/plugin-syntax-partial-application": "^7.4.4"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0-0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.4.4",
+    "@babel/helper-plugin-test-runner": "^7.0.0"
+  }
+}
diff --git a/packages/babel-plugin-proposal-partial-application/src/index.js b/packages/babel-plugin-proposal-partial-application/src/index.js
new file mode 100644
index 000000000000..8bd32c72c6f7
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/src/index.js
@@ -0,0 +1,150 @@
+import { declare } from "@babel/helper-plugin-utils";
+import syntaxPartialApplication from "@babel/plugin-syntax-partial-application";
+import { types as t } from "@babel/core";
+
+export default declare(api => {
+  api.assertVersion(7);
+
+  /**
+   * a function to figure out if a call expression has
+   * ArgumentPlaceholder as one of its arguments
+   * @param node a callExpression node
+   * @returns boolean
+   */
+  function hasArgumentPlaceholder(node) {
+    return node.arguments.some(arg => t.isArgumentPlaceholder(arg));
+  }
+
+  function unwrapArguments(node, scope) {
+    const init = [];
+    for (let i = 0; i < node.arguments.length; i++) {
+      if (
+        !t.isArgumentPlaceholder(node.arguments[i]) &&
+        !t.isImmutable(node.arguments[i])
+      ) {
+        const id = scope.generateUidIdentifierBasedOnNode(
+          node.arguments[i],
+          "param",
+        );
+        scope.push({ id });
+        if (t.isSpreadElement(node.arguments[i])) {
+          init.push(
+            t.assignmentExpression(
+              "=",
+              t.cloneNode(id),
+              t.arrayExpression([t.spreadElement(node.arguments[i].argument)]),
+            ),
+          );
+          node.arguments[i].argument = t.cloneNode(id);
+        } else {
+          init.push(
+            t.assignmentExpression("=", t.cloneNode(id), node.arguments[i]),
+          );
+          node.arguments[i] = t.cloneNode(id);
+        }
+      }
+    }
+    return init;
+  }
+
+  function replacePlaceholders(node, scope) {
+    const placeholders = [];
+    const args = [];
+
+    node.arguments.forEach(arg => {
+      if (t.isArgumentPlaceholder(arg)) {
+        const id = scope.generateUid("_argPlaceholder");
+        placeholders.push(t.identifier(id));
+        args.push(t.identifier(id));
+      } else {
+        args.push(arg);
+      }
+    });
+    return [placeholders, args];
+  }
+
+  return {
+    name: "proposal-partial-application",
+    inherits: syntaxPartialApplication,
+
+    visitor: {
+      CallExpression(path) {
+        if (!hasArgumentPlaceholder(path.node)) {
+          return;
+        }
+        const { node, scope } = path;
+        const functionLVal = path.scope.generateUidIdentifierBasedOnNode(
+          node.callee,
+        );
+        const sequenceParts = [];
+        const argsInitializers = unwrapArguments(node, scope);
+        const [placeholdersParams, args] = replacePlaceholders(node, scope);
+
+        scope.push({ id: functionLVal });
+
+        if (node.callee.type === "MemberExpression") {
+          const receiverLVal = path.scope.generateUidIdentifierBasedOnNode(
+            node.callee.object,
+          );
+          scope.push({ id: receiverLVal });
+          sequenceParts.push(
+            t.assignmentExpression(
+              "=",
+              t.cloneNode(receiverLVal),
+              node.callee.object,
+            ),
+            t.assignmentExpression(
+              "=",
+              t.cloneNode(functionLVal),
+              t.memberExpression(
+                receiverLVal,
+                node.callee.property,
+                false,
+                false,
+              ),
+            ),
+            ...argsInitializers,
+            t.functionExpression(
+              node.callee.property,
+              placeholdersParams,
+              t.blockStatement(
+                [
+                  t.returnStatement(
+                    t.callExpression(
+                      t.memberExpression(
+                        functionLVal,
+                        t.identifier("call"),
+                        false,
+                        false,
+                      ),
+                      [receiverLVal, ...args],
+                    ),
+                  ),
+                ],
+                [],
+              ),
+              false,
+              false,
+            ),
+          );
+        } else {
+          sequenceParts.push(
+            t.assignmentExpression("=", t.cloneNode(functionLVal), node.callee),
+            ...argsInitializers,
+            t.functionExpression(
+              node.callee,
+              placeholdersParams,
+              t.blockStatement(
+                [t.returnStatement(t.callExpression(functionLVal, args))],
+                [],
+              ),
+              false,
+              false,
+            ),
+          );
+        }
+        path.replaceWith(t.sequenceExpression(sequenceParts));
+      },
+    },
+  };
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/exec.js
new file mode 100644
index 000000000000..56f065b30939
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/exec.js
@@ -0,0 +1,16 @@
+class Partial {
+  constructor() {
+    this.compare = this.compare(?, ?);
+  }
+  compare(a, b) {
+    if(a > b){
+      return a;
+    }
+  }
+}
+
+const foo = new Partial;
+
+expect(foo.compare(3,1)).toEqual(3);
+expect(foo.compare.length).toEqual(2);
+expect(foo.compare.name).toEqual("compare");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/input.js
new file mode 100644
index 000000000000..b6e5de8dcb0c
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/input.js
@@ -0,0 +1,5 @@
+class Partial {
+  constructor() {
+    this.compare = this.compare(?, ?);
+  }
+}
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/output.js
new file mode 100644
index 000000000000..24a5f382898c
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/bound-method/output.js
@@ -0,0 +1,10 @@
+class Partial {
+  constructor() {
+    var _this$compare, _this;
+
+    this.compare = (_this = this, _this$compare = _this.compare, function compare(_argPlaceholder, _argPlaceholder2) {
+      return _this$compare.call(_this, _argPlaceholder, _argPlaceholder2);
+    });
+  }
+
+}
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/exec.js
new file mode 100644
index 000000000000..6a7a47109f60
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/exec.js
@@ -0,0 +1,8 @@
+"use strict";
+
+function add(x, y) { return x + y; }
+const addOne = add(1, ?);
+
+expect(addOne(2)).toEqual(3);
+expect(addOne.length).toEqual(1);
+expect(addOne.name).toEqual("add");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/input.js
new file mode 100644
index 000000000000..fd206f710677
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/input.js
@@ -0,0 +1,3 @@
+"use strict";
+
+const foo = bar(?, 1);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/output.js
new file mode 100644
index 000000000000..8d7e15b9bb55
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-left/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var _bar;
+
+const foo = (_bar = bar, function bar(_argPlaceholder) {
+  return _bar(_argPlaceholder, 1);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/exec.js
new file mode 100644
index 000000000000..173f71479e58
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/exec.js
@@ -0,0 +1,8 @@
+"use strict";
+
+function add(x, y) { return x + y; }
+const addTen = add(?, 10);
+
+expect(addTen(2)).toEqual(12);
+expect(addTen.length).toEqual(1);
+expect(addTen.name).toEqual("add");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/input.js
new file mode 100644
index 000000000000..963267eb5f60
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/input.js
@@ -0,0 +1,3 @@
+"use strict";
+
+const foo = bar(1, ?);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/output.js
new file mode 100644
index 000000000000..ec30cf79adb6
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/from-right/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var _bar;
+
+const foo = (_bar = bar, function bar(_argPlaceholder) {
+  return _bar(1, _argPlaceholder);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/exec.js
new file mode 100644
index 000000000000..cfd4c848a88c
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/exec.js
@@ -0,0 +1,7 @@
+"use strict";
+const obj = { add: (x, y) => x + y };
+const addOne = obj.add(1, ?);
+
+expect(addOne(5)).toEqual(6);
+expect(addOne.length).toEqual(1);
+expect(addOne.name).toEqual("add");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/input.js
new file mode 100644
index 000000000000..e0bac6ec4032
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/input.js
@@ -0,0 +1,7 @@
+"use strict";
+
+const g = o.f(?, x, 1);
+
+const h = p.b(1, y, x, 2, ?);
+
+const j = a.b.c.d.e.foo(?, 1);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/output.js
new file mode 100644
index 000000000000..32027e6ed7cc
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/member-expression/output.js
@@ -0,0 +1,13 @@
+"use strict";
+
+var _x, _o$f, _o, _y, _x2, _p$b, _p, _a$b$c$d$e$foo, _a$b$c$d$e;
+
+const g = (_o = o, _o$f = _o.f, _x = x, function f(_argPlaceholder) {
+  return _o$f.call(_o, _argPlaceholder, _x, 1);
+});
+const h = (_p = p, _p$b = _p.b, _y = y, _x2 = x, function b(_argPlaceholder2) {
+  return _p$b.call(_p, 1, _y, _x2, 2, _argPlaceholder2);
+});
+const j = (_a$b$c$d$e = a.b.c.d.e, _a$b$c$d$e$foo = _a$b$c$d$e.foo, function foo(_argPlaceholder3) {
+  return _a$b$c$d$e$foo.call(_a$b$c$d$e, _argPlaceholder3, 1);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/exec.js
new file mode 100644
index 000000000000..02dd85661d71
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/exec.js
@@ -0,0 +1,18 @@
+function add(a, b) {
+  return a + b;
+}
+
+function square(x){
+  return x * x;
+}
+
+const foo = add(?, 1);
+const bar = square(?);
+
+expect(bar(foo(2))).toEqual(9);
+expect(foo(2)).toEqual(3);
+expect(bar(4)).toEqual(16);
+expect(foo.length).toEqual(1);
+expect(foo.name).toEqual("add");
+expect(bar.length).toEqual(1);
+expect(bar.name).toEqual("square");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/input.js
new file mode 100644
index 000000000000..034235567b0c
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/input.js
@@ -0,0 +1,4 @@
+"use strict";
+
+const baz = ber(2, 4, ?, ?, 1);
+const foo = bar(1, ?, x, 3, ?);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/output.js
new file mode 100644
index 000000000000..3a4c01906ab6
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/multiple-calls/output.js
@@ -0,0 +1,10 @@
+"use strict";
+
+var _ber, _x, _bar;
+
+const baz = (_ber = ber, function ber(_argPlaceholder, _argPlaceholder2) {
+  return _ber(2, 4, _argPlaceholder, _argPlaceholder2, 1);
+});
+const foo = (_bar = bar, _x = x, function bar(_argPlaceholder3, _argPlaceholder4) {
+  return _bar(1, _argPlaceholder3, _x, 3, _argPlaceholder4);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/exec.js
new file mode 100644
index 000000000000..71e084d6f7e6
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/exec.js
@@ -0,0 +1,7 @@
+"use strict";
+
+function add(x, y) { return x + y; }
+const addOne = add(1, ?);
+const addTen = add(?, 10);
+
+expect(addOne(addTen(1))).toEqual(12);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/input.js
new file mode 100644
index 000000000000..214217d61430
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/input.js
@@ -0,0 +1,3 @@
+"use strict";
+
+const foo = bar(baz(?, 1));
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/output.js
new file mode 100644
index 000000000000..b1b24f5cffbf
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-calls/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var _baz;
+
+const foo = bar((_baz = baz, function baz(_argPlaceholder) {
+  return _baz(_argPlaceholder, 1);
+}));
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/exec.js
new file mode 100644
index 000000000000..b74177523adb
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/exec.js
@@ -0,0 +1,9 @@
+"use strict";
+
+const obj = {a : {b : {c : {add: (x, y) => x + y}}}};
+
+const addOne = obj.a.b.c.add(1, ?);
+
+expect(addOne(4)).toEqual(5);
+expect(addOne.length).toEqual(1);
+expect(addOne.name).toEqual("add");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/input.js
new file mode 100644
index 000000000000..0a17052ff441
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/input.js
@@ -0,0 +1,3 @@
+"use strict";
+
+const g = a.b.fn().c["d"].e(?, 1, ?, 3, x, y, z);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/output.js
new file mode 100644
index 000000000000..353c685720a1
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/nested-member-expression/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var _x, _y, _z, _a$b$fn$c$d$e, _a$b$fn$c$d;
+
+const g = (_a$b$fn$c$d = a.b.fn().c["d"], _a$b$fn$c$d$e = _a$b$fn$c$d.e, _x = x, _y = y, _z = z, function e(_argPlaceholder, _argPlaceholder2) {
+  return _a$b$fn$c$d$e.call(_a$b$fn$c$d, _argPlaceholder, 1, _argPlaceholder2, 3, _x, _y, _z);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/exec.js
new file mode 100644
index 000000000000..71b3cc3ea3d3
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/exec.js
@@ -0,0 +1,7 @@
+"use strict";
+
+function square(n){
+  return new Promise(resolve => resolve(n * n));
+}
+
+square(?)(3).then(res => expect(res).toBe(9));
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/input.js
new file mode 100644
index 000000000000..20c9fa88f034
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/input.js
@@ -0,0 +1,3 @@
+"use strict";
+
+foo(?)(b).then(() => {});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/output.js
new file mode 100644
index 000000000000..69369d1a752b
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/not-assigned-and-chained/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var _foo;
+
+(_foo = foo, function foo(_argPlaceholder) {
+  return _foo(_argPlaceholder);
+})(b).then(() => {});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/options.json b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/options.json
new file mode 100644
index 000000000000..3ad392344831
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["proposal-partial-application"]
+}
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/exec.js
new file mode 100644
index 000000000000..ae63040ce976
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/exec.js
@@ -0,0 +1,11 @@
+"use strict";
+
+function square(x){
+  return x * x;
+}
+
+const foo = square(?);
+
+expect(foo(3)).toBe(9);
+expect(foo.length).toEqual(1);
+expect(foo.name).toEqual("square");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/input.js
new file mode 100644
index 000000000000..e77a8e83a28e
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/input.js
@@ -0,0 +1,3 @@
+"use strict";
+
+const foo = bar(?);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/output.js
new file mode 100644
index 000000000000..7b3e1b488824
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/simple-call/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var _bar;
+
+const foo = (_bar = bar, function bar(_argPlaceholder) {
+  return _bar(_argPlaceholder);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/exec.js
new file mode 100644
index 000000000000..a6656129a76b
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/exec.js
@@ -0,0 +1,7 @@
+"use strict";
+
+const slice = Array.prototype.slice.call(?, ?, ?);
+
+expect(slice({ 0: "a", 1: "b", length: 2 }, 1, 2)).toEqual(["b"]);
+expect(slice.length).toEqual(3);
+expect(slice.name).toEqual("call");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/input.js
new file mode 100644
index 000000000000..696426b744a0
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/input.js
@@ -0,0 +1 @@
+const slice = Array.prototype.slice.call(?, ?, ?);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/output.js
new file mode 100644
index 000000000000..0099cf0db61b
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/uncurry-this/output.js
@@ -0,0 +1,5 @@
+var _Array$prototype$slic, _Array$prototype$slic2;
+
+const slice = (_Array$prototype$slic2 = Array.prototype.slice, _Array$prototype$slic = _Array$prototype$slic2.call, function call(_argPlaceholder, _argPlaceholder2, _argPlaceholder3) {
+  return _Array$prototype$slic.call(_Array$prototype$slic2, _argPlaceholder, _argPlaceholder2, _argPlaceholder3);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/exec.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/exec.js
new file mode 100644
index 000000000000..9ba70df2a91a
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/exec.js
@@ -0,0 +1,13 @@
+"use strict";
+
+const num = [2,3];
+
+function multiplyXYZ(x, y, z){
+  return x * y * z;
+}
+
+const multiplyBySix = multiplyXYZ(?, ...num);
+
+expect(multiplyBySix(6)).toBe(36);
+expect(multiplyBySix.length).toEqual(1);
+expect(multiplyBySix.name).toEqual("multiplyXYZ");
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/input.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/input.js
new file mode 100644
index 000000000000..dca891154318
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/input.js
@@ -0,0 +1,7 @@
+"use strict";
+
+const q = foo(a, ...b, ?);
+
+const w = bar(1, x, ?, ...y, ?, 2);
+
+const z = obj.baz(?, ...d);
diff --git a/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/output.js b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/output.js
new file mode 100644
index 000000000000..9f4f7ab6f99b
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/fixtures/general/with-spread/output.js
@@ -0,0 +1,13 @@
+"use strict";
+
+var _a, _param, _foo, _x, _param2, _bar, _param3, _obj$baz, _obj;
+
+const q = (_foo = foo, _a = a, _param = [...b], function foo(_argPlaceholder) {
+  return _foo(_a, ..._param, _argPlaceholder);
+});
+const w = (_bar = bar, _x = x, _param2 = [...y], function bar(_argPlaceholder2, _argPlaceholder3) {
+  return _bar(1, _x, _argPlaceholder2, ..._param2, _argPlaceholder3, 2);
+});
+const z = (_obj = obj, _obj$baz = _obj.baz, _param3 = [...d], function baz(_argPlaceholder4) {
+  return _obj$baz.call(_obj, _argPlaceholder4, ..._param3);
+});
diff --git a/packages/babel-plugin-proposal-partial-application/test/index.js b/packages/babel-plugin-proposal-partial-application/test/index.js
new file mode 100644
index 000000000000..1b534b8fc64a
--- /dev/null
+++ b/packages/babel-plugin-proposal-partial-application/test/index.js
@@ -0,0 +1,3 @@
+import runner from "@babel/helper-plugin-test-runner";
+
+runner(__dirname);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/package.json b/packages/babel-plugin-proposal-pipeline-operator/package.json
index cdd13ef14aef..bf0b947a8e84 100644
--- a/packages/babel-plugin-proposal-pipeline-operator/package.json
+++ b/packages/babel-plugin-proposal-pipeline-operator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-pipeline-operator",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Transform pipeline operator into call expressions",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-pipeline-operator",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-pipeline-operator": "^7.0.0"
+    "@babel/plugin-syntax-pipeline-operator": "^7.5.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-pipeline-operator/src/buildOptimizedSequenceExpression.js b/packages/babel-plugin-proposal-pipeline-operator/src/buildOptimizedSequenceExpression.js
new file mode 100644
index 000000000000..2d0d3f23ea8f
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/src/buildOptimizedSequenceExpression.js
@@ -0,0 +1,54 @@
+import { types as t } from "@babel/core";
+
+// tries to optimize sequence expressions in the format
+//   (a = b, ((c) => d + e)(a))
+// to
+//   (a = b, a + e)
+const buildOptimizedSequenceExpression = ({ assign, call, path }) => {
+  const { left: placeholderNode, right: pipelineLeft } = assign;
+  const { callee: calledExpression } = call;
+
+  let optimizeArrow =
+    t.isArrowFunctionExpression(calledExpression) &&
+    t.isExpression(calledExpression.body) &&
+    !calledExpression.async &&
+    !calledExpression.generator;
+  let param;
+
+  if (optimizeArrow) {
+    const { params } = calledExpression;
+    if (params.length === 1 && t.isIdentifier(params[0])) {
+      param = params[0];
+    } else if (params.length > 0) {
+      optimizeArrow = false;
+    }
+  } else if (t.isIdentifier(calledExpression, { name: "eval" })) {
+    const evalSequence = t.sequenceExpression([
+      t.numericLiteral(0),
+      calledExpression,
+    ]);
+
+    call.callee = evalSequence;
+
+    path.scope.push({ id: placeholderNode });
+
+    return t.sequenceExpression([assign, call]);
+  }
+
+  if (optimizeArrow && !param) {
+    // Arrow function with 0 arguments
+    return t.sequenceExpression([pipelineLeft, calledExpression.body]);
+  }
+
+  path.scope.push({ id: placeholderNode });
+
+  if (param) {
+    path.get("right").scope.rename(param.name, placeholderNode.name);
+
+    return t.sequenceExpression([assign, calledExpression.body]);
+  }
+
+  return t.sequenceExpression([assign, call]);
+};
+
+export default buildOptimizedSequenceExpression;
diff --git a/packages/babel-plugin-proposal-pipeline-operator/src/fsharpVisitor.js b/packages/babel-plugin-proposal-pipeline-operator/src/fsharpVisitor.js
new file mode 100644
index 000000000000..f32f8e33fd99
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/src/fsharpVisitor.js
@@ -0,0 +1,25 @@
+import { types as t } from "@babel/core";
+import buildOptimizedSequenceExpression from "./buildOptimizedSequenceExpression";
+
+const fsharpVisitor = {
+  BinaryExpression(path) {
+    const { scope, node } = path;
+    const { operator, left, right } = node;
+    if (operator !== "|>") return;
+
+    const placeholder = scope.generateUidIdentifierBasedOnNode(left);
+
+    const call =
+      right.type === "AwaitExpression"
+        ? t.awaitExpression(t.cloneNode(placeholder))
+        : t.callExpression(right, [t.cloneNode(placeholder)]);
+    const sequence = buildOptimizedSequenceExpression({
+      assign: t.assignmentExpression("=", t.cloneNode(placeholder), left),
+      call,
+      path,
+    });
+    path.replaceWith(sequence);
+  },
+};
+
+export default fsharpVisitor;
diff --git a/packages/babel-plugin-proposal-pipeline-operator/src/index.js b/packages/babel-plugin-proposal-pipeline-operator/src/index.js
index c56b5c84255d..241a99b87828 100644
--- a/packages/babel-plugin-proposal-pipeline-operator/src/index.js
+++ b/packages/babel-plugin-proposal-pipeline-operator/src/index.js
@@ -1,63 +1,21 @@
 import { declare } from "@babel/helper-plugin-utils";
 import syntaxPipelineOperator from "@babel/plugin-syntax-pipeline-operator";
-import { types as t } from "@babel/core";
+import minimalVisitor from "./minimalVisitor";
+import smartVisitor from "./smartVisitor";
+import fsharpVisitor from "./fsharpVisitor";
 
-export default declare(api => {
+const visitorsPerProposal = {
+  minimal: minimalVisitor,
+  smart: smartVisitor,
+  fsharp: fsharpVisitor,
+};
+
+export default declare((api, options) => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-pipeline-operator",
     inherits: syntaxPipelineOperator,
-
-    visitor: {
-      BinaryExpression(path) {
-        const { scope } = path;
-        const { node } = path;
-        const { operator, left } = node;
-        let { right } = node;
-        if (operator !== "|>") return;
-
-        let optimizeArrow =
-          t.isArrowFunctionExpression(right) &&
-          t.isExpression(right.body) &&
-          !right.async &&
-          !right.generator;
-        let param;
-
-        if (optimizeArrow) {
-          const { params } = right;
-          if (params.length === 1 && t.isIdentifier(params[0])) {
-            param = params[0];
-          } else if (params.length > 0) {
-            optimizeArrow = false;
-          }
-        } else if (t.isIdentifier(right, { name: "eval" })) {
-          right = t.sequenceExpression([t.numericLiteral(0), right]);
-        }
-
-        if (optimizeArrow && !param) {
-          // Arrow function with 0 arguments
-          path.replaceWith(t.sequenceExpression([left, right.body]));
-          return;
-        }
-
-        const placeholder = scope.generateUidIdentifierBasedOnNode(
-          param || left,
-        );
-        scope.push({ id: placeholder });
-        if (param) {
-          path.get("right").scope.rename(param.name, placeholder.name);
-        }
-
-        const call = optimizeArrow
-          ? right.body
-          : t.callExpression(right, [t.cloneNode(placeholder)]);
-        path.replaceWith(
-          t.sequenceExpression([
-            t.assignmentExpression("=", t.cloneNode(placeholder), left),
-            call,
-          ]),
-        );
-      },
-    },
+    visitor: visitorsPerProposal[options.proposal],
   };
 });
diff --git a/packages/babel-plugin-proposal-pipeline-operator/src/minimalVisitor.js b/packages/babel-plugin-proposal-pipeline-operator/src/minimalVisitor.js
new file mode 100644
index 000000000000..5975949779bb
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/src/minimalVisitor.js
@@ -0,0 +1,23 @@
+import { types as t } from "@babel/core";
+import buildOptimizedSequenceExpression from "./buildOptimizedSequenceExpression";
+
+const minimalVisitor = {
+  BinaryExpression(path) {
+    const { scope, node } = path;
+    const { operator, left, right } = node;
+    if (operator !== "|>") return;
+
+    const placeholder = scope.generateUidIdentifierBasedOnNode(left);
+
+    const call = t.callExpression(right, [t.cloneNode(placeholder)]);
+    path.replaceWith(
+      buildOptimizedSequenceExpression({
+        assign: t.assignmentExpression("=", t.cloneNode(placeholder), left),
+        call,
+        path,
+      }),
+    );
+  },
+};
+
+export default minimalVisitor;
diff --git a/packages/babel-plugin-proposal-pipeline-operator/src/smartVisitor.js b/packages/babel-plugin-proposal-pipeline-operator/src/smartVisitor.js
new file mode 100644
index 000000000000..750d9767ddeb
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/src/smartVisitor.js
@@ -0,0 +1,48 @@
+import { types as t } from "@babel/core";
+
+const updateTopicReferenceVisitor = {
+  PipelinePrimaryTopicReference(path) {
+    path.replaceWith(this.topicId);
+  },
+  PipelineTopicExpression(path) {
+    path.skip();
+  },
+};
+
+const smartVisitor = {
+  BinaryExpression(path) {
+    const { scope } = path;
+    const { node } = path;
+    const { operator, left, right } = node;
+    if (operator !== "|>") return;
+
+    const placeholder = scope.generateUidIdentifierBasedOnNode(left);
+    scope.push({ id: placeholder });
+
+    let call;
+    if (t.isPipelineTopicExpression(right)) {
+      path
+        .get("right")
+        .traverse(updateTopicReferenceVisitor, { topicId: placeholder });
+
+      call = right.expression;
+    } else {
+      // PipelineBareFunction
+      let callee = right.callee;
+      if (t.isIdentifier(callee, { name: "eval" })) {
+        callee = t.sequenceExpression([t.numericLiteral(0), callee]);
+      }
+
+      call = t.callExpression(callee, [t.cloneNode(placeholder)]);
+    }
+
+    path.replaceWith(
+      t.sequenceExpression([
+        t.assignmentExpression("=", t.cloneNode(placeholder), left),
+        call,
+      ]),
+    );
+  },
+};
+
+export default smartVisitor;
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions-parenless/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions-parenless/exec.js
new file mode 100644
index 000000000000..03ffe5328721
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions-parenless/exec.js
@@ -0,0 +1,27 @@
+const y = 2;
+
+const f = (x) => (x |> (y) => y + 1)
+  |> (z) => z * y
+
+const _f = (x) => x
+  |> (y) => y + 1
+  |> (z) => z * y
+
+const g = (x) => x
+  |> (y) => (y + 1 |> (z) => z * y)
+
+const _g = (x) => x
+  |> (y => (y + 1 |> (z) => z * y))
+
+const __g = (x) => x
+  |> (
+    y => {
+      return (y + 1 |> (z) => z * y);
+    }
+  )
+
+expect(  f(1)).toBe(4);
+expect( _f(1)).toBe(4);
+expect(  g(1)).toBe(2);
+expect( _g(1)).toBe(2);
+expect(__g(1)).toBe(2);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/arrow-functions/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/arrow-functions/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/arrow-functions/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/arrow-functions/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions/output.js
new file mode 100644
index 000000000000..cd2b80132c22
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/arrow-functions/output.js
@@ -0,0 +1,15 @@
+var _ref, _ref2, _ref3;
+
+var result = (_ref = (_ref2 = (_ref3 = [5, 10], _ref3.map(x => x * 2)), _ref2.reduce((a, b) => a + b)), _ref + 1);
+expect(result).toBe(31);
+
+var inc = x => x + 1;
+
+var double = x => x * 2;
+
+var result2 = [4, 9].map(x => {
+  var _ref4, _x;
+
+  return _ref4 = (_x = x, inc(_x)), double(_ref4);
+});
+expect(result2).toEqual([10, 20]);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/exec.js
new file mode 100644
index 000000000000..38503c1d0d23
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/exec.js
@@ -0,0 +1,13 @@
+const triple = (x) => x * 3;
+
+async function myFunction(n) {
+  return n
+    |> Math.abs
+    |> Promise.resolve
+    |> await
+    |> triple;
+}
+
+return myFunction(-7).then(result => {
+  expect(result).toBe(21);
+});
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/input.js
new file mode 100644
index 000000000000..ad69aa432bbf
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/input.js
@@ -0,0 +1,6 @@
+async function myFunction(n) {
+  return n
+    |> Math.abs
+    |> Promise.resolve
+    |> await;
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/options.json
new file mode 100644
index 000000000000..c5a39e971027
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/options.json
@@ -0,0 +1,9 @@
+{
+  "plugins": [
+    ["proposal-pipeline-operator", { "proposal": "fsharp" }]
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  },
+  "minNodeVersion": "8.0.0"
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/output.js
new file mode 100644
index 000000000000..bf7848696774
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/await/output.js
@@ -0,0 +1,5 @@
+async function myFunction(n) {
+  var _ref, _ref2, _n;
+
+  return _ref = (_ref2 = (_n = n, Math.abs(_n)), Promise.resolve(_ref2)), await _ref;
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/basic/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/basic/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/basic/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/basic/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/basic/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/basic/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/basic/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/basic/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/basic/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/basic/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/basic/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/basic/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/indirect-eval/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/indirect-eval/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/indirect-eval/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/indirect-eval/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/indirect-eval/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/indirect-eval/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/indirect-eval/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/indirect-eval/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/indirect-eval/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/indirect-eval/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/indirect-eval/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/indirect-eval/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/multiple-argument-use/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/multiple-argument-use/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/multiple-argument-use/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/multiple-argument-use/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/multiple-argument-use/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/multiple-argument-use/output.js
new file mode 100644
index 000000000000..121f15e8a584
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/multiple-argument-use/output.js
@@ -0,0 +1,5 @@
+var _array;
+
+var array = [10, 20, 30];
+var last = (_array = array, _array[_array.length - 1]);
+expect(last).toBe(30);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/optimize-0-param-arrow/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/optimize-0-param-arrow/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/optimize-0-param-arrow/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/optimize-0-param-arrow/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/optimize-0-param-arrow/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/optimize-0-param-arrow/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/optimize-0-param-arrow/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/optimize-0-param-arrow/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/optimize-0-param-arrow/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/optimize-0-param-arrow/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/optimize-0-param-arrow/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/optimize-0-param-arrow/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/options.json
new file mode 100644
index 000000000000..4e41244cc302
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/fsharp/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    ["proposal-pipeline-operator", { "proposal": "fsharp" }]
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/exec.js
new file mode 100644
index 000000000000..88762f8e568f
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/exec.js
@@ -0,0 +1,20 @@
+const y = 2;
+const f = (x) => x
+  |> (y => y + 1)
+  |> (z => z * y)
+
+const g = (x) => x
+  |> (y =>
+    y + 1
+    |> (z => z * y)
+  )
+
+const h = (x) => x
+  |> (y => (
+    y + 1
+    |> (z => z * y)
+  ))
+
+expect(f(1)).toBe(4);
+expect(g(1)).toBe(2);
+expect(h(1)).toBe(2);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/input.js
new file mode 100644
index 000000000000..88762f8e568f
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/input.js
@@ -0,0 +1,20 @@
+const y = 2;
+const f = (x) => x
+  |> (y => y + 1)
+  |> (z => z * y)
+
+const g = (x) => x
+  |> (y =>
+    y + 1
+    |> (z => z * y)
+  )
+
+const h = (x) => x
+  |> (y => (
+    y + 1
+    |> (z => z * y)
+  ))
+
+expect(f(1)).toBe(4);
+expect(g(1)).toBe(2);
+expect(h(1)).toBe(2);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/output.js
new file mode 100644
index 000000000000..926086963984
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions-parenless/output.js
@@ -0,0 +1,23 @@
+const y = 2;
+
+const f = x => {
+  var _ref, _x;
+
+  return _ref = (_x = x, _x + 1), _ref * y;
+};
+
+const g = x => {
+  var _x2, _ref2;
+
+  return _x2 = x, (_ref2 = _x2 + 1, _ref2 * _x2);
+};
+
+const h = x => {
+  var _x3, _ref3;
+
+  return _x3 = x, (_ref3 = _x3 + 1, _ref3 * _x3);
+};
+
+expect(f(1)).toBe(4);
+expect(g(1)).toBe(2);
+expect(h(1)).toBe(2);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/exec.js
new file mode 100644
index 000000000000..2411e82738ee
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/exec.js
@@ -0,0 +1,14 @@
+var result = [5,10]
+  |> (_ => _.map(x => x * 2))
+  |> (_ => _.reduce( (a,b) => a + b ))
+  |> (sum => sum + 1)
+
+expect(result).toBe(31);
+
+
+var inc = (x) => x + 1;
+var double = (x) => x * 2;
+
+var result2 = [4, 9].map( x => x |> inc |> double )
+
+expect(result2).toEqual([10, 20]);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/input.js
new file mode 100644
index 000000000000..2411e82738ee
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/input.js
@@ -0,0 +1,14 @@
+var result = [5,10]
+  |> (_ => _.map(x => x * 2))
+  |> (_ => _.reduce( (a,b) => a + b ))
+  |> (sum => sum + 1)
+
+expect(result).toBe(31);
+
+
+var inc = (x) => x + 1;
+var double = (x) => x * 2;
+
+var result2 = [4, 9].map( x => x |> inc |> double )
+
+expect(result2).toEqual([10, 20]);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/output.js
new file mode 100644
index 000000000000..cd2b80132c22
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/arrow-functions/output.js
@@ -0,0 +1,15 @@
+var _ref, _ref2, _ref3;
+
+var result = (_ref = (_ref2 = (_ref3 = [5, 10], _ref3.map(x => x * 2)), _ref2.reduce((a, b) => a + b)), _ref + 1);
+expect(result).toBe(31);
+
+var inc = x => x + 1;
+
+var double = x => x * 2;
+
+var result2 = [4, 9].map(x => {
+  var _ref4, _x;
+
+  return _ref4 = (_x = x, inc(_x)), double(_ref4);
+});
+expect(result2).toEqual([10, 20]);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/exec.js
new file mode 100644
index 000000000000..37a4b6c41b14
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/exec.js
@@ -0,0 +1,13 @@
+function then(fn) {
+  return async (value) => {
+    return fn(await value);
+  };
+}
+
+var result = 1
+  |> (async (x) => await x + 1)
+  |> then((x) => x + 1);
+
+return result.then(val => {
+  expect(val).toBe(3);
+});
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/options.json
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/options.json
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/async-arrow/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/exec.js
new file mode 100644
index 000000000000..a11e8073bb3f
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/exec.js
@@ -0,0 +1,3 @@
+var inc = (x) => x + 1
+
+expect(10 |> inc).toBe(11);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/input.js
new file mode 100644
index 000000000000..a11e8073bb3f
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/input.js
@@ -0,0 +1,3 @@
+var inc = (x) => x + 1
+
+expect(10 |> inc).toBe(11);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/output.js
new file mode 100644
index 000000000000..6ac05ce0fbc9
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/basic/output.js
@@ -0,0 +1,5 @@
+var _;
+
+var inc = x => x + 1;
+
+expect((_ = 10, inc(_))).toBe(11);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/chaining/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/chaining/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/chaining/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/chaining/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/chaining/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/chaining/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/chaining/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/chaining/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/chaining/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/chaining/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/chaining/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/chaining/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/currying/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/currying/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/currying/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/currying/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/currying/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/currying/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/currying/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/currying/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/currying/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/currying/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/currying/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/currying/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/deoptimize-multi-param-arrow/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/deoptimize-multi-param-arrow/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/deoptimize-multi-param-arrow/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/deoptimize-multi-param-arrow/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/deoptimize-multi-param-arrow/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/deoptimize-multi-param-arrow/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/deoptimize-multi-param-arrow/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/deoptimize-multi-param-arrow/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/deoptimize-multi-param-arrow/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/deoptimize-multi-param-arrow/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/deoptimize-multi-param-arrow/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/deoptimize-multi-param-arrow/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/options.json
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/options.json
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/destructure-arrow-param/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/destructure-arrow-param/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/evaluation/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/evaluation/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/evaluation/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/evaluation/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/evaluation/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/evaluation/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/evaluation/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/evaluation/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/evaluation/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/evaluation/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/evaluation/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/evaluation/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/exec.js
new file mode 100644
index 000000000000..30efd15ea92a
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/exec.js
@@ -0,0 +1,7 @@
+(function() {
+  'use strict';
+  var result = '(function() { return this; })()'
+    |> eval;
+
+  expect(result).not.toBeUndefined();
+})();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/input.js
new file mode 100644
index 000000000000..30efd15ea92a
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/input.js
@@ -0,0 +1,7 @@
+(function() {
+  'use strict';
+  var result = '(function() { return this; })()'
+    |> eval;
+
+  expect(result).not.toBeUndefined();
+})();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/output.js
new file mode 100644
index 000000000000..3c53e6d4f3bf
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/indirect-eval/output.js
@@ -0,0 +1,8 @@
+(function () {
+  'use strict';
+
+  var _functionReturn;
+
+  var result = (_functionReturn = '(function() { return this; })()', (0, eval)(_functionReturn));
+  expect(result).not.toBeUndefined();
+})();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/multiple-argument-use/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/multiple-argument-use/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/input.js
new file mode 100644
index 000000000000..f29037ed294e
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/input.js
@@ -0,0 +1,5 @@
+var array = [10,20,30];
+
+var last = array |> (a => a[a.length-1]);
+
+expect(last).toBe(30);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/output.js
new file mode 100644
index 000000000000..121f15e8a584
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/multiple-argument-use/output.js
@@ -0,0 +1,5 @@
+var _array;
+
+var array = [10, 20, 30];
+var last = (_array = array, _array[_array.length - 1]);
+expect(last).toBe(30);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/exec.js
new file mode 100644
index 000000000000..d8ab9b2ebcf2
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/exec.js
@@ -0,0 +1,8 @@
+var a = 1,
+    b = 2,
+    c = 3;
+var result = a
+  |> (() => b)
+  |> (() => c);
+
+expect(result).toBe(c);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/input.js
new file mode 100644
index 000000000000..d8ab9b2ebcf2
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/input.js
@@ -0,0 +1,8 @@
+var a = 1,
+    b = 2,
+    c = 3;
+var result = a
+  |> (() => b)
+  |> (() => c);
+
+expect(result).toBe(c);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/output.js
new file mode 100644
index 000000000000..4fcc70527ca8
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/optimize-0-param-arrow/output.js
@@ -0,0 +1,5 @@
+var a = 1,
+    b = 2,
+    c = 3;
+var result = ((a, b), c);
+expect(result).toBe(c);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/options.json
new file mode 100644
index 000000000000..71ad26916e60
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [["proposal-pipeline-operator", { "proposal": "minimal" }]],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/precedence/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/precedence/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/precedence/exec.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/precedence/exec.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/precedence/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/precedence/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/precedence/input.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/precedence/input.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/precedence/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/precedence/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/precedence/output.js
rename to packages/babel-plugin-proposal-pipeline-operator/test/fixtures/minimal/precedence/output.js
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/arrow-functions/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/arrow-functions/output.js
deleted file mode 100644
index f9e5075a4800..000000000000
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/arrow-functions/output.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var _sum, _ref, _ref2;
-
-var result = (_sum = (_ref = (_ref2 = [5, 10], _ref2.map(x => x * 2)), _ref.reduce((a, b) => a + b)), _sum + 1);
-expect(result).toBe(31);
-
-var inc = x => x + 1;
-
-var double = x => x * 2;
-
-var result2 = [4, 9].map(x => {
-  var _ref3, _x;
-
-  return _ref3 = (_x = x, inc(_x)), double(_ref3);
-});
-expect(result2).toEqual([10, 20]);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/exec.js
deleted file mode 100644
index 40fc7c9dd125..000000000000
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/async-arrow/exec.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function then(fn) {
-  return async (value) => {
-    return fn(await value);
-  };
-}
-
-var result = 1
-  |> (async (x) => await x + 1)
-  |> then((x) => x + 1);
-
-result.then(val => {
-  expect(val).toBe(3);
-});
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/multiple-argument-use/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/multiple-argument-use/output.js
deleted file mode 100644
index b26deb11cd97..000000000000
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/multiple-argument-use/output.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var _a;
-
-var array = [10, 20, 30];
-var last = (_a = array, _a[_a.length - 1]);
-expect(last).toBe(30);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/options.json
deleted file mode 100644
index ce2c6e0ddcbc..000000000000
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/pipeline-operator/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "plugins": [["proposal-pipeline-operator", { "proposal": "minimal" }]]
-}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/await/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/await/exec.js
new file mode 100644
index 000000000000..7e7ea94bd4cb
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/await/exec.js
@@ -0,0 +1,13 @@
+const triple = (x) => x * 3;
+
+async function myFunction(n) {
+  return n
+    |> Math.abs
+    |> Promise.resolve(#)
+    |> await #
+    |> triple;
+}
+
+return myFunction(-7).then(result => {
+  expect(result).toBe(21);
+});
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/await/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/await/options.json
new file mode 100644
index 000000000000..f19c36b8eef1
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/await/options.json
@@ -0,0 +1,6 @@
+{
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  },
+  "minNodeVersion": "8.0.0"
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/options.json
new file mode 100644
index 000000000000..2453ef11a549
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart+arrow/options.json
@@ -0,0 +1,9 @@
+{
+  "plugins": [
+    ["proposal-pipeline-operator", { "proposal": "smart" }],
+    "transform-arrow-functions"
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/exec.js
new file mode 100644
index 000000000000..7e7ea94bd4cb
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/exec.js
@@ -0,0 +1,13 @@
+const triple = (x) => x * 3;
+
+async function myFunction(n) {
+  return n
+    |> Math.abs
+    |> Promise.resolve(#)
+    |> await #
+    |> triple;
+}
+
+return myFunction(-7).then(result => {
+  expect(result).toBe(21);
+});
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/input.js
new file mode 100644
index 000000000000..09ec8493000b
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/input.js
@@ -0,0 +1,6 @@
+async function myFunction(n) {
+  return n
+    |> Math.abs
+    |> Promise.resolve(#)
+    |> await #;
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/options.json
new file mode 100644
index 000000000000..ef8ed8865bd4
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/options.json
@@ -0,0 +1,9 @@
+{
+  "plugins": [
+    ["proposal-pipeline-operator", { "proposal": "smart" }]
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  },
+  "minNodeVersion": "8.0.0"
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/output.js
new file mode 100644
index 000000000000..bf7848696774
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/await/output.js
@@ -0,0 +1,5 @@
+async function myFunction(n) {
+  var _ref, _ref2, _n;
+
+  return _ref = (_ref2 = (_n = n, Math.abs(_n)), Promise.resolve(_ref2)), await _ref;
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/exec.js
new file mode 100644
index 000000000000..93371d387af7
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/exec.js
@@ -0,0 +1,7 @@
+const abs = Math.abs;
+
+const value = -5.9
+|> abs
+|> Math.floor;
+
+expect(value).toBe(5);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/input.js
new file mode 100644
index 000000000000..be7fbdbd4cf5
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/input.js
@@ -0,0 +1,5 @@
+const abs = Math.abs;
+
+const value = -5.9
+|> abs
+|> Math.floor;
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/output.js
new file mode 100644
index 000000000000..24663cdab26a
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/bare-function/output.js
@@ -0,0 +1,4 @@
+var _ref, _ref2;
+
+const abs = Math.abs;
+const value = (_ref = (_ref2 = -5.9, abs(_ref2)), Math.floor(_ref));
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/exec.js
new file mode 100644
index 000000000000..1a4868deae2a
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/exec.js
@@ -0,0 +1,6 @@
+var result = 5
+  |> # + 1
+  |> # + #
+  |> Math.pow(((x) => (x * 7))(#), 2)
+
+expect(result).toBe(7056);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/input.js
new file mode 100644
index 000000000000..839ae46a7434
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/input.js
@@ -0,0 +1,4 @@
+var result = 5
+  |> # + 1
+  |> # + #
+  |> Math.pow(((x) => (x * 7))(#), 2)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/output.js
new file mode 100644
index 000000000000..0f5af7ba9589
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/basic/output.js
@@ -0,0 +1,3 @@
+var _ref, _ref2, _;
+
+var result = (_ref = (_ref2 = (_ = 5, _ + 1), _ref2 + _ref2), Math.pow((x => x * 7)(_ref), 2));
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/exec.js
new file mode 100644
index 000000000000..857fc6ce5b67
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/exec.js
@@ -0,0 +1,5 @@
+let sum = 0;
+for (var i = 0 |> #; i <= 10; i++) 
+  sum = sum + i;
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/input.js
new file mode 100644
index 000000000000..857fc6ce5b67
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/input.js
@@ -0,0 +1,5 @@
+let sum = 0;
+for (var i = 0 |> #; i <= 10; i++) 
+  sum = sum + i;
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/output.js
new file mode 100644
index 000000000000..23b1465b27a5
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-init/output.js
@@ -0,0 +1,9 @@
+let sum = 0;
+
+for (var i = (_ = 0, _); i <= 10; i++) {
+  var _;
+
+  sum = sum + i;
+}
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/exec.js
new file mode 100644
index 000000000000..41d1e0584ab9
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/exec.js
@@ -0,0 +1,6 @@
+let sum = 0;
+for (var i = 0; i <= 10; i = i |> # + 1) {
+  sum = sum + i;
+}
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/input.js
new file mode 100644
index 000000000000..41d1e0584ab9
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/input.js
@@ -0,0 +1,6 @@
+let sum = 0;
+for (var i = 0; i <= 10; i = i |> # + 1) {
+  sum = sum + i;
+}
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/output.js
new file mode 100644
index 000000000000..0ca0f35ad87b
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for-update/output.js
@@ -0,0 +1,9 @@
+let sum = 0;
+
+for (var i = 0; i <= 10; i = (_i = i, _i + 1)) {
+  var _i;
+
+  sum = sum + i;
+}
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/exec.js
new file mode 100644
index 000000000000..e1278cd25d46
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/exec.js
@@ -0,0 +1,5 @@
+let sum = 0;
+for (var i = 0; i |> # <= 10; i++) 
+  sum = sum + i;
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/input.js
new file mode 100644
index 000000000000..279b128e2da9
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/input.js
@@ -0,0 +1,5 @@
+let sum = 0;
+for (var i = 0; (i |> # <= 10); ++i) 
+  sum = sum + i;
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/output.js
new file mode 100644
index 000000000000..09d8bc056290
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/for/output.js
@@ -0,0 +1,9 @@
+let sum = 0;
+
+for (var i = 0; _i = i, _i <= 10; ++i) {
+  var _i;
+
+  sum = sum + i;
+}
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/if/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/if/input.js
new file mode 100644
index 000000000000..7b3de3747bbf
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/if/input.js
@@ -0,0 +1,4 @@
+if (v |> e |> f)
+  g() |> h(#, #+1) |> i;
+else
+  j();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/if/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/if/output.js
new file mode 100644
index 000000000000..3b71d143ae79
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/if/output.js
@@ -0,0 +1,3 @@
+var _ref, _v, _ref2, _g;
+
+if (_ref = (_v = v, e(_v)), f(_ref)) _ref2 = (_g = g(), h(_g, _g + 1)), i(_ref2);else j();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/exec.js
new file mode 100644
index 000000000000..30efd15ea92a
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/exec.js
@@ -0,0 +1,7 @@
+(function() {
+  'use strict';
+  var result = '(function() { return this; })()'
+    |> eval;
+
+  expect(result).not.toBeUndefined();
+})();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/input.js
new file mode 100644
index 000000000000..30efd15ea92a
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/input.js
@@ -0,0 +1,7 @@
+(function() {
+  'use strict';
+  var result = '(function() { return this; })()'
+    |> eval;
+
+  expect(result).not.toBeUndefined();
+})();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/output.js
new file mode 100644
index 000000000000..3c53e6d4f3bf
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/indirect-eval/output.js
@@ -0,0 +1,8 @@
+(function () {
+  'use strict';
+
+  var _functionReturn;
+
+  var result = (_functionReturn = '(function() { return this; })()', (0, eval)(_functionReturn));
+  expect(result).not.toBeUndefined();
+})();
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/exec.js
new file mode 100644
index 000000000000..20c1c83d22b5
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/exec.js
@@ -0,0 +1,7 @@
+var result = 5
+  |> Math.pow(#, 2)
+  |> [ 10, 20, 30, 40, 50 ].filter(n => #
+    |> n > #
+    |> !#);
+
+expect(result).toEqual([10, 20]);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/input.js
new file mode 100644
index 000000000000..1903dbd95b72
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/input.js
@@ -0,0 +1,5 @@
+var result = 5
+  |> Math.pow(#, 2)
+  |> [ 10, 20, 30, 40, 50 ].filter(n => #
+    |> n > #
+    |> !#);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/output.js
new file mode 100644
index 000000000000..d5266c661786
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/nested/output.js
@@ -0,0 +1,7 @@
+var _ref, _;
+
+var result = (_ref = (_ = 5, Math.pow(_, 2)), [10, 20, 30, 40, 50].filter(n => {
+  var _ref2, _ref3;
+
+  return _ref2 = (_ref3 = _ref, n > _ref3), !_ref2;
+}));
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/exec.js
new file mode 100644
index 000000000000..830e80efc6f9
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/exec.js
@@ -0,0 +1,10 @@
+function area(rect) {
+  return rect.width * rect.height;
+}
+
+const result = -5
+  |> Math.abs
+  |> ({ width: #, height: # + 3 })
+  |> area;
+
+expect(result).toBe(40);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/input.js
new file mode 100644
index 000000000000..1cc7970ff08c
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/input.js
@@ -0,0 +1,8 @@
+function area(rect) {
+  return rect.width * rect.height;
+}
+
+const result = -5
+  |> Math.abs
+  |> ({ width: #, height: # + 3 })
+  |> area;
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/output.js
new file mode 100644
index 000000000000..c8c1d0f95f04
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/object-literal/output.js
@@ -0,0 +1,10 @@
+var _ref, _ref2, _ref3;
+
+function area(rect) {
+  return rect.width * rect.height;
+}
+
+const result = (_ref = (_ref2 = (_ref3 = -5, Math.abs(_ref3)), {
+  width: _ref2,
+  height: _ref2 + 3
+}), area(_ref));
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/options.json
new file mode 100644
index 000000000000..c82020184d7b
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    ["proposal-pipeline-operator", { "proposal": "smart" }]
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-as-callee/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-as-callee/input.js
new file mode 100644
index 000000000000..5935729f4958
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-as-callee/input.js
@@ -0,0 +1 @@
+v |> #.method() |> f;
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-as-callee/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-as-callee/output.js
new file mode 100644
index 000000000000..95023f52e862
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-as-callee/output.js
@@ -0,0 +1,3 @@
+var _ref, _v;
+
+_ref = (_v = v, _v.method()), f(_ref);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/exec.js
new file mode 100644
index 000000000000..c5837e4a0b58
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/exec.js
@@ -0,0 +1,7 @@
+const result = -2.2   // -2.2
+  |> Math.floor       // -3
+  |> (() => Math.pow(#, 5))   // () => -243
+  |> #()              // -243
+  |> Math.sign;       // -1
+
+expect(result).toBe(-1);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/input.js
new file mode 100644
index 000000000000..14a6f5b6c1d9
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/input.js
@@ -0,0 +1,5 @@
+const result = -2.2   // -2.2
+  |> Math.floor       // -3
+  |> (() => Math.pow(#, 5))   // () => -243
+  |> #()              // -243
+  |> Math.sign;       // -1
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/output.js
new file mode 100644
index 000000000000..5517a532410f
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/topic-inside-arrow-function/output.js
@@ -0,0 +1,7 @@
+var _ref, _ref2, _ref3, _ref4;
+
+const result = (_ref = (_ref2 = (_ref3 = (_ref4 = -2.2 // -2.2
+, Math.floor(_ref4) // -3
+), () => Math.pow(_ref3, 5) // () => -243
+), _ref2() // -243
+), Math.sign(_ref)); // -1
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/exec.js
new file mode 100644
index 000000000000..4a86c3eab4f4
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/exec.js
@@ -0,0 +1,7 @@
+let i = 0
+let sum = 0
+
+while (i |> (i = # + 1) |> # <= 10)
+  sum = sum + i;
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/input.js
new file mode 100644
index 000000000000..4a86c3eab4f4
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/input.js
@@ -0,0 +1,7 @@
+let i = 0
+let sum = 0
+
+while (i |> (i = # + 1) |> # <= 10)
+  sum = sum + i;
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1)
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/output.js
new file mode 100644
index 000000000000..975844fd1286
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/while/output.js
@@ -0,0 +1,10 @@
+let i = 0;
+let sum = 0;
+
+while (_ref = (_i = i, i = _i + 1), _ref <= 10) {
+  var _ref, _i;
+
+  sum = sum + i;
+}
+
+expect(sum).toBe(10 + 9 + 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/exec.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/exec.js
new file mode 100644
index 000000000000..f998a1157ed0
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/exec.js
@@ -0,0 +1,13 @@
+function *myGenerator(n) {
+  return n
+  |> (yield #)
+  |> Math.abs;
+}
+
+const myIterator = myGenerator(15);
+
+const yieldedValue = myIterator.next().value;
+const returnedValue = myIterator.next(-30).value;
+
+expect(yieldedValue).toBe(15);
+expect(returnedValue).toBe(30);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/input.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/input.js
new file mode 100644
index 000000000000..602d85a0e1fe
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/input.js
@@ -0,0 +1,5 @@
+function *myGenerator(n) {
+  return n
+    |> (yield #)
+    |> Math.abs;
+}
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/output.js
new file mode 100644
index 000000000000..3ca1e506b2cf
--- /dev/null
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/smart/yield/output.js
@@ -0,0 +1,5 @@
+function* myGenerator(n) {
+  var _ref, _n;
+
+  return _ref = (_n = n, yield _n), Math.abs(_ref);
+}
diff --git a/packages/babel-plugin-proposal-private-methods/.npmignore b/packages/babel-plugin-proposal-private-methods/.npmignore
new file mode 100644
index 000000000000..f9806945836e
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-plugin-proposal-private-methods/README.md b/packages/babel-plugin-proposal-private-methods/README.md
new file mode 100644
index 000000000000..f4b7e50b120f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/README.md
@@ -0,0 +1,19 @@
+# @babel/plugin-proposal-private-methods
+
+> This plugin transforms private class methods
+
+See our website [@babel/plugin-proposal-private-methods](https://babeljs.io/docs/en/next/babel-plugin-proposal-private-methods.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/plugin-proposal-private-methods
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/plugin-proposal-private-methods --dev
+```
diff --git a/packages/babel-plugin-proposal-private-methods/package.json b/packages/babel-plugin-proposal-private-methods/package.json
new file mode 100644
index 000000000000..cd9cef01e36b
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@babel/plugin-proposal-private-methods",
+  "version": "7.4.4",
+  "description": "This plugin transforms private class methods",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-private-methods",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin"
+  ],
+  "dependencies": {
+    "@babel/helper-create-class-features-plugin": "^7.4.4",
+    "@babel/helper-plugin-utils": "^7.0.0"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0-0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.4.4",
+    "@babel/helper-plugin-test-runner": "^7.0.0"
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/src/index.js b/packages/babel-plugin-proposal-private-methods/src/index.js
new file mode 100644
index 000000000000..0efbf93682a6
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/src/index.js
@@ -0,0 +1,22 @@
+/* eslint-disable @babel/development/plugin-name */
+
+import { declare } from "@babel/helper-plugin-utils";
+import {
+  createClassFeaturePlugin,
+  FEATURES,
+} from "@babel/helper-create-class-features-plugin";
+
+export default declare((api, options) => {
+  api.assertVersion(7);
+
+  return createClassFeaturePlugin({
+    name: "proposal-private-methods",
+
+    feature: FEATURES.privateMethods,
+    loose: options.loose,
+
+    manipulateOptions(opts, parserOpts) {
+      parserOpts.plugins.push("classPrivateMethods");
+    },
+  });
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/exec.js
new file mode 100644
index 000000000000..3cdb24863398
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/exec.js
@@ -0,0 +1,31 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+}
+
+const cl = new Cl();
+
+expect(cl.publicGetPrivateField()).toEqual("top secret string");
+
+cl.publicSetPrivateField("new secret string");
+expect(cl.publicGetPrivateField()).toEqual("new secret string");
+
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/input.js
new file mode 100644
index 000000000000..53e77128c0bd
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/input.js
@@ -0,0 +1,23 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/output.js
new file mode 100644
index 000000000000..d3fad762b400
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/output.js
@@ -0,0 +1,34 @@
+class Cl {
+  constructor() {
+    Object.defineProperty(this, _privateFieldValue, {
+      get: _get_privateFieldValue,
+      set: _set_privateFieldValue
+    });
+    Object.defineProperty(this, _privateField, {
+      writable: true,
+      value: "top secret string"
+    });
+    this.publicField = "not secret string";
+  }
+
+  publicGetPrivateField() {
+    return babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue];
+  }
+
+  publicSetPrivateField(newValue) {
+    babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue] = newValue;
+  }
+
+}
+
+var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField");
+
+var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue");
+
+var _get_privateFieldValue = function () {
+  return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField];
+};
+
+var _set_privateFieldValue = function (newValue) {
+  babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField] = newValue;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/exec.js
new file mode 100644
index 000000000000..92e8197700c0
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/exec.js
@@ -0,0 +1,13 @@
+class Cl {
+  #privateField = 0;
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  constructor() {
+    expect(this.#privateFieldValue).toBeUndefined();
+  }
+}
+
+const cl = new Cl();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/input.js
new file mode 100644
index 000000000000..d676919b85eb
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  constructor() {
+    this.publicField = this.#privateFieldValue;
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js
new file mode 100644
index 000000000000..05866e2142fb
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js
@@ -0,0 +1,21 @@
+class Cl {
+  constructor() {
+    Object.defineProperty(this, _privateFieldValue, {
+      set: _set_privateFieldValue
+    });
+    Object.defineProperty(this, _privateField, {
+      writable: true,
+      value: 0
+    });
+    this.publicField = babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue];
+  }
+
+}
+
+var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField");
+
+var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue");
+
+var _set_privateFieldValue = function (newValue) {
+  babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField] = newValue;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/helper/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/helper/exec.js
new file mode 100644
index 000000000000..59d4b47896ae
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/helper/exec.js
@@ -0,0 +1,11 @@
+let foo;
+class Cl {
+  set #foo(v) { return 1 }
+  test() {
+    foo = this.#foo = 2;
+  }
+}
+
+new Cl().test();
+
+expect(foo).toBe(2);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/options.json
new file mode 100644
index 000000000000..50c7612f8387
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/options.json
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    ["proposal-private-methods", { "loose": true }],
+    ["proposal-class-properties", { "loose": true }],
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/exec.js
new file mode 100644
index 000000000000..64dd9738fd4f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/exec.js
@@ -0,0 +1,13 @@
+class Cl {
+  #privateField = 0;
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  constructor() {
+    expect(() => this.#privateFieldValue = 1).toThrow(TypeError);
+  }
+}
+
+const cl = new Cl();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/input.js
new file mode 100644
index 000000000000..a3385ef16034
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  constructor() {
+    this.#privateFieldValue = 1;
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js
new file mode 100644
index 000000000000..57a8789016fa
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js
@@ -0,0 +1,21 @@
+class Cl {
+  constructor() {
+    Object.defineProperty(this, _privateFieldValue, {
+      get: _get_privateFieldValue
+    });
+    Object.defineProperty(this, _privateField, {
+      writable: true,
+      value: 0
+    });
+    babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue] = 1;
+  }
+
+}
+
+var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField");
+
+var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue");
+
+var _get_privateFieldValue = function () {
+  return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField];
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/exec.js
new file mode 100644
index 000000000000..2e0c58ef2785
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/exec.js
@@ -0,0 +1,50 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+
+  get publicFieldValue() {
+    return this.publicField;
+  }
+
+  set publicFieldValue(newValue) {
+    this.publicField = newValue;
+  }
+
+  testUpdates() {
+    this.#privateField = 0;
+    this.publicField = 0;
+    this.#privateFieldValue = this.#privateFieldValue++;
+    this.publicFieldValue = this.publicFieldValue++;
+    expect(this.#privateField).toEqual(this.publicField);
+
+    ++this.#privateFieldValue;
+    ++this.publicFieldValue;
+    expect(this.#privateField).toEqual(this.publicField);
+
+    this.#privateFieldValue += 1;
+    this.publicFieldValue += 1;
+    expect(this.#privateField).toEqual(this.publicField);
+  }
+}
+
+const cl = new Cl();
+cl.testUpdates();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/input.js
new file mode 100644
index 000000000000..587f09e0aa93
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/input.js
@@ -0,0 +1,47 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+
+  get publicFieldValue() {
+    return this.publicField;
+  }
+
+  set publicFieldValue(newValue) {
+    this.publicField = newValue;
+  }
+
+  testUpdates() {
+    this.#privateField = 0;
+    this.publicField = 0;
+    this.#privateFieldValue = this.#privateFieldValue++;
+    this.publicFieldValue = this.publicFieldValue++;
+
+    ++this.#privateFieldValue;
+    ++this.publicFieldValue;
+
+    this.#privateFieldValue += 1;
+    this.publicFieldValue += 1;
+
+    this.#privateFieldValue = -(this.#privateFieldValue ** this.#privateFieldValue);
+    this.publicFieldValue = -(this.publicFieldValue ** this.publicFieldValue);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/output.js
new file mode 100644
index 000000000000..5dadfcf26954
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/output.js
@@ -0,0 +1,55 @@
+class Cl {
+  constructor() {
+    Object.defineProperty(this, _privateFieldValue, {
+      get: _get_privateFieldValue,
+      set: _set_privateFieldValue
+    });
+    Object.defineProperty(this, _privateField, {
+      writable: true,
+      value: "top secret string"
+    });
+    this.publicField = "not secret string";
+  }
+
+  publicGetPrivateField() {
+    return babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue];
+  }
+
+  publicSetPrivateField(newValue) {
+    babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue] = newValue;
+  }
+
+  get publicFieldValue() {
+    return this.publicField;
+  }
+
+  set publicFieldValue(newValue) {
+    this.publicField = newValue;
+  }
+
+  testUpdates() {
+    babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField] = 0;
+    this.publicField = 0;
+    babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue] = babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue]++;
+    this.publicFieldValue = this.publicFieldValue++;
+    ++babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue];
+    ++this.publicFieldValue;
+    babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue] += 1;
+    this.publicFieldValue += 1;
+    babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue] = -(babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue] ** babelHelpers.classPrivateFieldLooseBase(this, _privateFieldValue)[_privateFieldValue]);
+    this.publicFieldValue = -(this.publicFieldValue ** this.publicFieldValue);
+  }
+
+}
+
+var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField");
+
+var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue");
+
+var _get_privateFieldValue = function () {
+  return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField];
+};
+
+var _set_privateFieldValue = function (newValue) {
+  babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField] = newValue;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/exec.js
new file mode 100644
index 000000000000..3cdb24863398
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/exec.js
@@ -0,0 +1,31 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+}
+
+const cl = new Cl();
+
+expect(cl.publicGetPrivateField()).toEqual("top secret string");
+
+cl.publicSetPrivateField("new secret string");
+expect(cl.publicGetPrivateField()).toEqual("new secret string");
+
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/input.js
new file mode 100644
index 000000000000..53e77128c0bd
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/input.js
@@ -0,0 +1,23 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/output.js
new file mode 100644
index 000000000000..650c5727ed77
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/output.js
@@ -0,0 +1,36 @@
+class Cl {
+  constructor() {
+    _privateFieldValue.set(this, {
+      get: _get_privateFieldValue,
+      set: _set_privateFieldValue
+    });
+
+    _privateField.set(this, {
+      writable: true,
+      value: "top secret string"
+    });
+
+    this.publicField = "not secret string";
+  }
+
+  publicGetPrivateField() {
+    return babelHelpers.classPrivateFieldGet(this, _privateFieldValue);
+  }
+
+  publicSetPrivateField(newValue) {
+    babelHelpers.classPrivateFieldSet(this, _privateFieldValue, newValue);
+  }
+
+}
+
+var _privateField = new WeakMap();
+
+var _privateFieldValue = new WeakMap();
+
+var _get_privateFieldValue = function () {
+  return babelHelpers.classPrivateFieldGet(this, _privateField);
+};
+
+var _set_privateFieldValue = function (newValue) {
+  babelHelpers.classPrivateFieldSet(this, _privateField, newValue);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/exec.js
new file mode 100644
index 000000000000..92e8197700c0
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/exec.js
@@ -0,0 +1,13 @@
+class Cl {
+  #privateField = 0;
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  constructor() {
+    expect(this.#privateFieldValue).toBeUndefined();
+  }
+}
+
+const cl = new Cl();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/input.js
new file mode 100644
index 000000000000..d676919b85eb
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  constructor() {
+    this.publicField = this.#privateFieldValue;
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js
new file mode 100644
index 000000000000..0906668c51fe
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js
@@ -0,0 +1,23 @@
+class Cl {
+  constructor() {
+    _privateFieldValue.set(this, {
+      set: _set_privateFieldValue
+    });
+
+    _privateField.set(this, {
+      writable: true,
+      value: 0
+    });
+
+    this.publicField = babelHelpers.classPrivateFieldGet(this, _privateFieldValue);
+  }
+
+}
+
+var _privateField = new WeakMap();
+
+var _privateFieldValue = new WeakMap();
+
+var _set_privateFieldValue = function (newValue) {
+  babelHelpers.classPrivateFieldSet(this, _privateField, newValue);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/helper/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/helper/exec.js
new file mode 100644
index 000000000000..59d4b47896ae
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/helper/exec.js
@@ -0,0 +1,11 @@
+let foo;
+class Cl {
+  set #foo(v) { return 1 }
+  test() {
+    foo = this.#foo = 2;
+  }
+}
+
+new Cl().test();
+
+expect(foo).toBe(2);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/options.json
new file mode 100644
index 000000000000..c5e6649e4ea8
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/options.json
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    "proposal-private-methods",
+    "proposal-class-properties",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/exec.js
new file mode 100644
index 000000000000..64dd9738fd4f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/exec.js
@@ -0,0 +1,13 @@
+class Cl {
+  #privateField = 0;
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  constructor() {
+    expect(() => this.#privateFieldValue = 1).toThrow(TypeError);
+  }
+}
+
+const cl = new Cl();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/input.js
new file mode 100644
index 000000000000..a3385ef16034
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  constructor() {
+    this.#privateFieldValue = 1;
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js
new file mode 100644
index 000000000000..4ea497e71a17
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js
@@ -0,0 +1,23 @@
+class Cl {
+  constructor() {
+    _privateFieldValue.set(this, {
+      get: _get_privateFieldValue
+    });
+
+    _privateField.set(this, {
+      writable: true,
+      value: 0
+    });
+
+    babelHelpers.classPrivateMethodSet();
+  }
+
+}
+
+var _privateField = new WeakMap();
+
+var _privateFieldValue = new WeakMap();
+
+var _get_privateFieldValue = function () {
+  return babelHelpers.classPrivateFieldGet(this, _privateField);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/exec.js
new file mode 100644
index 000000000000..2e0c58ef2785
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/exec.js
@@ -0,0 +1,50 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+
+  get publicFieldValue() {
+    return this.publicField;
+  }
+
+  set publicFieldValue(newValue) {
+    this.publicField = newValue;
+  }
+
+  testUpdates() {
+    this.#privateField = 0;
+    this.publicField = 0;
+    this.#privateFieldValue = this.#privateFieldValue++;
+    this.publicFieldValue = this.publicFieldValue++;
+    expect(this.#privateField).toEqual(this.publicField);
+
+    ++this.#privateFieldValue;
+    ++this.publicFieldValue;
+    expect(this.#privateField).toEqual(this.publicField);
+
+    this.#privateFieldValue += 1;
+    this.publicFieldValue += 1;
+    expect(this.#privateField).toEqual(this.publicField);
+  }
+}
+
+const cl = new Cl();
+cl.testUpdates();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/input.js
new file mode 100644
index 000000000000..587f09e0aa93
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/input.js
@@ -0,0 +1,47 @@
+class Cl {
+  #privateField = "top secret string";
+
+  constructor() {
+    this.publicField = "not secret string";
+  }
+
+  get #privateFieldValue() {
+    return this.#privateField;
+  }
+
+  set #privateFieldValue(newValue) {
+    this.#privateField = newValue;
+  }
+
+  publicGetPrivateField() {
+    return this.#privateFieldValue;
+  }
+
+  publicSetPrivateField(newValue) {
+    this.#privateFieldValue = newValue;
+  }
+
+  get publicFieldValue() {
+    return this.publicField;
+  }
+
+  set publicFieldValue(newValue) {
+    this.publicField = newValue;
+  }
+
+  testUpdates() {
+    this.#privateField = 0;
+    this.publicField = 0;
+    this.#privateFieldValue = this.#privateFieldValue++;
+    this.publicFieldValue = this.publicFieldValue++;
+
+    ++this.#privateFieldValue;
+    ++this.publicFieldValue;
+
+    this.#privateFieldValue += 1;
+    this.publicFieldValue += 1;
+
+    this.#privateFieldValue = -(this.#privateFieldValue ** this.#privateFieldValue);
+    this.publicFieldValue = -(this.publicFieldValue ** this.publicFieldValue);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/output.js
new file mode 100644
index 000000000000..5d32aa28543a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/output.js
@@ -0,0 +1,59 @@
+class Cl {
+  constructor() {
+    _privateFieldValue.set(this, {
+      get: _get_privateFieldValue,
+      set: _set_privateFieldValue
+    });
+
+    _privateField.set(this, {
+      writable: true,
+      value: "top secret string"
+    });
+
+    this.publicField = "not secret string";
+  }
+
+  publicGetPrivateField() {
+    return babelHelpers.classPrivateFieldGet(this, _privateFieldValue);
+  }
+
+  publicSetPrivateField(newValue) {
+    babelHelpers.classPrivateFieldSet(this, _privateFieldValue, newValue);
+  }
+
+  get publicFieldValue() {
+    return this.publicField;
+  }
+
+  set publicFieldValue(newValue) {
+    this.publicField = newValue;
+  }
+
+  testUpdates() {
+    var _this$privateFieldVal, _this$privateFieldVal2;
+
+    babelHelpers.classPrivateFieldSet(this, _privateField, 0);
+    this.publicField = 0;
+    babelHelpers.classPrivateFieldSet(this, _privateFieldValue, (babelHelpers.classPrivateFieldSet(this, _privateFieldValue, (_this$privateFieldVal2 = +babelHelpers.classPrivateFieldGet(this, _privateFieldValue)) + 1), _this$privateFieldVal2));
+    this.publicFieldValue = this.publicFieldValue++;
+    babelHelpers.classPrivateFieldSet(this, _privateFieldValue, +babelHelpers.classPrivateFieldGet(this, _privateFieldValue) + 1);
+    ++this.publicFieldValue;
+    babelHelpers.classPrivateFieldSet(this, _privateFieldValue, babelHelpers.classPrivateFieldGet(this, _privateFieldValue) + 1);
+    this.publicFieldValue += 1;
+    babelHelpers.classPrivateFieldSet(this, _privateFieldValue, -(babelHelpers.classPrivateFieldGet(this, _privateFieldValue) ** babelHelpers.classPrivateFieldGet(this, _privateFieldValue)));
+    this.publicFieldValue = -(this.publicFieldValue ** this.publicFieldValue);
+  }
+
+}
+
+var _privateField = new WeakMap();
+
+var _privateFieldValue = new WeakMap();
+
+var _get_privateFieldValue = function () {
+  return babelHelpers.classPrivateFieldGet(this, _privateField);
+};
+
+var _set_privateFieldValue = function (newValue) {
+  babelHelpers.classPrivateFieldSet(this, _privateField, newValue);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-get/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-get/input.js
new file mode 100644
index 000000000000..db0d70c935f2
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-get/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+  
+  get #getSet() {
+    return this.#privateField;
+  }
+
+  get #getSet() {
+    return this.#privateField;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-get/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-get/options.json
new file mode 100644
index 000000000000..9c0ba0e4b46a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-get/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Duplicate private field"
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-method/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-method/input.js
new file mode 100644
index 000000000000..5373621ed2c9
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-method/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+  
+  get #foo() {
+    return this.#privateField;
+  }
+
+  #foo() {
+    return 'foo';
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-method/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-method/options.json
new file mode 100644
index 000000000000..9c0ba0e4b46a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-method/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Duplicate private field"
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/input.js
new file mode 100644
index 000000000000..baea164e2758
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  get #getSet() {
+    return this.#privateField;
+  }
+  
+  set #getSet(newValue) {
+    this.#privateField = newValue;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/output.js
new file mode 100644
index 000000000000..baa69fd20e52
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/output.js
@@ -0,0 +1,26 @@
+class Cl {
+  constructor() {
+    _getSet.set(this, {
+      get: _get_getSet,
+      set: _set_getSet
+    });
+
+    _privateField.set(this, {
+      writable: true,
+      value: 0
+    });
+  }
+
+}
+
+var _privateField = new WeakMap();
+
+var _getSet = new WeakMap();
+
+var _get_getSet = function () {
+  return babelHelpers.classPrivateFieldGet(this, _privateField);
+};
+
+var _set_getSet = function (newValue) {
+  babelHelpers.classPrivateFieldSet(this, _privateField, newValue);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-get/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-get/input.js
new file mode 100644
index 000000000000..7bab9a5e1e90
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-get/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  #foo() {
+    return 'foo';
+  }
+
+  get #foo() {
+    return this.#privateField;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-get/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-get/options.json
new file mode 100644
index 000000000000..9c0ba0e4b46a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-get/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Duplicate private field"
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-method/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-method/input.js
new file mode 100644
index 000000000000..ae1c35a48959
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-method/input.js
@@ -0,0 +1,10 @@
+class Cl {
+  #dank() {
+    return 'foo';
+  }
+
+  #dank() {
+    return 'foo';
+  }
+
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-method/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-method/options.json
new file mode 100644
index 000000000000..9c0ba0e4b46a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-method/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Duplicate private field"
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-set/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-set/input.js
new file mode 100644
index 000000000000..e8d1b3d499b1
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-set/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  #foo() {
+    return 'foo';
+  }
+
+  set #foo(newValue) {
+    this.#privateField = newValue;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-set/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-set/options.json
new file mode 100644
index 000000000000..9c0ba0e4b46a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/method-set/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Duplicate private field"
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/options.json
new file mode 100644
index 000000000000..c5e6649e4ea8
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/options.json
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    "proposal-private-methods",
+    "proposal-class-properties",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/input.js
new file mode 100644
index 000000000000..7854fd014ebb
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+  
+  set #getSet(newValue) {
+    this.#privateField = newValue;
+  }
+
+  get #getSet() {
+    return this.#privateField;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/output.js
new file mode 100644
index 000000000000..305f1a49d769
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/output.js
@@ -0,0 +1,26 @@
+class Cl {
+  constructor() {
+    _getSet.set(this, {
+      get: _get_getSet,
+      set: _set_getSet
+    });
+
+    _privateField.set(this, {
+      writable: true,
+      value: 0
+    });
+  }
+
+}
+
+var _privateField = new WeakMap();
+
+var _getSet = new WeakMap();
+
+var _set_getSet = function (newValue) {
+  babelHelpers.classPrivateFieldSet(this, _privateField, newValue);
+};
+
+var _get_getSet = function () {
+  return babelHelpers.classPrivateFieldGet(this, _privateField);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-method/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-method/input.js
new file mode 100644
index 000000000000..85fea5177687
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-method/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+
+  set #foo(newValue) {
+    this.#privateField = newValue;
+  }
+
+  #foo() {
+    return 'foo';
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-method/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-method/options.json
new file mode 100644
index 000000000000..9c0ba0e4b46a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-method/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Duplicate private field"
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-set/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-set/input.js
new file mode 100644
index 000000000000..a000cf21edce
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-set/input.js
@@ -0,0 +1,11 @@
+class Cl {
+  #privateField = 0;
+  
+  set #getSet(newValue) {
+    return this.#privateField;
+  }
+
+  set #getSet(newValue) {
+    return this.#privateField;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-set/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-set/options.json
new file mode 100644
index 000000000000..9c0ba0e4b46a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-set/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Duplicate private field"
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/exec.js
new file mode 100644
index 000000000000..4c1324aeeb62
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/exec.js
@@ -0,0 +1,11 @@
+class Foo {
+    constructor() {
+      this.publicField = this.#privateMethod();
+    }
+
+    #privateMethod() {
+      return 42;
+    }
+  }
+
+  expect((new Foo).publicField).toEqual(42);
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/input.js
new file mode 100644
index 000000000000..e55a8afdd3ad
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/input.js
@@ -0,0 +1,9 @@
+class Foo {
+  constructor() {
+    this.publicField = this.#privateMethod();
+  }
+
+  #privateMethod() {
+    return 42;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/output.js
new file mode 100644
index 000000000000..2dfef83ea5f7
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/output.js
@@ -0,0 +1,15 @@
+class Foo {
+  constructor() {
+    Object.defineProperty(this, _privateMethod, {
+      value: _privateMethod2
+    });
+    this.publicField = babelHelpers.classPrivateFieldLooseBase(this, _privateMethod)[_privateMethod]();
+  }
+
+}
+
+var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod");
+
+var _privateMethod2 = function _privateMethod2() {
+  return 42;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/exec.js
new file mode 100644
index 000000000000..168eb945dd14
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/exec.js
@@ -0,0 +1,13 @@
+class Cl {
+  async #foo() {
+    return 2;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
+
+return new Cl().test().then(val => {
+  expect(val).toBe(2);
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/input.js
new file mode 100644
index 000000000000..aed36e25613f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/input.js
@@ -0,0 +1,9 @@
+class Cl {
+  async #foo() {
+    return 2;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/options.json
new file mode 100644
index 000000000000..580349bcb7ba
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/options.json
@@ -0,0 +1,11 @@
+{
+  "minNodeVersion": "8.0.0",
+  "plugins": [
+    ["external-helpers", { "helperVersion": "7.1000.0" }],
+    ["proposal-private-methods", { "loose": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/output.js
new file mode 100644
index 000000000000..eeda4b58890a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/output.js
@@ -0,0 +1,18 @@
+class Cl {
+  constructor() {
+    Object.defineProperty(this, _foo, {
+      value: _foo2
+    });
+  }
+
+  test() {
+    return babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo]();
+  }
+
+}
+
+var _foo = babelHelpers.classPrivateFieldLooseKey("foo");
+
+var _foo2 = async function _foo2() {
+  return 2;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/exec.js
new file mode 100644
index 000000000000..26caf2d02c1f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/exec.js
@@ -0,0 +1,16 @@
+class Cl {
+  prop = this.#method(1);
+
+  #priv = this.#method(2);
+
+  #method(x) {
+    return x;
+  }
+
+  getPriv() {
+    return this.#priv;
+  }
+}
+
+expect(new Cl().prop).toBe(1);
+expect(new Cl().getPriv()).toBe(2);
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/input.js
new file mode 100644
index 000000000000..2fcb7857468f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/input.js
@@ -0,0 +1,13 @@
+class Cl {
+  prop = this.#method(1);
+
+  #priv = this.#method(2);
+
+  #method(x) {
+    return x;
+  }
+
+  getPriv() {
+    return this.#priv;
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/output.js
new file mode 100644
index 000000000000..aed2cf961923
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/output.js
@@ -0,0 +1,25 @@
+class Cl {
+  constructor() {
+    Object.defineProperty(this, _method, {
+      value: _method2
+    });
+    this.prop = babelHelpers.classPrivateFieldLooseBase(this, _method)[_method](1);
+    Object.defineProperty(this, _priv, {
+      writable: true,
+      value: babelHelpers.classPrivateFieldLooseBase(this, _method)[_method](2)
+    });
+  }
+
+  getPriv() {
+    return babelHelpers.classPrivateFieldLooseBase(this, _priv)[_priv];
+  }
+
+}
+
+var _priv = babelHelpers.classPrivateFieldLooseKey("priv");
+
+var _method = babelHelpers.classPrivateFieldLooseKey("method");
+
+var _method2 = function _method2(x) {
+  return x;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/exec.js
new file mode 100644
index 000000000000..6c18bf53c193
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/exec.js
@@ -0,0 +1,41 @@
+class Foo {
+    constructor(status) {
+      this.status = status;
+      expect(() => this.#getStatus = null).toThrow(TypeError);
+    }
+
+    #getStatus() {
+      return this.status;
+    }
+
+    getCurrentStatus() {
+      return this.#getStatus();
+    }
+
+    setCurrentStatus(newStatus) {
+      this.status = newStatus;
+    }
+
+    getFakeStatus(fakeStatus) {
+      const getStatus = this.#getStatus;
+      return function () {
+        return getStatus.call({ status: fakeStatus });
+      };
+    }
+
+    getFakeStatusFunc() {
+      return {
+        status: 'fake-status',
+        getFakeStatus: this.#getStatus,
+      };
+    }
+  }
+
+  const f = new Foo('inactive');
+  expect(f.getCurrentStatus()).toBe('inactive');
+
+  f.setCurrentStatus('new-status');
+  expect(f.getCurrentStatus()).toBe('new-status');
+
+  expect(f.getFakeStatus('fake')()).toBe('fake');
+  expect(f.getFakeStatusFunc().getFakeStatus()).toBe('fake-status');
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/input.js
new file mode 100644
index 000000000000..67a8ab68a682
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/input.js
@@ -0,0 +1,31 @@
+class Foo {
+  constructor(status) {
+    this.status = status;
+  }
+
+  #getStatus() {
+    return this.status;
+  }
+
+  getCurrentStatus() {
+    return this.#getStatus();
+  }
+
+  setCurrentStatus(newStatus) {
+    this.status = newStatus;
+  }
+
+  getFakeStatus(fakeStatus) {
+    const fakeGetStatus = this.#getStatus;
+    return function() {
+      return fakeGetStatus.call({ status: fakeStatus });
+    };
+  }
+
+  getFakeStatusFunc() {
+    return {
+      status: 'fake-status',
+      getFakeStatus: this.#getStatus,
+    };
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/output.js
new file mode 100644
index 000000000000..1945a52af19b
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/output.js
@@ -0,0 +1,40 @@
+class Foo {
+  constructor(status) {
+    Object.defineProperty(this, _getStatus, {
+      value: _getStatus2
+    });
+    this.status = status;
+  }
+
+  getCurrentStatus() {
+    return babelHelpers.classPrivateFieldLooseBase(this, _getStatus)[_getStatus]();
+  }
+
+  setCurrentStatus(newStatus) {
+    this.status = newStatus;
+  }
+
+  getFakeStatus(fakeStatus) {
+    var fakeGetStatus = babelHelpers.classPrivateFieldLooseBase(this, _getStatus)[_getStatus];
+
+    return function () {
+      return fakeGetStatus.call({
+        status: fakeStatus
+      });
+    };
+  }
+
+  getFakeStatusFunc() {
+    return {
+      status: 'fake-status',
+      getFakeStatus: babelHelpers.classPrivateFieldLooseBase(this, _getStatus)[_getStatus]
+    };
+  }
+
+}
+
+var _getStatus = babelHelpers.classPrivateFieldLooseKey("getStatus");
+
+var _getStatus2 = function _getStatus2() {
+  return this.status;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/exec.js
new file mode 100644
index 000000000000..659a3e891085
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/exec.js
@@ -0,0 +1,15 @@
+let exfiltrated;
+class Foo {
+    #privateMethod() {}
+
+    constructor() {
+        if (exfiltrated === undefined) {
+            exfiltrated = this.#privateMethod;
+        }
+        expect(exfiltrated).toStrictEqual(this.#privateMethod);
+    }
+}
+
+new Foo();
+// check for private method function object equality
+new Foo();
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/input.js
new file mode 100644
index 000000000000..91bf8510d814
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/input.js
@@ -0,0 +1,10 @@
+let exfiltrated;
+class Foo {
+    #privateMethod() {}
+
+    constructor() {
+        if (exfiltrated === undefined) {
+            exfiltrated = this.#privateMethod;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/output.js
new file mode 100644
index 000000000000..831162dfa625
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/output.js
@@ -0,0 +1,18 @@
+var exfiltrated;
+
+class Foo {
+  constructor() {
+    Object.defineProperty(this, _privateMethod, {
+      value: _privateMethod2
+    });
+
+    if (exfiltrated === undefined) {
+      exfiltrated = babelHelpers.classPrivateFieldLooseBase(this, _privateMethod)[_privateMethod];
+    }
+  }
+
+}
+
+var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod");
+
+var _privateMethod2 = function _privateMethod2() {};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/exec.js
new file mode 100644
index 000000000000..472eadeabff6
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/exec.js
@@ -0,0 +1,14 @@
+class Cl {
+  *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
+
+const val = new Cl().test();
+expect(val.next()).toEqual({ value: 2, done: false });
+expect(val.next()).toEqual({ value: 3, done: true });
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/input.js
new file mode 100644
index 000000000000..39aace6dc402
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/input.js
@@ -0,0 +1,10 @@
+class Cl {
+  *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/options.json
new file mode 100644
index 000000000000..d497a940acc4
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    ["external-helpers", { "helperVersion": "7.1000.0" }],
+    ["proposal-private-methods", { "loose": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/output.js
new file mode 100644
index 000000000000..a65255f8cf0c
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/output.js
@@ -0,0 +1,19 @@
+class Cl {
+  constructor() {
+    Object.defineProperty(this, _foo, {
+      value: _foo2
+    });
+  }
+
+  test() {
+    return babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo]();
+  }
+
+}
+
+var _foo = babelHelpers.classPrivateFieldLooseKey("foo");
+
+var _foo2 = function* _foo2() {
+  yield 2;
+  return 3;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/options.json
new file mode 100644
index 000000000000..50c7612f8387
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/options.json
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    ["proposal-private-methods", { "loose": true }],
+    ["proposal-class-properties", { "loose": true }],
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/exec.js
new file mode 100644
index 000000000000..63d8fe8cdfe3
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/exec.js
@@ -0,0 +1,21 @@
+class Base {
+  superMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  superMethod() {
+    return 'bad';
+  }
+
+  #privateMethod() {
+    return super.superMethod();
+  }
+
+  publicMethod() {
+    return this.#privateMethod();
+  }
+}
+
+expect((new Sub()).publicMethod()).toEqual('good');
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/input.js
new file mode 100644
index 000000000000..d85e01133ac1
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/input.js
@@ -0,0 +1,19 @@
+class Base {
+  superMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  superMethod() {
+    return 'bad';
+  }
+
+  #privateMethod() {
+    return super.superMethod();
+  }
+
+  publicMethod() {
+    return this.#privateMethod();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js
new file mode 100644
index 000000000000..f12c62348ca4
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js
@@ -0,0 +1,30 @@
+class Base {
+  superMethod() {
+    return 'good';
+  }
+
+}
+
+class Sub extends Base {
+  constructor(...args) {
+    super(...args);
+    Object.defineProperty(this, _privateMethod, {
+      value: _privateMethod2
+    });
+  }
+
+  superMethod() {
+    return 'bad';
+  }
+
+  publicMethod() {
+    return babelHelpers.classPrivateFieldLooseBase(this, _privateMethod)[_privateMethod]();
+  }
+
+}
+
+var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod");
+
+var _privateMethod2 = function _privateMethod2() {
+  return Base.prototype.superMethod.call(this);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/exec.js
new file mode 100644
index 000000000000..24633c66730d
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/exec.js
@@ -0,0 +1,11 @@
+class Foo {
+    constructor() {
+      this.publicField = this.#privateMethod();
+    }
+  
+    #privateMethod() {
+      return 42;
+    }
+  }
+  
+  expect((new Foo).publicField).toEqual(42);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/input.js
new file mode 100644
index 000000000000..e55a8afdd3ad
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/input.js
@@ -0,0 +1,9 @@
+class Foo {
+  constructor() {
+    this.publicField = this.#privateMethod();
+  }
+
+  #privateMethod() {
+    return 42;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/output.js
new file mode 100644
index 000000000000..2cc1c0b861d2
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/output.js
@@ -0,0 +1,14 @@
+class Foo {
+  constructor() {
+    _privateMethod.add(this);
+
+    this.publicField = babelHelpers.classPrivateMethodGet(this, _privateMethod, _privateMethod2).call(this);
+  }
+
+}
+
+var _privateMethod = new WeakSet();
+
+var _privateMethod2 = function _privateMethod2() {
+  return 42;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/exec.js
new file mode 100644
index 000000000000..168eb945dd14
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/exec.js
@@ -0,0 +1,13 @@
+class Cl {
+  async #foo() {
+    return 2;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
+
+return new Cl().test().then(val => {
+  expect(val).toBe(2);
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/input.js
new file mode 100644
index 000000000000..aed36e25613f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/input.js
@@ -0,0 +1,9 @@
+class Cl {
+  async #foo() {
+    return 2;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/options.json
new file mode 100644
index 000000000000..d102004d8783
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/options.json
@@ -0,0 +1,11 @@
+{
+  "minNodeVersion": "8.0.0",
+  "plugins": [
+    ["external-helpers", { "helperVersion": "7.1000.0" }],
+    "proposal-private-methods",
+    "proposal-class-properties"
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/output.js
new file mode 100644
index 000000000000..7f6889735cb5
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/output.js
@@ -0,0 +1,16 @@
+class Cl {
+  constructor() {
+    _foo.add(this);
+  }
+
+  test() {
+    return babelHelpers.classPrivateMethodGet(this, _foo, _foo2).call(this);
+  }
+
+}
+
+var _foo = new WeakSet();
+
+var _foo2 = async function _foo2() {
+  return 2;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/exec.js
new file mode 100644
index 000000000000..26caf2d02c1f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/exec.js
@@ -0,0 +1,16 @@
+class Cl {
+  prop = this.#method(1);
+
+  #priv = this.#method(2);
+
+  #method(x) {
+    return x;
+  }
+
+  getPriv() {
+    return this.#priv;
+  }
+}
+
+expect(new Cl().prop).toBe(1);
+expect(new Cl().getPriv()).toBe(2);
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/input.js
new file mode 100644
index 000000000000..2fcb7857468f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/input.js
@@ -0,0 +1,13 @@
+class Cl {
+  prop = this.#method(1);
+
+  #priv = this.#method(2);
+
+  #method(x) {
+    return x;
+  }
+
+  getPriv() {
+    return this.#priv;
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/output.js
new file mode 100644
index 000000000000..834c4512d080
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/output.js
@@ -0,0 +1,25 @@
+class Cl {
+  constructor() {
+    _method.add(this);
+
+    babelHelpers.defineProperty(this, "prop", babelHelpers.classPrivateMethodGet(this, _method, _method2).call(this, 1));
+
+    _priv.set(this, {
+      writable: true,
+      value: babelHelpers.classPrivateMethodGet(this, _method, _method2).call(this, 2)
+    });
+  }
+
+  getPriv() {
+    return babelHelpers.classPrivateFieldGet(this, _priv);
+  }
+
+}
+
+var _priv = new WeakMap();
+
+var _method = new WeakSet();
+
+var _method2 = function _method2(x) {
+  return x;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/exec.js
new file mode 100644
index 000000000000..6c18bf53c193
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/exec.js
@@ -0,0 +1,41 @@
+class Foo {
+    constructor(status) {
+      this.status = status;
+      expect(() => this.#getStatus = null).toThrow(TypeError);
+    }
+
+    #getStatus() {
+      return this.status;
+    }
+
+    getCurrentStatus() {
+      return this.#getStatus();
+    }
+
+    setCurrentStatus(newStatus) {
+      this.status = newStatus;
+    }
+
+    getFakeStatus(fakeStatus) {
+      const getStatus = this.#getStatus;
+      return function () {
+        return getStatus.call({ status: fakeStatus });
+      };
+    }
+
+    getFakeStatusFunc() {
+      return {
+        status: 'fake-status',
+        getFakeStatus: this.#getStatus,
+      };
+    }
+  }
+
+  const f = new Foo('inactive');
+  expect(f.getCurrentStatus()).toBe('inactive');
+
+  f.setCurrentStatus('new-status');
+  expect(f.getCurrentStatus()).toBe('new-status');
+
+  expect(f.getFakeStatus('fake')()).toBe('fake');
+  expect(f.getFakeStatusFunc().getFakeStatus()).toBe('fake-status');
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/input.js
new file mode 100644
index 000000000000..67a8ab68a682
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/input.js
@@ -0,0 +1,31 @@
+class Foo {
+  constructor(status) {
+    this.status = status;
+  }
+
+  #getStatus() {
+    return this.status;
+  }
+
+  getCurrentStatus() {
+    return this.#getStatus();
+  }
+
+  setCurrentStatus(newStatus) {
+    this.status = newStatus;
+  }
+
+  getFakeStatus(fakeStatus) {
+    const fakeGetStatus = this.#getStatus;
+    return function() {
+      return fakeGetStatus.call({ status: fakeStatus });
+    };
+  }
+
+  getFakeStatusFunc() {
+    return {
+      status: 'fake-status',
+      getFakeStatus: this.#getStatus,
+    };
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/output.js
new file mode 100644
index 000000000000..02b0f4f7269f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/output.js
@@ -0,0 +1,38 @@
+class Foo {
+  constructor(status) {
+    _getStatus.add(this);
+
+    this.status = status;
+  }
+
+  getCurrentStatus() {
+    return babelHelpers.classPrivateMethodGet(this, _getStatus, _getStatus2).call(this);
+  }
+
+  setCurrentStatus(newStatus) {
+    this.status = newStatus;
+  }
+
+  getFakeStatus(fakeStatus) {
+    var fakeGetStatus = babelHelpers.classPrivateMethodGet(this, _getStatus, _getStatus2);
+    return function () {
+      return fakeGetStatus.call({
+        status: fakeStatus
+      });
+    };
+  }
+
+  getFakeStatusFunc() {
+    return {
+      status: 'fake-status',
+      getFakeStatus: babelHelpers.classPrivateMethodGet(this, _getStatus, _getStatus2)
+    };
+  }
+
+}
+
+var _getStatus = new WeakSet();
+
+var _getStatus2 = function _getStatus2() {
+  return this.status;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/exec.js
new file mode 100644
index 000000000000..659a3e891085
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/exec.js
@@ -0,0 +1,15 @@
+let exfiltrated;
+class Foo {
+    #privateMethod() {}
+
+    constructor() {
+        if (exfiltrated === undefined) {
+            exfiltrated = this.#privateMethod;
+        }
+        expect(exfiltrated).toStrictEqual(this.#privateMethod);
+    }
+}
+
+new Foo();
+// check for private method function object equality
+new Foo();
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/input.js
new file mode 100644
index 000000000000..91bf8510d814
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/input.js
@@ -0,0 +1,10 @@
+let exfiltrated;
+class Foo {
+    #privateMethod() {}
+
+    constructor() {
+        if (exfiltrated === undefined) {
+            exfiltrated = this.#privateMethod;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/output.js
new file mode 100644
index 000000000000..ed6b8b538e8b
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/output.js
@@ -0,0 +1,16 @@
+var exfiltrated;
+
+class Foo {
+  constructor() {
+    _privateMethod.add(this);
+
+    if (exfiltrated === undefined) {
+      exfiltrated = babelHelpers.classPrivateMethodGet(this, _privateMethod, _privateMethod2);
+    }
+  }
+
+}
+
+var _privateMethod = new WeakSet();
+
+var _privateMethod2 = function _privateMethod2() {};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/exec.js
new file mode 100644
index 000000000000..472eadeabff6
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/exec.js
@@ -0,0 +1,14 @@
+class Cl {
+  *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
+
+const val = new Cl().test();
+expect(val.next()).toEqual({ value: 2, done: false });
+expect(val.next()).toEqual({ value: 3, done: true });
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/input.js
new file mode 100644
index 000000000000..39aace6dc402
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/input.js
@@ -0,0 +1,10 @@
+class Cl {
+  *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return this.#foo();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/options.json
new file mode 100644
index 000000000000..df92baa99f47
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    ["external-helpers", { "helperVersion": "7.1000.0" }],
+    "proposal-private-methods",
+    "proposal-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/output.js
new file mode 100644
index 000000000000..be02820a8505
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/output.js
@@ -0,0 +1,17 @@
+class Cl {
+  constructor() {
+    _foo.add(this);
+  }
+
+  test() {
+    return babelHelpers.classPrivateMethodGet(this, _foo, _foo2).call(this);
+  }
+
+}
+
+var _foo = new WeakSet();
+
+var _foo2 = function* _foo2() {
+  yield 2;
+  return 3;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/options.json
new file mode 100644
index 000000000000..c5e6649e4ea8
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/options.json
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    "proposal-private-methods",
+    "proposal-class-properties",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/scopable/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/scopable/exec.js
new file mode 100644
index 000000000000..874b970d155f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/scopable/exec.js
@@ -0,0 +1,17 @@
+class Foo {
+  #privateMethodA() {
+    const i = 40;
+    return i;
+  }
+
+  #privateMethodB() {
+    const i = 2;
+    return i;
+  }
+
+  publicMethod() {
+    return this.#privateMethodA() + this.#privateMethodB();
+  }
+}
+
+expect((new Foo).publicMethod()).toEqual(42);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/exec.js
new file mode 100644
index 000000000000..63d8fe8cdfe3
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/exec.js
@@ -0,0 +1,21 @@
+class Base {
+  superMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  superMethod() {
+    return 'bad';
+  }
+
+  #privateMethod() {
+    return super.superMethod();
+  }
+
+  publicMethod() {
+    return this.#privateMethod();
+  }
+}
+
+expect((new Sub()).publicMethod()).toEqual('good');
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/input.js
new file mode 100644
index 000000000000..d85e01133ac1
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/input.js
@@ -0,0 +1,19 @@
+class Base {
+  superMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  superMethod() {
+    return 'bad';
+  }
+
+  #privateMethod() {
+    return super.superMethod();
+  }
+
+  publicMethod() {
+    return this.#privateMethod();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/output.js
new file mode 100644
index 000000000000..d934fb365e2f
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/output.js
@@ -0,0 +1,29 @@
+class Base {
+  superMethod() {
+    return 'good';
+  }
+
+}
+
+class Sub extends Base {
+  constructor(...args) {
+    super(...args);
+
+    _privateMethod.add(this);
+  }
+
+  superMethod() {
+    return 'bad';
+  }
+
+  publicMethod() {
+    return babelHelpers.classPrivateMethodGet(this, _privateMethod, _privateMethod2).call(this);
+  }
+
+}
+
+var _privateMethod = new WeakSet();
+
+var _privateMethod2 = function _privateMethod2() {
+  return babelHelpers.get(babelHelpers.getPrototypeOf(Sub.prototype), "superMethod", this).call(this);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/input.js
new file mode 100644
index 000000000000..99125b6f24c4
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/input.js
@@ -0,0 +1,13 @@
+class Cl {
+  static async #privateStaticMethod() {
+    return 2;
+  }
+
+  test() {
+    return Cl.#privateStaticMethod();
+  }
+}
+
+return new Cl().test().then(val => {
+  expect(val).toBe(2);
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/options.json
new file mode 100644
index 000000000000..a34201ad4f9b
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/options.json
@@ -0,0 +1,18 @@
+{
+  "minNodeVersion": "8.0.0",
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    "proposal-private-methods",
+    "proposal-class-properties",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/output.js
new file mode 100644
index 000000000000..d21e2139e823
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/output.js
@@ -0,0 +1,14 @@
+class Cl {
+  test() {
+    return babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod).call(Cl);
+  }
+
+}
+
+var _privateStaticMethod = async function _privateStaticMethod() {
+  return 2;
+};
+
+return new Cl().test().then(val => {
+  expect(val).toBe(2);
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/exec.js
new file mode 100644
index 000000000000..d5577057caa9
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/exec.js
@@ -0,0 +1,33 @@
+const privateStaticValue = 1017;
+
+class Cl {
+  static staticMethod2() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static #privateStaticMethod() {
+    return privateStaticValue;
+  }
+
+  static staticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static privateStaticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  publicMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  constructor() {
+    this.instanceField = Cl.#privateStaticMethod();
+  }
+}
+
+expect((new Cl).publicMethod()).toEqual(privateStaticValue);
+// expect((new Cl).instanceField).toEqual(privateStaticValue);
+// expect(Cl.privateStaticMethod()).toEqual(privateStaticValue);
+// expect(Cl.staticMethod()).toEqual(privateStaticValue);
+// expect(Cl.staticMethod2()).toEqual(privateStaticValue);
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/input.js
new file mode 100644
index 000000000000..ad0ee3d44814
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/input.js
@@ -0,0 +1,25 @@
+class Cl {
+  static staticMethod2() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  static staticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static privateStaticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  publicMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  constructor() {
+    this.instanceField = Cl.#privateStaticMethod();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/output.js
new file mode 100644
index 000000000000..a6fe9f8e28fa
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/output.js
@@ -0,0 +1,32 @@
+class Cl {
+  static staticMethod2() {
+    return babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod]();
+  }
+
+  static staticMethod() {
+    return babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod]();
+  }
+
+  static privateStaticMethod() {
+    return babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod]();
+  }
+
+  publicMethod() {
+    return babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod]();
+  }
+
+  constructor() {
+    this.instanceField = babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod]();
+  }
+
+}
+
+var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod");
+
+var _privateStaticMethod2 = function _privateStaticMethod2() {
+  return 1017;
+};
+
+Object.defineProperty(Cl, _privateStaticMethod, {
+  value: _privateStaticMethod2
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/exec.js
new file mode 100644
index 000000000000..940b62801e26
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/exec.js
@@ -0,0 +1,12 @@
+class Cl {
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  publicMethod(checked) {
+    return checked.#privateStaticMethod();
+  }
+}
+
+const cl = new Cl();
+expect(cl.publicMethod(Cl)).toBe(1017);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/input.js
new file mode 100644
index 000000000000..fd8c6c331e4e
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/input.js
@@ -0,0 +1,7 @@
+class Cl {
+  static #privateStaticMethod() { }
+
+  publicMethod(checked) {
+    return checked.#privateStaticMethod();
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/output.js
new file mode 100644
index 000000000000..b93f1e9d252e
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/output.js
@@ -0,0 +1,14 @@
+class Cl {
+  publicMethod(checked) {
+    return babelHelpers.classPrivateFieldLooseBase(checked, _privateStaticMethod)[_privateStaticMethod]();
+  }
+
+}
+
+var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod");
+
+var _privateStaticMethod2 = function _privateStaticMethod2() {};
+
+Object.defineProperty(Cl, _privateStaticMethod, {
+  value: _privateStaticMethod2
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/exec.js
new file mode 100644
index 000000000000..14a7b5edd830
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/exec.js
@@ -0,0 +1,20 @@
+let exfiltrated;
+
+class Cl {
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  constructor() {
+    if (exfiltrated === undefined) {
+        exfiltrated = Cl.#privateStaticMethod;
+    }
+    expect(exfiltrated).toStrictEqual(Cl.#privateStaticMethod);
+  }
+}
+
+new Cl();
+// check for private method function object equality
+new Cl();
+
+expect(exfiltrated()).toEqual(1017);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/input.js
new file mode 100644
index 000000000000..fdc78e57981a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/input.js
@@ -0,0 +1,13 @@
+let exfiltrated;
+
+class Cl {
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  constructor() {
+    if (exfiltrated === undefined) {
+        exfiltrated = Cl.#privateStaticMethod;
+    }
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/output.js
new file mode 100644
index 000000000000..ebdf256588dd
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/output.js
@@ -0,0 +1,20 @@
+var exfiltrated;
+
+class Cl {
+  constructor() {
+    if (exfiltrated === undefined) {
+      exfiltrated = babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod];
+    }
+  }
+
+}
+
+var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod");
+
+var _privateStaticMethod2 = function _privateStaticMethod2() {
+  return 1017;
+};
+
+Object.defineProperty(Cl, _privateStaticMethod, {
+  value: _privateStaticMethod2
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/exec.js
new file mode 100644
index 000000000000..97a6a708fc63
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/exec.js
@@ -0,0 +1,14 @@
+class Cl {
+  static *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return Cl.#foo();
+  }
+}
+
+const val = new Cl().test();
+expect(val.next()).toEqual({ value: 2, done: false });
+expect(val.next()).toEqual({ value: 3, done: true });
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/input.js
new file mode 100644
index 000000000000..2b8727d64cfa
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/input.js
@@ -0,0 +1,10 @@
+class Cl {
+  static *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return Cl.#foo();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/output.js
new file mode 100644
index 000000000000..2f1d02594715
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/output.js
@@ -0,0 +1,17 @@
+class Cl {
+  test() {
+    return babelHelpers.classPrivateFieldLooseBase(Cl, _foo)[_foo]();
+  }
+
+}
+
+var _foo = babelHelpers.classPrivateFieldLooseKey("foo");
+
+var _foo2 = function* _foo2() {
+  yield 2;
+  return 3;
+};
+
+Object.defineProperty(Cl, _foo, {
+  value: _foo2
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/options.json
new file mode 100644
index 000000000000..50c7612f8387
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/options.json
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    ["proposal-private-methods", { "loose": true }],
+    ["proposal-class-properties", { "loose": true }],
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/exec.js
new file mode 100644
index 000000000000..d55af8ba71d7
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/exec.js
@@ -0,0 +1,9 @@
+class Cl {
+  static #privateStaticMethod() { }
+
+  constructor() {
+    expect(() => Cl.#privateStaticMethod = null).toThrow(TypeError);
+  }
+}
+
+new Cl();
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/input.js
new file mode 100644
index 000000000000..865ddea4ccf1
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/input.js
@@ -0,0 +1,9 @@
+class Cl {
+  static #privateStaticMethod() { }
+
+  constructor() {
+    Cl.#privateStaticMethod = null;
+  }
+}
+
+new Cl();
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/output.js
new file mode 100644
index 000000000000..1be439447ff4
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/output.js
@@ -0,0 +1,15 @@
+class Cl {
+  constructor() {
+    babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod] = null;
+  }
+
+}
+
+var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod");
+
+var _privateStaticMethod2 = function _privateStaticMethod2() {};
+
+Object.defineProperty(Cl, _privateStaticMethod, {
+  value: _privateStaticMethod2
+});
+new Cl();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/scopable/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/scopable/exec.js
new file mode 100644
index 000000000000..f94e5c495f9a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/scopable/exec.js
@@ -0,0 +1,17 @@
+class Cl {
+  static #privateMethodA() {
+    const i = 40;
+    return i;
+  }
+
+  static #privateMethodB() {
+    const i = 2;
+    return i;
+  }
+
+  publicMethod() {
+    return Cl.#privateMethodA() + Cl.#privateMethodB();
+  }
+}
+
+expect((new Cl).publicMethod()).toEqual(42);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/exec.js
new file mode 100644
index 000000000000..1d6f0c63559a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/exec.js
@@ -0,0 +1,21 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  static basePublicStaticMethod() {
+    return 'bad';
+  }
+
+  static #subStaticPrivateMethod() {
+    return super.basePublicStaticMethod();
+  }
+
+  static check() {
+    return Sub.#subStaticPrivateMethod();
+  }
+}
+
+expect(Sub.check()).toEqual('good');
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/input.js
new file mode 100644
index 000000000000..e5fb0ecd5eec
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/input.js
@@ -0,0 +1,19 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  static basePublicStaticMethod() {
+    return 'bad';
+  }
+
+  static #subStaticPrivateMethod() {
+    return super.basePublicStaticMethod();
+  }
+
+  static check() {
+    Sub.#subStaticPrivateMethod();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js
new file mode 100644
index 000000000000..98be96809ba9
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js
@@ -0,0 +1,27 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 'good';
+  }
+
+}
+
+class Sub extends Base {
+  static basePublicStaticMethod() {
+    return 'bad';
+  }
+
+  static check() {
+    babelHelpers.classPrivateFieldLooseBase(Sub, _subStaticPrivateMethod)[_subStaticPrivateMethod]();
+  }
+
+}
+
+var _subStaticPrivateMethod = babelHelpers.classPrivateFieldLooseKey("subStaticPrivateMethod");
+
+var _subStaticPrivateMethod2 = function _subStaticPrivateMethod2() {
+  return Base.basePublicStaticMethod.call(this);
+};
+
+Object.defineProperty(Sub, _subStaticPrivateMethod, {
+  value: _subStaticPrivateMethod2
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/exec.js
new file mode 100644
index 000000000000..3262c36845be
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/exec.js
@@ -0,0 +1,18 @@
+class A {
+  static get a() { return 1 }
+}
+
+class B extends A {
+  static get b() { return 2 }
+
+  static #getA() { return super.a }
+  static #getB() { return this.b }
+
+  static extract() {
+    return [this.#getA, this.#getB];
+  }
+}
+
+const [getA, getB] = B.extract();
+expect(getA.call({ a: 3 })).toBe(1);
+expect(getB.call({ b: 4 })).toBe(4);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/input.js
new file mode 100644
index 000000000000..3c8639776d62
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/input.js
@@ -0,0 +1,16 @@
+class A {
+  static get a() { return 1 }
+}
+
+class B extends A {
+  static get b() { return 2 }
+
+  static #getA() { return super.a }
+  static #getB() { return this.b }
+
+  static extract() {
+    return [this.#getA, this.#getB];
+  }
+}
+
+const [getA, getB] = B.extract();
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js
new file mode 100644
index 000000000000..4a5cddf8618c
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js
@@ -0,0 +1,38 @@
+class A {
+  static get a() {
+    return 1;
+  }
+
+}
+
+class B extends A {
+  static get b() {
+    return 2;
+  }
+
+  static extract() {
+    return [babelHelpers.classPrivateFieldLooseBase(this, _getA)[_getA], babelHelpers.classPrivateFieldLooseBase(this, _getB)[_getB]];
+  }
+
+}
+
+var _getA = babelHelpers.classPrivateFieldLooseKey("getA");
+
+var _getB = babelHelpers.classPrivateFieldLooseKey("getB");
+
+var _getA2 = function _getA2() {
+  return A.a;
+};
+
+Object.defineProperty(B, _getA, {
+  value: _getA2
+});
+
+var _getB2 = function _getB2() {
+  return this.b;
+};
+
+Object.defineProperty(B, _getB, {
+  value: _getB2
+});
+var [getA, getB] = B.extract();
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/input.js
new file mode 100644
index 000000000000..99125b6f24c4
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/input.js
@@ -0,0 +1,13 @@
+class Cl {
+  static async #privateStaticMethod() {
+    return 2;
+  }
+
+  test() {
+    return Cl.#privateStaticMethod();
+  }
+}
+
+return new Cl().test().then(val => {
+  expect(val).toBe(2);
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/options.json
new file mode 100644
index 000000000000..a34201ad4f9b
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/options.json
@@ -0,0 +1,18 @@
+{
+  "minNodeVersion": "8.0.0",
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    "proposal-private-methods",
+    "proposal-class-properties",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/output.js
new file mode 100644
index 000000000000..d21e2139e823
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/output.js
@@ -0,0 +1,14 @@
+class Cl {
+  test() {
+    return babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod).call(Cl);
+  }
+
+}
+
+var _privateStaticMethod = async function _privateStaticMethod() {
+  return 2;
+};
+
+return new Cl().test().then(val => {
+  expect(val).toBe(2);
+});
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/exec.js
new file mode 100644
index 000000000000..ca3487099eb5
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/exec.js
@@ -0,0 +1,33 @@
+const privateStaticValue = 1017;
+
+class Cl {
+  static staticMethod2() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static #privateStaticMethod() {
+    return privateStaticValue;
+  }
+
+  static staticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static privateStaticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  publicMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  constructor() {
+    this.instanceField = Cl.#privateStaticMethod();
+  }
+}
+
+expect((new Cl).publicMethod()).toEqual(privateStaticValue);
+expect((new Cl).instanceField).toEqual(privateStaticValue);
+expect(Cl.privateStaticMethod()).toEqual(privateStaticValue);
+expect(Cl.staticMethod()).toEqual(privateStaticValue);
+expect(Cl.staticMethod2()).toEqual(privateStaticValue);
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/input.js
new file mode 100644
index 000000000000..ad0ee3d44814
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/input.js
@@ -0,0 +1,25 @@
+class Cl {
+  static staticMethod2() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  static staticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  static privateStaticMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  publicMethod() {
+    return Cl.#privateStaticMethod();
+  }
+
+  constructor() {
+    this.instanceField = Cl.#privateStaticMethod();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/output.js
new file mode 100644
index 000000000000..2c56c6dedcc3
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/basic/output.js
@@ -0,0 +1,26 @@
+class Cl {
+  static staticMethod2() {
+    return babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod).call(Cl);
+  }
+
+  static staticMethod() {
+    return babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod).call(Cl);
+  }
+
+  static privateStaticMethod() {
+    return babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod).call(Cl);
+  }
+
+  publicMethod() {
+    return babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod).call(Cl);
+  }
+
+  constructor() {
+    this.instanceField = babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod).call(Cl);
+  }
+
+}
+
+var _privateStaticMethod = function _privateStaticMethod() {
+  return 1017;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/exec.js
new file mode 100644
index 000000000000..940b62801e26
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/exec.js
@@ -0,0 +1,12 @@
+class Cl {
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  publicMethod(checked) {
+    return checked.#privateStaticMethod();
+  }
+}
+
+const cl = new Cl();
+expect(cl.publicMethod(Cl)).toBe(1017);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/input.js
new file mode 100644
index 000000000000..fd8c6c331e4e
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/input.js
@@ -0,0 +1,7 @@
+class Cl {
+  static #privateStaticMethod() { }
+
+  publicMethod(checked) {
+    return checked.#privateStaticMethod();
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/output.js
new file mode 100644
index 000000000000..06b25f9a78bf
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/class-check/output.js
@@ -0,0 +1,8 @@
+class Cl {
+  publicMethod(checked) {
+    return babelHelpers.classStaticPrivateMethodGet(checked, Cl, _privateStaticMethod).call(checked);
+  }
+
+}
+
+var _privateStaticMethod = function _privateStaticMethod() {};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/exec.js
new file mode 100644
index 000000000000..14a7b5edd830
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/exec.js
@@ -0,0 +1,20 @@
+let exfiltrated;
+
+class Cl {
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  constructor() {
+    if (exfiltrated === undefined) {
+        exfiltrated = Cl.#privateStaticMethod;
+    }
+    expect(exfiltrated).toStrictEqual(Cl.#privateStaticMethod);
+  }
+}
+
+new Cl();
+// check for private method function object equality
+new Cl();
+
+expect(exfiltrated()).toEqual(1017);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/input.js
new file mode 100644
index 000000000000..fdc78e57981a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/input.js
@@ -0,0 +1,13 @@
+let exfiltrated;
+
+class Cl {
+  static #privateStaticMethod() {
+    return 1017;
+  }
+
+  constructor() {
+    if (exfiltrated === undefined) {
+        exfiltrated = Cl.#privateStaticMethod;
+    }
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/output.js
new file mode 100644
index 000000000000..6edcd3d51afc
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/exfiltrated/output.js
@@ -0,0 +1,14 @@
+var exfiltrated;
+
+class Cl {
+  constructor() {
+    if (exfiltrated === undefined) {
+      exfiltrated = babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _privateStaticMethod);
+    }
+  }
+
+}
+
+var _privateStaticMethod = function _privateStaticMethod() {
+  return 1017;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/exec.js
new file mode 100644
index 000000000000..97a6a708fc63
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/exec.js
@@ -0,0 +1,14 @@
+class Cl {
+  static *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return Cl.#foo();
+  }
+}
+
+const val = new Cl().test();
+expect(val.next()).toEqual({ value: 2, done: false });
+expect(val.next()).toEqual({ value: 3, done: true });
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/input.js
new file mode 100644
index 000000000000..2b8727d64cfa
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/input.js
@@ -0,0 +1,10 @@
+class Cl {
+  static *#foo() {
+    yield 2;
+    return 3;
+  }
+
+  test() {
+    return Cl.#foo();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/output.js
new file mode 100644
index 000000000000..be6d0e6bf2fa
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/generator/output.js
@@ -0,0 +1,11 @@
+class Cl {
+  test() {
+    return babelHelpers.classStaticPrivateMethodGet(Cl, Cl, _foo).call(Cl);
+  }
+
+}
+
+var _foo = function* _foo() {
+  yield 2;
+  return 3;
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/options.json
new file mode 100644
index 000000000000..c5e6649e4ea8
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/options.json
@@ -0,0 +1,14 @@
+{
+  "plugins": [
+    [
+      "external-helpers",
+      {
+        "helperVersion": "7.1000.0"
+      }
+    ],
+    "proposal-private-methods",
+    "proposal-class-properties",
+    "transform-block-scoping",
+    "syntax-class-properties"
+  ]
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/reassignment/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/reassignment/exec.js
new file mode 100644
index 000000000000..d55af8ba71d7
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/reassignment/exec.js
@@ -0,0 +1,9 @@
+class Cl {
+  static #privateStaticMethod() { }
+
+  constructor() {
+    expect(() => Cl.#privateStaticMethod = null).toThrow(TypeError);
+  }
+}
+
+new Cl();
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/scopable/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/scopable/exec.js
new file mode 100644
index 000000000000..f94e5c495f9a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/scopable/exec.js
@@ -0,0 +1,17 @@
+class Cl {
+  static #privateMethodA() {
+    const i = 40;
+    return i;
+  }
+
+  static #privateMethodB() {
+    const i = 2;
+    return i;
+  }
+
+  publicMethod() {
+    return Cl.#privateMethodA() + Cl.#privateMethodB();
+  }
+}
+
+expect((new Cl).publicMethod()).toEqual(42);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/exec.js
new file mode 100644
index 000000000000..1d6f0c63559a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/exec.js
@@ -0,0 +1,21 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  static basePublicStaticMethod() {
+    return 'bad';
+  }
+
+  static #subStaticPrivateMethod() {
+    return super.basePublicStaticMethod();
+  }
+
+  static check() {
+    return Sub.#subStaticPrivateMethod();
+  }
+}
+
+expect(Sub.check()).toEqual('good');
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/input.js
new file mode 100644
index 000000000000..e5fb0ecd5eec
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/input.js
@@ -0,0 +1,19 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 'good';
+  }
+}
+
+class Sub extends Base {
+  static basePublicStaticMethod() {
+    return 'bad';
+  }
+
+  static #subStaticPrivateMethod() {
+    return super.basePublicStaticMethod();
+  }
+
+  static check() {
+    Sub.#subStaticPrivateMethod();
+  }
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/output.js
new file mode 100644
index 000000000000..b9cdbb4d24b4
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/output.js
@@ -0,0 +1,21 @@
+class Base {
+  static basePublicStaticMethod() {
+    return 'good';
+  }
+
+}
+
+class Sub extends Base {
+  static basePublicStaticMethod() {
+    return 'bad';
+  }
+
+  static check() {
+    babelHelpers.classStaticPrivateMethodGet(Sub, Sub, _subStaticPrivateMethod).call(Sub);
+  }
+
+}
+
+var _subStaticPrivateMethod = function _subStaticPrivateMethod() {
+  return babelHelpers.get(babelHelpers.getPrototypeOf(Sub), "basePublicStaticMethod", this).call(this);
+};
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/exec.js
new file mode 100644
index 000000000000..3262c36845be
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/exec.js
@@ -0,0 +1,18 @@
+class A {
+  static get a() { return 1 }
+}
+
+class B extends A {
+  static get b() { return 2 }
+
+  static #getA() { return super.a }
+  static #getB() { return this.b }
+
+  static extract() {
+    return [this.#getA, this.#getB];
+  }
+}
+
+const [getA, getB] = B.extract();
+expect(getA.call({ a: 3 })).toBe(1);
+expect(getB.call({ b: 4 })).toBe(4);
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/input.js
new file mode 100644
index 000000000000..3c8639776d62
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/input.js
@@ -0,0 +1,16 @@
+class A {
+  static get a() { return 1 }
+}
+
+class B extends A {
+  static get b() { return 2 }
+
+  static #getA() { return super.a }
+  static #getB() { return this.b }
+
+  static extract() {
+    return [this.#getA, this.#getB];
+  }
+}
+
+const [getA, getB] = B.extract();
\ No newline at end of file
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/output.js
new file mode 100644
index 000000000000..e440955ecc99
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/this/output.js
@@ -0,0 +1,27 @@
+class A {
+  static get a() {
+    return 1;
+  }
+
+}
+
+class B extends A {
+  static get b() {
+    return 2;
+  }
+
+  static extract() {
+    return [babelHelpers.classStaticPrivateMethodGet(this, B, _getA), babelHelpers.classStaticPrivateMethodGet(this, B, _getB)];
+  }
+
+}
+
+var _getA = function _getA() {
+  return babelHelpers.get(babelHelpers.getPrototypeOf(B), "a", this);
+};
+
+var _getB = function _getB() {
+  return this.b;
+};
+
+var [getA, getB] = B.extract();
diff --git a/packages/babel-plugin-proposal-private-methods/test/index.js b/packages/babel-plugin-proposal-private-methods/test/index.js
new file mode 100644
index 000000000000..1b534b8fc64a
--- /dev/null
+++ b/packages/babel-plugin-proposal-private-methods/test/index.js
@@ -0,0 +1,3 @@
+import runner from "@babel/helper-plugin-test-runner";
+
+runner(__dirname);
diff --git a/packages/babel-plugin-proposal-throw-expressions/package.json b/packages/babel-plugin-proposal-throw-expressions/package.json
index 453b6b388a42..2f6bc414a717 100644
--- a/packages/babel-plugin-proposal-throw-expressions/package.json
+++ b/packages/babel-plugin-proposal-throw-expressions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-throw-expressions",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Wraps Throw Expressions in an IIFE",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-throw-expressions",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-throw-expressions": "^7.0.0"
+    "@babel/plugin-syntax-throw-expressions": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-throw-expressions/src/index.js b/packages/babel-plugin-proposal-throw-expressions/src/index.js
index 17cc945784a5..5cb1ff73a916 100644
--- a/packages/babel-plugin-proposal-throw-expressions/src/index.js
+++ b/packages/babel-plugin-proposal-throw-expressions/src/index.js
@@ -6,6 +6,7 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "proposal-throw-expressions",
     inherits: syntaxThrowExpressions,
 
     visitor: {
diff --git a/packages/babel-plugin-proposal-unicode-property-regex/package.json b/packages/babel-plugin-proposal-unicode-property-regex/package.json
index 91eea88bdac8..96bdc44c4698 100644
--- a/packages/babel-plugin-proposal-unicode-property-regex/package.json
+++ b/packages/babel-plugin-proposal-unicode-property-regex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-proposal-unicode-property-regex",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Compile Unicode property escapes in Unicode regular expressions to ES5.",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
@@ -23,14 +23,14 @@
   "bugs": "https://github.com/babel/babel/issues",
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-regex": "^7.0.0",
-    "regexpu-core": "^4.2.0"
+    "@babel/helper-regex": "^7.4.4",
+    "regexpu-core": "^4.5.4"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-proposal-unicode-property-regex/src/index.js b/packages/babel-plugin-proposal-unicode-property-regex/src/index.js
index e48298ed8999..b0245892311f 100644
--- a/packages/babel-plugin-proposal-unicode-property-regex/src/index.js
+++ b/packages/babel-plugin-proposal-unicode-property-regex/src/index.js
@@ -11,6 +11,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "proposal-unicode-property-regex",
+
     visitor: {
       RegExpLiteral(path) {
         const node = path.node;
diff --git a/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/with-unicode-flag/unicode-12/input.js b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/with-unicode-flag/unicode-12/input.js
new file mode 100644
index 000000000000..711dde943b3c
--- /dev/null
+++ b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/with-unicode-flag/unicode-12/input.js
@@ -0,0 +1 @@
+var regex = /[\u{1E2C0}-\u{1E2F9}\u{1E2FF}]/u;
diff --git a/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/with-unicode-flag/unicode-12/output.js b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/with-unicode-flag/unicode-12/output.js
new file mode 100644
index 000000000000..711dde943b3c
--- /dev/null
+++ b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/with-unicode-flag/unicode-12/output.js
@@ -0,0 +1 @@
+var regex = /[\u{1E2C0}-\u{1E2F9}\u{1E2FF}]/u;
diff --git a/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/without-unicode-flag/unicode-12/input.js b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/without-unicode-flag/unicode-12/input.js
new file mode 100644
index 000000000000..f563d323bd55
--- /dev/null
+++ b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/without-unicode-flag/unicode-12/input.js
@@ -0,0 +1 @@
+var regex = /\p{Script_Extensions=Wancho}/u;
diff --git a/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/without-unicode-flag/unicode-12/output.js b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/without-unicode-flag/unicode-12/output.js
new file mode 100644
index 000000000000..941a22ba2c3e
--- /dev/null
+++ b/packages/babel-plugin-proposal-unicode-property-regex/test/fixtures/without-unicode-flag/unicode-12/output.js
@@ -0,0 +1 @@
+var regex = /(?:\uD838[\uDEC0-\uDEF9\uDEFF])/;
diff --git a/packages/babel-plugin-syntax-async-generators/package.json b/packages/babel-plugin-syntax-async-generators/package.json
index 76d42df80583..60a1702af977 100644
--- a/packages/babel-plugin-syntax-async-generators/package.json
+++ b/packages/babel-plugin-syntax-async-generators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-async-generators",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of async generator functions",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-async-generators/src/index.js b/packages/babel-plugin-syntax-async-generators/src/index.js
index 44e1b1dd52aa..e18612556b27 100644
--- a/packages/babel-plugin-syntax-async-generators/src/index.js
+++ b/packages/babel-plugin-syntax-async-generators/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-async-generators",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("asyncGenerators");
     },
diff --git a/packages/babel-plugin-syntax-bigint/package.json b/packages/babel-plugin-syntax-bigint/package.json
index bb82f45cc5c2..9993d4d33f1a 100644
--- a/packages/babel-plugin-syntax-bigint/package.json
+++ b/packages/babel-plugin-syntax-bigint/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@babel/plugin-syntax-bigint",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Allow parsing of BigInt literals",
-  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-bigint",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-bigint",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.4.4"
   }
 }
diff --git a/packages/babel-plugin-syntax-bigint/src/index.js b/packages/babel-plugin-syntax-bigint/src/index.js
index 085614f0a6ca..89129a5f06d4 100644
--- a/packages/babel-plugin-syntax-bigint/src/index.js
+++ b/packages/babel-plugin-syntax-bigint/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-bigint",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("bigInt");
     },
diff --git a/packages/babel-plugin-syntax-class-properties/package.json b/packages/babel-plugin-syntax-class-properties/package.json
index 6177dcfc6ba3..dba0685a8477 100644
--- a/packages/babel-plugin-syntax-class-properties/package.json
+++ b/packages/babel-plugin-syntax-class-properties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-class-properties",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of class properties",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-class-properties",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-class-properties/src/index.js b/packages/babel-plugin-syntax-class-properties/src/index.js
index fc3f176e037f..113fcbf9a245 100644
--- a/packages/babel-plugin-syntax-class-properties/src/index.js
+++ b/packages/babel-plugin-syntax-class-properties/src/index.js
@@ -4,8 +4,14 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-class-properties",
+
     manipulateOptions(opts, parserOpts) {
-      parserOpts.plugins.push("classProperties", "classPrivateProperties");
+      parserOpts.plugins.push(
+        "classProperties",
+        "classPrivateProperties",
+        "classPrivateMethods",
+      );
     },
   };
 });
diff --git a/packages/babel-plugin-syntax-decorators/package.json b/packages/babel-plugin-syntax-decorators/package.json
index 67ab13ed283c..a8bae4e61af0 100644
--- a/packages/babel-plugin-syntax-decorators/package.json
+++ b/packages/babel-plugin-syntax-decorators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-decorators",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Allow parsing of decorators",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-decorators",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-decorators/src/index.js b/packages/babel-plugin-syntax-decorators/src/index.js
index 5185a067f992..a825adfd77a5 100644
--- a/packages/babel-plugin-syntax-decorators/src/index.js
+++ b/packages/babel-plugin-syntax-decorators/src/index.js
@@ -30,6 +30,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "syntax-decorators",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push(
         legacy
diff --git a/packages/babel-plugin-syntax-do-expressions/package.json b/packages/babel-plugin-syntax-do-expressions/package.json
index 6cf5d051c431..d95b511792ad 100644
--- a/packages/babel-plugin-syntax-do-expressions/package.json
+++ b/packages/babel-plugin-syntax-do-expressions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-do-expressions",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of do expressions",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-do-expressions",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-do-expressions/src/index.js b/packages/babel-plugin-syntax-do-expressions/src/index.js
index 5105beed9c64..f42c925550a4 100644
--- a/packages/babel-plugin-syntax-do-expressions/src/index.js
+++ b/packages/babel-plugin-syntax-do-expressions/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-do-expressions",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("doExpressions");
     },
diff --git a/packages/babel-plugin-syntax-dynamic-import/package.json b/packages/babel-plugin-syntax-dynamic-import/package.json
index b9fe12424060..23240cbaa16e 100644
--- a/packages/babel-plugin-syntax-dynamic-import/package.json
+++ b/packages/babel-plugin-syntax-dynamic-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-dynamic-import",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of import()",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-dynamic-import",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-dynamic-import/src/index.js b/packages/babel-plugin-syntax-dynamic-import/src/index.js
index bb6dde61e46b..13914e3ada57 100644
--- a/packages/babel-plugin-syntax-dynamic-import/src/index.js
+++ b/packages/babel-plugin-syntax-dynamic-import/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-dynamic-import",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("dynamicImport");
     },
diff --git a/packages/babel-plugin-syntax-export-default-from/package.json b/packages/babel-plugin-syntax-export-default-from/package.json
index 59282ced987f..7c2f2ab05435 100644
--- a/packages/babel-plugin-syntax-export-default-from/package.json
+++ b/packages/babel-plugin-syntax-export-default-from/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-export-default-from",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of export default from",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-export-default-from",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-export-default-from/src/index.js b/packages/babel-plugin-syntax-export-default-from/src/index.js
index fcb0b794492c..078a1be36ec5 100644
--- a/packages/babel-plugin-syntax-export-default-from/src/index.js
+++ b/packages/babel-plugin-syntax-export-default-from/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-export-default-from",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("exportDefaultFrom");
     },
diff --git a/packages/babel-plugin-syntax-export-namespace-from/package.json b/packages/babel-plugin-syntax-export-namespace-from/package.json
index 9c6a6a20dc08..fde4093e1be8 100644
--- a/packages/babel-plugin-syntax-export-namespace-from/package.json
+++ b/packages/babel-plugin-syntax-export-namespace-from/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-export-namespace-from",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of export namespace from",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-export-namespace-from",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-export-namespace-from/src/index.js b/packages/babel-plugin-syntax-export-namespace-from/src/index.js
index 21446499a6a0..3bf85c518390 100644
--- a/packages/babel-plugin-syntax-export-namespace-from/src/index.js
+++ b/packages/babel-plugin-syntax-export-namespace-from/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-export-namespace-from",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("exportNamespaceFrom");
     },
diff --git a/packages/babel-plugin-syntax-flow/package.json b/packages/babel-plugin-syntax-flow/package.json
index 409a14de8ff5..864023567a5d 100644
--- a/packages/babel-plugin-syntax-flow/package.json
+++ b/packages/babel-plugin-syntax-flow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-flow",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of the flow syntax",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-flow",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-flow/src/index.js b/packages/babel-plugin-syntax-flow/src/index.js
index 7f80f4843a31..0062dbee50e6 100644
--- a/packages/babel-plugin-syntax-flow/src/index.js
+++ b/packages/babel-plugin-syntax-flow/src/index.js
@@ -12,6 +12,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "syntax-flow",
+
     manipulateOptions(opts, parserOpts) {
       // If the file has already enabled TS, assume that this is not a
       // valid Flowtype file.
diff --git a/packages/babel-plugin-syntax-function-bind/package.json b/packages/babel-plugin-syntax-function-bind/package.json
index b1391f57f814..86cf0265d67e 100644
--- a/packages/babel-plugin-syntax-function-bind/package.json
+++ b/packages/babel-plugin-syntax-function-bind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-function-bind",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of function bind",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-function-bind",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-function-bind/src/index.js b/packages/babel-plugin-syntax-function-bind/src/index.js
index 98c5082f88bc..f7486f73cf99 100644
--- a/packages/babel-plugin-syntax-function-bind/src/index.js
+++ b/packages/babel-plugin-syntax-function-bind/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-function-bind",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("functionBind");
     },
diff --git a/packages/babel-plugin-syntax-function-sent/package.json b/packages/babel-plugin-syntax-function-sent/package.json
index 2b1b6ce7d0dc..1b503528cb48 100644
--- a/packages/babel-plugin-syntax-function-sent/package.json
+++ b/packages/babel-plugin-syntax-function-sent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-function-sent",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of the function.sent meta property",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-function-sent",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-function-sent/src/index.js b/packages/babel-plugin-syntax-function-sent/src/index.js
index cb8471dd4af3..4dfad81d44e5 100644
--- a/packages/babel-plugin-syntax-function-sent/src/index.js
+++ b/packages/babel-plugin-syntax-function-sent/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-function-sent",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("functionSent");
     },
diff --git a/packages/babel-plugin-syntax-import-meta/package.json b/packages/babel-plugin-syntax-import-meta/package.json
index 95482ff5a62e..25c7cb70c748 100644
--- a/packages/babel-plugin-syntax-import-meta/package.json
+++ b/packages/babel-plugin-syntax-import-meta/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-import-meta",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of import.meta",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-import-meta",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-import-meta/src/index.js b/packages/babel-plugin-syntax-import-meta/src/index.js
index 36e22743b08c..efdbcba095df 100644
--- a/packages/babel-plugin-syntax-import-meta/src/index.js
+++ b/packages/babel-plugin-syntax-import-meta/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-import-meta",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("importMeta");
     },
diff --git a/packages/babel-plugin-syntax-json-strings/package.json b/packages/babel-plugin-syntax-json-strings/package.json
index 807e4a45b55b..3f1dcab3841e 100644
--- a/packages/babel-plugin-syntax-json-strings/package.json
+++ b/packages/babel-plugin-syntax-json-strings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-json-strings",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of the U+2028 LINE SEPARATOR and U+2029 PARAGRAPH SEPARATOR in JS strings",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-json-strings/src/index.js b/packages/babel-plugin-syntax-json-strings/src/index.js
index c6200a4b1772..0a61997b8a6f 100644
--- a/packages/babel-plugin-syntax-json-strings/src/index.js
+++ b/packages/babel-plugin-syntax-json-strings/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-json-strings",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("jsonStrings");
     },
diff --git a/packages/babel-plugin-syntax-jsx/package.json b/packages/babel-plugin-syntax-jsx/package.json
index f574ff3289e4..dd4ead2baaf8 100644
--- a/packages/babel-plugin-syntax-jsx/package.json
+++ b/packages/babel-plugin-syntax-jsx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-jsx",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of jsx",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-jsx",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-jsx/src/index.js b/packages/babel-plugin-syntax-jsx/src/index.js
index 33b751f6c701..e9d2ae493828 100644
--- a/packages/babel-plugin-syntax-jsx/src/index.js
+++ b/packages/babel-plugin-syntax-jsx/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-jsx",
+
     manipulateOptions(opts, parserOpts) {
       // If the Typescript plugin already ran, it will have decided whether
       // or not this is a TSX file.
diff --git a/packages/babel-plugin-syntax-logical-assignment-operators/package.json b/packages/babel-plugin-syntax-logical-assignment-operators/package.json
index 5d0520e9ef36..aeea2eaa72e7 100644
--- a/packages/babel-plugin-syntax-logical-assignment-operators/package.json
+++ b/packages/babel-plugin-syntax-logical-assignment-operators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-logical-assignment-operators",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of the logical assignment operators",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-logical-assignment-operators",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-logical-assignment-operators/src/index.js b/packages/babel-plugin-syntax-logical-assignment-operators/src/index.js
index d283645e1cff..26499ffcb1df 100644
--- a/packages/babel-plugin-syntax-logical-assignment-operators/src/index.js
+++ b/packages/babel-plugin-syntax-logical-assignment-operators/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-logical-assignment-operators",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("logicalAssignment");
     },
diff --git a/packages/babel-plugin-syntax-nullish-coalescing-operator/package.json b/packages/babel-plugin-syntax-nullish-coalescing-operator/package.json
index c95bee00597a..323934061e24 100644
--- a/packages/babel-plugin-syntax-nullish-coalescing-operator/package.json
+++ b/packages/babel-plugin-syntax-nullish-coalescing-operator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-nullish-coalescing-operator",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of the nullish-coalescing operator",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-nullish-coalescing-operator",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-nullish-coalescing-operator/src/index.js b/packages/babel-plugin-syntax-nullish-coalescing-operator/src/index.js
index 69578ca419a1..0bd6c5d70048 100644
--- a/packages/babel-plugin-syntax-nullish-coalescing-operator/src/index.js
+++ b/packages/babel-plugin-syntax-nullish-coalescing-operator/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-nullish-coalescing-operator",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("nullishCoalescingOperator");
     },
diff --git a/packages/babel-plugin-syntax-numeric-separator/package.json b/packages/babel-plugin-syntax-numeric-separator/package.json
index 884336533364..c60d9ccdf975 100644
--- a/packages/babel-plugin-syntax-numeric-separator/package.json
+++ b/packages/babel-plugin-syntax-numeric-separator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-numeric-separator",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of Decimal, Binary, Hex and Octal literals that contain a Numeric Literal Separator",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-numeric-separator",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-numeric-separator/src/index.js b/packages/babel-plugin-syntax-numeric-separator/src/index.js
index 8a9cd625ed31..f4849990d9d4 100644
--- a/packages/babel-plugin-syntax-numeric-separator/src/index.js
+++ b/packages/babel-plugin-syntax-numeric-separator/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-numeric-separator",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("numericSeparator");
     },
diff --git a/packages/babel-plugin-syntax-object-rest-spread/package.json b/packages/babel-plugin-syntax-object-rest-spread/package.json
index 19ca84f4d879..e0b6524d3a5b 100644
--- a/packages/babel-plugin-syntax-object-rest-spread/package.json
+++ b/packages/babel-plugin-syntax-object-rest-spread/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-object-rest-spread",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of object rest/spread",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-object-rest-spread/src/index.js b/packages/babel-plugin-syntax-object-rest-spread/src/index.js
index 7cd1b759a403..66f909c5a1d9 100644
--- a/packages/babel-plugin-syntax-object-rest-spread/src/index.js
+++ b/packages/babel-plugin-syntax-object-rest-spread/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-object-rest-spread",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("objectRestSpread");
     },
diff --git a/packages/babel-plugin-syntax-optional-catch-binding/package.json b/packages/babel-plugin-syntax-optional-catch-binding/package.json
index 4888105a3c4e..09e1ff1b176f 100644
--- a/packages/babel-plugin-syntax-optional-catch-binding/package.json
+++ b/packages/babel-plugin-syntax-optional-catch-binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-optional-catch-binding",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of optional catch bindings",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-optional-catch-binding/src/index.js b/packages/babel-plugin-syntax-optional-catch-binding/src/index.js
index 466b78e570f3..68de2be52c31 100644
--- a/packages/babel-plugin-syntax-optional-catch-binding/src/index.js
+++ b/packages/babel-plugin-syntax-optional-catch-binding/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-optional-catch-binding",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("optionalCatchBinding");
     },
diff --git a/packages/babel-plugin-syntax-optional-chaining/package.json b/packages/babel-plugin-syntax-optional-chaining/package.json
index 59927aeeacb4..22adb320d437 100644
--- a/packages/babel-plugin-syntax-optional-chaining/package.json
+++ b/packages/babel-plugin-syntax-optional-chaining/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-optional-chaining",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of optional properties",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-chaining",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-optional-chaining/src/index.js b/packages/babel-plugin-syntax-optional-chaining/src/index.js
index 5677a39ee9d7..968f34dd728e 100644
--- a/packages/babel-plugin-syntax-optional-chaining/src/index.js
+++ b/packages/babel-plugin-syntax-optional-chaining/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-optional-chaining",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("optionalChaining");
     },
diff --git a/packages/babel-plugin-syntax-partial-application/.npmignore b/packages/babel-plugin-syntax-partial-application/.npmignore
new file mode 100644
index 000000000000..f9806945836e
--- /dev/null
+++ b/packages/babel-plugin-syntax-partial-application/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-plugin-syntax-partial-application/README.md b/packages/babel-plugin-syntax-partial-application/README.md
new file mode 100644
index 000000000000..11603ae13fa5
--- /dev/null
+++ b/packages/babel-plugin-syntax-partial-application/README.md
@@ -0,0 +1,19 @@
+# @babel/plugin-syntax-partial-application
+
+> Allow parsing of partial application syntax
+
+See our website [@babel/plugin-syntax-partial-application](https://babeljs.io/docs/en/next/babel-plugin-syntax-partial-application.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/plugin-syntax-partial-application
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/plugin-syntax-partial-application --dev
+```
diff --git a/packages/babel-plugin-syntax-partial-application/package.json b/packages/babel-plugin-syntax-partial-application/package.json
new file mode 100644
index 000000000000..50f8fcdf7e6b
--- /dev/null
+++ b/packages/babel-plugin-syntax-partial-application/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@babel/plugin-syntax-partial-application",
+  "version": "7.4.4",
+  "description": "Allow parsing of partial application syntax",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-partial-application",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin"
+  ],
+  "dependencies": {
+    "@babel/helper-plugin-utils": "^7.0.0"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0-0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.4.4"
+  }
+}
diff --git a/packages/babel-plugin-syntax-partial-application/src/index.js b/packages/babel-plugin-syntax-partial-application/src/index.js
new file mode 100644
index 000000000000..aafcfc315e2a
--- /dev/null
+++ b/packages/babel-plugin-syntax-partial-application/src/index.js
@@ -0,0 +1,13 @@
+import { declare } from "@babel/helper-plugin-utils";
+
+export default declare(api => {
+  api.assertVersion(7);
+
+  return {
+    name: "syntax-partial-application",
+
+    manipulateOptions(opts, parserOpts) {
+      parserOpts.plugins.push("partialApplication");
+    },
+  };
+});
diff --git a/packages/babel-plugin-syntax-pipeline-operator/package.json b/packages/babel-plugin-syntax-pipeline-operator/package.json
index a456a64e55c0..61f571097149 100644
--- a/packages/babel-plugin-syntax-pipeline-operator/package.json
+++ b/packages/babel-plugin-syntax-pipeline-operator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-pipeline-operator",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Allow parsing of the pipeline operator",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-pipeline-operator",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.5.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-pipeline-operator/src/index.js b/packages/babel-plugin-syntax-pipeline-operator/src/index.js
index 9d58042b2090..df904e77644c 100644
--- a/packages/babel-plugin-syntax-pipeline-operator/src/index.js
+++ b/packages/babel-plugin-syntax-pipeline-operator/src/index.js
@@ -1,6 +1,6 @@
 import { declare } from "@babel/helper-plugin-utils";
 
-export const proposals = ["minimal"];
+export const proposals = ["minimal", "smart", "fsharp"];
 
 export default declare((api, { proposal }) => {
   api.assertVersion(7);
@@ -15,6 +15,8 @@ export default declare((api, { proposal }) => {
   }
 
   return {
+    name: "syntax-pipeline-operator",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push(["pipelineOperator", { proposal }]);
     },
diff --git a/packages/babel-plugin-syntax-throw-expressions/package.json b/packages/babel-plugin-syntax-throw-expressions/package.json
index 775c233027d5..55afeeb6b1dc 100644
--- a/packages/babel-plugin-syntax-throw-expressions/package.json
+++ b/packages/babel-plugin-syntax-throw-expressions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-throw-expressions",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Allow parsing of Throw Expressions",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-throw-expressions",
   "license": "MIT",
@@ -18,6 +18,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-syntax-throw-expressions/src/index.js b/packages/babel-plugin-syntax-throw-expressions/src/index.js
index 62150d3655d0..d9164eea2bd4 100644
--- a/packages/babel-plugin-syntax-throw-expressions/src/index.js
+++ b/packages/babel-plugin-syntax-throw-expressions/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-throw-expressions",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("throwExpressions");
     },
diff --git a/packages/babel-plugin-syntax-typescript/package.json b/packages/babel-plugin-syntax-typescript/package.json
index b87262f0ba74..d3410aca3a27 100644
--- a/packages/babel-plugin-syntax-typescript/package.json
+++ b/packages/babel-plugin-syntax-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-syntax-typescript",
-  "version": "7.0.0",
+  "version": "7.3.3",
   "description": "Allow parsing of TypeScript syntax",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-typescript",
   "license": "MIT",
@@ -19,6 +19,6 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0"
+    "@babel/core": "^7.3.3"
   }
 }
diff --git a/packages/babel-plugin-syntax-typescript/src/index.js b/packages/babel-plugin-syntax-typescript/src/index.js
index d804ab18bf7c..c4c5eddaa27b 100644
--- a/packages/babel-plugin-syntax-typescript/src/index.js
+++ b/packages/babel-plugin-syntax-typescript/src/index.js
@@ -19,20 +19,23 @@ export default declare((api, { isTSX }) => {
   api.assertVersion(7);
 
   return {
+    name: "syntax-typescript",
+
     manipulateOptions(opts, parserOpts) {
       const { plugins } = parserOpts;
       // If the Flow syntax plugin already ran, remove it since Typescript
       // takes priority.
       removePlugin(plugins, "flow");
 
-      // If the JSX syntax plugin already ran, remomove it because JSX handling
+      // If the JSX syntax plugin already ran, remove it because JSX handling
       // in TS depends on the extensions, and is purely dependent on 'isTSX'.
       removePlugin(plugins, "jsx");
 
       parserOpts.plugins.push(
         "typescript",
-        "objectRestSpread",
         "classProperties",
+        // TODO: This is enabled by default now, remove in Babel 8
+        "objectRestSpread",
       );
 
       if (isTSX) {
diff --git a/packages/babel-plugin-transform-arrow-functions/package.json b/packages/babel-plugin-transform-arrow-functions/package.json
index ad3838f45941..7506dfc22b99 100644
--- a/packages/babel-plugin-transform-arrow-functions/package.json
+++ b/packages/babel-plugin-transform-arrow-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-arrow-functions",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Compile ES2015 arrow functions to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-arrow-functions",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0",
     "@babel/traverse": "^7.0.0"
   }
diff --git a/packages/babel-plugin-transform-arrow-functions/src/index.js b/packages/babel-plugin-transform-arrow-functions/src/index.js
index bc74d0eedf98..3e323707a887 100644
--- a/packages/babel-plugin-transform-arrow-functions/src/index.js
+++ b/packages/babel-plugin-transform-arrow-functions/src/index.js
@@ -6,6 +6,8 @@ export default declare((api, options) => {
 
   const { spec } = options;
   return {
+    name: "transform-arrow-functions",
+
     visitor: {
       ArrowFunctionExpression(
         path: NodePath<BabelNodeArrowFunctionExpression>,
diff --git a/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/this/output.js b/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/this/output.js
index f13e5374e2bc..bc43aa41d838 100644
--- a/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/this/output.js
+++ b/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/this/output.js
@@ -15,9 +15,10 @@ class Foo extends function () {} {
     };
 
     if (true) {
-      console.log(_this2 = super(), foo());
+      console.log((super(), _this2 = this), foo());
     } else {
-      _this2 = super();
+      super();
+      _this2 = this;
       console.log(foo());
     }
   }
diff --git a/packages/babel-plugin-transform-async-to-generator/package.json b/packages/babel-plugin-transform-async-to-generator/package.json
index 0c33ab5d28bb..d6b8b908e89a 100644
--- a/packages/babel-plugin-transform-async-to-generator/package.json
+++ b/packages/babel-plugin-transform-async-to-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-async-to-generator",
-  "version": "7.1.0",
+  "version": "7.5.0",
   "description": "Turn async functions into ES2015 generators",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-async-to-generator",
   "license": "MIT",
@@ -20,7 +20,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-async-to-generator/src/index.js b/packages/babel-plugin-transform-async-to-generator/src/index.js
index d0aaf7d5c0c1..55669063f13b 100644
--- a/packages/babel-plugin-transform-async-to-generator/src/index.js
+++ b/packages/babel-plugin-transform-async-to-generator/src/index.js
@@ -10,6 +10,8 @@ export default declare((api, options) => {
 
   if (method && module) {
     return {
+      name: "transform-async-to-generator",
+
       visitor: {
         Function(path, state) {
           if (!path.node.async || path.node.generator) return;
@@ -28,6 +30,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "transform-async-to-generator",
+
     visitor: {
       Function(path, state) {
         if (!path.node.async || path.node.generator) return;
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/output.js
index d036604c88eb..1dd679cfa250 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/output.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/output.js
@@ -13,7 +13,7 @@ regeneratorRuntime.mark(function _callee() {
       case "end":
         return _context.stop();
     }
-  }, _callee, this);
+  }, _callee);
 }))();
 babelHelpers.asyncToGenerator(
 /*#__PURE__*/
@@ -47,12 +47,14 @@ regeneratorRuntime.mark(function _callee2() {
         case "end":
           return _context3.stop();
       }
-    }, _callee3, this);
+    }, _callee3);
   }));
 
-  return function notIIFE() {
+  function notIIFE() {
     return _notIIFE.apply(this, arguments);
-  };
+  }
+
+  return notIIFE;
 })();
 
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/output.js
index 5cc5472121a2..97c381e41ed7 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/output.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/output.js
@@ -11,7 +11,7 @@ regeneratorRuntime.mark(function _callee() {
       case "end":
         return _context.stop();
     }
-  }, _callee, this);
+  }, _callee);
 }))();
 babelHelpers.asyncToGenerator(
 /*#__PURE__*/
@@ -26,7 +26,7 @@ regeneratorRuntime.mark(function _callee2() {
       case "end":
         return _context2.stop();
     }
-  }, _callee2, this);
+  }, _callee2);
 }))();
 
 /*#__PURE__*/
@@ -44,12 +44,14 @@ regeneratorRuntime.mark(function _callee2() {
         case "end":
           return _context3.stop();
       }
-    }, _callee3, this);
+    }, _callee3);
   }));
 
-  return function notIIFE() {
+  function notIIFE() {
     return _notIIFE.apply(this, arguments);
-  };
+  }
+
+  return notIIFE;
 })();
 
 /*#__PURE__*/
@@ -66,5 +68,5 @@ regeneratorRuntime.mark(function _callee4() {
       case "end":
         return _context4.stop();
     }
-  }, _callee4, this);
+  }, _callee4);
 }));
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife/output.js
index 293c2722a5c8..825c719c2d65 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife/output.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife/output.js
@@ -11,9 +11,11 @@ babelHelpers.asyncToGenerator(function* () {
     yield 'ok';
   });
 
-  return function notIIFE() {
+  function notIIFE() {
     return _notIIFE.apply(this, arguments);
-  };
+  }
+
+  return notIIFE;
 })();
 
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/output.js
index 2a8d624a4e2b..9dad5008a8ed 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/output.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/output.js
@@ -5,7 +5,9 @@ function () {
     console.log(bar);
   });
 
-  return function bar() {
+  function bar() {
     return _bar.apply(this, arguments);
-  };
+  }
+
+  return bar;
 }();
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/named-expression/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/named-expression/output.js
index d84f51a71eac..7bbf45dac641 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/named-expression/output.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/named-expression/output.js
@@ -7,7 +7,9 @@ function () {
     console.log(bar);
   });
 
-  return function bar() {
+  function bar() {
     return _bar.apply(this, arguments);
-  };
+  }
+
+  return bar;
 }();
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/exec.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/exec.js
index 12f604438409..c8839c7358f9 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/exec.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/exec.js
@@ -9,5 +9,5 @@ async function foo({ a, b = mandatory("b") } = {}) {
 }
 
 return foo().then(() => {
-  throw new Error('should not occcur');
+  throw new Error('should not occur');
 }, () => true);
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/exec.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/exec.js
new file mode 100644
index 000000000000..4feaef3d1ea4
--- /dev/null
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/exec.js
@@ -0,0 +1,14 @@
+let log = [];
+
+let resolve;
+const main = new Promise(r => { resolve = r });
+
+(async function poll(count) {
+  log.push(await Promise.resolve(count))
+  if (count < 3) setTimeout(poll, 10, count + 1);
+  else resolve();
+})(0)
+
+return main.then(() => {
+  expect(log).toEqual([0, 1, 2, 3]);
+});
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/input.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/input.js
new file mode 100644
index 000000000000..3dc7ee537238
--- /dev/null
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/input.js
@@ -0,0 +1,4 @@
+(async function poll() {
+  console.log(await Promise.resolve('Hello'))
+  setTimeout(poll, 1000);
+})();
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/options.json
new file mode 100644
index 000000000000..37be843c6eed
--- /dev/null
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": ["transform-async-to-generator"],
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/output.js
new file mode 100644
index 000000000000..39a8061003c9
--- /dev/null
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/output.js
@@ -0,0 +1,16 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+(function () {
+  var _poll = _asyncToGenerator(function* () {
+    console.log((yield Promise.resolve('Hello')));
+    setTimeout(poll, 1000);
+  });
+
+  function poll() {
+    return _poll.apply(this, arguments);
+  }
+
+  return poll;
+})()();
diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/gh-6923/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/gh-6923/output.js
index ac46ce86c686..e42a824bdc78 100644
--- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/gh-6923/output.js
+++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/gh-6923/output.js
@@ -24,7 +24,7 @@ function _foo() {
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, this);
+              }, _callee);
             }));
 
             return function (_x) {
@@ -36,7 +36,7 @@ function _foo() {
         case "end":
           return _context2.stop();
       }
-    }, _callee2, this);
+    }, _callee2);
   }));
   return _foo.apply(this, arguments);
 }
diff --git a/packages/babel-plugin-transform-block-scoped-functions/package.json b/packages/babel-plugin-transform-block-scoped-functions/package.json
index 13203de4296e..b6ea3d6117f3 100644
--- a/packages/babel-plugin-transform-block-scoped-functions/package.json
+++ b/packages/babel-plugin-transform-block-scoped-functions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-block-scoped-functions",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Babel plugin to ensure function declarations at the block level are block scoped",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoped-functions",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-block-scoped-functions/src/index.js b/packages/babel-plugin-transform-block-scoped-functions/src/index.js
index 1f1783dc9e86..79b9b27e2b47 100644
--- a/packages/babel-plugin-transform-block-scoped-functions/src/index.js
+++ b/packages/babel-plugin-transform-block-scoped-functions/src/index.js
@@ -26,6 +26,8 @@ export default declare(api => {
   }
 
   return {
+    name: "transform-block-scoped-functions",
+
     visitor: {
       BlockStatement(path) {
         const { node, parent } = path;
diff --git a/packages/babel-plugin-transform-block-scoping/package.json b/packages/babel-plugin-transform-block-scoping/package.json
index a0af9db80ef7..d942568230ab 100644
--- a/packages/babel-plugin-transform-block-scoping/package.json
+++ b/packages/babel-plugin-transform-block-scoping/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-block-scoping",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Compile ES2015 block scoping (const and let) to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-block-scoping",
   "license": "MIT",
@@ -10,7 +10,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "lodash": "^4.17.10"
+    "lodash": "^4.17.13"
   },
   "keywords": [
     "babel-plugin"
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-block-scoping/src/index.js b/packages/babel-plugin-transform-block-scoping/src/index.js
index 560368cf0fbf..50c254c848a8 100644
--- a/packages/babel-plugin-transform-block-scoping/src/index.js
+++ b/packages/babel-plugin-transform-block-scoping/src/index.js
@@ -16,10 +16,12 @@ export default declare((api, opts) => {
     throw new Error(`.throwIfClosureRequired must be a boolean, or undefined`);
   }
   if (typeof tdzEnabled !== "boolean") {
-    throw new Error(`.throwIfClosureRequired must be a boolean, or undefined`);
+    throw new Error(`.tdz must be a boolean, or undefined`);
   }
 
   return {
+    name: "transform-block-scoping",
+
     visitor: {
       VariableDeclaration(path) {
         const { node, parent, scope } = path;
@@ -31,11 +33,13 @@ export default declare((api, opts) => {
 
           for (let i = 0; i < node.declarations.length; i++) {
             const decl = node.declarations[i];
-            if (decl.init) {
-              const assign = t.assignmentExpression("=", decl.id, decl.init);
-              assign._ignoreBlockScopingTDZ = true;
-              nodes.push(t.expressionStatement(assign));
-            }
+            const assign = t.assignmentExpression(
+              "=",
+              decl.id,
+              decl.init || scope.buildUndefinedNode(),
+            );
+            assign._ignoreBlockScopingTDZ = true;
+            nodes.push(t.expressionStatement(assign));
             decl.init = this.addHelper("temporalUndefined");
           }
 
@@ -151,8 +155,7 @@ function convertBlockScopedToVar(
   // Move bindings from current block scope to function scope.
   if (moveBindingsToParent) {
     const parentScope = scope.getFunctionParent() || scope.getProgramParent();
-    const ids = path.getBindingIdentifiers();
-    for (const name in ids) {
+    for (const name of Object.keys(path.getBindingIdentifiers())) {
       const binding = scope.getOwnBinding(name);
       if (binding) binding.kind = "var";
       scope.moveBindingTo(name, parentScope);
@@ -180,6 +183,8 @@ const letReferenceBlockVisitor = traverse.visitors.merge([
       // simply rename the variables.
       if (state.loopDepth > 0) {
         path.traverse(letReferenceFunctionVisitor, state);
+      } else {
+        path.traverse(tdzVisitor, state);
       }
       return path.skip();
     },
@@ -243,8 +248,7 @@ const loopLabelVisitor = {
 const continuationVisitor = {
   enter(path, state) {
     if (path.isAssignmentExpression() || path.isUpdateExpression()) {
-      const bindings = path.getBindingIdentifiers();
-      for (const name in bindings) {
+      for (const name of Object.keys(path.getBindingIdentifiers())) {
         if (
           state.outsideReferences[name] !==
           path.scope.getBindingIdentifier(name)
@@ -289,7 +293,7 @@ const loopVisitor = {
   },
 
   "BreakStatement|ContinueStatement|ReturnStatement"(path, state) {
-    const { node, parent, scope } = path;
+    const { node, scope } = path;
     if (node[this.LOOP_IGNORE]) return;
 
     let replace;
@@ -309,7 +313,7 @@ const loopVisitor = {
         if (state.ignoreLabeless) return;
 
         // break statements mean something different in this context
-        if (t.isBreakStatement(node) && t.isSwitchCase(parent)) return;
+        if (t.isBreakStatement(node) && state.inSwitchCase) return;
       }
 
       state.hasBreakContinue = true;
@@ -408,7 +412,7 @@ class BlockScoping {
     const scope = this.scope;
     const state = this.state;
 
-    for (const name in scope.bindings) {
+    for (const name of Object.keys(scope.bindings)) {
       const binding = scope.bindings[name];
       if (binding.kind !== "const") continue;
 
@@ -442,7 +446,7 @@ class BlockScoping {
     const parentScope = scope.getFunctionParent() || scope.getProgramParent();
     const letRefs = this.letReferences;
 
-    for (const key in letRefs) {
+    for (const key of Object.keys(letRefs)) {
       const ref = letRefs[key];
       const binding = scope.getBinding(ref.name);
       if (!binding) continue;
@@ -460,14 +464,16 @@ class BlockScoping {
 
   remap() {
     const letRefs = this.letReferences;
+    const outsideLetRefs = this.outsideLetReferences;
     const scope = this.scope;
+    const blockPathScope = this.blockPath.scope;
 
     // alright, so since we aren't wrapping this block in a closure
     // we have to check if any of our let variables collide with
     // those in upper scopes and then if they do, generate a uid
     // for them and replace all references with it
 
-    for (const key in letRefs) {
+    for (const key of Object.keys(letRefs)) {
       // just an Identifier node we collected in `getLetReferences`
       // this is the defining identifier of a declaration
       const ref = letRefs[key];
@@ -481,11 +487,20 @@ class BlockScoping {
           scope.rename(ref.name);
         }
 
-        if (this.blockPath.scope.hasOwnBinding(key)) {
-          this.blockPath.scope.rename(ref.name);
+        if (blockPathScope.hasOwnBinding(key)) {
+          blockPathScope.rename(ref.name);
         }
       }
     }
+
+    for (const key of Object.keys(outsideLetRefs)) {
+      const ref = letRefs[key];
+      // check for collisions with a for loop's init variable and the enclosing scope's bindings
+      // https://github.com/babel/babel/issues/8498
+      if (isInLoop(this.blockPath) && blockPathScope.hasOwnBinding(key)) {
+        blockPathScope.rename(ref.name);
+      }
+    }
   }
 
   wrapClosure() {
@@ -501,7 +516,7 @@ class BlockScoping {
 
     // remap loop heads with colliding variables
     if (this.loop) {
-      for (const name in outsideRefs) {
+      for (const name of Object.keys(outsideRefs)) {
         const id = outsideRefs[name];
 
         if (
@@ -745,7 +760,7 @@ class BlockScoping {
       closurify: false,
       loopDepth: 0,
       tdzEnabled: this.tdzEnabled,
-      addHelper: name => this.addHelper(name),
+      addHelper: name => this.state.addHelper(name),
     };
 
     if (isInLoop(this.blockPath)) {
@@ -801,7 +816,7 @@ class BlockScoping {
   pushDeclar(node: { type: "VariableDeclaration" }): Array<Object> {
     const declars = [];
     const names = t.getBindingIdentifiers(node);
-    for (const name in names) {
+    for (const name of Object.keys(names)) {
       declars.push(t.variableDeclarator(names[name]));
     }
 
@@ -839,7 +854,7 @@ class BlockScoping {
     }
 
     if (has.hasBreakContinue) {
-      for (const key in has.map) {
+      for (const key of Object.keys(has.map)) {
         cases.push(t.switchCase(t.stringLiteral(key), [has.map[key]]));
       }
 
diff --git a/packages/babel-plugin-transform-block-scoping/src/tdz.js b/packages/babel-plugin-transform-block-scoping/src/tdz.js
index e1423513489e..0588e2a276d1 100644
--- a/packages/babel-plugin-transform-block-scoping/src/tdz.js
+++ b/packages/babel-plugin-transform-block-scoping/src/tdz.js
@@ -1,12 +1,12 @@
-import { types as t } from "@babel/core";
+import { types as t, template } from "@babel/core";
 
 function getTDZStatus(refPath, bindingPath) {
   const executionStatus = bindingPath._guessExecutionStatusRelativeTo(refPath);
 
   if (executionStatus === "before") {
-    return "inside";
-  } else if (executionStatus === "after") {
     return "outside";
+  } else if (executionStatus === "after") {
+    return "inside";
   } else {
     return "maybe";
   }
@@ -41,7 +41,7 @@ export const visitor = {
     if (bindingPath.isFunctionDeclaration()) return;
 
     const status = getTDZStatus(path, bindingPath);
-    if (status === "inside") return;
+    if (status === "outside") return;
 
     if (status === "maybe") {
       const assert = buildTDZAssert(node, state);
@@ -57,19 +57,8 @@ export const visitor = {
       } else {
         path.replaceWith(assert);
       }
-    } else if (status === "outside") {
-      path.replaceWith(
-        t.throwStatement(
-          t.inherits(
-            t.newExpression(t.identifier("ReferenceError"), [
-              t.stringLiteral(
-                `${node.name} is not defined - temporal dead zone`,
-              ),
-            ]),
-            node,
-          ),
-        ),
-      );
+    } else if (status === "inside") {
+      path.replaceWith(template.ast`${state.addHelper("tdz")}("${node.name}")`);
     }
   },
 
@@ -83,18 +72,18 @@ export const visitor = {
       const nodes = [];
       const ids = path.getBindingIdentifiers();
 
-      for (const name in ids) {
+      for (const name of Object.keys(ids)) {
         const id = ids[name];
 
         if (isReference(id, path.scope, state)) {
-          nodes.push(buildTDZAssert(id, state));
+          nodes.push(id);
         }
       }
 
       if (nodes.length) {
         node._ignoreBlockScopingTDZ = true;
         nodes.push(node);
-        path.replaceWithMultiple(nodes.map(t.expressionStatement));
+        path.replaceWithMultiple(nodes.map(n => t.expressionStatement(n)));
       }
     },
   },
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-classes/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-classes/input.js
deleted file mode 100644
index 4d0266bd50d6..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-classes/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const MULTIPLIER = 5;
-
-class MULTIPLIER {
-
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-classes/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-classes/options.json
deleted file mode 100644
index 8901cbf81b9b..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-classes/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Duplicate declaration \"MULTIPLIER\""
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-declaration/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-declaration/input.js
deleted file mode 100644
index ccb0ca0d0544..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-declaration/input.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const MULTIPLIER = 5;
-
-var MULTIPLIER = "overwrite";
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-declaration/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-declaration/options.json
deleted file mode 100644
index 8901cbf81b9b..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-declaration/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Duplicate declaration \"MULTIPLIER\""
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-functions/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-functions/input.js
deleted file mode 100644
index 8b3451172fee..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-functions/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const MULTIPLIER = 5;
-
-function MULTIPLIER() {
-
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-functions/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-functions/options.json
deleted file mode 100644
index 8901cbf81b9b..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-functions/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Duplicate declaration \"MULTIPLIER\""
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js
index 877467f94cfd..3014558a0261 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/scope-bindings.js
@@ -5,6 +5,7 @@ if (x) {
 
 var innerScope = true;
 var res = transform(code, {
+  configFile: false,
   plugins: opts.plugins.concat([
     function (b) {
       var t = b.types;
@@ -34,3 +35,4 @@ if (x) {
 }`;
 
 expect(res.code).toBe(expected);
+expect(innerScope).toBe(false);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/switch-labeled-break.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/switch-labeled-break.js
new file mode 100644
index 000000000000..a81996184293
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/exec/switch-labeled-break.js
@@ -0,0 +1,14 @@
+// it shouldn't break on a case-break statement
+var i;
+the_loop: for (i = 0; i < 10; i++) {
+  switch (i) {
+    case 3: {
+      break the_loop;
+    }
+  }
+
+  const z = 3; // to force the plugin to convert to loop function call
+  () => z;
+}
+
+expect(i).toBe(3);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/exec.js
new file mode 100644
index 000000000000..6ab05df0697c
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/exec.js
@@ -0,0 +1,51 @@
+// it shouldn't break on a case-break statement
+var i;
+for (i = 0; i < 10; i++) {
+  switch (i) {
+    case 1: {
+      break;
+    }
+  }
+
+  const z = 3; // to force the plugin to convert to loop function call
+  () => z;
+}
+
+expect(i).toBe(10);
+
+// it should continue on continue statements within switch
+var j = 0;
+for (i = 0; i < 10; i++) {
+  switch (i) {
+    case 0: {
+      continue;
+    }
+  }
+  j++;
+
+  const z = 3;
+  () => z;
+}
+
+expect(j).toBe(9);
+
+// it should work with loops nested within switch
+j = 0;
+for (i = 0; i < 10; i++) {
+  switch (i) {
+    case 0: {
+      for (var k = 0; k < 10; k++) {
+        const z = 3;
+        () => z;
+        j++;
+        break;
+      }
+      break;
+    }
+  }
+
+  const z = 3;
+  () => z;
+}
+
+expect(j).toBe(1);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/input.js
new file mode 100644
index 000000000000..39e162890d03
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/input.js
@@ -0,0 +1,48 @@
+// it shouldn't break on a case-break statement
+var i;
+for (i = 0; i < 10; i++) {
+  switch (i) {
+    case 1:
+      break;
+  }
+
+  const z = 3; // to force the plugin to convert to loop function call
+  () => z;
+}
+
+expect(i).toBe(10);
+
+// it should continue on continue statements within switch
+var j = 0;
+for (i = 0; i < 10; i++) {
+  switch (i) {
+    case 0:
+      continue;
+  }
+  j++;
+
+  const z = 3;
+  () => z;
+}
+
+expect(j).toBe(9);
+
+// it should work with loops nested within switch
+j = 0;
+for (i = 0; i < 10; i++) {
+  switch (i) {
+    case 0:
+      for (var k = 0; k < 10; k++) {
+        const z = 3;
+        () => z;
+        j++;
+        break;
+      }
+      break;
+  }
+
+  const z = 3;
+  () => z;
+}
+
+expect(j).toBe(1);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/output.js
new file mode 100644
index 000000000000..2e502dabfae3
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/block-inside-switch-inside-loop/output.js
@@ -0,0 +1,85 @@
+// it shouldn't break on a case-break statement
+var i;
+
+var _loop = function () {
+  switch (i) {
+    case 1:
+      break;
+  }
+
+  var z = 3; // to force the plugin to convert to loop function call
+
+  (function () {
+    return z;
+  });
+};
+
+for (i = 0; i < 10; i++) {
+  _loop();
+}
+
+expect(i).toBe(10); // it should continue on continue statements within switch
+
+var j = 0;
+
+var _loop2 = function () {
+  switch (i) {
+    case 0:
+      return "continue";
+  }
+
+  j++;
+  var z = 3;
+
+  (function () {
+    return z;
+  });
+};
+
+for (i = 0; i < 10; i++) {
+  var _ret = _loop2();
+
+  if (_ret === "continue") continue;
+}
+
+expect(j).toBe(9); // it should work with loops nested within switch
+
+j = 0;
+
+var _loop3 = function () {
+  switch (i) {
+    case 0:
+      var _loop4 = function () {
+        var z = 3;
+
+        (function () {
+          return z;
+        });
+
+        j++;
+        return "break";
+      };
+
+      for (k = 0; k < 10; k++) {
+        var _ret2 = _loop4();
+
+        if (_ret2 === "break") break;
+      }
+
+      break;
+  }
+
+  var z = 3;
+
+  (function () {
+    return z;
+  });
+};
+
+for (i = 0; i < 10; i++) {
+  var k;
+
+  _loop3();
+}
+
+expect(j).toBe(1);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-5979/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-5979/input.js
deleted file mode 100644
index 301ed2e804e8..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-5979/input.js
+++ /dev/null
@@ -1 +0,0 @@
-try {} catch (a) { let a }
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-5979/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-5979/options.json
deleted file mode 100644
index ca26076ba7ea..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-5979/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Duplicate declaration \"a\""
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/input.js
new file mode 100644
index 000000000000..7d59ce437b19
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/input.js
@@ -0,0 +1,7 @@
+for (let a, { b } = {};;) {
+  let a, { b } = {};
+
+  {
+    let a, { b } = {};
+  }
+}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/options.json
new file mode 100644
index 000000000000..9df3780bbc43
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-destructuring", "transform-block-scoping"]
+}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/output.js
new file mode 100644
index 000000000000..d69de3a075a2
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision-destructuring/output.js
@@ -0,0 +1,11 @@
+for (var a, _ref = {}, b = _ref.b;;) {
+  var _a = void 0,
+      _ref2 = {},
+      _b = _ref2.b;
+
+  {
+    var _a2 = void 0,
+        _ref3 = {},
+        _b2 = _ref3.b;
+  }
+}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision/input.js
new file mode 100644
index 000000000000..9a2f0f21ecde
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision/input.js
@@ -0,0 +1,8 @@
+for (let i = 0; i < 3; i++) {
+    let i = 'abc';
+    console.log(i);
+
+    {
+      let i = "hello";
+    }
+}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision/output.js
new file mode 100644
index 000000000000..a08721ee5e33
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-8498-loop-init-collision/output.js
@@ -0,0 +1,7 @@
+for (var i = 0; i < 3; i++) {
+  var _i = 'abc';
+  console.log(_i);
+  {
+    var _i2 = "hello";
+  }
+}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/exec.js
index f62c4127af3c..759123317338 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/exec.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/exec.js
@@ -1,3 +1,5 @@
-f();
+expect(() => {
+  f();
 
-const f = function f() {}
+  const f = function f() {}
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/input.js
new file mode 100644
index 000000000000..f62c4127af3c
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/input.js
@@ -0,0 +1,3 @@
+f();
+
+const f = function f() {}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/options.json
deleted file mode 100644
index 7a63bc19c6c6..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "f is not defined - temporal dead zone"
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/output.js
new file mode 100644
index 000000000000..6ef35b6f90bf
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/block-ref-function-call/output.js
@@ -0,0 +1,3 @@
+babelHelpers.tdz("f")();
+
+var f = function f() {};
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/exec.js
index 166d7445f1ff..95ff7d58546f 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/exec.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/exec.js
@@ -1 +1,3 @@
-let { b: d } = { d }
+expect(() => {
+  let { b: d } = { d }
+}).toThrow(ReferenceError);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/input.js
new file mode 100644
index 000000000000..166d7445f1ff
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/input.js
@@ -0,0 +1 @@
+let { b: d } = { d }
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/options.json
deleted file mode 100644
index e727ad851d25..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "d is not defined - temporal dead zone"
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/output.js
new file mode 100644
index 000000000000..e80677c113d3
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/destructured-self-reference/output.js
@@ -0,0 +1,5 @@
+var {
+  b: d
+} = {
+  d: babelHelpers.tdz("d")
+};
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/exec.js
new file mode 100644
index 000000000000..57f99f6fd0ae
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/exec.js
@@ -0,0 +1,7 @@
+expect(() => {
+  function f() {
+    x;
+  }
+  let x;
+  f();
+}).not.toThrow();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-no-throw/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/input.js
similarity index 100%
rename from packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-no-throw/exec.js
rename to packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/input.js
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/output.js
new file mode 100644
index 000000000000..0666189283c9
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-after/output.js
@@ -0,0 +1,6 @@
+function f() {
+  x;
+}
+
+var x;
+f();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/exec.js
new file mode 100644
index 000000000000..afd1da8d03bd
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/exec.js
@@ -0,0 +1,7 @@
+expect(() => {
+  function f() {
+    x;
+  }
+  f();
+  let x;
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/input.js
new file mode 100644
index 000000000000..65d75d718937
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/input.js
@@ -0,0 +1,5 @@
+function f() {
+    x;
+}
+f();
+let x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/output.js
new file mode 100644
index 000000000000..12dfbdd8c187
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-before/output.js
@@ -0,0 +1,6 @@
+function f() {
+  babelHelpers.tdz("x");
+}
+
+f();
+var x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/exec.js
new file mode 100644
index 000000000000..04e3cc201038
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/exec.js
@@ -0,0 +1,6 @@
+expect(() => {
+  function f() { x }
+  Math.random() === 2 && f();
+  let x;
+  f();
+}).not.toThrow();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/input.js
new file mode 100644
index 000000000000..9f43c5a414d7
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/input.js
@@ -0,0 +1,4 @@
+function f() { x }
+Math.random() === 2 && f();
+let x;
+f();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/output.js
new file mode 100644
index 000000000000..be10d14b421e
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-real-after/output.js
@@ -0,0 +1,9 @@
+var x = babelHelpers.temporalUndefined;
+
+function f() {
+  babelHelpers.temporalRef(x, "x");
+}
+
+Math.random() === 2 && f();
+x = void 0;
+f();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/exec.js
new file mode 100644
index 000000000000..6b24914bd9a9
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/exec.js
@@ -0,0 +1,5 @@
+function f() { x }
+Math.random() === 2 && f();
+let x = 3;
+
+expect(x).toBe(3);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/input.js
new file mode 100644
index 000000000000..6b24914bd9a9
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/input.js
@@ -0,0 +1,5 @@
+function f() { x }
+Math.random() === 2 && f();
+let x = 3;
+
+expect(x).toBe(3);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/output.js
new file mode 100644
index 000000000000..65855262f71a
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe-value-assign/output.js
@@ -0,0 +1,9 @@
+var x = babelHelpers.temporalUndefined;
+
+function f() {
+  babelHelpers.temporalRef(x, "x");
+}
+
+Math.random() === 2 && f();
+x = 3;
+expect(x).toBe(3);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/exec.js
new file mode 100644
index 000000000000..4b2b4b9e3177
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/exec.js
@@ -0,0 +1,29 @@
+// "random" :)
+let random = (i => {
+  const vals = [0, 0, 1, 1];
+  return () => vals[i++];
+})(0);
+
+expect(() => {
+  function f() { x }
+  random() && f();
+  let x;
+}).not.toThrow();
+
+expect(() => {
+  function f() { x }
+  random() || f();
+  let x;
+}).toThrow(ReferenceError);
+
+expect(() => {
+  function f() { x }
+  random() && f();
+  let x;
+}).toThrow(ReferenceError);
+
+expect(() => {
+  function f() { x }
+  random() || f();
+  let x;
+}).not.toThrow();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/input.js
new file mode 100644
index 000000000000..41390ee1f4a6
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/input.js
@@ -0,0 +1,3 @@
+function f() { x }
+Math.random() && f();
+let x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/output.js
new file mode 100644
index 000000000000..7d416473c45e
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-maybe/output.js
@@ -0,0 +1,9 @@
+var x = babelHelpers.temporalUndefined;
+
+function f() {
+  babelHelpers.temporalRef(x, "x");
+}
+
+Math.random() && f();
+x = void 0;
+void 0;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/exec.js
new file mode 100644
index 000000000000..44763e65ec3f
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/exec.js
@@ -0,0 +1,17 @@
+expect(() => {
+  function f() {
+    return function() { x };
+  }
+  let g = f();
+  let x;
+  g();
+}).not.toThrow();
+
+expect(() => {
+  function f() {
+    return function() { x };
+  }
+  let g = f();
+  g();
+  let x;
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/input.js
new file mode 100644
index 000000000000..473220910b97
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/input.js
@@ -0,0 +1,5 @@
+function f() {
+  return function() { x };
+}
+f();
+let x;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/output.js
new file mode 100644
index 000000000000..262dd53d4306
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-nested-function/output.js
@@ -0,0 +1,11 @@
+var x = babelHelpers.temporalUndefined;
+
+function f() {
+  return function () {
+    babelHelpers.temporalRef(x, "x");
+  };
+}
+
+f();
+x = void 0;
+void 0;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/exec.js
new file mode 100644
index 000000000000..0e7185778c41
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/exec.js
@@ -0,0 +1,9 @@
+expect(() => {
+  function f(i) {
+    if (i) f(i - 1);
+    x;
+  }
+
+  let x;
+  f(3);
+}).not.toThrow();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/input.js
new file mode 100644
index 000000000000..d50d6a69743e
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/input.js
@@ -0,0 +1,7 @@
+function f(i) {
+  if (i) f(i - 1);
+  x;
+}
+
+let x;
+f(3);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/output.js
new file mode 100644
index 000000000000..c63e0af30e2d
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-after/output.js
@@ -0,0 +1,7 @@
+function f(i) {
+  if (i) f(i - 1);
+  x;
+}
+
+var x;
+f(3);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/exec.js
new file mode 100644
index 000000000000..eef606be9fe5
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/exec.js
@@ -0,0 +1,9 @@
+expect(() => {
+  function f(i) {
+    if (i) f(i - 1);
+    x;
+  }
+
+  f(3);
+  let x;
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/input.js
new file mode 100644
index 000000000000..b07cb1e2235f
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/input.js
@@ -0,0 +1,7 @@
+function f(i) {
+  if (i) f(i - 1);
+  x;
+}
+
+f(3);
+let x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/output.js
new file mode 100644
index 000000000000..38da18f3e1ea
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-before/output.js
@@ -0,0 +1,7 @@
+function f(i) {
+  if (i) f(i - 1);
+  babelHelpers.tdz("x");
+}
+
+f(3);
+var x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/exec.js
new file mode 100644
index 000000000000..7dd31073305c
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/exec.js
@@ -0,0 +1,12 @@
+expect(() => {
+  function f(i) {
+    return () => {
+      x;
+      f(i - 1);
+    };
+  }
+
+  const g = f(1);
+  let x;
+  g();
+}).not.toThrow();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/input.js
new file mode 100644
index 000000000000..07c586249f11
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/input.js
@@ -0,0 +1,10 @@
+function f(i) {
+  return () => {
+    x;
+    f(i - 1);
+  };
+}
+
+const g = f(1);
+let x;
+g();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/output.js
new file mode 100644
index 000000000000..0621da46002f
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-call-recursive-reference/output.js
@@ -0,0 +1,12 @@
+var x = babelHelpers.temporalUndefined;
+
+function f(i) {
+  return () => {
+    babelHelpers.temporalRef(x, "x");
+    f(i - 1);
+  };
+}
+
+var g = f(1);
+x = void 0;
+g();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-ref/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-ref/input.js
new file mode 100644
index 000000000000..4955ea61d31a
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-ref/input.js
@@ -0,0 +1,3 @@
+function f() { x }
+maybeCall(f);
+let x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-ref/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-ref/output.js
new file mode 100644
index 000000000000..816fba494e3d
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/function-ref/output.js
@@ -0,0 +1,9 @@
+var x = babelHelpers.temporalUndefined;
+
+function f() {
+  babelHelpers.temporalRef(x, "x");
+}
+
+maybeCall(f);
+x = void 0;
+void 0;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/exec.js
index 4f5fd2025711..254ec1eb3200 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/exec.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/exec.js
@@ -1,3 +1,5 @@
-f();
+expect(() => {
+  f();
 
-function f() {}
+  function f() {}
+}).not.toThrow();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/input.js
new file mode 100644
index 000000000000..4f5fd2025711
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/input.js
@@ -0,0 +1,3 @@
+f();
+
+function f() {}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/output.js
new file mode 100644
index 000000000000..4f5fd2025711
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-function/output.js
@@ -0,0 +1,3 @@
+f();
+
+function f() {}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/exec.js
index 4c3aa2b2feaa..a63f521aa873 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/exec.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/exec.js
@@ -1,3 +1,5 @@
-x = 3;
+expect(() => {
+  x = 3;
 
-var x;
+  var x;
+}).not.toThrow();
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/input.js
new file mode 100644
index 000000000000..4c3aa2b2feaa
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/input.js
@@ -0,0 +1,3 @@
+x = 3;
+
+var x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/output.js
new file mode 100644
index 000000000000..ba478df54193
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/hoisted-var/output.js
@@ -0,0 +1,2 @@
+x = 3;
+var x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json
index 07942e513ebc..e04afdec5da4 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json
@@ -1,3 +1,6 @@
 {
-  "plugins": [["transform-block-scoping", { "tdz": true }]]
+  "plugins": [
+    ["transform-block-scoping", { "tdz": true }],
+    ["external-helpers", { "helperVersion": "7.1000.0" }]
+  ]
 }
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/exec.js
index 29ade8c5aade..a2fbc3b8e865 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/exec.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/exec.js
@@ -1 +1,3 @@
-let x = x;
+expect(() => {
+  let x = x;
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/input.js
new file mode 100644
index 000000000000..29ade8c5aade
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/input.js
@@ -0,0 +1 @@
+let x = x;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/options.json
deleted file mode 100644
index 9bf6222fbc72..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "x is not defined - temporal dead zone"
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/output.js
new file mode 100644
index 000000000000..6b6c616e8b6f
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/self-reference/output.js
@@ -0,0 +1 @@
+var x = babelHelpers.tdz("x");
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/exec.js
index 88558f3540ef..1adbbf90a20a 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/exec.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/exec.js
@@ -1,3 +1,8 @@
-var a = 5;
-if (a){ console.log(a); let a = 2; }
-console.log(a);
+expect(() => {
+  var a = 5;
+  if (a) {
+    a;
+    let a = 2;
+  }
+  a;
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/input.js
new file mode 100644
index 000000000000..00b816f4bea8
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/input.js
@@ -0,0 +1,6 @@
+var a = 5;
+if (a) {
+  a;
+  let a = 2;
+}
+a;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/options.json
deleted file mode 100644
index c97e0b72d066..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "a is not defined - temporal dead zone"
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/output.js
new file mode 100644
index 000000000000..387cd33a8a8b
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/shadow-outer-var/output.js
@@ -0,0 +1,8 @@
+var a = 5;
+
+if (a) {
+  babelHelpers.tdz("a");
+  var _a = 2;
+}
+
+a;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/exec.js
new file mode 100644
index 000000000000..c05e082ae3cf
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/exec.js
@@ -0,0 +1,4 @@
+expect(() => {
+  i = 2;
+  let i
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/input.js
new file mode 100644
index 000000000000..818e85c9e7a3
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/input.js
@@ -0,0 +1,2 @@
+i = 2;
+let i
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/output.js
new file mode 100644
index 000000000000..b6ec817e6248
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-assign/output.js
@@ -0,0 +1,3 @@
+babelHelpers.tdz("i");
+i = 2;
+var i;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/exec.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/exec.js
index 99758d996390..37f6df1e98d8 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/exec.js
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/exec.js
@@ -1,2 +1,4 @@
-i
-let i
+expect(() => {
+  i
+  let i
+}).toThrow(ReferenceError);
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/input.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/input.js
new file mode 100644
index 000000000000..99758d996390
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/input.js
@@ -0,0 +1,2 @@
+i
+let i
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/options.json
deleted file mode 100644
index 7983b3617563..000000000000
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "i is not defined - temporal dead zone"
-}
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/output.js
new file mode 100644
index 000000000000..b9ae80d157d5
--- /dev/null
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/simple-reference/output.js
@@ -0,0 +1,2 @@
+babelHelpers.tdz("i");
+var i;
diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/throwIfClosureRequired/for-const-closure/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/throwIfClosureRequired/for-const-closure/options.json
index 99d9938cc1ed..30a935bce776 100644
--- a/packages/babel-plugin-transform-block-scoping/test/fixtures/throwIfClosureRequired/for-const-closure/options.json
+++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/throwIfClosureRequired/for-const-closure/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [["transform-block-scoping", { "throwIfClosureRequired": true }]],
-  "throws":
-    "Compiling let/const in this block would add a closure (throwIfClosureRequired)."
+  "throws": "Compiling let/const in this block would add a closure (throwIfClosureRequired)."
 }
diff --git a/packages/babel-plugin-transform-classes/package.json b/packages/babel-plugin-transform-classes/package.json
index 0aa40aaeadad..f1fcc8a2e80b 100644
--- a/packages/babel-plugin-transform-classes/package.json
+++ b/packages/babel-plugin-transform-classes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-classes",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Compile ES2015 classes to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-classes",
   "license": "MIT",
@@ -10,12 +10,12 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/helper-annotate-as-pure": "^7.0.0",
-    "@babel/helper-define-map": "^7.1.0",
+    "@babel/helper-define-map": "^7.5.5",
     "@babel/helper-function-name": "^7.1.0",
     "@babel/helper-optimise-call-expression": "^7.0.0",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-replace-supers": "^7.1.0",
-    "@babel/helper-split-export-declaration": "^7.0.0",
+    "@babel/helper-replace-supers": "^7.5.5",
+    "@babel/helper-split-export-declaration": "^7.4.4",
     "globals": "^11.1.0"
   },
   "keywords": [
@@ -25,7 +25,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-classes/src/index.js b/packages/babel-plugin-transform-classes/src/index.js
index 176c0a2ae3bd..8f0ecfc202ca 100644
--- a/packages/babel-plugin-transform-classes/src/index.js
+++ b/packages/babel-plugin-transform-classes/src/index.js
@@ -25,6 +25,8 @@ export default declare((api, options) => {
   const VISITED = Symbol();
 
   return {
+    name: "transform-classes",
+
     visitor: {
       ExportDefaultDeclaration(path: NodePath) {
         if (!path.get("declaration").isClassDeclaration()) return;
diff --git a/packages/babel-plugin-transform-classes/src/transformClass.js b/packages/babel-plugin-transform-classes/src/transformClass.js
index 66847750231a..0335e363439a 100644
--- a/packages/babel-plugin-transform-classes/src/transformClass.js
+++ b/packages/babel-plugin-transform-classes/src/transformClass.js
@@ -19,41 +19,6 @@ function buildConstructor(classRef, constructorBody, node) {
   return func;
 }
 
-const verifyConstructorVisitor = traverse.visitors.merge([
-  environmentVisitor,
-  {
-    Super(path, state) {
-      if (state.isDerived) return;
-
-      const { node, parentPath } = path;
-      if (parentPath.isCallExpression({ callee: node })) {
-        throw path.buildCodeFrameError(
-          "super() is only allowed in a derived constructor",
-        );
-      }
-    },
-
-    ThisExpression(path, state) {
-      if (!state.isDerived) return;
-
-      const { node, parentPath } = path;
-      if (parentPath.isMemberExpression({ object: node })) {
-        // In cases like this.foo or this[foo], there is no need to add
-        // assertThisInitialized, since they already throw if this is
-        // undefined.
-        return;
-      }
-
-      const assertion = t.callExpression(
-        state.file.addHelper("assertThisInitialized"),
-        [node],
-      );
-      path.replaceWith(assertion);
-      path.skip();
-    },
-  },
-]);
-
 export default function transformClass(
   path: NodePath,
   file: any,
@@ -84,7 +49,6 @@ export default function transformClass(
     instancePropRefs: {},
     staticPropBody: [],
     body: [],
-    bareSupers: new Set(),
     superThises: [],
     pushedConstructor: false,
     pushedInherits: false,
@@ -200,13 +164,6 @@ export default function transformClass(
       if (t.isClassMethod(node)) {
         const isConstructor = node.kind === "constructor";
 
-        if (isConstructor) {
-          path.traverse(verifyConstructorVisitor, {
-            isDerived: classState.isDerived,
-            file: classState.file,
-          });
-        }
-
         const replaceSupers = new ReplaceSupers({
           methodPath: path,
           objectRef: classState.classRef,
@@ -217,34 +174,22 @@ export default function transformClass(
 
         replaceSupers.replace();
 
-        // TODO this needs to be cleaned up. But, one step at a time.
-        const state = {
-          returns: [],
-          bareSupers: new Set(),
-        };
+        const superReturns = [];
         path.traverse(
           traverse.visitors.merge([
             environmentVisitor,
             {
-              ReturnStatement(path, state) {
+              ReturnStatement(path) {
                 if (!path.getFunctionParent().isArrowFunctionExpression()) {
-                  state.returns.push(path);
-                }
-              },
-
-              Super(path, state) {
-                const { node, parentPath } = path;
-                if (parentPath.isCallExpression({ callee: node })) {
-                  state.bareSupers.add(parentPath);
+                  superReturns.push(path);
                 }
               },
             },
           ]),
-          state,
         );
 
         if (isConstructor) {
-          pushConstructor(state, node, path);
+          pushConstructor(superReturns, node, path);
         } else {
           pushMethod(node, path);
         }
@@ -378,15 +323,43 @@ export default function transformClass(
 
     path.traverse(findThisesVisitor);
 
-    let guaranteedSuperBeforeFinish = !!classState.bareSupers.size;
-
     let thisRef = function() {
       const ref = path.scope.generateDeclaredUidIdentifier("this");
       thisRef = () => t.cloneNode(ref);
       return ref;
     };
 
-    for (const bareSuper of classState.bareSupers) {
+    for (const thisPath of classState.superThises) {
+      const { node, parentPath } = thisPath;
+      if (parentPath.isMemberExpression({ object: node })) {
+        thisPath.replaceWith(thisRef());
+        continue;
+      }
+      thisPath.replaceWith(
+        t.callExpression(classState.file.addHelper("assertThisInitialized"), [
+          thisRef(),
+        ]),
+      );
+    }
+
+    const bareSupers = new Set();
+    path.traverse(
+      traverse.visitors.merge([
+        environmentVisitor,
+        {
+          Super(path) {
+            const { node, parentPath } = path;
+            if (parentPath.isCallExpression({ callee: node })) {
+              bareSupers.add(parentPath);
+            }
+          },
+        },
+      ]),
+    );
+
+    let guaranteedSuperBeforeFinish = !!bareSupers.size;
+
+    for (const bareSuper of bareSupers) {
       wrapSuperCall(bareSuper, classState.superName, thisRef, body);
 
       if (guaranteedSuperBeforeFinish) {
@@ -408,19 +381,6 @@ export default function transformClass(
       }
     }
 
-    for (const thisPath of classState.superThises) {
-      const { node, parentPath } = thisPath;
-      if (parentPath.isMemberExpression({ object: node })) {
-        thisPath.replaceWith(thisRef());
-        continue;
-      }
-      thisPath.replaceWith(
-        t.callExpression(classState.file.addHelper("assertThisInitialized"), [
-          thisRef(),
-        ]),
-      );
-    }
-
     let wrapReturn;
 
     if (classState.isLoose) {
@@ -494,7 +454,8 @@ export default function transformClass(
         node.generator,
         node.async,
       );
-      func.returnType = node.returnType;
+      t.inherits(func, node);
+
       const key = t.toComputedKey(node, node.key);
       if (t.isStringLiteral(key)) {
         func = nameFunction({
@@ -534,7 +495,7 @@ export default function transformClass(
    * Replace the constructor body of our class.
    */
   function pushConstructor(
-    replaceSupers,
+    superReturns,
     method: { type: "ClassMethod" },
     path: NodePath,
   ) {
@@ -547,8 +508,7 @@ export default function transformClass(
       userConstructorPath: path,
       userConstructor: method,
       hasConstructor: true,
-      bareSupers: replaceSupers.bareSupers,
-      superReturns: replaceSupers.returns,
+      superReturns,
     });
 
     const { construct } = classState;
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern-1/input.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern-1/input.js
new file mode 100644
index 000000000000..5b3864b52b67
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern-1/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  foo(props) {
+    ;([x, ...super.client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern-1/output.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern-1/output.js
new file mode 100644
index 000000000000..79753b87162a
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern-1/output.js
@@ -0,0 +1,16 @@
+var Foo =
+/*#__PURE__*/
+function () {
+  "use strict";
+
+  function Foo() {}
+
+  var _proto = Foo.prototype;
+
+  _proto.foo = function foo(props) {
+    ;
+    [x, ...this.client] = props;
+  };
+
+  return Foo;
+}();
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern/input.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern/input.js
new file mode 100644
index 000000000000..96267163e8ad
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  foo(props) {
+    ;([super.client] = props);
+  }
+}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern/output.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern/output.js
new file mode 100644
index 000000000000..0672ad62fdab
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-array-pattern/output.js
@@ -0,0 +1,16 @@
+var Foo =
+/*#__PURE__*/
+function () {
+  "use strict";
+
+  function Foo() {}
+
+  var _proto = Foo.prototype;
+
+  _proto.foo = function foo(props) {
+    ;
+    [this.client] = props;
+  };
+
+  return Foo;
+}();
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern-1/input.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern-1/input.js
new file mode 100644
index 000000000000..f90c1a21039d
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern-1/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  foo(props) {
+    ;({ x, ...super.client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern-1/output.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern-1/output.js
new file mode 100644
index 000000000000..896273e40f43
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern-1/output.js
@@ -0,0 +1,19 @@
+var Foo =
+/*#__PURE__*/
+function () {
+  "use strict";
+
+  function Foo() {}
+
+  var _proto = Foo.prototype;
+
+  _proto.foo = function foo(props) {
+    ;
+    ({
+      x,
+      ...this.client
+    } = props);
+  };
+
+  return Foo;
+}();
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern/input.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern/input.js
new file mode 100644
index 000000000000..391378c2af5e
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  foo(props) {
+    ;({ client: super.client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern/output.js b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern/output.js
new file mode 100644
index 000000000000..816071362136
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/super-destructuring-object-pattern/output.js
@@ -0,0 +1,18 @@
+var Foo =
+/*#__PURE__*/
+function () {
+  "use strict";
+
+  function Foo() {}
+
+  var _proto = Foo.prototype;
+
+  _proto.foo = function foo(props) {
+    ;
+    ({
+      client: this.client
+    } = props);
+  };
+
+  return Foo;
+}();
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js
index 9efa6b0755b9..4ac5364faf8f 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _net = babelHelpers.interopRequireDefault(require("net"));
 
@@ -31,7 +31,7 @@ function (_EventEmitter) {
   babelHelpers.createClass(Connection, [{
     key: "send",
     value: function send(message) {
-      this.sock.write(_binarySerializer.default.serializeMessage(message));
+      this.sock.write(_binarySerializer["default"].serializeMessage(message));
     }
   }, {
     key: "disconnect",
@@ -42,4 +42,4 @@ function (_EventEmitter) {
   return Connection;
 }(_events.EventEmitter);
 
-exports.default = Connection;
+exports["default"] = Connection;
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js
index b90d883f21e9..32ea562ad9b2 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _BaseFoo2 = babelHelpers.interopRequireDefault(require("./BaseFoo"));
 
@@ -25,6 +25,6 @@ function (_BaseFoo) {
     }
   }]);
   return SubFoo;
-}(_BaseFoo2.default);
+}(_BaseFoo2["default"]);
 
-exports.default = SubFoo;
+exports["default"] = SubFoo;
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js
index dda51585da09..19b7f10208f7 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _react = babelHelpers.interopRequireDefault(require("react"));
 
@@ -20,12 +20,12 @@ function (_Component) {
   babelHelpers.createClass(RandomComponent, [{
     key: "render",
     value: function render() {
-      return _react.default.createElement("div", {
+      return _react["default"].createElement("div", {
         className: "sui-RandomComponent"
-      }, _react.default.createElement("h2", null, "Hi there!"));
+      }, _react["default"].createElement("h2", null, "Hi there!"));
     }
   }]);
   return RandomComponent;
 }(_react.Component);
 
-exports.default = RandomComponent;
+exports["default"] = RandomComponent;
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2941/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/2941/output.js
index 9c148ffe0c53..292e226a977e 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2941/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2941/output.js
@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _default = function _default() {
   babelHelpers.classCallCheck(this, _default);
 };
 
-exports.default = _default;
+exports["default"] = _default;
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js
index ec55d2a483b8..333b2e176c1f 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var b = function b() {
   babelHelpers.classCallCheck(this, b);
@@ -21,7 +21,7 @@ function (_b) {
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(a1).call(this));
 
     _this.x = function () {
-      return babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this));
+      return babelHelpers.assertThisInitialized(_this);
     };
 
     return _this;
@@ -42,7 +42,7 @@ function (_b2) {
     _this2 = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(a2).call(this));
 
     _this2.x = function () {
-      return babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this2));
+      return babelHelpers.assertThisInitialized(_this2);
     };
 
     return _this2;
@@ -51,4 +51,4 @@ function (_b2) {
   return a2;
 }(b);
 
-exports.default = a2;
+exports["default"] = a2;
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/T6750/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/T6750/output.js
index dc1613a68fb3..5ea54d765c16 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/regression/T6750/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/T6750/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = _default;
+exports["default"] = _default;
 
 function _default() {
   return (
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js
index df342bc8fa27..435ad8c4dfa3 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js
@@ -29,12 +29,14 @@ function () {
               return _context.stop();
           }
         }
-      }, _callee, this);
+      }, _callee);
     }));
 
-    return function test1() {
+    function test1() {
       return _test.apply(this, arguments);
-    };
+    }
+
+    return test1;
   }();
 
   _proto.test2 =
@@ -52,7 +54,7 @@ function () {
             return _context2.stop();
         }
       }
-    }, test2, this);
+    }, test2);
   });
   return Example;
 }();
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-call-only-allowed-in-derived-constructor/input.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-call-only-allowed-in-derived-constructor/input.js
deleted file mode 100644
index 036ce36e395c..000000000000
--- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-call-only-allowed-in-derived-constructor/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-class Foo {
-  constructor() {
-    super();
-  }
-}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-call-only-allowed-in-derived-constructor/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-call-only-allowed-in-derived-constructor/options.json
deleted file mode 100644
index a4e0aa5c67b6..000000000000
--- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-call-only-allowed-in-derived-constructor/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "throws": "super() is only allowed in a derived constructor",
-  "plugins": ["transform-classes"]
-}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/input.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/input.js
new file mode 100644
index 000000000000..bc8f7e6aa311
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;([x, ...super.client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/options.json
new file mode 100644
index 000000000000..15c260b243c0
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-function-name",
+    "transform-classes",
+    "transform-spread",
+    "transform-block-scoping"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/input.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/input.js
new file mode 100644
index 000000000000..aa6fb16c74d4
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;([super.client] = props);
+  }
+}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/options.json
new file mode 100644
index 000000000000..15c260b243c0
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-function-name",
+    "transform-classes",
+    "transform-spread",
+    "transform-block-scoping"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/input.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/input.js
new file mode 100644
index 000000000000..19705340451c
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;({ x, ...super.client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/options.json
new file mode 100644
index 000000000000..15c260b243c0
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-function-name",
+    "transform-classes",
+    "transform-spread",
+    "transform-block-scoping"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/input.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/input.js
new file mode 100644
index 000000000000..45845d4e16b5
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/input.js
@@ -0,0 +1,5 @@
+class Foo {
+  constructor(props) {
+    ;({ client: super.client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/options.json
new file mode 100644
index 000000000000..15c260b243c0
--- /dev/null
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/options.json
@@ -0,0 +1,10 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-function-name",
+    "transform-classes",
+    "transform-spread",
+    "transform-block-scoping"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-illegal-non-constructor-call/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-illegal-non-constructor-call/options.json
index 99308b242326..84442f571d97 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-illegal-non-constructor-call/options.json
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-illegal-non-constructor-call/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "super() is only valid inside a class constructor. Make sure the method name is spelled exactly as 'constructor'."
+  "throws": "super() is only valid inside a class constructor of a subclass. Maybe a typo in the method name ('constructor') or not extending another class?"
 }
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-2/output.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-2/output.js
index 37de9b654a58..ec1d652c8dad 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-2/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-2/output.js
@@ -9,7 +9,7 @@ function (_Bar) {
     var _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    return _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))));
+    return _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, babelHelpers.assertThisInitialized(_this)));
   }
 
   return Foo;
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-3/output.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-3/output.js
index d678fc5b304f..06e41b47d3a1 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-3/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-3/output.js
@@ -10,7 +10,7 @@ function (_Bar) {
 
     babelHelpers.classCallCheck(this, Foo);
 
-    var fn = () => babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this));
+    var fn = () => babelHelpers.assertThisInitialized(_this);
 
     fn();
     return _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-4/output.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-4/output.js
index bc92c2f54d12..2bce474839d1 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-4/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-4/output.js
@@ -10,7 +10,7 @@ function (_Bar) {
 
     babelHelpers.classCallCheck(this, Foo);
 
-    var fn = () => babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this));
+    var fn = () => babelHelpers.assertThisInitialized(_this);
 
     _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
     fn();
diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-5/output.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-5/output.js
index 57ca566c9954..a49d2be8091e 100644
--- a/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-5/output.js
+++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/this-not-allowed-before-super-in-derived-classes-5/output.js
@@ -9,7 +9,7 @@ function (_Bar) {
     var _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    Foo[babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this))];
+    Foo[babelHelpers.assertThisInitialized(_this)];
     return babelHelpers.possibleConstructorReturn(_this);
   }
 
diff --git a/packages/babel-plugin-transform-computed-properties/package.json b/packages/babel-plugin-transform-computed-properties/package.json
index 8df20722c154..c749cfab88d6 100644
--- a/packages/babel-plugin-transform-computed-properties/package.json
+++ b/packages/babel-plugin-transform-computed-properties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-computed-properties",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Compile ES2015 computed properties to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-computed-properties",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-computed-properties/src/index.js b/packages/babel-plugin-transform-computed-properties/src/index.js
index e751f5008877..81073325429c 100644
--- a/packages/babel-plugin-transform-computed-properties/src/index.js
+++ b/packages/babel-plugin-transform-computed-properties/src/index.js
@@ -115,6 +115,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "transform-computed-properties",
+
     visitor: {
       ObjectExpression: {
         exit(path, state) {
diff --git a/packages/babel-plugin-transform-destructuring/package.json b/packages/babel-plugin-transform-destructuring/package.json
index 1fa6dc739f72..fde64105a8bc 100644
--- a/packages/babel-plugin-transform-destructuring/package.json
+++ b/packages/babel-plugin-transform-destructuring/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-destructuring",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Compile ES2015 destructuring to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-destructuring",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-destructuring/src/index.js b/packages/babel-plugin-transform-destructuring/src/index.js
index b706ed5bea64..04cb37b4afa9 100644
--- a/packages/babel-plugin-transform-destructuring/src/index.js
+++ b/packages/babel-plugin-transform-destructuring/src/index.js
@@ -44,13 +44,36 @@ export default declare((api, options) => {
     return false;
   }
 
-  const arrayUnpackVisitor = {
-    ReferencedIdentifier(path, state) {
-      if (state.bindings[path.node.name]) {
-        state.deopt = true;
-        path.stop();
+  /**
+   * Test if an ObjectPattern's elements contain any RestElements.
+   */
+
+  function hasObjectRest(pattern) {
+    for (const elem of (pattern.properties: Array)) {
+      if (t.isRestElement(elem)) {
+        return true;
       }
-    },
+    }
+    return false;
+  }
+
+  const STOP_TRAVERSAL = {};
+
+  // NOTE: This visitor is meant to be used via t.traverse
+  const arrayUnpackVisitor = (node, ancestors, state) => {
+    if (!ancestors.length) {
+      // Top-level node: this is the array literal.
+      return;
+    }
+
+    if (
+      t.isIdentifier(node) &&
+      t.isReferenced(node, ancestors[ancestors.length - 1]) &&
+      state.bindings[node.name]
+    ) {
+      state.deopt = true;
+      throw STOP_TRAVERSAL;
+    }
   };
 
   class DestructuringTransformer {
@@ -73,7 +96,11 @@ export default declare((api, options) => {
 
       if (op) {
         node = t.expressionStatement(
-          t.assignmentExpression(op, id, t.cloneNode(init)),
+          t.assignmentExpression(
+            op,
+            id,
+            t.cloneNode(init) || this.scope.buildUndefinedNode(),
+          ),
         );
       } else {
         node = t.variableDeclaration(this.kind, [
@@ -160,7 +187,8 @@ export default declare((api, options) => {
     pushObjectRest(pattern, objRef, spreadProp, spreadPropIndex) {
       // get all the keys that appear in this object before the current spread
 
-      let keys = [];
+      const keys = [];
+      let allLiteral = true;
 
       for (let i = 0; i < pattern.properties.length; i++) {
         const prop = pattern.properties[i];
@@ -172,11 +200,17 @@ export default declare((api, options) => {
         // ignore other spread properties
         if (t.isRestElement(prop)) continue;
 
-        let key = prop.key;
+        const key = prop.key;
         if (t.isIdentifier(key) && !prop.computed) {
-          key = t.stringLiteral(prop.key.name);
+          keys.push(t.stringLiteral(key.name));
+        } else if (t.isTemplateLiteral(prop.key)) {
+          keys.push(t.cloneNode(prop.key));
+        } else if (t.isLiteral(key)) {
+          keys.push(t.stringLiteral(String(key.value)));
+        } else {
+          keys.push(t.cloneNode(key));
+          allLiteral = false;
         }
-        keys.push(t.cloneNode(key));
       }
 
       let value;
@@ -186,11 +220,18 @@ export default declare((api, options) => {
           t.cloneNode(objRef),
         ]);
       } else {
-        keys = t.arrayExpression(keys);
+        let keyExpression = t.arrayExpression(keys);
+
+        if (!allLiteral) {
+          keyExpression = t.callExpression(
+            t.memberExpression(keyExpression, t.identifier("map")),
+            [this.addHelper("toPropertyKey")],
+          );
+        }
 
         value = t.callExpression(
           this.addHelper(`objectWithoutProperties${loose ? "Loose" : ""}`),
-          [t.cloneNode(objRef), keys],
+          [t.cloneNode(objRef), keyExpression],
         );
       }
 
@@ -237,6 +278,31 @@ export default declare((api, options) => {
         objRef = temp;
       }
 
+      // Replace impure computed key expressions if we have a rest parameter
+      if (hasObjectRest(pattern)) {
+        let copiedPattern;
+        for (let i = 0; i < pattern.properties.length; i++) {
+          const prop = pattern.properties[i];
+          if (t.isRestElement(prop)) {
+            break;
+          }
+          const key = prop.key;
+          if (prop.computed && !this.scope.isPure(key)) {
+            const name = this.scope.generateUidIdentifierBasedOnNode(key);
+            this.nodes.push(this.buildVariableDeclaration(name, key));
+            if (!copiedPattern) {
+              copiedPattern = pattern = {
+                ...pattern,
+                properties: pattern.properties.slice(),
+              };
+            }
+            copiedPattern.properties[i] = {
+              ...copiedPattern.properties[i],
+              key: name,
+            };
+          }
+        }
+      }
       //
 
       for (let i = 0; i < pattern.properties.length; i++) {
@@ -282,7 +348,13 @@ export default declare((api, options) => {
       // deopt on reference to left side identifiers
       const bindings = t.getBindingIdentifiers(pattern);
       const state = { deopt: false, bindings };
-      this.scope.traverse(arr, arrayUnpackVisitor, state);
+
+      try {
+        t.traverse(arr, arrayUnpackVisitor, state);
+      } catch (e) {
+        if (e !== STOP_TRAVERSAL) throw e;
+      }
+
       return !state.deopt;
     }
 
@@ -383,6 +455,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "transform-destructuring",
+
     visitor: {
       ExportNamedDeclaration(path) {
         const declaration = path.get("declaration");
@@ -391,7 +465,7 @@ export default declare((api, options) => {
 
         const specifiers = [];
 
-        for (const name in path.getOuterBindingIdentifiers(path)) {
+        for (const name of Object.keys(path.getOuterBindingIdentifiers(path))) {
           specifiers.push(
             t.exportSpecifier(t.identifier(name), t.identifier(name)),
           );
@@ -419,8 +493,14 @@ export default declare((api, options) => {
 
           path.ensureBlock();
 
+          if (node.body.body.length === 0 && path.isCompletionRecord()) {
+            node.body.body.unshift(
+              t.expressionStatement(scope.buildUndefinedNode()),
+            );
+          }
+
           node.body.body.unshift(
-            t.variableDeclaration("var", [t.variableDeclarator(left, temp)]),
+            t.expressionStatement(t.assignmentExpression("=", left, temp)),
           );
 
           return;
@@ -510,7 +590,12 @@ export default declare((api, options) => {
         destructuring.init(node.left, ref || node.right);
 
         if (ref) {
-          nodes.push(t.expressionStatement(t.cloneNode(ref)));
+          if (path.parentPath.isArrowFunctionExpression()) {
+            path.replaceWith(t.blockStatement([]));
+            nodes.push(t.returnStatement(t.cloneNode(ref)));
+          } else {
+            nodes.push(t.expressionStatement(t.cloneNode(ref)));
+          }
         }
 
         path.replaceWithMultiple(nodes);
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/input.js
index 87493c5fd57f..935a280524fc 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/input.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/input.js
@@ -11,3 +11,7 @@ var [a, b] = [...foo, bar];
 var [a, b] = [foo(), bar];
 var [a, b] = [clazz.foo(), bar];
 var [a, b] = [clazz.foo, bar];
+var [a, b] = [, 2];
+[a, b] = [1, 2];
+[a, b] = [, 2];
+; // Avoid completion record special case
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/output.js
index 7743f54e7c6a..7de1af1261e7 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/output.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/array-unpack-optimisation/output.js
@@ -21,7 +21,7 @@ var _ref4 = [a[1], a[0]];
 a[0] = _ref4[0];
 a[1] = _ref4[1];
 
-var _ref5 = babelHelpers.toConsumableArray(foo).concat([bar]),
+var _ref5 = [].concat(babelHelpers.toConsumableArray(foo), [bar]),
     a = _ref5[0],
     b = _ref5[1];
 
@@ -34,3 +34,10 @@ var _ref7 = [clazz.foo(), bar],
 var _ref8 = [clazz.foo, bar],
     a = _ref8[0],
     b = _ref8[1];
+var a,
+    b = 2;
+a = 1;
+b = 2;
+a = void 0;
+b = 2;
+; // Avoid completion record special case
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-block/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-block/input.js
new file mode 100644
index 000000000000..71ebd5203878
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-block/input.js
@@ -0,0 +1 @@
+() => { [a, b] = [1, 2] }
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-block/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-block/output.js
new file mode 100644
index 000000000000..4dca9fc16ca5
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-block/output.js
@@ -0,0 +1,4 @@
+() => {
+  a = 1;
+  b = 2;
+};
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-no-block/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-no-block/input.js
new file mode 100644
index 000000000000..da9e7d37e015
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-no-block/input.js
@@ -0,0 +1 @@
+() => [a, b] = [1, 2]
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-no-block/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-no-block/output.js
new file mode 100644
index 000000000000..408faf04b5e8
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/assignment-arrow-function-no-block/output.js
@@ -0,0 +1,6 @@
+() => {
+  var _ref = [1, 2];
+  a = _ref[0];
+  b = _ref[1];
+  return _ref;
+};
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json
index a4a5f2d213ea..9b67610435a1 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json
@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "external-helpers",
+    ["external-helpers", { "helperVersion": "7.1.5" }],
     ["transform-destructuring", { "useBuiltIns": true }],
     "transform-spread",
     "transform-parameters",
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/output.js
index 8e8f96790853..8dcd578573fa 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/output.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/output.js
@@ -6,7 +6,7 @@ var _z2 = z,
     y = babelHelpers.objectWithoutProperties(_z2, ["x"]);
 var _z3 = z,
     x = _z3[x],
-    y = babelHelpers.objectWithoutProperties(_z3, [x]);
+    y = babelHelpers.objectWithoutProperties(_z3, [x].map(babelHelpers.toPropertyKey));
 
 (function (_ref) {
   var x = _ref.x,
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json
index 30b537ae9118..ec06f619d092 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json
@@ -1,6 +1,7 @@
 {
   "plugins": [
     ["transform-destructuring", { "loose": true }],
-    "proposal-object-rest-spread"
+    "proposal-object-rest-spread",
+    ["external-helpers", { "helperVersion": "7.1.5" }]
   ]
 }
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/output.js
index 50093aa1720a..e202791b6fd4 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/output.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/output.js
@@ -1,27 +1,20 @@
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 var z = {};
-
 var _z = z,
-    x = _extends({}, _z);
-
+    x = babelHelpers.extends({}, _z);
 var _z2 = z,
     x = _z2.x,
-    y = _objectWithoutPropertiesLoose(_z2, ["x"]);
-
+    y = babelHelpers.objectWithoutPropertiesLoose(_z2, ["x"]);
 var _z3 = z,
     x = _z3[x],
-    y = _objectWithoutPropertiesLoose(_z3, [x]);
+    y = babelHelpers.objectWithoutPropertiesLoose(_z3, [x].map(babelHelpers.toPropertyKey));
 
 (function (_ref) {
   let x = _ref.x,
-      y = _objectWithoutPropertiesLoose(_ref, ["x"]);
+      y = babelHelpers.objectWithoutPropertiesLoose(_ref, ["x"]);
 });
 
 var _o = o;
 x = _o.x;
 y = _o.y;
-z = _objectWithoutPropertiesLoose(_o, ["x", "y"]);
+z = babelHelpers.objectWithoutPropertiesLoose(_o, ["x", "y"]);
 _o;
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest/output.js
index 0729c49dd0e2..c4af22047ad0 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest/output.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest/output.js
@@ -6,7 +6,7 @@ var _z2 = z,
     y = babelHelpers.objectWithoutProperties(_z2, ["x"]);
 var _z3 = z,
     x = _z3[x],
-    y = babelHelpers.objectWithoutProperties(_z3, [x]);
+    y = babelHelpers.objectWithoutProperties(_z3, [x].map(babelHelpers.toPropertyKey));
 
 (function (_ref) {
   var x = _ref.x,
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/input.js
index 87fe7e7dde90..f7a87fe3f876 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/input.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/input.js
@@ -1,3 +1,7 @@
 for (var [name, value] in obj) {
   print("Name: " + name + ", Value: " + value);
 }
+
+for ([name, value] in obj) {
+  print("Name: " + name + ", Value: " + value);
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/output.js
index ce9032c5c1f7..6f2e55a2b029 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/output.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-in/output.js
@@ -5,3 +5,11 @@ for (var _ref in obj) {
   var value = _ref2[1];
   print("Name: " + name + ", Value: " + value);
 }
+
+for (var _ref3 in obj) {
+  var _ref4 = babelHelpers.slicedToArray(_ref3, 2);
+
+  name = _ref4[0];
+  value = _ref4[1];
+  print("Name: " + name + ", Value: " + value);
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/input.js
index d8aae78557a4..47a53442b9ea 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/input.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/input.js
@@ -1,3 +1,7 @@
 for (var [ name, before, after ] of test.expectation.registers) {
 
 }
+
+for ([ name, before, after ] of test.expectation.registers) {
+
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/output.js
index 45ddc2fc6a81..570f8b2ef665 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/output.js
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/for-of/output.js
@@ -5,3 +5,12 @@ for (var _ref of test.expectation.registers) {
   var before = _ref2[1];
   var after = _ref2[2];
 }
+
+for (var _ref3 of test.expectation.registers) {
+  var _ref4 = babelHelpers.slicedToArray(_ref3, 3);
+
+  name = _ref4[0];
+  before = _ref4[1];
+  after = _ref4[2];
+  void 0;
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/function-key-with-object-rest-spread/exec.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/function-key-with-object-rest-spread/exec.js
new file mode 100644
index 000000000000..fc8ae90c7411
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/function-key-with-object-rest-spread/exec.js
@@ -0,0 +1,4 @@
+const { [(() => 1)()]: a, ...rest } = { 1: "a" };
+
+expect(a).toBe("a");
+expect(rest).toEqual({});
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/function-key-with-object-rest-spread/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/function-key-with-object-rest-spread/options.json
new file mode 100644
index 000000000000..9fd3882905b5
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/function-key-with-object-rest-spread/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-destructuring", "proposal-object-rest-spread"]
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-9834/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-9834/input.js
new file mode 100644
index 000000000000..66679d7f052d
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-9834/input.js
@@ -0,0 +1,10 @@
+const input = {};
+
+const {
+  given_name: givenName,
+  'last_name': lastName,
+  [`country`]: country,
+  [prefix + 'state']: state,
+  [`${prefix}consents`]: consents,
+  ...rest
+} = input;
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-9834/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-9834/output.js
new file mode 100644
index 000000000000..a830257bda3c
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-9834/output.js
@@ -0,0 +1,10 @@
+var input = {};
+
+var _ref = prefix + 'state',
+    _ref2 = `${prefix}consents`,
+    givenName = input.given_name,
+    lastName = input['last_name'],
+    country = input[`country`],
+    state = input[_ref],
+    consents = input[_ref2],
+    rest = babelHelpers.objectWithoutProperties(input, ["given_name", "last_name", `country`, _ref, _ref2].map(babelHelpers.toPropertyKey));
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/number-key-with-object-rest-spread/exec.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/number-key-with-object-rest-spread/exec.js
new file mode 100644
index 000000000000..fe160adb01ca
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/number-key-with-object-rest-spread/exec.js
@@ -0,0 +1,10 @@
+const foo = {
+  1: "a",
+  2: "b",
+  3: "c",
+};
+
+const { [1]: bar, ...rest } = foo;
+
+expect(bar).toBe("a");
+expect(rest).toEqual({ 2: "b", 3: "c" });
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/number-key-with-object-rest-spread/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/number-key-with-object-rest-spread/options.json
new file mode 100644
index 000000000000..9fd3882905b5
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/number-key-with-object-rest-spread/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-destructuring", "proposal-object-rest-spread"]
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/exec.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/exec.js
new file mode 100644
index 000000000000..da5288308c3b
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/exec.js
@@ -0,0 +1,34 @@
+var key, x, y, z;
+// impure
+key = 1;
+var { [key++]: y, ...x } = { 1: 1, a: 1 };
+expect(x).toEqual({ a: 1 });
+expect(key).toBe(2);
+expect(1).toBe(y);
+
+// takes care of the order
+
+key = 1;
+var { [++key]: y, [++key]: z, ...rest} = {2: 2, 3: 3};
+expect(y).toBe(2);
+expect(z).toBe(3);
+
+// pure, computed property should remain as-is
+key = 2;
+({ [key]: y, z, ...x } = {2: "two", z: "zee"});
+expect(y).toBe("two");
+expect(x).toEqual({});
+expect(z).toBe("zee");
+
+// rhs evaluated before lhs
+var order = [];
+function left() {
+  order.push("left");
+  return 0;
+}
+function right() {
+  order.push("right");
+  return {};
+}
+var { [left()]: y, ...x} = right();
+expect(order).toEqual(["right", "left"]);
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/input.js
new file mode 100644
index 000000000000..af55509ef761
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/input.js
@@ -0,0 +1 @@
+var { [fn()]: x, ...y } = z;
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/output.js
new file mode 100644
index 000000000000..94225a5e8c1d
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/object-rest-impure-computed-keys/output.js
@@ -0,0 +1,4 @@
+var _z = z,
+    _fn = fn(),
+    x = _z[_fn],
+    y = babelHelpers.objectWithoutProperties(_z, [_fn].map(babelHelpers.toPropertyKey));
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json
index 0a58a1e00d3e..780d83b9b4ce 100644
--- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json
@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "external-helpers",
+    ["external-helpers", { "helperVersion": "7.1.5" }],
     "transform-destructuring",
     "transform-spread",
     "transform-parameters",
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/input.js b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/input.js
new file mode 100644
index 000000000000..9c6f1a18396d
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/input.js
@@ -0,0 +1,4 @@
+function isBetween(x, a, b) {
+  if (a > b) [a, b] = [b, a];
+  return x > a && x < b;
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/options.json
new file mode 100644
index 000000000000..84e28c07f51e
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-destructuring"]
+}
diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/output.js b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/output.js
new file mode 100644
index 000000000000..9546a2734c73
--- /dev/null
+++ b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/8528/output.js
@@ -0,0 +1,9 @@
+function isBetween(x, a, b) {
+  if (a > b) {
+    var _ref = [b, a];
+    a = _ref[0];
+    b = _ref[1];
+  }
+
+  return x > a && x < b;
+}
diff --git a/packages/babel-plugin-transform-dotall-regex/package.json b/packages/babel-plugin-transform-dotall-regex/package.json
index 14b5707a4610..2e36b5923586 100644
--- a/packages/babel-plugin-transform-dotall-regex/package.json
+++ b/packages/babel-plugin-transform-dotall-regex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-dotall-regex",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Compile regular expressions using the `s` (`dotAll`) flag to ES5.",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
@@ -18,21 +18,18 @@
     "regular expressions",
     "dotall"
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-dotall-regex.git"
-  },
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-dotall-regex",
   "bugs": "https://github.com/babel/babel/issues",
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-regex": "^7.0.0",
-    "regexpu-core": "^4.1.3"
+    "@babel/helper-regex": "^7.4.4",
+    "regexpu-core": "^4.5.4"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-dotall-regex/src/index.js b/packages/babel-plugin-transform-dotall-regex/src/index.js
index e1303cd90311..af11660ea05e 100644
--- a/packages/babel-plugin-transform-dotall-regex/src/index.js
+++ b/packages/babel-plugin-transform-dotall-regex/src/index.js
@@ -6,6 +6,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-dotall-regex",
+
     visitor: {
       RegExpLiteral(path) {
         const node = path.node;
diff --git a/packages/babel-plugin-transform-duplicate-keys/package.json b/packages/babel-plugin-transform-duplicate-keys/package.json
index 63ba036fc0df..e58d6908cf20 100644
--- a/packages/babel-plugin-transform-duplicate-keys/package.json
+++ b/packages/babel-plugin-transform-duplicate-keys/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-duplicate-keys",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Compile objects with duplicate keys to valid strict ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-duplicate-keys",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-duplicate-keys/src/index.js b/packages/babel-plugin-transform-duplicate-keys/src/index.js
index ff69a0b49f83..6765c4895de3 100644
--- a/packages/babel-plugin-transform-duplicate-keys/src/index.js
+++ b/packages/babel-plugin-transform-duplicate-keys/src/index.js
@@ -12,6 +12,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-duplicate-keys",
+
     visitor: {
       ObjectExpression(path) {
         const { node } = path;
@@ -20,11 +22,11 @@ export default declare(api => {
         );
 
         // A property is a duplicate key if:
-        // * the property is a data property, and is preceeded by a data,
+        // * the property is a data property, and is preceded by a data,
         //   getter, or setter property of the same name.
-        // * the property is a getter property, and is preceeded by a data or
+        // * the property is a getter property, and is preceded by a data or
         //   getter property of the same name.
-        // * the property is a setter property, and is preceeded by a data or
+        // * the property is a setter property, and is preceded by a data or
         //   setter property of the same name.
 
         const alreadySeenData = Object.create(null);
diff --git a/packages/babel-plugin-transform-exponentiation-operator/package.json b/packages/babel-plugin-transform-exponentiation-operator/package.json
index 2e491e58c5cb..aaf4029930b0 100644
--- a/packages/babel-plugin-transform-exponentiation-operator/package.json
+++ b/packages/babel-plugin-transform-exponentiation-operator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-exponentiation-operator",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Compile exponentiation operator to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-exponentiation-operator",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-exponentiation-operator/src/index.js b/packages/babel-plugin-transform-exponentiation-operator/src/index.js
index 92fa3a95bc23..680b8b24e8e0 100644
--- a/packages/babel-plugin-transform-exponentiation-operator/src/index.js
+++ b/packages/babel-plugin-transform-exponentiation-operator/src/index.js
@@ -6,6 +6,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-exponentiation-operator",
+
     visitor: build({
       operator: "**",
 
diff --git a/packages/babel-plugin-transform-flow-comments/package.json b/packages/babel-plugin-transform-flow-comments/package.json
index f676786cd975..34123bbcc748 100644
--- a/packages/babel-plugin-transform-flow-comments/package.json
+++ b/packages/babel-plugin-transform-flow-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-flow-comments",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Turn flow type annotations into comments",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-flow-comments",
   "license": "MIT",
@@ -12,14 +12,15 @@
     "babel-plugin"
   ],
   "dependencies": {
+    "@babel/generator": "^7.5.5",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-flow": "^7.0.0"
+    "@babel/plugin-syntax-flow": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-flow-comments/src/index.js b/packages/babel-plugin-transform-flow-comments/src/index.js
index 2ea870857ee5..2d54ae9d9854 100644
--- a/packages/babel-plugin-transform-flow-comments/src/index.js
+++ b/packages/babel-plugin-transform-flow-comments/src/index.js
@@ -1,21 +1,26 @@
 import { declare } from "@babel/helper-plugin-utils";
 import syntaxFlow from "@babel/plugin-syntax-flow";
 import { types as t } from "@babel/core";
+import generateCode from "@babel/generator";
 
 export default declare(api => {
   api.assertVersion(7);
 
-  function wrapInFlowComment(path, parent) {
+  function attachComment(path, comment) {
     let attach = path.getPrevSibling();
     let where = "trailing";
     if (!attach.node) {
       attach = path.parentPath;
       where = "inner";
     }
-    attach.addComment(where, generateComment(path, parent));
+    attach.addComment(where, comment);
     path.remove();
   }
 
+  function wrapInFlowComment(path, parent) {
+    attachComment(path, generateComment(path, parent));
+  }
+
   function generateComment(path, parent) {
     let comment = path
       .getSource()
@@ -26,7 +31,12 @@ export default declare(api => {
     return comment;
   }
 
+  function isTypeImport(importKind) {
+    return importKind === "type" || importKind === "typeof";
+  }
+
   return {
+    name: "transform-flow-comments",
     inherits: syntaxFlow,
 
     visitor: {
@@ -121,10 +131,44 @@ export default declare(api => {
       // support `import type A` and `import typeof A` #10
       ImportDeclaration(path) {
         const { node, parent } = path;
-        if (node.importKind !== "type" && node.importKind !== "typeof") {
+        if (isTypeImport(node.importKind)) {
+          wrapInFlowComment(path, parent);
           return;
         }
-        wrapInFlowComment(path, parent);
+
+        const typeSpecifiers = node.specifiers.filter(specifier =>
+          isTypeImport(specifier.importKind),
+        );
+
+        const nonTypeSpecifiers = node.specifiers.filter(
+          specifier => !isTypeImport(specifier.importKind),
+        );
+        node.specifiers = nonTypeSpecifiers;
+
+        if (typeSpecifiers.length > 0) {
+          const typeImportNode = t.cloneNode(node);
+          typeImportNode.specifiers = typeSpecifiers;
+
+          if (nonTypeSpecifiers.length > 0) {
+            path.addComment(
+              "trailing",
+              `:: ${generateCode(typeImportNode).code}`,
+            );
+          } else {
+            attachComment(path, `:: ${generateCode(typeImportNode).code}`);
+          }
+        }
+      },
+      ObjectPattern(path) {
+        const { node } = path;
+        if (node.typeAnnotation) {
+          const typeAnnotation = path.get("typeAnnotation");
+          path.addComment(
+            "trailing",
+            generateComment(typeAnnotation, typeAnnotation.node),
+          );
+          typeAnnotation.remove();
+        }
       },
 
       Flow(path) {
@@ -134,14 +178,31 @@ export default declare(api => {
 
       Class(path) {
         const { node } = path;
-        if (node.typeParameters) {
-          const typeParameters = path.get("typeParameters");
+        if (node.typeParameters || node.implements) {
+          const comments = [];
+          if (node.typeParameters) {
+            const typeParameters = path.get("typeParameters");
+            comments.push(
+              generateComment(typeParameters, typeParameters.node).replace(
+                /^:: /,
+                "",
+              ),
+            );
+            typeParameters.remove();
+          }
+          if (node.implements) {
+            const impls = path.get("implements");
+            comments.push(
+              "implements " +
+                impls
+                  .map(impl => generateComment(impl).replace(/^:: /, ""))
+                  .join(", "),
+            );
+            delete node["implements"];
+          }
+
           const block = path.get("body");
-          block.addComment(
-            "leading",
-            generateComment(typeParameters, typeParameters.node),
-          );
-          typeParameters.remove();
+          block.addComment("leading", ":: " + comments.join(" "));
         }
       },
     },
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-2/input.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-2/input.js
new file mode 100644
index 000000000000..68abd11b6acc
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-2/input.js
@@ -0,0 +1 @@
+class Foo implements Bar, Baz {}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-2/output.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-2/output.js
new file mode 100644
index 000000000000..c72770b29773
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-2/output.js
@@ -0,0 +1,3 @@
+class Foo
+/*:: implements Bar, Baz*/
+{}
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-3/input.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-3/input.js
new file mode 100644
index 000000000000..67517b8a1bee
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-3/input.js
@@ -0,0 +1 @@
+class Foo<S, T> implements Bar, Baz {}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-3/output.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-3/output.js
new file mode 100644
index 000000000000..ee702c5f1b5d
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter-3/output.js
@@ -0,0 +1,3 @@
+class Foo
+/*:: <S, T> implements Bar, Baz*/
+{}
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter/input.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter/input.js
new file mode 100644
index 000000000000..9e65be152ed5
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter/input.js
@@ -0,0 +1 @@
+class Foo<T> {}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter/output.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter/output.js
new file mode 100644
index 000000000000..d504c239ddc1
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/class-type-parameter/output.js
@@ -0,0 +1,3 @@
+class Foo
+/*:: <T>*/
+{}
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/input.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/input.js
index 53b5bac68e1b..d2cfab8fba1d 100644
--- a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/input.js
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/input.js
@@ -1,5 +1,5 @@
 export type GraphQLFormattedError = number;
-export type GraphQLFormattedError = {
+export type GraphQLFormattedError2 = {
   message: string,
   locations?: Array<{
     line: number,
@@ -7,4 +7,4 @@ export type GraphQLFormattedError = {
   }>
 };
 export interface foo { p: number }
-export interface foo<T> { p: T }
+export interface foo2<T> { p: T }
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/output.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/output.js
index 9e64ba75a316..7c4a2cffff69 100644
--- a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/output.js
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/export-type-alias/output.js
@@ -1,6 +1,6 @@
 /*:: export type GraphQLFormattedError = number;*/
 
-/*:: export type GraphQLFormattedError = {
+/*:: export type GraphQLFormattedError2 = {
   message: string,
   locations?: Array<{
     line: number,
@@ -10,4 +10,4 @@
 
 /*:: export interface foo { p: number }*/
 
-/*:: export interface foo<T> { p: T }*/
+/*:: export interface foo2<T> { p: T }*/
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias-2/input.mjs b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias-2/input.mjs
new file mode 100644
index 000000000000..a68a3a9af8cb
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias-2/input.mjs
@@ -0,0 +1,5 @@
+import A, { B, type C, type D, E } from './types';
+import F, { typeof G, H, type I } from './types';
+import { type J } from './types';
+import K, { L, M } from './types';
+import './types';
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias-2/output.mjs b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias-2/output.mjs
new file mode 100644
index 000000000000..aec6406ae2e1
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/import-type-alias-2/output.mjs
@@ -0,0 +1,10 @@
+import A, { B, E } from './types';
+/*:: import { type C, type D } from './types';*/
+
+import F, { H } from './types';
+/*:: import { typeof G, type I } from './types';*/
+
+/*:: import { type J } from './types';*/
+
+import K, { L, M } from './types';
+import './types';
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-1/input.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-1/input.js
new file mode 100644
index 000000000000..012394cdc352
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-1/input.js
@@ -0,0 +1,3 @@
+function add({ a, b }: {a: number, b: number}): number {
+  return a + b;
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-1/output.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-1/output.js
new file mode 100644
index 000000000000..1b94de916099
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-1/output.js
@@ -0,0 +1,10 @@
+function add({
+  a,
+  b
+}
+/*: {a: number, b: number}*/
+)
+/*: number*/
+{
+  return a + b;
+}
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-2/input.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-2/input.js
new file mode 100644
index 000000000000..7f5be924a0cf
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-2/input.js
@@ -0,0 +1 @@
+const { a, b }: { a: number, b: number } = { a: 1, b: 2 };
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-2/output.js b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-2/output.js
new file mode 100644
index 000000000000..78fd7a3ae717
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/object-destructuring-2/output.js
@@ -0,0 +1,9 @@
+const {
+  a,
+  b
+}
+/*: { a: number, b: number }*/
+= {
+  a: 1,
+  b: 2
+};
diff --git a/packages/babel-plugin-transform-flow-strip-types/package.json b/packages/babel-plugin-transform-flow-strip-types/package.json
index cf4d090b243d..c484570c331d 100644
--- a/packages/babel-plugin-transform-flow-strip-types/package.json
+++ b/packages/babel-plugin-transform-flow-strip-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-flow-strip-types",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Strip flow type annotations from your output code.",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-flow-strip-types",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-flow": "^7.0.0"
+    "@babel/plugin-syntax-flow": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-flow-strip-types/src/index.js b/packages/babel-plugin-transform-flow-strip-types/src/index.js
index 294ff7be1a3d..bf4e5acafff0 100644
--- a/packages/babel-plugin-transform-flow-strip-types/src/index.js
+++ b/packages/babel-plugin-transform-flow-strip-types/src/index.js
@@ -5,11 +5,12 @@ import { types as t } from "@babel/core";
 export default declare(api => {
   api.assertVersion(7);
 
-  const FLOW_DIRECTIVE = "@flow";
+  const FLOW_DIRECTIVE = /(@flow(\s+(strict(-local)?|weak))?|@noflow)/;
 
   let skipStrip = false;
 
   return {
+    name: "transform-flow-strip-types",
     inherits: syntaxFlow,
 
     visitor: {
@@ -25,15 +26,19 @@ export default declare(api => {
         skipStrip = false;
         let directiveFound = false;
 
-        for (const comment of (comments: Array<Object>)) {
-          if (comment.value.indexOf(FLOW_DIRECTIVE) >= 0) {
-            directiveFound = true;
+        if (comments) {
+          for (const comment of (comments: Array<Object>)) {
+            if (FLOW_DIRECTIVE.test(comment.value)) {
+              directiveFound = true;
 
-            // remove flow directive
-            comment.value = comment.value.replace(FLOW_DIRECTIVE, "");
+              // remove flow directive
+              comment.value = comment.value.replace(FLOW_DIRECTIVE, "");
 
-            // remove the comment completely if it only consists of whitespace and/or stars
-            if (!comment.value.replace(/\*/g, "").trim()) comment.ignore = true;
+              // remove the comment completely if it only consists of whitespace and/or stars
+              if (!comment.value.replace(/\*/g, "").trim()) {
+                comment.ignore = true;
+              }
+            }
           }
         }
 
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/requireDirective/true-throws-if-found-with-directive/options.json b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/requireDirective/true-throws-if-found-with-directive/options.json
index 7eaa14b1a148..09a51e3ba58f 100644
--- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/requireDirective/true-throws-if-found-with-directive/options.json
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/requireDirective/true-throws-if-found-with-directive/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "A @flow directive is required when using Flow annotations with the `requireDirective` option."
+  "throws": "A @flow directive is required when using Flow annotations with the `requireDirective` option."
 }
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/def-site-variance/input.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/def-site-variance/input.js
index a97695f41813..eb188c5c908a 100644
--- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/def-site-variance/input.js
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/def-site-variance/input.js
@@ -1,10 +1,10 @@
 class C1<+T, -U> {}
 function f<+T, -U>() {}
 type T<+T, -U> = {}
-type T = { +p: T }
-type T = { -p: T }
-type T = { +[k:K]: V }
-type T = { -[k:K]: V }
+type T1 = { +p: T }
+type T2 = { -p: T }
+type T3 = { +[k:K]: V }
+type T4 = { -[k:K]: V }
 interface I { +p: T }
 interface I { -p: T }
 interface I { +[k:K]: V }
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-noflow/input.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-noflow/input.js
new file mode 100644
index 000000000000..5d6ff3552aef
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-noflow/input.js
@@ -0,0 +1,2 @@
+// @noflow
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-noflow/output.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-noflow/output.js
new file mode 100644
index 000000000000..6d3cec7eeef8
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-noflow/output.js
@@ -0,0 +1 @@
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict-local/input.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict-local/input.js
new file mode 100644
index 000000000000..02271a151cc6
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict-local/input.js
@@ -0,0 +1,2 @@
+// @flow strict-local
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict-local/output.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict-local/output.js
new file mode 100644
index 000000000000..6d3cec7eeef8
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict-local/output.js
@@ -0,0 +1 @@
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict/input.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict/input.js
new file mode 100644
index 000000000000..08a31836de77
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict/input.js
@@ -0,0 +1,2 @@
+// @flow strict
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict/output.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict/output.js
new file mode 100644
index 000000000000..6d3cec7eeef8
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-strict/output.js
@@ -0,0 +1 @@
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-weak/input.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-weak/input.js
new file mode 100644
index 000000000000..1e784b350772
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-weak/input.js
@@ -0,0 +1,2 @@
+// @flow weak
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-weak/output.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-weak/output.js
new file mode 100644
index 000000000000..6d3cec7eeef8
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-comment-weak/output.js
@@ -0,0 +1 @@
+const a = 1;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-opaque-type-alias/input.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-opaque-type-alias/input.js
index 53dfc2c87440..404f6d84e4c6 100644
--- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-opaque-type-alias/input.js
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-opaque-type-alias/input.js
@@ -1,6 +1,6 @@
 opaque type ID = string;
 opaque type Foo<T> = Bar<T>
-export opaque type Foo = number;
+export opaque type Foo1 = number;
 
 opaque type union =
  | {type: "A"}
@@ -12,5 +12,5 @@ opaque type overloads =
   & ((x: number) => string)
 ;
 
-declare opaque type Foo: Bar;
-declare export opaque type Foo: Bar;
+declare opaque type Foo2: Bar;
+declare export opaque type Fo3: Bar;
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-alias/input.js b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-alias/input.js
index 12bfc22fc85e..2718274e2cf6 100644
--- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-alias/input.js
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-alias/input.js
@@ -1,6 +1,6 @@
 type FBID = number;
 type Foo<T> = Bar<T>
-export type Foo = number;
+export type Foo1 = number;
 
 type union =
  | {type: "A"}
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/input.mjs b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/input.mjs
new file mode 100644
index 000000000000..9007738a2b7c
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/input.mjs
@@ -0,0 +1 @@
+import type, { imp } from "bar";
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/options.json b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/options.json
new file mode 100644
index 000000000000..8bbb3f309f07
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/options.json
@@ -0,0 +1 @@
+{ "plugins": ["transform-flow-strip-types", "syntax-class-properties"] }
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/output.mjs b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/output.mjs
new file mode 100644
index 000000000000..9007738a2b7c
--- /dev/null
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations-2/output.mjs
@@ -0,0 +1 @@
+import type, { imp } from "bar";
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/input.mjs b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/input.mjs
index 2d40466b5bf7..8fdbffd7f814 100644
--- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/input.mjs
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/input.mjs
@@ -1,29 +1,29 @@
-function foo(numVal: any) {}
-function foo(numVal: number) {}
-function foo(numVal: number, strVal: string) {}
-function foo(numVal: number, untypedVal) {}
-function foo(untypedVal, numVal: number) {}
-function foo(nullableNum: ?number) {}
-function foo(callback: () => void) {}
-function foo(callback: () => number) {}
-function foo(callback: (_: bool) => number) {}
-function foo(callback: (_1: bool, _2: string) => number) {}
-function foo(callback: (_1: bool, ...foo: Array<number>) => number) {}
-function foo(): number{}
-function foo():() => void {}
-function foo():(_:bool) => number{}
-function foo():(_?:bool) => number{}
-function foo(): {} {}
-function foo<T>() {}
-function foo<T,S>() {}
-a = function<T,S>() {};
-a = { set fooProp(value: number) {} };
-a = { set fooProp(value: number): void {} };
-a = { get fooProp():number{} };
-a = { id<T>(x: T): T {} };
-a = { *id<T>(x: T): T {} };
-a = { async id<T>(x: T): T {} };
-a = { 123<T>(x: T): T {} };
+function foo1(numVal: any) {}
+function foo2(numVal: number) {}
+function foo3(numVal: number, strVal: string) {}
+function foo4(numVal: number, untypedVal) {}
+function foo5(untypedVal, numVal: number) {}
+function foo6(nullableNum: ?number) {}
+function foo7(callback: () => void) {}
+function foo8(callback: () => number) {}
+function foo9(callback: (_: bool) => number) {}
+function foo10(callback: (_1: bool, _2: string) => number) {}
+function foo11(callback: (_1: bool, ...foo: Array<number>) => number) {}
+function foo12(): number{}
+function foo13():() => void {}
+function foo14():(_:bool) => number{}
+function foo15():(_?:bool) => number{}
+function foo16(): {} {}
+function foo17<T>() {}
+function foo18<T,S>() {}
+a1 = function<T,S>() {};
+a2 = { set fooProp(value: number) {} };
+a3 = { set fooProp(value: number): void {} };
+a4 = { get fooProp():number{} };
+a5 = { id<T>(x: T): T {} };
+a6 = { *id<T>(x: T): T {} };
+a7 = { async id<T>(x: T): T {} };
+a8 = { 123<T>(x: T): T {} };
 class Foo {
   set fooProp(value: number) {}
 }
@@ -35,22 +35,22 @@ class Foo3 {
 }
 var numVal: number;
 var numVal: number = otherNumVal;
-var a: { numVal: number };
-var a: { numVal: number; };
-var a: { numVal: number; [indexer: string]: number };
-var a: ?{ numVal: number };
-var a: { numVal: number; strVal: string }
-var a: { subObj: {strVal: string} }
-var a: { subObj: ?{strVal: string} }
-var a: { param1: number; param2: string }
-var a: { param1: number; param2?: string }
-var a: { ...any; ...{}|{p: void} };
-var a: { [a: number]: string; [b: number]: string; };
-var a: { add(x: number, ...y: Array<string>): void };
-var a: { id<T>(x: T): T; };
-var a:Array<number> = [1, 2, 3]
-a = class Foo<T> {}
-a = class Foo<T> extends Bar<T> {}
+var a1: { numVal: number };
+var a2: { numVal: number; };
+var a3: { numVal: number; [indexer: string]: number };
+var a4: ?{ numVal: number };
+var a5: { numVal: number; strVal: string }
+var a6: { subObj: {strVal: string} }
+var a7: { subObj: ?{strVal: string} }
+var a8: { param1: number; param2: string }
+var a9: { param1: number; param2?: string }
+var a10: { ...any; ...{}|{p: void} };
+var a11: { [a: number]: string; [b: number]: string; };
+var a12: { add(x: number, ...y: Array<string>): void };
+var a13: { id<T>(x: T): T; };
+var a14:Array<number> = [1, 2, 3]
+a13 = class Foo<T> {}
+a14 = class Foo<T> extends Bar<T> {}
 class Foo4<T> {}
 class Foo5<T> extends Bar<T> {}
 class Foo6<T> extends mixin(Bar) {}
@@ -60,7 +60,7 @@ class Foo7<T> {
 class Foo8 {
   "bar"<T>() {}
 }
-function foo(requiredParam, optParam?) {}
+function foo19(requiredParam, optParam?) {}
 class Foo9 {
   prop1: string;
   prop2: number;
@@ -73,40 +73,39 @@ class Foo11 {
   #prop1: string;
   #prop2: number;
 }
-var x: number | string = 4;
+var x1: number | string = 4;
 class Array { concat(items:number | string) {}; }
-var x: () => number | () => string = fn;
-var x: typeof Y = Y;
-var x: typeof Y | number = Y;
-var {x}: {x: string; } = { x: "hello" };
-var {x}: {x: string } = { x: "hello" };
-var [x]: Array<string> = [ "hello" ];
-function foo({x}: { x: string; }) {}
-function foo([x]: Array<string>) {}
-function foo(...rest: Array<number>) {}
+var x2: () => number | () => string = fn;
+var x3: typeof Y = Y;
+var x4: typeof Y | number = Y;
+var {x5}: {x5: string; } = { x5: "hello" };
+var {x6}: {x6: string } = { x6: "hello" };
+var [x7]: Array<string> = [ "hello" ];
+function foo20({x}: { x: string; }) {}
+function foo21([x]: Array<string>) {}
+function foo22(...rest: Array<number>) {}
 (function (...rest: Array<number>) {});
 ((...rest: Array<number>) => rest);
-var a: Map<string, Array<string> >
-var a: Map<string, Array<string>>
-var a: number[]
-var a: ?string[]
-var a: Promise<bool>[]
-var a:(...rest:Array<number>) => number
-var identity: <T>(x: T) => T
-var identity: <T>(x: T, ...y:T[]) => T
-import type foo4 from "bar";
-import type { foo2, bar } from "baz";
-import type { foo as bar2 } from "baz";
+var a15: Map<string, Array<string> >
+var a16: Map<string, Array<string>>
+var a17: number[]
+var a18: ?string[]
+var a19: Promise<bool>[]
+var a20:(...rest:Array<number>) => number
+var identity1: <T>(x: T) => T
+var identity2: <T>(x: T, ...y:T[]) => T
+import type imp1 from "bar";
+import type { imp2, imp3 } from "baz";
+import type { foo as imp4 } from "baz";
 import type from "foo";
-import type2, { foo3 } from "bar";
 import typeof * as namespace from "bar";
-export type { foo };
+export type { foo1 };
 export type { foo2 } from "bar";
 import {type T} from "foo";
 import {type T2, V1} from "foo";
 import {typeof V2} from "foo";
 import {typeof V3, V4} from "foo";
-export interface foo5 { p: number }
-export interface foo6<T> { p: T }
+export interface int5 { p: number }
+export interface int6<T> { p: T }
 import 'foo';
 export type * from "foo";
diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/output.mjs b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/output.mjs
index 74989f4e7ef3..8df6545f3906 100644
--- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/output.mjs
+++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/strip-types/strip-type-annotations/output.mjs
@@ -1,66 +1,66 @@
-function foo(numVal) {}
+function foo1(numVal) {}
 
-function foo(numVal) {}
+function foo2(numVal) {}
 
-function foo(numVal, strVal) {}
+function foo3(numVal, strVal) {}
 
-function foo(numVal, untypedVal) {}
+function foo4(numVal, untypedVal) {}
 
-function foo(untypedVal, numVal) {}
+function foo5(untypedVal, numVal) {}
 
-function foo(nullableNum) {}
+function foo6(nullableNum) {}
 
-function foo(callback) {}
+function foo7(callback) {}
 
-function foo(callback) {}
+function foo8(callback) {}
 
-function foo(callback) {}
+function foo9(callback) {}
 
-function foo(callback) {}
+function foo10(callback) {}
 
-function foo(callback) {}
+function foo11(callback) {}
 
-function foo() {}
+function foo12() {}
 
-function foo() {}
+function foo13() {}
 
-function foo() {}
+function foo14() {}
 
-function foo() {}
+function foo15() {}
 
-function foo() {}
+function foo16() {}
 
-function foo() {}
+function foo17() {}
 
-function foo() {}
+function foo18() {}
 
-a = function () {};
+a1 = function () {};
 
-a = {
+a2 = {
   set fooProp(value) {}
 
 };
-a = {
+a3 = {
   set fooProp(value) {}
 
 };
-a = {
+a4 = {
   get fooProp() {}
 
 };
-a = {
+a5 = {
   id(x) {}
 
 };
-a = {
+a6 = {
   *id(x) {}
 
 };
-a = {
+a7 = {
   async id(x) {}
 
 };
-a = {
+a8 = {
   123(x) {}
 
 };
@@ -82,22 +82,22 @@ class Foo3 {
 
 var numVal;
 var numVal = otherNumVal;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var a = [1, 2, 3];
-a = class Foo {};
-a = class Foo extends Bar {};
+var a1;
+var a2;
+var a3;
+var a4;
+var a5;
+var a6;
+var a7;
+var a8;
+var a9;
+var a10;
+var a11;
+var a12;
+var a13;
+var a14 = [1, 2, 3];
+a13 = class Foo {};
+a14 = class Foo extends Bar {};
 
 class Foo4 {}
 
@@ -117,7 +117,7 @@ class Foo8 {
 
 }
 
-function foo(requiredParam, optParam) {}
+function foo19(requiredParam, optParam) {}
 
 class Foo9 {}
 
@@ -128,50 +128,49 @@ class Foo11 {
   #prop2;
 }
 
-var x = 4;
+var x1 = 4;
 
 class Array {
   concat(items) {}
 
 }
 
-var x = fn;
-var x = Y;
-var x = Y;
+var x2 = fn;
+var x3 = Y;
+var x4 = Y;
 var {
-  x
+  x5
 } = {
-  x: "hello"
+  x5: "hello"
 };
 var {
-  x
+  x6
 } = {
-  x: "hello"
+  x6: "hello"
 };
-var [x] = ["hello"];
+var [x7] = ["hello"];
 
-function foo({
+function foo20({
   x
 }) {}
 
-function foo([x]) {}
+function foo21([x]) {}
 
-function foo(...rest) {}
+function foo22(...rest) {}
 
 (function (...rest) {});
 
 (...rest) => rest;
 
-var a;
-var a;
-var a;
-var a;
-var a;
-var a;
-var identity;
-var identity;
+var a15;
+var a16;
+var a17;
+var a18;
+var a19;
+var a20;
+var identity1;
+var identity2;
 import type from "foo";
-import type2, { foo3 } from "bar";
 import { V1 } from "foo";
 import { V4 } from "foo";
 import 'foo';
diff --git a/packages/babel-plugin-transform-for-of/package.json b/packages/babel-plugin-transform-for-of/package.json
index eda8d9c39c96..66d3aa78455d 100644
--- a/packages/babel-plugin-transform-for-of/package.json
+++ b/packages/babel-plugin-transform-for-of/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-for-of",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Compile ES2015 for...of to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-for-of",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-for-of/src/index.js b/packages/babel-plugin-transform-for-of/src/index.js
index 057a6846fbd7..cd4c6e17bcd5 100644
--- a/packages/babel-plugin-transform-for-of/src/index.js
+++ b/packages/babel-plugin-transform-for-of/src/index.js
@@ -14,6 +14,8 @@ export default declare((api, options) => {
 
   if (assumeArray) {
     return {
+      name: "transform-for-of",
+
       visitor: {
         ForOfStatement(path) {
           const { scope } = path;
@@ -68,7 +70,7 @@ export default declare((api, options) => {
     : pushComputedPropsSpec;
 
   const buildForOfArray = template(`
-    for (var KEY = 0; KEY < ARR.length; KEY++) BODY;
+    for (var KEY = 0, NAME = ARR; KEY < NAME.length; KEY++) BODY;
   `);
 
   const buildForOfLoose = template(`
@@ -116,25 +118,15 @@ export default declare((api, options) => {
 
   function _ForOfStatementArray(path) {
     const { node, scope } = path;
-    const nodes = [];
-    let right = node.right;
-
-    if (!t.isIdentifier(right) || !scope.hasBinding(right.name)) {
-      const uid = scope.generateUid("arr");
-      nodes.push(
-        t.variableDeclaration("var", [
-          t.variableDeclarator(t.identifier(uid), right),
-        ]),
-      );
-      right = t.identifier(uid);
-    }
 
+    const right = scope.generateUidIdentifierBasedOnNode(node.right, "arr");
     const iterationKey = scope.generateUidIdentifier("i");
 
     let loop = buildForOfArray({
       BODY: node.body,
       KEY: iterationKey,
-      ARR: right,
+      NAME: right,
+      ARR: node.right,
     });
 
     t.inherits(loop, node);
@@ -162,9 +154,7 @@ export default declare((api, options) => {
       loop = t.labeledStatement(path.parentPath.node.label, loop);
     }
 
-    nodes.push(loop);
-
-    return nodes;
+    return [loop];
   }
 
   function replaceWithArray(path) {
@@ -176,6 +166,7 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "transform-for-of",
     visitor: {
       ForOfStatement(path, state) {
         const right = path.get("right");
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/error/invalid-option/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/error/invalid-option/options.json
index c18fd74438ef..2f5c6598efb7 100644
--- a/packages/babel-plugin-transform-for-of/test/fixtures/error/invalid-option/options.json
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/error/invalid-option/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [["transform-for-of", { "assumeArray": true, "loose": true }]],
-  "throws":
-    "The loose and assumeArray options cannot be used together in @babel/plugin-transform-for-of"
+  "throws": "The loose and assumeArray options cannot be used together in @babel/plugin-transform-for-of"
 }
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/for-of-as-array/for-of-redeclare/input.js b/packages/babel-plugin-transform-for-of/test/fixtures/for-of-as-array/for-of-redeclare/input.js
new file mode 100644
index 000000000000..3abfab88f65b
--- /dev/null
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/for-of-as-array/for-of-redeclare/input.js
@@ -0,0 +1,3 @@
+for (let o of arr) {
+  const arr = o;
+}
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/for-of-as-array/for-of-redeclare/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/for-of-as-array/for-of-redeclare/output.js
new file mode 100644
index 000000000000..81a8e0ef45fb
--- /dev/null
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/for-of-as-array/for-of-redeclare/output.js
@@ -0,0 +1,4 @@
+for (let _i = 0, _arr = arr; _i < _arr.length; _i++) {
+  let o = _arr[_i];
+  const arr = o;
+}
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/opt/array-binding/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/opt/array-binding/output.js
index ffdfc695cfb1..e8f8aeb809d0 100644
--- a/packages/babel-plugin-transform-for-of/test/fixtures/opt/array-binding/output.js
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/opt/array-binding/output.js
@@ -1,11 +1,11 @@
 const x = [];
 
-for (var _i = 0; _i < x.length; _i++) {
-  const y = x[_i];
+for (var _i = 0, _x = x; _i < _x.length; _i++) {
+  const y = _x[_i];
 }
 
 const arr = Object.entries(x);
 
-for (var _i2 = 0; _i2 < arr.length; _i2++) {
-  const y = arr[_i2];
+for (var _i2 = 0, _arr = arr; _i2 < _arr.length; _i2++) {
+  const y = _arr[_i2];
 }
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/opt/built-ins/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/opt/built-ins/output.js
index c04a64bea6e1..873cadbbf76c 100644
--- a/packages/babel-plugin-transform-for-of/test/fixtures/opt/built-ins/output.js
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/opt/built-ins/output.js
@@ -1,29 +1,19 @@
-var _arr = [];
-
-for (var _i = 0; _i < _arr.length; _i++) {
+for (var _i = 0, _arr = []; _i < _arr.length; _i++) {
   const y = _arr[_i];
 }
 
-var _arr2 = Array.from(x);
-
-for (var _i2 = 0; _i2 < _arr2.length; _i2++) {
-  const y = _arr2[_i2];
+for (var _i2 = 0, _Array$from = Array.from(x); _i2 < _Array$from.length; _i2++) {
+  const y = _Array$from[_i2];
 }
 
-var _arr3 = Object.keys(x);
-
-for (var _i3 = 0; _i3 < _arr3.length; _i3++) {
-  const y = _arr3[_i3];
+for (var _i3 = 0, _Object$keys = Object.keys(x); _i3 < _Object$keys.length; _i3++) {
+  const y = _Object$keys[_i3];
 }
 
-var _arr4 = Object.values(x);
-
-for (var _i4 = 0; _i4 < _arr4.length; _i4++) {
-  const y = _arr4[_i4];
+for (var _i4 = 0, _Object$values = Object.values(x); _i4 < _Object$values.length; _i4++) {
+  const y = _Object$values[_i4];
 }
 
-var _arr5 = Object.entries(x);
-
-for (var _i5 = 0; _i5 < _arr5.length; _i5++) {
-  const y = _arr5[_i5];
+for (var _i5 = 0, _Object$entries = Object.entries(x); _i5 < _Object$entries.length; _i5++) {
+  const y = _Object$entries[_i5];
 }
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/opt/typeannotation/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/opt/typeannotation/output.js
index 04108bdc793d..55ebccb8d7db 100644
--- a/packages/babel-plugin-transform-for-of/test/fixtures/opt/typeannotation/output.js
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/opt/typeannotation/output.js
@@ -1,6 +1,4 @@
-var _arr = b;
-
-for (var _i = 0; _i < _arr.length; _i++) {
+for (var _i = 0, _arr = b; _i < _arr.length; _i++) {
   const y = _arr[_i];
 }
 
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-block-label-3858/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-block-label-3858/output.js
index 79a8edf0bce7..0085c57dcafa 100644
--- a/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-block-label-3858/output.js
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-block-label-3858/output.js
@@ -1,7 +1,5 @@
 if (true) {
-  var _arr = [];
-
-  loop: for (var _i = 0; _i < _arr.length; _i++) {
+  loop: for (var _i = 0, _arr = []; _i < _arr.length; _i++) {
     let ch = _arr[_i];
   }
 }
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-label-3858/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-label-3858/output.js
index 79a8edf0bce7..0085c57dcafa 100644
--- a/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-label-3858/output.js
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/if-label-3858/output.js
@@ -1,7 +1,5 @@
 if (true) {
-  var _arr = [];
-
-  loop: for (var _i = 0; _i < _arr.length; _i++) {
+  loop: for (var _i = 0, _arr = []; _i < _arr.length; _i++) {
     let ch = _arr[_i];
   }
 }
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/redeclare-array-8913/input.js b/packages/babel-plugin-transform-for-of/test/fixtures/regression/redeclare-array-8913/input.js
new file mode 100644
index 000000000000..9b14e068e020
--- /dev/null
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/redeclare-array-8913/input.js
@@ -0,0 +1,5 @@
+function f(...t) {
+  for (let o of t) {
+    const t = o;
+  }
+}
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/redeclare-array-8913/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/regression/redeclare-array-8913/output.js
new file mode 100644
index 000000000000..73b85fd6d722
--- /dev/null
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/redeclare-array-8913/output.js
@@ -0,0 +1,6 @@
+function f(...t) {
+  for (var _i = 0, _t = t; _i < _t.length; _i++) {
+    let o = _t[_i];
+    const t = o;
+  }
+}
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/exec.js b/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/exec.js
new file mode 100644
index 000000000000..05e8b874a7b2
--- /dev/null
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/exec.js
@@ -0,0 +1,9 @@
+var arr = [1, 2, 3];
+var results = [];
+
+for (let v of arr) {
+  results.push(v);
+  arr = null;
+}
+
+expect(results).toEqual([1, 2, 3]);
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/input.js b/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/input.js
new file mode 100644
index 000000000000..a146399f4b6d
--- /dev/null
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/input.js
@@ -0,0 +1,6 @@
+var arr = [1,2,3]
+
+for (let v of arr) {
+  console.log(v)
+  arr = null
+}
diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/output.js b/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/output.js
new file mode 100644
index 000000000000..a8bbca26392f
--- /dev/null
+++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/scope-9696/output.js
@@ -0,0 +1,7 @@
+var arr = [1, 2, 3];
+
+for (var _i = 0, _arr = arr; _i < _arr.length; _i++) {
+  let v = _arr[_i];
+  console.log(v);
+  arr = null;
+}
diff --git a/packages/babel-plugin-transform-function-name/package.json b/packages/babel-plugin-transform-function-name/package.json
index d34e1f48c6c6..2a03ae1b21ac 100644
--- a/packages/babel-plugin-transform-function-name/package.json
+++ b/packages/babel-plugin-transform-function-name/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-function-name",
-  "version": "7.1.0",
+  "version": "7.4.4",
   "description": "Apply ES2015 function.name semantics to all functions",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-function-name",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-function-name/src/index.js b/packages/babel-plugin-transform-function-name/src/index.js
index 733a56096aaf..4c9c56f083e9 100644
--- a/packages/babel-plugin-transform-function-name/src/index.js
+++ b/packages/babel-plugin-transform-function-name/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-function-name",
+
     visitor: {
       FunctionExpression: {
         exit(path) {
diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/output.js b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/output.js
index c652c1e2073b..b964949fa89e 100644
--- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/output.js
+++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _default = function _default() {
   return {
@@ -13,4 +13,4 @@ var _default = function _default() {
   };
 };
 
-exports.default = _default;
+exports["default"] = _default;
diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/output.js b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/output.js
index f7a52d1c29ab..d408ec5652ca 100644
--- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/output.js
+++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _default = function _default(_ref) {
   var _onClick = _ref.onClick;
@@ -14,4 +14,4 @@ var _default = function _default(_ref) {
   });
 };
 
-exports.default = _default;
+exports["default"] = _default;
diff --git a/packages/babel-plugin-transform-instanceof/package.json b/packages/babel-plugin-transform-instanceof/package.json
index 857295ff80b2..323984f68c50 100644
--- a/packages/babel-plugin-transform-instanceof/package.json
+++ b/packages/babel-plugin-transform-instanceof/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-instanceof",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "This plugin transforms all the ES2015 'instanceof' methods",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-instanceof",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-instanceof/src/index.js b/packages/babel-plugin-transform-instanceof/src/index.js
index dc9d402880dc..442bd3f8bd5d 100644
--- a/packages/babel-plugin-transform-instanceof/src/index.js
+++ b/packages/babel-plugin-transform-instanceof/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-instanceof",
+
     visitor: {
       BinaryExpression(path) {
         const { node } = path;
diff --git a/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/exec.js b/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/exec.js
index 187f18b8f7a2..eb681c286f3f 100644
--- a/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/exec.js
+++ b/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/exec.js
@@ -4,6 +4,11 @@ foo[Symbol.hasInstance]= function () { return true; };
 var bar = {};
 
 expect(bar instanceof foo).toBe(true);
+
+var qux = {};
+qux[Symbol.hasInstance]= function () { return NaN };
+expect(bar instanceof qux).toBe(false);
+
 expect(new String).toBeInstanceOf(String);
 
 //
diff --git a/packages/babel-plugin-transform-jscript/package.json b/packages/babel-plugin-transform-jscript/package.json
index 72c7108e9249..81bbf34e52c0 100644
--- a/packages/babel-plugin-transform-jscript/package.json
+++ b/packages/babel-plugin-transform-jscript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-jscript",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Babel plugin to fix buggy JScript named function expressions",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-jscript",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-jscript/src/index.js b/packages/babel-plugin-transform-jscript/src/index.js
index 868f94c000ad..06bbad6d3606 100644
--- a/packages/babel-plugin-transform-jscript/src/index.js
+++ b/packages/babel-plugin-transform-jscript/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-jscript",
+
     visitor: {
       FunctionExpression: {
         exit(path) {
diff --git a/packages/babel-plugin-transform-literals/package.json b/packages/babel-plugin-transform-literals/package.json
index 489c2b7c29f1..5f171fa2f0e8 100644
--- a/packages/babel-plugin-transform-literals/package.json
+++ b/packages/babel-plugin-transform-literals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-literals",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Compile ES2015 unicode string and number literals to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-literals",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-literals/src/index.js b/packages/babel-plugin-transform-literals/src/index.js
index 82c90e860443..879a37c49f08 100644
--- a/packages/babel-plugin-transform-literals/src/index.js
+++ b/packages/babel-plugin-transform-literals/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-literals",
+
     visitor: {
       NumericLiteral({ node }) {
         // number octal like 0b10 or 0o70
diff --git a/packages/babel-plugin-transform-member-expression-literals/package.json b/packages/babel-plugin-transform-member-expression-literals/package.json
index 3a5141dae879..58e267904e81 100644
--- a/packages/babel-plugin-transform-member-expression-literals/package.json
+++ b/packages/babel-plugin-transform-member-expression-literals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-member-expression-literals",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Ensure that reserved words are quoted in property accesses",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-member-expression-literals",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-member-expression-literals/src/index.js b/packages/babel-plugin-transform-member-expression-literals/src/index.js
index d31b955247f4..78e4f947330c 100644
--- a/packages/babel-plugin-transform-member-expression-literals/src/index.js
+++ b/packages/babel-plugin-transform-member-expression-literals/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-member-expression-literals",
+
     visitor: {
       MemberExpression: {
         exit({ node }) {
diff --git a/packages/babel-plugin-transform-modules-amd/package.json b/packages/babel-plugin-transform-modules-amd/package.json
index 914f171a1031..fd87e33c074a 100644
--- a/packages/babel-plugin-transform-modules-amd/package.json
+++ b/packages/babel-plugin-transform-modules-amd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-modules-amd",
-  "version": "7.1.0",
+  "version": "7.5.0",
   "description": "This plugin transforms ES2015 modules to AMD",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-amd",
   "license": "MIT",
@@ -10,7 +10,8 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/helper-module-transforms": "^7.1.0",
-    "@babel/helper-plugin-utils": "^7.0.0"
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "babel-plugin-dynamic-import-node": "^2.3.0"
   },
   "keywords": [
     "babel-plugin"
@@ -19,7 +20,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-modules-amd/src/index.js b/packages/babel-plugin-transform-modules-amd/src/index.js
index 2bceb843c346..5ad9cd9861a3 100644
--- a/packages/babel-plugin-transform-modules-amd/src/index.js
+++ b/packages/babel-plugin-transform-modules-amd/src/index.js
@@ -9,21 +9,92 @@ import {
   wrapInterop,
 } from "@babel/helper-module-transforms";
 import { template, types as t } from "@babel/core";
+import { getImportSource } from "babel-plugin-dynamic-import-node/utils";
 
 const buildWrapper = template(`
   define(MODULE_NAME, AMD_ARGUMENTS, function(IMPORT_NAMES) {
   })
 `);
 
+const buildAnonymousWrapper = template(`
+  define(["require"], function(REQUIRE) {
+  })
+`);
+
+function injectWrapper(path, wrapper) {
+  const { body, directives } = path.node;
+  path.node.directives = [];
+  path.node.body = [];
+  const amdWrapper = path.pushContainer("body", wrapper)[0];
+  const amdFactory = amdWrapper
+    .get("expression.arguments")
+    .filter(arg => arg.isFunctionExpression())[0]
+    .get("body");
+  amdFactory.pushContainer("directives", directives);
+  amdFactory.pushContainer("body", body);
+}
+
 export default declare((api, options) => {
   api.assertVersion(7);
 
   const { loose, allowTopLevelThis, strict, strictMode, noInterop } = options;
   return {
+    name: "transform-modules-amd",
+
+    pre() {
+      this.file.set("@babel/plugin-transform-modules-*", "amd");
+    },
+
     visitor: {
+      CallExpression(path, state) {
+        if (!this.file.has("@babel/plugin-proposal-dynamic-import")) return;
+        if (!path.get("callee").isImport()) return;
+
+        let { requireId, resolveId, rejectId } = state;
+        if (!requireId) {
+          requireId = path.scope.generateUidIdentifier("require");
+          state.requireId = requireId;
+        }
+        if (!resolveId || !rejectId) {
+          resolveId = path.scope.generateUidIdentifier("resolve");
+          rejectId = path.scope.generateUidIdentifier("reject");
+          state.resolveId = resolveId;
+          state.rejectId = rejectId;
+        }
+
+        let result = t.identifier("imported");
+        if (!noInterop) result = wrapInterop(path, result, "namespace");
+
+        path.replaceWith(
+          template.expression.ast`
+            new Promise((${resolveId}, ${rejectId}) =>
+              ${requireId}(
+                [${getImportSource(t, path.node)}],
+                imported => ${resolveId}(${result}),
+                ${rejectId}
+              )
+            )`,
+        );
+      },
+
       Program: {
-        exit(path) {
-          if (!isModule(path)) return;
+        exit(path, { requireId }) {
+          if (!isModule(path)) {
+            if (requireId) {
+              injectWrapper(
+                path,
+                buildAnonymousWrapper({ REQUIRE: requireId }),
+              );
+            }
+            return;
+          }
+
+          const amdArgs = [];
+          const importNames = [];
+          if (requireId) {
+            amdArgs.push(t.stringLiteral("require"));
+            importNames.push(requireId);
+          }
 
           let moduleName = this.getModuleName();
           if (moduleName) moduleName = t.stringLiteral(moduleName);
@@ -39,9 +110,6 @@ export default declare((api, options) => {
             },
           );
 
-          const amdArgs = [];
-          const importNames = [];
-
           if (hasExports(meta)) {
             amdArgs.push(t.stringLiteral("exports"));
 
@@ -79,23 +147,15 @@ export default declare((api, options) => {
           ensureStatementsHoisted(headers);
           path.unshiftContainer("body", headers);
 
-          const { body, directives } = path.node;
-          path.node.directives = [];
-          path.node.body = [];
-          const amdWrapper = path.pushContainer("body", [
+          injectWrapper(
+            path,
             buildWrapper({
               MODULE_NAME: moduleName,
 
               AMD_ARGUMENTS: t.arrayExpression(amdArgs),
               IMPORT_NAMES: importNames,
             }),
-          ])[0];
-          const amdFactory = amdWrapper
-            .get("expression.arguments")
-            .filter(arg => arg.isFunctionExpression())[0]
-            .get("body");
-          amdFactory.pushContainer("directives", directives);
-          amdFactory.pushContainer("body", body);
+          );
         },
       },
     },
diff --git a/packages/babel-plugin-transform-modules-commonjs/package.json b/packages/babel-plugin-transform-modules-commonjs/package.json
index 8d6c75e22ccd..00a0df0c6201 100644
--- a/packages/babel-plugin-transform-modules-commonjs/package.json
+++ b/packages/babel-plugin-transform-modules-commonjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-modules-commonjs",
-  "version": "7.1.0",
+  "version": "7.5.0",
   "description": "This plugin transforms ES2015 modules to CommonJS",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-commonjs",
   "license": "MIT",
@@ -9,9 +9,10 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-module-transforms": "^7.1.0",
+    "@babel/helper-module-transforms": "^7.4.4",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-simple-access": "^7.1.0"
+    "@babel/helper-simple-access": "^7.1.0",
+    "babel-plugin-dynamic-import-node": "^2.3.0"
   },
   "keywords": [
     "babel-plugin"
@@ -20,8 +21,8 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "@babel/plugin-syntax-object-rest-spread": "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-transform-modules-commonjs/src/index.js b/packages/babel-plugin-transform-modules-commonjs/src/index.js
index 6bf6ff482956..11d4617f4398 100644
--- a/packages/babel-plugin-transform-modules-commonjs/src/index.js
+++ b/packages/babel-plugin-transform-modules-commonjs/src/index.js
@@ -10,9 +10,13 @@ import {
 import simplifyAccess from "@babel/helper-simple-access";
 import { template, types as t } from "@babel/core";
 
+import { createDynamicImportTransform } from "babel-plugin-dynamic-import-node/utils";
+
 export default declare((api, options) => {
   api.assertVersion(7);
 
+  const transformImportCall = createDynamicImportTransform(api);
+
   const {
     loose,
 
@@ -116,7 +120,25 @@ export default declare((api, options) => {
   };
 
   return {
+    name: "transform-modules-commonjs",
+
+    pre() {
+      this.file.set("@babel/plugin-transform-modules-*", "commonjs");
+    },
+
     visitor: {
+      CallExpression(path) {
+        if (!this.file.has("@babel/plugin-proposal-dynamic-import")) return;
+        if (!path.get("callee").isImport()) return;
+
+        let { scope } = path;
+        do {
+          scope.rename("require");
+        } while ((scope = scope.parent));
+
+        transformImportCall(this, path.get("callee"));
+      },
+
       Program: {
         exit(path, state) {
           if (!isModule(path)) return;
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/live-rewrite/input.mjs b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/live-rewrite/input.mjs
new file mode 100644
index 000000000000..020955cd324d
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/live-rewrite/input.mjs
@@ -0,0 +1,14 @@
+import {test1, test2, test3, test4, test5, test6, test7, test8, test9} from 'anywhere';
+
+class Example {
+  #test1 = test1;
+  test2 = test2;
+  #test3() { return test3; }
+  test4() { return test4; }
+  get #test5() { return test5; }
+  get test6() { return test6; }
+
+  #test7 = this.#test1;
+  #test8() { return this.#test3(); }
+  get #test9() { return this.#test5(); }
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/live-rewrite/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/live-rewrite/output.js
new file mode 100644
index 000000000000..6a8704aee87b
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/live-rewrite/output.js
@@ -0,0 +1,35 @@
+"use strict";
+
+var _anywhere = require("anywhere");
+
+class Example {
+  #test1 = _anywhere.test1;
+  test2 = _anywhere.test2;
+
+  #test3() {
+    return _anywhere.test3;
+  }
+
+  test4() {
+    return _anywhere.test4;
+  }
+
+  get #test5() {
+    return _anywhere.test5;
+  }
+
+  get test6() {
+    return _anywhere.test6;
+  }
+
+  #test7 = this.#test1;
+
+  #test8() {
+    return this.#test3();
+  }
+
+  get #test9() {
+    return this.#test5();
+  }
+
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/options.json
new file mode 100644
index 000000000000..cfb4f002f46a
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/options.json
@@ -0,0 +1,6 @@
+{
+  "parserOpts": {
+    "plugins": ["classProperties", "classPrivateProperties", "classPrivateMethods"]
+  },
+  "plugins": ["transform-modules-commonjs"]
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private-method/input.mjs b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private-method/input.mjs
new file mode 100644
index 000000000000..e61557f40092
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private-method/input.mjs
@@ -0,0 +1,5 @@
+class Example {
+  #method() {
+    console.log(this);
+  }
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private-method/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private-method/output.js
new file mode 100644
index 000000000000..c4427337a50d
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private-method/output.js
@@ -0,0 +1,8 @@
+"use strict";
+
+class Example {
+  #method() {
+    console.log(this);
+  }
+
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private/input.mjs b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private/input.mjs
new file mode 100644
index 000000000000..d654d4e40f3f
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private/input.mjs
@@ -0,0 +1,3 @@
+class Example {
+  #property = this;
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private/output.js
new file mode 100644
index 000000000000..23a7990566dd
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/private/output.js
@@ -0,0 +1,5 @@
+"use strict";
+
+class Example {
+  #property = this;
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/public/input.mjs b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/public/input.mjs
new file mode 100644
index 000000000000..95c59a13feb4
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/public/input.mjs
@@ -0,0 +1,3 @@
+class Example {
+  property = this;
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/public/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/public/output.js
new file mode 100644
index 000000000000..fde228b2b566
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/class-properties/public/output.js
@@ -0,0 +1,5 @@
+"use strict";
+
+class Example {
+  property = this;
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js
index 9930c38eb4aa..fc02ffa1536e 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js
@@ -2,6 +2,8 @@
 
 var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
 
+exports.__esModule = true;
+
 var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault"));
 
 console.log(_interopRequireDefault2.default);
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js
index 9930c38eb4aa..2e762d530630 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js
@@ -2,6 +2,10 @@
 
 var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
 var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault"));
 
 console.log(_interopRequireDefault2.default);
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-default/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-default/output.js
index a8f74edadbaa..26619f436931 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-default/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-default/output.js
@@ -1,16 +1,16 @@
 "use strict";
 
-var _white = babelHelpers.interopRequireDefault(require("white"));
+function _white() {
+  const data = babelHelpers.interopRequireDefault(require("white"));
 
-function _black() {
-  const data = babelHelpers.interopRequireDefault(require("black"));
-
-  _black = function () {
+  _white = function () {
     return data;
   };
 
   return data;
 }
 
-console.log(_white.default);
-console.log(_black().default);
+var _black = babelHelpers.interopRequireDefault(require("black"));
+
+console.log(_white().default);
+console.log(_black.default);
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-named/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-named/output.js
index 839569975a87..90c5f2516677 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-named/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-named/output.js
@@ -1,16 +1,16 @@
 "use strict";
 
-var _white = require("white");
+function _white() {
+  const data = require("white");
 
-function _black() {
-  const data = require("black");
-
-  _black = function () {
+  _white = function () {
     return data;
   };
 
   return data;
 }
 
-console.log(_white.foo1);
-console.log(_black().foo2);
+var _black = require("black");
+
+console.log(_white().foo1);
+console.log(_black.foo2);
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-namespace/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-namespace/output.js
index 848b8cb1d317..208fc75d2196 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-namespace/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/import-namespace/output.js
@@ -1,16 +1,15 @@
 "use strict";
 
-var foo1 = babelHelpers.interopRequireDefault(require("white"));
+function foo1() {
+  const data = babelHelpers.interopRequireDefault(require("white"));
 
-function foo2() {
-  const data = babelHelpers.interopRequireDefault(require("black"));
-
-  foo2 = function () {
+  foo1 = function () {
     return data;
   };
 
   return data;
 }
 
-console.log(foo1);
-console.log(foo2());
+var foo2 = babelHelpers.interopRequireDefault(require("black"));
+console.log(foo1());
+console.log(foo2);
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-default/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-default/output.js
index 4286297a7d35..472469de8f99 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-default/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-default/output.js
@@ -6,8 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () {
-    return _white.default;
+    return _white().default;
   }
 });
 
-var _white = babelHelpers.interopRequireDefault(require("white"));
+function _white() {
+  const data = babelHelpers.interopRequireDefault(require("white"));
+
+  _white = function () {
+    return data;
+  };
+
+  return data;
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-named/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-named/output.js
index 5ef2c0f7bf59..14225e43f309 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-named/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-named/output.js
@@ -6,24 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "named1", {
   enumerable: true,
   get: function () {
-    return _white.named1;
+    return _white().named1;
   }
 });
 Object.defineProperty(exports, "named2", {
   enumerable: true,
   get: function () {
-    return _black().named2;
+    return _black.named2;
   }
 });
 
-var _white = require("white");
+function _white() {
+  const data = require("white");
 
-function _black() {
-  const data = require("black");
-
-  _black = function () {
+  _white = function () {
     return data;
   };
 
   return data;
 }
+
+var _black = require("black");
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-namespace/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-namespace/output.js
index 999143700b19..6eaee023ec52 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-namespace/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/reexport-namespace/output.js
@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.namespace2 = exports.namespace1 = void 0;
-var namespace1 = babelHelpers.interopRequireDefault(require("white"));
-exports.namespace1 = namespace1;
 
-function namespace2() {
-  const data = babelHelpers.interopRequireDefault(require("black"));
+function namespace1() {
+  const data = babelHelpers.interopRequireDefault(require("white"));
 
-  namespace2 = function () {
+  namespace1 = function () {
     return data;
   };
 
   return data;
 }
 
-Object.defineProperty(exports, "namespace2", {
+Object.defineProperty(exports, "namespace1", {
   enumerable: true,
   get: function () {
-    return namespace2();
+    return namespace1();
   }
 });
+var namespace2 = babelHelpers.interopRequireDefault(require("black"));
+exports.namespace2 = namespace2;
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/import-const-throw/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/import-const-throw/output.js
index 7b05f0c82458..01984ae47f96 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/import-const-throw/output.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/import-const-throw/output.js
@@ -18,24 +18,32 @@ _baz.Baz = (44, function () {
   throw new Error('"' + "Baz" + '" is read-only.');
 }());
 ({
-  Foo: _foo.default
-} = {});
+  Foo
+} = ({}, function () {
+  throw new Error('"' + "Foo" + '" is read-only.');
+}()));
 ({
   Bar
 } = ({}, function () {
   throw new Error('"' + "Bar" + '" is read-only.');
 }()));
 ({
-  Baz: _baz.Baz
-} = {});
+  Baz
+} = ({}, function () {
+  throw new Error('"' + "Baz" + '" is read-only.');
+}()));
 ({
-  prop: _foo.default
-} = {});
+  prop: Foo
+} = ({}, function () {
+  throw new Error('"' + "Foo" + '" is read-only.');
+}()));
 ({
   prop: Bar
 } = ({}, function () {
   throw new Error('"' + "Bar" + '" is read-only.');
 }()));
 ({
-  prop: _baz.Baz
-} = {});
+  prop: Baz
+} = ({}, function () {
+  throw new Error('"' + "Baz" + '" is read-only.');
+}()));
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/input.mjs b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/input.mjs
new file mode 100644
index 000000000000..cb0ff5c3b541
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/input.mjs
@@ -0,0 +1 @@
+export {};
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/options.json
new file mode 100644
index 000000000000..81e5ce12436d
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-modules-commonjs"]
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/output.js
new file mode 100644
index 000000000000..e8650c927876
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9155/output.js
@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/input.mjs b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/input.mjs
new file mode 100644
index 000000000000..cdc221254f38
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/input.mjs
@@ -0,0 +1,3 @@
+import x from './x';
+
+export default function(x) {}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/options.json
new file mode 100644
index 000000000000..81e5ce12436d
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-modules-commonjs"]
+}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/output.js
new file mode 100644
index 000000000000..d1b46e901e14
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/issue-9611/output.js
@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+
+var _x = _interopRequireDefault(require("./x"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _default(x) {}
diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/exec.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/exec.js
index 6d0c797949d5..c3b5044c0b2b 100644
--- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/exec.js
+++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/exec.js
@@ -23,6 +23,7 @@ var tests = [
 
 tests.forEach(function (code) {
   var res = transform(code, {
+    configFile: false,
     sourceMap: true,
     plugins: opts.plugins
   });
diff --git a/packages/babel-plugin-transform-modules-systemjs/package.json b/packages/babel-plugin-transform-modules-systemjs/package.json
index 0258b460e9c3..d827ae959527 100644
--- a/packages/babel-plugin-transform-modules-systemjs/package.json
+++ b/packages/babel-plugin-transform-modules-systemjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-modules-systemjs",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "This plugin transforms ES2015 modules to SystemJS",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-systemjs",
   "license": "MIT",
@@ -9,8 +9,9 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-hoist-variables": "^7.0.0",
-    "@babel/helper-plugin-utils": "^7.0.0"
+    "@babel/helper-hoist-variables": "^7.4.4",
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "babel-plugin-dynamic-import-node": "^2.3.0"
   },
   "keywords": [
     "babel-plugin"
@@ -19,8 +20,8 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0"
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0"
   }
 }
diff --git a/packages/babel-plugin-transform-modules-systemjs/src/index.js b/packages/babel-plugin-transform-modules-systemjs/src/index.js
index 5f93094be5bb..779b76170cdc 100644
--- a/packages/babel-plugin-transform-modules-systemjs/src/index.js
+++ b/packages/babel-plugin-transform-modules-systemjs/src/index.js
@@ -1,6 +1,7 @@
 import { declare } from "@babel/helper-plugin-utils";
 import hoistVariables from "@babel/helper-hoist-variables";
 import { template, types as t } from "@babel/core";
+import { getImportSource } from "babel-plugin-dynamic-import-node/utils";
 
 const buildTemplate = template(`
   SYSTEM_REGISTER(MODULE_NAME, SOURCES, function (EXPORT_IDENTIFIER, CONTEXT_IDENTIFIER) {
@@ -21,6 +22,12 @@ const buildExportAll = template(`
   }
 `);
 
+const MISSING_PLUGIN_WARNING = `\
+WARNING: Dynamic import() transformation must be enabled using the
+         @babel/plugin-proposal-dynamic-import plugin. Babel 8 will
+         no longer transform import() without using that plugin.
+`;
+
 function constructExportCall(
   path,
   exportIdent,
@@ -96,8 +103,6 @@ function constructExportCall(
   return statements;
 }
 
-const TYPE_IMPORT = "Import";
-
 export default declare((api, options) => {
   api.assertVersion(7);
 
@@ -113,7 +118,7 @@ export default declare((api, options) => {
 
       if (arg.isObjectPattern() || arg.isArrayPattern()) {
         const exprs = [path.node];
-        for (const name in arg.getBindingIdentifiers()) {
+        for (const name of Object.keys(arg.getBindingIdentifiers())) {
           if (this.scope.getBinding(name) !== path.scope.getBinding(name)) {
             return;
           }
@@ -166,16 +171,26 @@ export default declare((api, options) => {
   };
 
   return {
+    name: "transform-modules-systemjs",
+
+    pre() {
+      this.file.set("@babel/plugin-transform-modules-*", "systemjs");
+    },
+
     visitor: {
       CallExpression(path, state) {
-        if (path.node.callee.type === TYPE_IMPORT) {
+        if (t.isImport(path.node.callee)) {
+          if (!this.file.has("@babel/plugin-proposal-dynamic-import")) {
+            console.warn(MISSING_PLUGIN_WARNING);
+          }
+
           path.replaceWith(
             t.callExpression(
               t.memberExpression(
                 t.identifier(state.contextIdent),
                 t.identifier("import"),
               ),
-              path.node.arguments,
+              [getImportSource(t, path.node)],
             ),
           );
         }
@@ -197,7 +212,7 @@ export default declare((api, options) => {
 
       ReferencedIdentifier(path, state) {
         if (
-          path.node.name == "__moduleName" &&
+          path.node.name === "__moduleName" &&
           !path.scope.hasBinding("__moduleName")
         ) {
           path.replaceWith(
@@ -214,10 +229,11 @@ export default declare((api, options) => {
           state.contextIdent = path.scope.generateUid("context");
         },
         exit(path, state) {
+          const undefinedIdent = path.scope.buildUndefinedNode();
           const exportIdent = path.scope.generateUid("export");
           const contextIdent = state.contextIdent;
 
-          const exportNames = Object.create(null);
+          const exportMap = Object.create(null);
           const modules = [];
 
           let beforeBody = [];
@@ -227,8 +243,8 @@ export default declare((api, options) => {
           const removedPaths = [];
 
           function addExportName(key, val) {
-            exportNames[key] = exportNames[key] || [];
-            exportNames[key].push(val);
+            exportMap[key] = exportMap[key] || [];
+            exportMap[key].push(val);
           }
 
           function pushModule(source, key, specifiers) {
@@ -255,16 +271,30 @@ export default declare((api, options) => {
             );
           }
 
+          const exportNames = [];
+          const exportValues = [];
+
           const body: Array<Object> = path.get("body");
 
           for (const path of body) {
             if (path.isFunctionDeclaration()) {
               beforeBody.push(path.node);
               removedPaths.push(path);
+            } else if (path.isClassDeclaration()) {
+              variableIds.push(path.node.id);
+              path.replaceWith(
+                t.expressionStatement(
+                  t.assignmentExpression(
+                    "=",
+                    t.cloneNode(path.node.id),
+                    t.toExpression(path.node),
+                  ),
+                ),
+              );
             } else if (path.isImportDeclaration()) {
               const source = path.node.source.value;
               pushModule(source, "imports", path.node.specifiers);
-              for (const name in path.getBindingIdentifiers()) {
+              for (const name of Object.keys(path.getBindingIdentifiers())) {
                 path.scope.removeBinding(name);
                 variableIds.push(t.identifier(name));
               }
@@ -274,29 +304,38 @@ export default declare((api, options) => {
               path.remove();
             } else if (path.isExportDefaultDeclaration()) {
               const declar = path.get("declaration");
-              if (
-                declar.isClassDeclaration() ||
-                declar.isFunctionDeclaration()
-              ) {
-                const id = declar.node.id;
-                const nodes = [];
-
+              const id = declar.node.id;
+              if (declar.isClassDeclaration()) {
                 if (id) {
-                  nodes.push(declar.node);
-                  nodes.push(buildExportCall("default", t.cloneNode(id)));
+                  exportNames.push("default");
+                  exportValues.push(undefinedIdent);
+                  variableIds.push(id);
                   addExportName(id.name, "default");
-                } else {
-                  nodes.push(
-                    buildExportCall("default", t.toExpression(declar.node)),
+                  path.replaceWith(
+                    t.expressionStatement(
+                      t.assignmentExpression(
+                        "=",
+                        t.cloneNode(id),
+                        t.toExpression(declar.node),
+                      ),
+                    ),
                   );
-                }
-
-                if (declar.isClassDeclaration()) {
-                  path.replaceWithMultiple(nodes);
                 } else {
-                  beforeBody = beforeBody.concat(nodes);
+                  exportNames.push("default");
+                  exportValues.push(t.toExpression(declar.node));
                   removedPaths.push(path);
                 }
+              } else if (declar.isFunctionDeclaration()) {
+                if (id) {
+                  beforeBody.push(declar.node);
+                  exportNames.push("default");
+                  exportValues.push(t.cloneNode(id));
+                  addExportName(id.name, "default");
+                } else {
+                  exportNames.push("default");
+                  exportValues.push(t.toExpression(declar.node));
+                }
+                removedPaths.push(path);
               } else {
                 path.replaceWith(buildExportCall("default", declar.node));
               }
@@ -311,14 +350,28 @@ export default declare((api, options) => {
                   const name = node.id.name;
                   addExportName(name, name);
                   beforeBody.push(node);
-                  beforeBody.push(buildExportCall(name, t.cloneNode(node.id)));
+                  exportNames.push(name);
+                  exportValues.push(t.cloneNode(node.id));
                   removedPaths.push(path);
                 } else if (path.isClass()) {
                   const name = declar.node.id.name;
+                  exportNames.push(name);
+                  exportValues.push(undefinedIdent);
+                  variableIds.push(declar.node.id);
+                  path.replaceWith(
+                    t.expressionStatement(
+                      t.assignmentExpression(
+                        "=",
+                        t.cloneNode(declar.node.id),
+                        t.toExpression(declar.node),
+                      ),
+                    ),
+                  );
                   addExportName(name, name);
-                  path.insertAfter([buildExportCall(name, t.identifier(name))]);
                 } else {
-                  for (const name in declar.getBindingIdentifiers()) {
+                  for (const name of Object.keys(
+                    declar.getBindingIdentifiers(),
+                  )) {
                     addExportName(name, name);
                   }
                 }
@@ -332,8 +385,19 @@ export default declare((api, options) => {
                     const nodes = [];
 
                     for (const specifier of specifiers) {
-                      // only globals exported this way
-                      if (!path.scope.getBinding(specifier.local.name)) {
+                      const binding = path.scope.getBinding(
+                        specifier.local.name,
+                      );
+                      // hoisted function export
+                      if (
+                        binding &&
+                        t.isFunctionDeclaration(binding.path.node)
+                      ) {
+                        exportNames.push(specifier.exported.name);
+                        exportValues.push(t.cloneNode(specifier.local));
+                      }
+                      // only globals also exported this way
+                      else if (!binding) {
                         nodes.push(
                           buildExportCall(
                             specifier.exported.name,
@@ -434,13 +498,13 @@ export default declare((api, options) => {
           let moduleName = this.getModuleName();
           if (moduleName) moduleName = t.stringLiteral(moduleName);
 
-          const uninitializedVars = [];
           hoistVariables(
             path,
             (id, name, hasInit) => {
               variableIds.push(id);
               if (!hasInit) {
-                uninitializedVars.push(name);
+                exportNames.push(name);
+                exportValues.push(undefinedIdent);
               }
             },
             null,
@@ -455,25 +519,20 @@ export default declare((api, options) => {
             );
           }
 
-          if (uninitializedVars.length) {
-            const undefinedValues = [];
-            const undefinedIdent = path.scope.buildUndefinedNode();
-            for (let i = 0; i < uninitializedVars.length; i++) {
-              undefinedValues[i] = undefinedIdent;
-            }
+          if (exportNames.length) {
             beforeBody = beforeBody.concat(
               constructExportCall(
                 path,
                 t.identifier(exportIdent),
-                uninitializedVars,
-                undefinedValues,
+                exportNames,
+                exportValues,
                 null,
               ),
             );
           }
 
           path.traverse(reassignmentVisitor, {
-            exports: exportNames,
+            exports: exportMap,
             buildCall: buildExportCall,
             scope: path.scope,
           });
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/dynamic-import/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/dynamic-import/input.mjs
deleted file mode 100644
index 6e6ea639620c..000000000000
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/dynamic-import/input.mjs
+++ /dev/null
@@ -1,6 +0,0 @@
-export function lazyLoadOperation () {
-  return import('./x')
-  .then(function (x) {
-    x.y();
-  });
-}
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/dynamic-import/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/dynamic-import/output.mjs
deleted file mode 100644
index 7ec92b2c7cb8..000000000000
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/dynamic-import/output.mjs
+++ /dev/null
@@ -1,16 +0,0 @@
-System.register([], function (_export, _context) {
-  "use strict";
-
-  function lazyLoadOperation() {
-    return _context.import('./x').then(function (x) {
-      x.y();
-    });
-  }
-
-  _export("lazyLoadOperation", lazyLoadOperation);
-
-  return {
-    setters: [],
-    execute: function () {}
-  };
-});
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/import-meta/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/import-meta/input.mjs
similarity index 100%
rename from packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/import-meta/input.mjs
rename to packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/import-meta/input.mjs
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/import-meta/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/import-meta/output.mjs
similarity index 100%
rename from packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/import-meta/output.mjs
rename to packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/import-meta/output.mjs
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json
similarity index 100%
rename from packages/babel-plugin-transform-modules-systemjs/test/fixtures/dynamic-import/options.json
rename to packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-default-8/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-default-8/output.mjs
index d3a5a24dbefc..84456f86389e 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-default-8/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-default-8/output.mjs
@@ -1,12 +1,14 @@
 System.register([], function (_export, _context) {
   "use strict";
 
+  var Foo;
+
+  _export("default", void 0);
+
   return {
     setters: [],
     execute: function () {
-      class Foo {}
-
-      _export("default", Foo);
+      _export("default", Foo = class Foo {});
     }
   };
 });
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-fn-decl/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-fn-decl/input.mjs
new file mode 100644
index 000000000000..3c230f186782
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-fn-decl/input.mjs
@@ -0,0 +1,10 @@
+var testProp = 'test property';
+
+function testFunc() {
+  return 'test function';
+}
+
+export {
+  testFunc,
+  testProp
+};
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-fn-decl/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-fn-decl/output.mjs
new file mode 100644
index 000000000000..c3c2159be301
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-fn-decl/output.mjs
@@ -0,0 +1,18 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var testProp;
+
+  function testFunc() {
+    return 'test function';
+  }
+
+  _export("testFunc", testFunc);
+
+  return {
+    setters: [],
+    execute: function () {
+      _export("testProp", testProp = 'test property');
+    }
+  };
+});
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/input.mjs
index fdbc94275097..97b218259d14 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/input.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/input.mjs
@@ -1 +1,2 @@
 export {foo, bar};
+var foo, bar;
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/output.mjs
index ab82079a7c68..bed82c28410d 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-2/output.mjs
@@ -1,12 +1,15 @@
 System.register([], function (_export, _context) {
   "use strict";
 
+  var foo, bar;
+
+  _export({
+    foo: void 0,
+    bar: void 0
+  });
+
   return {
     setters: [],
-    execute: function () {
-      _export("foo", foo);
-
-      _export("bar", bar);
-    }
+    execute: function () {}
   };
 });
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/input.mjs
index e7820a6f027c..2ad49c002c36 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/input.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/input.mjs
@@ -1 +1,2 @@
 export {foo as bar};
+var foo;
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/output.mjs
index 418e0cea9532..d613ff78b938 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/output.mjs
@@ -1,10 +1,12 @@
 System.register([], function (_export, _context) {
   "use strict";
 
+  var foo;
+
+  _export("foo", void 0);
+
   return {
     setters: [],
-    execute: function () {
-      _export("bar", foo);
-    }
+    execute: function () {}
   };
 });
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/input.mjs
index 5d32a24de0a9..974ab55e4371 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/input.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/input.mjs
@@ -1 +1,2 @@
 export {foo as default};
+var foo;
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/output.mjs
index 25834444d127..d613ff78b938 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/output.mjs
@@ -1,10 +1,12 @@
 System.register([], function (_export, _context) {
   "use strict";
 
+  var foo;
+
+  _export("foo", void 0);
+
   return {
     setters: [],
-    execute: function () {
-      _export("default", foo);
-    }
+    execute: function () {}
   };
 });
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/input.mjs
index ff57927839e8..f0218dfca8ab 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/input.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/input.mjs
@@ -1 +1,2 @@
 export {foo as default, bar};
+var foo, bar;
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/output.mjs
index bc1c7593c0d4..bed82c28410d 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/output.mjs
@@ -1,12 +1,15 @@
 System.register([], function (_export, _context) {
   "use strict";
 
+  var foo, bar;
+
+  _export({
+    foo: void 0,
+    bar: void 0
+  });
+
   return {
     setters: [],
-    execute: function () {
-      _export("default", foo);
-
-      _export("bar", bar);
-    }
+    execute: function () {}
   };
 });
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/input.mjs
index df5f5e609e93..ff265b20ef19 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/input.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/input.mjs
@@ -1 +1,2 @@
 export {foo};
+var foo;
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/output.mjs
index 0981d53ba56a..d613ff78b938 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named/output.mjs
@@ -1,10 +1,12 @@
 System.register([], function (_export, _context) {
   "use strict";
 
+  var foo;
+
+  _export("foo", void 0);
+
   return {
     setters: [],
-    execute: function () {
-      _export("foo", foo);
-    }
+    execute: function () {}
   };
 });
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/exports-variable/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/exports-variable/output.mjs
index be63333c5ba4..540eaf37557c 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/exports-variable/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/exports-variable/output.mjs
@@ -1,13 +1,13 @@
 System.register([], function (_export, _context) {
   "use strict";
 
-  var foo, foo2, foo3, foo4, foo5, foo6;
+  var foo8, foo, foo2, foo3, foo4, foo5, foo6;
 
   function foo7() {}
 
-  _export("foo7", foo7);
-
   _export({
+    foo7: foo7,
+    foo8: void 0,
     foo3: void 0,
     foo5: void 0
   });
@@ -23,9 +23,7 @@ System.register([], function (_export, _context) {
 
       _export("foo6", foo6 = 3);
 
-      class foo8 {}
-
-      _export("foo8", foo8);
+      _export("foo8", foo8 = class foo8 {});
 
       _export("foo3", foo3 = 5);
     }
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-class/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-class/input.mjs
new file mode 100644
index 000000000000..b417eeefc10e
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-class/input.mjs
@@ -0,0 +1,15 @@
+export function hoisted () {
+  return HoistedClass, HoistedClassExport, HoistedClassDefaultExport;
+}
+
+class HoistedClass {
+  
+}
+
+export class HoistedClassExport {
+
+}
+
+export default class HoistedClassDefaultExport {
+
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-class/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-class/output.mjs
new file mode 100644
index 000000000000..e39d30ddd159
--- /dev/null
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-class/output.mjs
@@ -0,0 +1,26 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var HoistedClass, HoistedClassExport, HoistedClassDefaultExport;
+
+  function hoisted() {
+    return HoistedClass, HoistedClassExport, HoistedClassDefaultExport;
+  }
+
+  _export({
+    hoisted: hoisted,
+    HoistedClassExport: void 0,
+    default: void 0
+  });
+
+  return {
+    setters: [],
+    execute: function () {
+      HoistedClass = class HoistedClass {};
+
+      _export("HoistedClassExport", HoistedClassExport = class HoistedClassExport {});
+
+      _export("default", HoistedClassDefaultExport = class HoistedClassDefaultExport {});
+    }
+  };
+});
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/output.mjs
index 54c3d53e71e8..61759df89e08 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/output.mjs
@@ -7,9 +7,10 @@ System.register(["./evens"], function (_export, _context) {
     return _export("p", p = isEven(n) ? n + 1 : n + 2);
   }
 
-  _export("nextOdd", nextOdd);
-
-  _export("a", void 0);
+  _export({
+    nextOdd: nextOdd,
+    a: void 0
+  });
 
   return {
     setters: [function (_evens) {
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoisting-bindings/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoisting-bindings/output.mjs
index 3c774382cadf..74730bf2895a 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoisting-bindings/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/hoisting-bindings/output.mjs
@@ -8,12 +8,12 @@ System.register([], function (_export, _context) {
     _export("c", +c + 1), c++;
   }
 
-  _export("a", a);
-
   function b() {
     a();
   }
 
+  _export("a", a);
+
   return {
     setters: [],
     execute: function () {
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/input.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/input.mjs
index 1623f8b61e3a..3e062136f23f 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/input.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/input.mjs
@@ -6,7 +6,7 @@ import * as foo2 from "foo";
 import {bar} from "foo";
 import {foo as bar2} from "foo";
 
-export {test};
+export {foo};
 export var test2 = 5;
 
-export default test;
+export default foo;
diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/output.mjs
index 97f9581aa131..e84b007dcd43 100644
--- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/output.mjs
+++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/overview/output.mjs
@@ -10,11 +10,11 @@ System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export, _c
       bar2 = _foo.foo;
     }, function (_fooBar) {}, function (_directoryFooBar) {}],
     execute: function () {
-      _export("test", test);
+      _export("foo", foo);
 
       _export("test2", test2 = 5);
 
-      _export("default", test);
+      _export("default", foo);
     }
   };
 });
diff --git a/packages/babel-plugin-transform-modules-umd/package.json b/packages/babel-plugin-transform-modules-umd/package.json
index f34a56f25a8d..9dd0f73213e6 100644
--- a/packages/babel-plugin-transform-modules-umd/package.json
+++ b/packages/babel-plugin-transform-modules-umd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-modules-umd",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "This plugin transforms ES2015 modules to UMD",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-modules-umd",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-modules-umd/src/index.js b/packages/babel-plugin-transform-modules-umd/src/index.js
index 0e7979d9c8b4..cd8000febb85 100644
--- a/packages/babel-plugin-transform-modules-umd/src/index.js
+++ b/packages/babel-plugin-transform-modules-umd/src/index.js
@@ -125,6 +125,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "transform-modules-umd",
+
     visitor: {
       Program: {
         exit(path) {
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/.npmignore b/packages/babel-plugin-transform-named-capturing-groups-regex/.npmignore
new file mode 100644
index 000000000000..f9806945836e
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/README.md b/packages/babel-plugin-transform-named-capturing-groups-regex/README.md
new file mode 100644
index 000000000000..a04992d5c64b
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/README.md
@@ -0,0 +1,19 @@
+# @babel/plugin-transform-named-capturing-groups-regex
+
+> Compile regular expressions using named groups to ES5.
+
+See our website [@babel/plugin-transform-named-capturing-groups-regex](https://babeljs.io/docs/en/next/babel-plugin-transform-named-capturing-groups-regex.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/plugin-transform-named-capturing-groups-regex
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/plugin-transform-named-capturing-groups-regex --dev
+```
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/package.json b/packages/babel-plugin-transform-named-capturing-groups-regex/package.json
new file mode 100644
index 000000000000..3de8ee619969
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@babel/plugin-transform-named-capturing-groups-regex",
+  "version": "7.4.5",
+  "description": "Compile regular expressions using named groups to ES5.",
+  "homepage": "https://babeljs.io/",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin",
+    "regex",
+    "regexp",
+    "regular expressions"
+  ],
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-named-capturing-groups-regex",
+  "bugs": "https://github.com/babel/babel/issues",
+  "dependencies": {
+    "regexp-tree": "^0.1.6"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.4.5",
+    "@babel/helper-plugin-test-runner": "^7.0.0"
+  }
+}
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/src/index.js b/packages/babel-plugin-transform-named-capturing-groups-regex/src/index.js
new file mode 100644
index 000000000000..042d16de9d4d
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/src/index.js
@@ -0,0 +1,54 @@
+import regexpTree from "regexp-tree";
+
+export default function({ types: t }, options) {
+  const { runtime = true } = options;
+  if (typeof runtime !== "boolean") {
+    throw new Error("The 'runtime' option must be boolean");
+  }
+
+  return {
+    name: "transform-named-capturing-groups-regex",
+
+    visitor: {
+      RegExpLiteral(path) {
+        const node = path.node;
+        if (node.pattern.indexOf("(?<") === -1) {
+          // Return early if there are no named groups.
+          // The .indexOf check may have false positives (e.g. /\(?</); in
+          // this case we parse the regex and regexp-tree won't transform it.
+          return;
+        }
+
+        const result = regexpTree.compatTranspile(node.extra.raw, [
+          "namedCapturingGroups",
+        ]);
+        const { namedCapturingGroups } = result.getExtra();
+
+        if (
+          namedCapturingGroups &&
+          Object.keys(namedCapturingGroups).length > 0
+        ) {
+          node.pattern = result.getSource();
+
+          if (runtime && !isRegExpTest(path)) {
+            path.replaceWith(
+              t.callExpression(this.addHelper("wrapRegExp"), [
+                node,
+                t.valueToNode(namedCapturingGroups),
+              ]),
+            );
+          }
+        }
+      },
+    },
+  };
+}
+
+function isRegExpTest(path) {
+  return (
+    path.parentPath.isMemberExpression({
+      object: path.node,
+      computed: false,
+    }) && path.parentPath.get("property").isIdentifier({ name: "test" })
+  );
+}
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/exec.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/exec.js
new file mode 100644
index 000000000000..6f6e7eb9770b
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/exec.js
@@ -0,0 +1,15 @@
+var re = /(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})/;
+
+var result = re.exec("2017-12-23");
+
+expect(result.groups).toEqual({
+  year: "2017",
+  month: "12",
+  day: "23",
+});
+
+expect(result.groups).toEqual({
+  year: result[1],
+  month: result[2],
+  day: result[3],
+});
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/instanceof-regexp.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/instanceof-regexp.js
new file mode 100644
index 000000000000..7b3eea56647e
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/instanceof-regexp.js
@@ -0,0 +1,3 @@
+var re = /(?<group>)/;
+
+expect(re instanceof RegExp).toBeTruthy();
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/issue-9722.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/issue-9722.js
new file mode 100644
index 000000000000..5841d48c53fc
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/issue-9722.js
@@ -0,0 +1,10 @@
+const regex1 = /(?<alpha>\w+):(?<bravo>\d+)/;
+const regex2 = /(?<alpha>\w+):(?<bravo>[a-z]+):(?<charlie>\w+)/;
+
+const result = regex2.exec("foo:abc:bar");
+
+expect(result.groups).toEqual({
+  alpha: "foo",
+  bravo: "abc",
+  charlie: "bar",
+});
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/match.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/match.js
new file mode 100644
index 000000000000..9fbe902285ab
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/match.js
@@ -0,0 +1,15 @@
+var re = /(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})/;
+
+var result = "1999-09-29".match(re);
+
+expect(result.groups).toEqual({
+  year: "1999",
+  month: "09",
+  day: "29",
+});
+
+expect(result.groups).toEqual({
+  year: result[1],
+  month: result[2],
+  day: result[3],
+});
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/no-groups.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/no-groups.js
new file mode 100644
index 000000000000..030be5eea3c9
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/no-groups.js
@@ -0,0 +1,4 @@
+var re = /no-groups-\(?<looks-like-a-group>looks\)/;
+var result = re.exec("no-groups-(<looks-like-a-group>looks)")
+
+expect(result.groups).toBeUndefined();
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/options.json
new file mode 100644
index 000000000000..8b8fe93e5deb
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-named-capturing-groups-regex"]
+}
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/replace-string.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/replace-string.js
new file mode 100644
index 000000000000..2902c419f5f9
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/replace-string.js
@@ -0,0 +1,5 @@
+var re = /(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})/;
+
+var result = "2015-10-31".replace(re, "$<day>/$<month>/$<year>")
+
+expect(result).toBe("31/10/2015");
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/input.js
new file mode 100644
index 000000000000..8414081fd509
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/input.js
@@ -0,0 +1 @@
+/(?<name>)\k<name>/;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/options.json
new file mode 100644
index 000000000000..3b43d3bd5d98
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "external-helpers",
+    ["transform-named-capturing-groups-regex", { "runtime": false }]
+  ]
+}
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/output.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/output.js
new file mode 100644
index 000000000000..67c955321e66
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/output.js
@@ -0,0 +1 @@
+/()\1/;
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-no-unicode-flag/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-no-unicode-flag/input.js
new file mode 100644
index 000000000000..2393cc30f52a
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-no-unicode-flag/input.js
@@ -0,0 +1 @@
+/(?<\u{41}>)\k<\u{41}>/;
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-no-unicode-flag/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-no-unicode-flag/options.json
new file mode 100644
index 000000000000..47dc981e754b
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-no-unicode-flag/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "invalid group Unicode name \"\\u{41}\", use `u` flag."
+}
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-unicode-flag/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-unicode-flag/input.js
new file mode 100644
index 000000000000..e455e5e672b5
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-unicode-flag/input.js
@@ -0,0 +1 @@
+/(?<\u{41}>)\k<\u{41}>/u;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-unicode-flag/output.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-unicode-flag/output.js
new file mode 100644
index 000000000000..5548e7368638
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/escape-unicode-flag/output.js
@@ -0,0 +1 @@
+/()\1/u;
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/options.json
new file mode 100644
index 000000000000..2490cf9876bf
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    ["external-helpers", { "helperVersion": "7.1000.0" }],
+    ["transform-named-capturing-groups-regex", { "runtime": false }]
+  ]
+}
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/basic/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/basic/input.js
new file mode 100644
index 000000000000..2761445e091b
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/basic/input.js
@@ -0,0 +1 @@
+"foo".match(/(?<double>.)\k<double>/);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/basic/output.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/basic/output.js
new file mode 100644
index 000000000000..2c6eed2f6dec
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/basic/output.js
@@ -0,0 +1,3 @@
+"foo".match(babelHelpers.wrapRegExp(/(.)\1/, {
+  double: 1
+}));
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group/input.js
new file mode 100644
index 000000000000..4c55ef0dbe17
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group/input.js
@@ -0,0 +1 @@
+/no-groups-\(?<looks-like-a-group>looks\)/;
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group/output.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group/output.js
new file mode 100644
index 000000000000..4c55ef0dbe17
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group/output.js
@@ -0,0 +1 @@
+/no-groups-\(?<looks-like-a-group>looks\)/;
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/only-when-named-groups/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/only-when-named-groups/input.js
new file mode 100644
index 000000000000..581032632ae1
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/only-when-named-groups/input.js
@@ -0,0 +1 @@
+"foo".match(/(.)\1/);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/only-when-named-groups/output.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/only-when-named-groups/output.js
new file mode 100644
index 000000000000..c545e42ac5ca
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/only-when-named-groups/output.js
@@ -0,0 +1 @@
+"foo".match(/(.)\1/);
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/options.json
new file mode 100644
index 000000000000..ce85d0c0f4a6
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    ["external-helpers", { "helperVersion": "7.1000.0" }],
+    "transform-named-capturing-groups-regex"
+  ]
+}
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/skips-anonymous-capturing-groups/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/skips-anonymous-capturing-groups/input.js
new file mode 100644
index 000000000000..86639f6f7e17
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/skips-anonymous-capturing-groups/input.js
@@ -0,0 +1 @@
+"abba".match(/(.)(?<n>.)\k<n>\1/);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/skips-anonymous-capturing-groups/output.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/skips-anonymous-capturing-groups/output.js
new file mode 100644
index 000000000000..f9da17ab47a1
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/skips-anonymous-capturing-groups/output.js
@@ -0,0 +1,3 @@
+"abba".match(babelHelpers.wrapRegExp(/(.)(.)\2\1/, {
+  n: 2
+}));
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/test-method/input.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/test-method/input.js
new file mode 100644
index 000000000000..3e26e4ee498a
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/test-method/input.js
@@ -0,0 +1 @@
+/^(?<x>.)\k<x>$/.test("aa");
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/test-method/output.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/test-method/output.js
new file mode 100644
index 000000000000..808fc64e4f90
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/test-method/output.js
@@ -0,0 +1 @@
+/^(.)\1$/.test("aa");
diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/index.js b/packages/babel-plugin-transform-named-capturing-groups-regex/test/index.js
new file mode 100644
index 000000000000..1b534b8fc64a
--- /dev/null
+++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/index.js
@@ -0,0 +1,3 @@
+import runner from "@babel/helper-plugin-test-runner";
+
+runner(__dirname);
diff --git a/packages/babel-plugin-transform-new-target/package.json b/packages/babel-plugin-transform-new-target/package.json
index 136faddc7297..f415edcfec42 100644
--- a/packages/babel-plugin-transform-new-target/package.json
+++ b/packages/babel-plugin-transform-new-target/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-new-target",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Transforms new.target meta property",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-new-target",
   "license": "MIT",
@@ -18,9 +18,9 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-transform-arrow-functions": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-new-target/test/fixtures/errors/new-target-arrow/input.js b/packages/babel-plugin-transform-new-target/test/fixtures/errors/new-target-arrow/input.js
deleted file mode 100644
index 47bd62071480..000000000000
--- a/packages/babel-plugin-transform-new-target/test/fixtures/errors/new-target-arrow/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-const a = () => {
-  new.target;
-};
diff --git a/packages/babel-plugin-transform-new-target/test/fixtures/errors/new-target-arrow/options.json b/packages/babel-plugin-transform-new-target/test/fixtures/errors/new-target-arrow/options.json
deleted file mode 100644
index bd1ea4079447..000000000000
--- a/packages/babel-plugin-transform-new-target/test/fixtures/errors/new-target-arrow/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "plugins": ["transform-new-target"],
-  "throws": "new.target must be under a (non-arrow) function or a class."
-}
diff --git a/packages/babel-plugin-transform-object-assign/package.json b/packages/babel-plugin-transform-object-assign/package.json
index bc74f3a91457..b0852beb749c 100644
--- a/packages/babel-plugin-transform-object-assign/package.json
+++ b/packages/babel-plugin-transform-object-assign/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-object-assign",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Replace Object.assign with an inline helper",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-assign",
   "author": "Jed Watson",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-object-assign/src/index.js b/packages/babel-plugin-transform-object-assign/src/index.js
index 856405ce2f25..a5467dfe1c0a 100644
--- a/packages/babel-plugin-transform-object-assign/src/index.js
+++ b/packages/babel-plugin-transform-object-assign/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-object-assign",
+
     visitor: {
       CallExpression: function(path, file) {
         if (path.get("callee").matchesPattern("Object.assign")) {
diff --git a/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json b/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json
index cccc0e77f061..850f7c9e1c53 100644
--- a/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json
+++ b/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-object-set-prototype-of-to-assign",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Turn Object.setPrototypeOf to assignments",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-set-prototype-of-to-assign",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-object-set-prototype-of-to-assign/src/index.js b/packages/babel-plugin-transform-object-set-prototype-of-to-assign/src/index.js
index 84f4399a978d..b0a0a02f0173 100644
--- a/packages/babel-plugin-transform-object-set-prototype-of-to-assign/src/index.js
+++ b/packages/babel-plugin-transform-object-set-prototype-of-to-assign/src/index.js
@@ -4,6 +4,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-object-set-prototype-of-to-assign",
+
     visitor: {
       CallExpression(path, file) {
         if (path.get("callee").matchesPattern("Object.setPrototypeOf")) {
diff --git a/packages/babel-plugin-transform-object-super/package.json b/packages/babel-plugin-transform-object-super/package.json
index 7c8a090d2cfe..488357a6e245 100644
--- a/packages/babel-plugin-transform-object-super/package.json
+++ b/packages/babel-plugin-transform-object-super/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-object-super",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Compile ES2015 object super to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-super",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-replace-supers": "^7.1.0"
+    "@babel/helper-replace-supers": "^7.5.5"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-object-super/src/index.js b/packages/babel-plugin-transform-object-super/src/index.js
index d56ae749d9f0..c810a49d22eb 100644
--- a/packages/babel-plugin-transform-object-super/src/index.js
+++ b/packages/babel-plugin-transform-object-super/src/index.js
@@ -16,6 +16,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-object-super",
+
     visitor: {
       ObjectExpression(path, state) {
         let objectRef;
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/input.js b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/input.js
new file mode 100644
index 000000000000..e9757ea1ef41
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/input.js
@@ -0,0 +1,5 @@
+const foo = {
+  bar(props) {
+    ;([x, ...super.client] = props);
+  }
+}
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/options.json
new file mode 100644
index 000000000000..7975cd686c73
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-object-super",
+    "transform-shorthand-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/input.js b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/input.js
new file mode 100644
index 000000000000..e4ee0d05beb8
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/input.js
@@ -0,0 +1,5 @@
+const foo = {
+  bar(props) {
+    ;([super.client] = props);
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/options.json
new file mode 100644
index 000000000000..7975cd686c73
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-object-super",
+    "transform-shorthand-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/input.js b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/input.js
new file mode 100644
index 000000000000..232d42042fdc
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/input.js
@@ -0,0 +1,5 @@
+const foo = {
+  bar(props) {
+    ;({ x, ...super.client } = props)
+  }
+}
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/options.json
new file mode 100644
index 000000000000..7975cd686c73
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-object-super",
+    "transform-shorthand-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/input.js b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/input.js
new file mode 100644
index 000000000000..5400ca56b6b6
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/input.js
@@ -0,0 +1,5 @@
+const foo = {
+  bar(props) {
+    ;({ client: super.client } = props)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/options.json
new file mode 100644
index 000000000000..7975cd686c73
--- /dev/null
+++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-object-super",
+    "transform-shorthand-properties"
+  ],
+  "throws": "Destructuring to a super field is not supported yet."
+}
diff --git a/packages/babel-plugin-transform-parameters/package.json b/packages/babel-plugin-transform-parameters/package.json
index be76841ecf45..fa8403ed44ce 100644
--- a/packages/babel-plugin-transform-parameters/package.json
+++ b/packages/babel-plugin-transform-parameters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-parameters",
-  "version": "7.1.0",
+  "version": "7.4.4",
   "description": "Compile ES2015 default and rest parameters to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-parameters",
   "license": "MIT",
@@ -9,7 +9,7 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/helper-call-delegate": "^7.1.0",
+    "@babel/helper-call-delegate": "^7.4.4",
     "@babel/helper-get-function-arity": "^7.0.0",
     "@babel/helper-plugin-utils": "^7.0.0"
   },
@@ -20,7 +20,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-parameters/src/index.js b/packages/babel-plugin-transform-parameters/src/index.js
index 733ff830834a..5ba89ba9eec1 100644
--- a/packages/babel-plugin-transform-parameters/src/index.js
+++ b/packages/babel-plugin-transform-parameters/src/index.js
@@ -7,6 +7,8 @@ export default declare((api, options) => {
 
   const { loose } = options;
   return {
+    name: "transform-parameters",
+
     visitor: {
       Function(path) {
         if (
diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/input.mjs b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/input.mjs
new file mode 100644
index 000000000000..971a693e6b72
--- /dev/null
+++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/input.mjs
@@ -0,0 +1,6 @@
+export class Test {
+  invite(options: { privacy: string } = {}) {
+    const privacy = options.privacy || "Private"
+    console.log(this)
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/options.json b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/options.json
new file mode 100644
index 000000000000..cc760c8a6ca5
--- /dev/null
+++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-typescript"],
+  "presets": ["env"]
+}
diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/output.js b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/output.js
new file mode 100644
index 000000000000..5e502c2384f7
--- /dev/null
+++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/output.js
@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Test = void 0;
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var Test =
+/*#__PURE__*/
+function () {
+  function Test() {
+    _classCallCheck(this, Test);
+  }
+
+  _createClass(Test, [{
+    key: "invite",
+    value: function invite() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var privacy = options.privacy || "Private";
+      console.log(this);
+    }
+  }]);
+
+  return Test;
+}();
+
+exports.Test = Test;
diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this/input.js b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this/input.js
new file mode 100644
index 000000000000..b25022747087
--- /dev/null
+++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this/input.js
@@ -0,0 +1,8 @@
+var a;
+
+class Test {
+  invite(p = a) {
+    let a;
+    this;
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this/output.js b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this/output.js
new file mode 100644
index 000000000000..d199a0d7866f
--- /dev/null
+++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this/output.js
@@ -0,0 +1,23 @@
+var a;
+
+var Test =
+/*#__PURE__*/
+function () {
+  "use strict";
+
+  function Test() {
+    babelHelpers.classCallCheck(this, Test);
+  }
+
+  babelHelpers.createClass(Test, [{
+    key: "invite",
+    value: function invite() {
+      var p = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : a;
+      return function () {
+        var a;
+        this;
+      }.apply(this);
+    }
+  }]);
+  return Test;
+}();
diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js b/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js
index f7722d117eab..451673e683d4 100644
--- a/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js
+++ b/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js
@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _args = _interopRequireDefault(require("utils/url/args"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
@@ -21,12 +21,12 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var App =
@@ -47,7 +47,7 @@ function (_Component) {
 
     _this = _possibleConstructorReturn(this, (_getPrototypeOf2 = _getPrototypeOf(App)).call.apply(_getPrototypeOf2, [this].concat(args)));
 
-    _defineProperty(_assertThisInitialized(_assertThisInitialized(_this)), "exportType", '');
+    _defineProperty(_assertThisInitialized(_this), "exportType", '');
 
     return _this;
   }
@@ -55,11 +55,11 @@ function (_Component) {
   _createClass(App, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      this.exportType = _args.default.get('type', window.location.href);
+      this.exportType = _args["default"].get('type', window.location.href);
     }
   }]);
 
   return App;
 }(Component);
 
-exports.default = App;
+exports["default"] = App;
diff --git a/packages/babel-plugin-transform-property-literals/package.json b/packages/babel-plugin-transform-property-literals/package.json
index 0235e684a0e5..d74f95007361 100644
--- a/packages/babel-plugin-transform-property-literals/package.json
+++ b/packages/babel-plugin-transform-property-literals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-property-literals",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Ensure that reserved words are quoted in object property keys",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-property-literals",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-property-literals/src/index.js b/packages/babel-plugin-transform-property-literals/src/index.js
index 812cf1a3b50d..8e35fa027b1b 100644
--- a/packages/babel-plugin-transform-property-literals/src/index.js
+++ b/packages/babel-plugin-transform-property-literals/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-property-literals",
+
     visitor: {
       ObjectProperty: {
         exit({ node }) {
diff --git a/packages/babel-plugin-transform-property-mutators/package.json b/packages/babel-plugin-transform-property-mutators/package.json
index 65aee855b5ea..b280968195ce 100644
--- a/packages/babel-plugin-transform-property-mutators/package.json
+++ b/packages/babel-plugin-transform-property-mutators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-property-mutators",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Compile ES5 property mutator shorthand syntax to Object.defineProperty",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-property-mutators",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-property-mutators/src/index.js b/packages/babel-plugin-transform-property-mutators/src/index.js
index 6428f9a86227..bb20e860fcea 100644
--- a/packages/babel-plugin-transform-property-mutators/src/index.js
+++ b/packages/babel-plugin-transform-property-mutators/src/index.js
@@ -6,6 +6,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-property-mutators",
+
     visitor: {
       ObjectExpression(path, file) {
         const { node } = path;
diff --git a/packages/babel-plugin-transform-proto-to-assign/package.json b/packages/babel-plugin-transform-proto-to-assign/package.json
index c596e6282095..7b5799fa217d 100644
--- a/packages/babel-plugin-transform-proto-to-assign/package.json
+++ b/packages/babel-plugin-transform-proto-to-assign/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-proto-to-assign",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Babel plugin for turning __proto__ into a shallow property clone",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-proto-to-assign",
   "license": "MIT",
@@ -12,13 +12,14 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/helper-plugin-utils": "^7.0.0"
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "lodash": "^4.17.13"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-proto-to-assign/src/index.js b/packages/babel-plugin-transform-proto-to-assign/src/index.js
index 1a8fea57e5f2..e8699699fba8 100644
--- a/packages/babel-plugin-transform-proto-to-assign/src/index.js
+++ b/packages/babel-plugin-transform-proto-to-assign/src/index.js
@@ -24,6 +24,8 @@ export default declare(api => {
   }
 
   return {
+    name: "transform-proto-to-assign",
+
     visitor: {
       AssignmentExpression(path, file) {
         if (!isProtoAssignmentExpression(path.node)) return;
diff --git a/packages/babel-plugin-transform-react-constant-elements/package.json b/packages/babel-plugin-transform-react-constant-elements/package.json
index 8d275fc7661f..fd4533b2adba 100644
--- a/packages/babel-plugin-transform-react-constant-elements/package.json
+++ b/packages/babel-plugin-transform-react-constant-elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-react-constant-elements",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Treat React JSX elements as value types and hoist them to the highest scope",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-constant-elements",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-react-constant-elements/src/index.js b/packages/babel-plugin-transform-react-constant-elements/src/index.js
index 70c6fb115be0..15589bd808f0 100644
--- a/packages/babel-plugin-transform-react-constant-elements/src/index.js
+++ b/packages/babel-plugin-transform-react-constant-elements/src/index.js
@@ -78,6 +78,8 @@ export default declare((api, options) => {
   };
 
   return {
+    name: "transform-react-constant-elements",
+
     visitor: {
       JSXElement(path) {
         if (HOISTED.has(path.node)) return;
diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js
index 3ae20e546c19..27a2ad4df045 100644
--- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js
+++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js
@@ -1,6 +1,6 @@
 var REACT_ELEMENT_TYPE;
 
-function _jsx(type, props, key, children) { if (!REACT_ELEMENT_TYPE) { REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol.for && Symbol.for("react.element") || 0xeac7; } var defaultProps = type && type.defaultProps; var childrenLength = arguments.length - 3; if (!props && childrenLength !== 0) { props = { children: void 0 }; } if (props && defaultProps) { for (var propName in defaultProps) { if (props[propName] === void 0) { props[propName] = defaultProps[propName]; } } } else if (!props) { props = defaultProps || {}; } if (childrenLength === 1) { props.children = children; } else if (childrenLength > 1) { var childArray = new Array(childrenLength); for (var i = 0; i < childrenLength; i++) { childArray[i] = arguments[i + 3]; } props.children = childArray; } return { $$typeof: REACT_ELEMENT_TYPE, type: type, key: key === undefined ? null : '' + key, ref: null, props: props, _owner: null }; }
+function _jsx(type, props, key, children) { if (!REACT_ELEMENT_TYPE) { REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol["for"] && Symbol["for"]("react.element") || 0xeac7; } var defaultProps = type && type.defaultProps; var childrenLength = arguments.length - 3; if (!props && childrenLength !== 0) { props = { children: void 0 }; } if (props && defaultProps) { for (var propName in defaultProps) { if (props[propName] === void 0) { props[propName] = defaultProps[propName]; } } } else if (!props) { props = defaultProps || {}; } if (childrenLength === 1) { props.children = children; } else if (childrenLength > 1) { var childArray = new Array(childrenLength); for (var i = 0; i < childrenLength; i++) { childArray[i] = arguments[i + 3]; } props.children = childArray; } return { $$typeof: REACT_ELEMENT_TYPE, type: type, key: key === undefined ? null : '' + key, ref: null, props: props, _owner: null }; }
 
 var _ref =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-react-display-name/package.json b/packages/babel-plugin-transform-react-display-name/package.json
index 55f2ddf5edd8..97aa1609d217 100644
--- a/packages/babel-plugin-transform-react-display-name/package.json
+++ b/packages/babel-plugin-transform-react-display-name/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-react-display-name",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Add displayName to React.createClass calls",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-display-name",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-react-display-name/src/index.js b/packages/babel-plugin-transform-react-display-name/src/index.js
index e0d88d85699f..cc8479cbd82c 100644
--- a/packages/babel-plugin-transform-react-display-name/src/index.js
+++ b/packages/babel-plugin-transform-react-display-name/src/index.js
@@ -53,6 +53,8 @@ export default declare(api => {
   }
 
   return {
+    name: "transform-react-display-name",
+
     visitor: {
       ExportDefaultDeclaration({ node }, state) {
         if (isCreateClass(node.declaration)) {
diff --git a/packages/babel-plugin-transform-react-inline-elements/package.json b/packages/babel-plugin-transform-react-inline-elements/package.json
index bd010d711564..fe32f272e543 100644
--- a/packages/babel-plugin-transform-react-inline-elements/package.json
+++ b/packages/babel-plugin-transform-react-inline-elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-react-inline-elements",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Turn JSX elements into exploded React objects",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-inline-elements",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-react-inline-elements/src/index.js b/packages/babel-plugin-transform-react-inline-elements/src/index.js
index a5c2ef3ff85f..ab81b6b51a06 100644
--- a/packages/babel-plugin-transform-react-inline-elements/src/index.js
+++ b/packages/babel-plugin-transform-react-inline-elements/src/index.js
@@ -64,5 +64,8 @@ export default declare(api => {
       }
     },
   });
-  return { visitor };
+  return {
+    name: "transform-react-inline-elements",
+    visitor,
+  };
 });
diff --git a/packages/babel-plugin-transform-react-jsx-compat/package.json b/packages/babel-plugin-transform-react-jsx-compat/package.json
index e33913bfa0b4..87a9d5e4735e 100644
--- a/packages/babel-plugin-transform-react-jsx-compat/package.json
+++ b/packages/babel-plugin-transform-react-jsx-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-react-jsx-compat",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Turn JSX into React Pre-0.12 function calls",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-jsx-compat",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-react-jsx-compat/src/index.js b/packages/babel-plugin-transform-react-jsx-compat/src/index.js
index 844b255d4c7a..294607ba79ec 100644
--- a/packages/babel-plugin-transform-react-jsx-compat/src/index.js
+++ b/packages/babel-plugin-transform-react-jsx-compat/src/index.js
@@ -6,6 +6,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-react-jsx-compat",
+
     manipulateOptions(opts, parserOpts) {
       parserOpts.plugins.push("jsx");
     },
diff --git a/packages/babel-plugin-transform-react-jsx-self/package.json b/packages/babel-plugin-transform-react-jsx-self/package.json
index cd7245e2c6d8..d649d89f05ae 100644
--- a/packages/babel-plugin-transform-react-jsx-self/package.json
+++ b/packages/babel-plugin-transform-react-jsx-self/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-react-jsx-self",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Add a __self prop to all JSX Elements",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-jsx-self",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-jsx": "^7.0.0"
+    "@babel/plugin-syntax-jsx": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-react-jsx-self/src/index.js b/packages/babel-plugin-transform-react-jsx-self/src/index.js
index 375f22325620..208de870d821 100644
--- a/packages/babel-plugin-transform-react-jsx-self/src/index.js
+++ b/packages/babel-plugin-transform-react-jsx-self/src/index.js
@@ -29,6 +29,7 @@ export default declare(api => {
   };
 
   return {
+    name: "transform-react-jsx-self",
     visitor,
   };
 });
diff --git a/packages/babel-plugin-transform-react-jsx-source/package.json b/packages/babel-plugin-transform-react-jsx-source/package.json
index e8c1bf58df4e..829536fe4dc2 100644
--- a/packages/babel-plugin-transform-react-jsx-source/package.json
+++ b/packages/babel-plugin-transform-react-jsx-source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-react-jsx-source",
-  "version": "7.0.0",
+  "version": "7.5.0",
   "description": "Add a __source prop to all JSX Elements",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-jsx-source",
   "license": "MIT",
@@ -13,13 +13,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-jsx": "^7.0.0"
+    "@babel/plugin-syntax-jsx": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-react-jsx-source/src/index.js b/packages/babel-plugin-transform-react-jsx-source/src/index.js
index 70820c61e0eb..9c0f99ed41cc 100644
--- a/packages/babel-plugin-transform-react-jsx-source/src/index.js
+++ b/packages/babel-plugin-transform-react-jsx-source/src/index.js
@@ -48,7 +48,7 @@ export default declare(api => {
       for (let i = 0; i < attributes.length; i++) {
         const name = attributes[i].name;
         if (name && name.name === TRACE_ID) {
-          // The __source attibute already exists
+          // The __source attribute already exists
           return;
         }
       }
@@ -75,6 +75,7 @@ export default declare(api => {
   };
 
   return {
+    name: "transform-react-jsx-source",
     visitor,
   };
 });
diff --git a/packages/babel-plugin-transform-react-jsx/package.json b/packages/babel-plugin-transform-react-jsx/package.json
index 31b772d4c4ef..5af70957b122 100644
--- a/packages/babel-plugin-transform-react-jsx/package.json
+++ b/packages/babel-plugin-transform-react-jsx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-react-jsx",
-  "version": "7.0.0",
+  "version": "7.3.0",
   "description": "Turn JSX into React function calls",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-jsx",
   "license": "MIT",
@@ -12,15 +12,15 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/helper-builder-react-jsx": "^7.0.0",
+    "@babel/helper-builder-react-jsx": "^7.3.0",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-jsx": "^7.0.0"
+    "@babel/plugin-syntax-jsx": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-react-jsx/src/index.js b/packages/babel-plugin-transform-react-jsx/src/index.js
index 5ae4f11e7116..778e5f960b7a 100644
--- a/packages/babel-plugin-transform-react-jsx/src/index.js
+++ b/packages/babel-plugin-transform-react-jsx/src/index.js
@@ -51,16 +51,18 @@ export default declare((api, options) => {
       let pragmaSet = !!options.pragma;
       let pragmaFragSet = !!options.pragmaFrag;
 
-      for (const comment of (file.ast.comments: Array<Object>)) {
-        const jsxMatches = JSX_ANNOTATION_REGEX.exec(comment.value);
-        if (jsxMatches) {
-          pragma = jsxMatches[1];
-          pragmaSet = true;
-        }
-        const jsxFragMatches = JSX_FRAG_ANNOTATION_REGEX.exec(comment.value);
-        if (jsxFragMatches) {
-          pragmaFrag = jsxFragMatches[1];
-          pragmaFragSet = true;
+      if (file.ast.comments) {
+        for (const comment of (file.ast.comments: Array<Object>)) {
+          const jsxMatches = JSX_ANNOTATION_REGEX.exec(comment.value);
+          if (jsxMatches) {
+            pragma = jsxMatches[1];
+            pragmaSet = true;
+          }
+          const jsxFragMatches = JSX_FRAG_ANNOTATION_REGEX.exec(comment.value);
+          if (jsxFragMatches) {
+            pragmaFrag = jsxFragMatches[1];
+            pragmaFragSet = true;
+          }
         }
       }
 
@@ -91,6 +93,7 @@ export default declare((api, options) => {
   };
 
   return {
+    name: "transform-react-jsx",
     inherits: jsx,
     visitor,
   };
diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-spread-children/input.js b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-spread-children/input.js
new file mode 100644
index 000000000000..6a05e108dc66
--- /dev/null
+++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-spread-children/input.js
@@ -0,0 +1 @@
+<div>{...children}</div>;
diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-spread-children/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-spread-children/options.json
new file mode 100644
index 000000000000..bcb773e34314
--- /dev/null
+++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-spread-children/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Spread children are not supported in React."
+}
diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-xml-namespacing/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-xml-namespacing/options.json
index 2ff4f32134d2..8285c733a003 100644
--- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-xml-namespacing/options.json
+++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-disallow-xml-namespacing/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "Namespace tags are not supported by default. React's JSX doesn't support namespace tags. You can turn on the 'throwIfNamespace' flag to bypass this warning."
+  "throws": "Namespace tags are not supported by default. React's JSX doesn't support namespace tags. You can turn on the 'throwIfNamespace' flag to bypass this warning."
 }
diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-throw-error-namespaces-if-not-flag/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-throw-error-namespaces-if-not-flag/options.json
index ebcbfc2dc3e7..261ae7727779 100644
--- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-throw-error-namespaces-if-not-flag/options.json
+++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/should-throw-error-namespaces-if-not-flag/options.json
@@ -8,6 +8,5 @@
       }
     ]
   ],
-  "throws":
-    "Namespace tags are not supported by default. React's JSX doesn't support namespace tags. You can turn on the 'throwIfNamespace' flag to bypass this warning."
+  "throws": "Namespace tags are not supported by default. React's JSX doesn't support namespace tags. You can turn on the 'throwIfNamespace' flag to bypass this warning."
 }
diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-pragma-set-but-not-pragmafrag-and-frag-used/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-pragma-set-but-not-pragmafrag-and-frag-used/options.json
index f461d24b6f55..b89035fd105e 100644
--- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-pragma-set-but-not-pragmafrag-and-frag-used/options.json
+++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/throw-if-pragma-set-but-not-pragmafrag-and-frag-used/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "transform-react-jsx: pragma has been set but pragmafrag has not been set"
+  "throws": "transform-react-jsx: pragma has been set but pragmafrag has not been set"
 }
diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/useBuiltIns/assignment-invalid-option/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/useBuiltIns/assignment-invalid-option/options.json
index e1d66421a3e9..3baf37938e7d 100644
--- a/packages/babel-plugin-transform-react-jsx/test/fixtures/useBuiltIns/assignment-invalid-option/options.json
+++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/useBuiltIns/assignment-invalid-option/options.json
@@ -1,5 +1,4 @@
 {
   "plugins": [["transform-react-jsx", { "useBuiltIns": "invalidOption" }]],
-  "throws":
-    "transform-react-jsx currently only accepts a boolean option for useBuiltIns (defaults to false)"
+  "throws": "transform-react-jsx currently only accepts a boolean option for useBuiltIns (defaults to false)"
 }
diff --git a/packages/babel-plugin-transform-regenerator/package.json b/packages/babel-plugin-transform-regenerator/package.json
index 8a7e6dbe7698..9dbdaa4c6c7c 100644
--- a/packages/babel-plugin-transform-regenerator/package.json
+++ b/packages/babel-plugin-transform-regenerator/package.json
@@ -2,12 +2,12 @@
   "name": "@babel/plugin-transform-regenerator",
   "author": "Ben Newman <bn@cs.stanford.edu>",
   "description": "Explode async and generator functions into a state machine.",
-  "version": "7.0.0",
+  "version": "7.4.5",
   "homepage": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-regenerator",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-regenerator",
   "main": "lib/index.js",
   "dependencies": {
-    "regenerator-transform": "^0.13.3"
+    "regenerator-transform": "^0.14.0"
   },
   "license": "MIT",
   "publishConfig": {
@@ -17,7 +17,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/computed-properties/example/output.js b/packages/babel-plugin-transform-regenerator/test/fixtures/computed-properties/example/output.js
index a106fae81bd3..923673d960df 100644
--- a/packages/babel-plugin-transform-regenerator/test/fixtures/computed-properties/example/output.js
+++ b/packages/babel-plugin-transform-regenerator/test/fixtures/computed-properties/example/output.js
@@ -1,16 +1,20 @@
 var o = {
-  foo:
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          return _context.abrupt("return", "foo");
+  foo() {
+    return (
+      /*#__PURE__*/
+      regeneratorRuntime.mark(function _callee() {
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", "foo");
+
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      })()
+    );
+  }
 
-        case 1:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, this);
-  })
 };
diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js
index 2689c4bf2f7b..0b2d02f3770d 100644
--- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js
+++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js
@@ -20,7 +20,7 @@ function test(fn) {
               return _context.stop();
           }
         }
-      }, _callee, this);
+      }, _callee);
     }))
   );
 }
diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/6733/output.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/6733/output.js
index de3486b178dd..869290481d30 100644
--- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/6733/output.js
+++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/6733/output.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = _callee;
+exports["default"] = _callee;
 
 var _marked =
 /*#__PURE__*/
@@ -27,5 +27,5 @@ function _callee() {
           return _context.stop();
       }
     }
-  }, _marked, this);
+  }, _marked);
 }
diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js
index a67193cb03ef..5c1627f53221 100644
--- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js
+++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js
@@ -15,5 +15,5 @@ function fn() {
           return _context.stop();
       }
     }
-  }, _marked, this);
+  }, _marked);
 }
diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/variable-renaming/retain-lines/output.js b/packages/babel-plugin-transform-regenerator/test/fixtures/variable-renaming/retain-lines/output.js
index 4cdfb7f4216a..ecba790be476 100644
--- a/packages/babel-plugin-transform-regenerator/test/fixtures/variable-renaming/retain-lines/output.js
+++ b/packages/babel-plugin-transform-regenerator/test/fixtures/variable-renaming/retain-lines/output.js
@@ -3,4 +3,4 @@ var func = /*#__PURE__*/regeneratorRuntime.mark(function _callee() {var actual;r
         method().
         method2();case 2:
 
-        actual = true;case 3:case "end":return _context.stop();}}, _callee, this);});
+        actual = true;case 3:case "end":return _context.stop();}}, _callee);});
diff --git a/packages/babel-plugin-transform-reserved-words/package.json b/packages/babel-plugin-transform-reserved-words/package.json
index c5976c384227..dfce3bc9cf07 100644
--- a/packages/babel-plugin-transform-reserved-words/package.json
+++ b/packages/babel-plugin-transform-reserved-words/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-reserved-words",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Ensure that no reserved words are used.",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-reserved-words",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-reserved-words/src/index.js b/packages/babel-plugin-transform-reserved-words/src/index.js
index b691947ac642..014e7b964866 100644
--- a/packages/babel-plugin-transform-reserved-words/src/index.js
+++ b/packages/babel-plugin-transform-reserved-words/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-reserved-words",
+
     visitor: {
       "BindingIdentifier|ReferencedIdentifier"(path) {
         if (!t.isValidES3Identifier(path.node.name)) {
diff --git a/packages/babel-plugin-transform-runtime/package.json b/packages/babel-plugin-transform-runtime/package.json
index 167722dd9c42..d6881ae6fb63 100644
--- a/packages/babel-plugin-transform-runtime/package.json
+++ b/packages/babel-plugin-transform-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-runtime",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Externalise references to helpers and builtins, automatically polyfilling your code without polluting globals",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-runtime",
   "license": "MIT",
@@ -21,13 +21,13 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "@babel/helpers": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/runtime": "^7.0.0",
-    "@babel/template": "^7.0.0",
+    "@babel/helpers": "^7.5.5",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/runtime": "^7.5.5",
+    "@babel/template": "^7.4.4",
     "@babel/types": "7.0.0-beta.53"
   }
 }
diff --git a/packages/babel-plugin-transform-runtime/scripts/build-dist.js b/packages/babel-plugin-transform-runtime/scripts/build-dist.js
index 4f8375d284e9..e36ef0c68b0a 100644
--- a/packages/babel-plugin-transform-runtime/scripts/build-dist.js
+++ b/packages/babel-plugin-transform-runtime/scripts/build-dist.js
@@ -8,35 +8,79 @@ const template = require("@babel/template");
 const t = require("@babel/types");
 
 const transformRuntime = require("../");
-const getCorejs2Definitions = require("../lib/definitions").default;
-const corejs2Definitions = getCorejs2Definitions();
 
-writeHelpers("@babel/runtime");
+const corejs2Definitions = require("../lib/runtime-corejs2-definitions").default();
+const corejs3Definitions = require("../lib/runtime-corejs3-definitions").default();
 
-writeCoreJS2("@babel/runtime-corejs2");
+writeHelpers("@babel/runtime");
 writeHelpers("@babel/runtime-corejs2", { corejs: 2 });
-
-function writeCoreJS2(runtimeName) {
-  const pkgDirname = getRuntimeRoot(runtimeName);
-
-  const paths = ["is-iterable", "get-iterator"];
-
-  Object.keys(corejs2Definitions.builtins).forEach(key => {
-    const path = corejs2Definitions.builtins[key];
-    paths.push(path);
+writeHelpers("@babel/runtime-corejs3", {
+  corejs: { version: 3, proposals: true },
+});
+
+writeCoreJS({
+  corejs: 2,
+  proposals: true,
+  definitions: corejs2Definitions,
+  paths: [
+    "is-iterable",
+    "get-iterator",
+    // This was previously in definitions, but was removed to work around
+    // zloirock/core-js#262. We need to keep it in @babel/runtime-corejs2 to
+    // avoid a breaking change there.
+    "symbol/async-iterator",
+  ],
+  corejsRoot: "core-js/library/fn",
+});
+writeCoreJS({
+  corejs: 3,
+  proposals: false,
+  definitions: corejs3Definitions,
+  paths: [],
+  corejsRoot: "core-js-pure/stable",
+});
+writeCoreJS({
+  corejs: 3,
+  proposals: true,
+  definitions: corejs3Definitions,
+  paths: ["is-iterable", "get-iterator", "get-iterator-method"],
+  corejsRoot: "core-js-pure/features",
+});
+
+function writeCoreJS({
+  corejs,
+  proposals,
+  definitions: { BuiltIns, StaticProperties, InstanceProperties },
+  paths,
+  corejsRoot,
+}) {
+  const pkgDirname = getRuntimeRoot(`@babel/runtime-corejs${corejs}`);
+
+  Object.keys(BuiltIns).forEach(name => {
+    const { stable, path } = BuiltIns[name];
+    if (stable || proposals) paths.push(path);
   });
 
-  Object.keys(corejs2Definitions.methods).forEach(key => {
-    const props = corejs2Definitions.methods[key];
-    Object.keys(props).forEach(key2 => {
-      paths.push(props[key2]);
+  Object.keys(StaticProperties).forEach(builtin => {
+    const props = StaticProperties[builtin];
+    Object.keys(props).forEach(name => {
+      const { stable, path } = props[name];
+      if (stable || proposals) paths.push(path);
     });
   });
 
-  paths.forEach(function(corePath) {
+  if (InstanceProperties) {
+    Object.keys(InstanceProperties).forEach(name => {
+      const { stable, path } = InstanceProperties[name];
+      if (stable || proposals) paths.push(`instance/${path}`);
+    });
+  }
+
+  const runtimeRoot = proposals ? "core-js" : "core-js-stable";
+  paths.forEach(function(corejsPath) {
     outputFile(
-      path.join(pkgDirname, "core-js", `${corePath}.js`),
-      `module.exports = require("core-js/library/fn/${corePath}");`
+      path.join(pkgDirname, runtimeRoot, `${corejsPath}.js`),
+      `module.exports = require("${corejsRoot}/${corejsPath}");`
     );
   });
 }
diff --git a/packages/babel-plugin-transform-runtime/src/definitions.js b/packages/babel-plugin-transform-runtime/src/definitions.js
deleted file mode 100644
index ac044910a08e..000000000000
--- a/packages/babel-plugin-transform-runtime/src/definitions.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import semver from "semver";
-
-function hasMinVersion(minVersion, runtimeVersion) {
-  // If the range is unavailable, we're running the script during Babel's
-  // build process, and we want to assume that all versions are satisfied so
-  // that the built output will include all definitions.
-  if (!runtimeVersion) return true;
-
-  // semver.intersects() has some surprising behavior with comparing ranges
-  // with preprelease versions. We add '^' to ensure that we are always
-  // comparing ranges with ranges, which sidesteps this logic.
-  // For example:
-  //
-  //   semver.intersects(`<7.0.1`, "7.0.0-beta.0") // false - surprising
-  //   semver.intersects(`<7.0.1`, "^7.0.0-beta.0") // true - expected
-  //
-  // This is because the first falls back to
-  //
-  //   semver.satisfies("7.0.0-beta.0", `<7.0.1`) // false - surprising
-  //
-  // and this fails because a prerelease version can only satisfy a range
-  // if it is a prerelease within the same major/minor/patch range.
-  //
-  // Note: If this is found to have issues, please also revist the logic in
-  // babel-core's availableHelper() API.
-  if (semver.valid(runtimeVersion)) runtimeVersion = `^${runtimeVersion}`;
-
-  return (
-    !semver.intersects(`<${minVersion}`, runtimeVersion) &&
-    !semver.intersects(`>=8.0.0`, runtimeVersion)
-  );
-}
-
-export default runtimeVersion => {
-  // Conditionally include 'Math' because it was not included in the 7.0.0
-  // release of '@babel/runtime'. See issue https://github.com/babel/babel/pull/8616.
-  const includeMathModule = hasMinVersion("7.0.1", runtimeVersion);
-
-  return {
-    builtins: {
-      Symbol: "symbol",
-      Promise: "promise",
-      Map: "map",
-      WeakMap: "weak-map",
-      Set: "set",
-      WeakSet: "weak-set",
-      setImmediate: "set-immediate",
-      clearImmediate: "clear-immediate",
-      parseFloat: "parse-float",
-      parseInt: "parse-int",
-    },
-
-    methods: {
-      Array: {
-        from: "array/from",
-        isArray: "array/is-array",
-        of: "array/of",
-      },
-
-      JSON: {
-        stringify: "json/stringify",
-      },
-
-      Object: {
-        assign: "object/assign",
-        create: "object/create",
-        defineProperties: "object/define-properties",
-        defineProperty: "object/define-property",
-        entries: "object/entries",
-        freeze: "object/freeze",
-        getOwnPropertyDescriptor: "object/get-own-property-descriptor",
-        getOwnPropertyDescriptors: "object/get-own-property-descriptors",
-        getOwnPropertyNames: "object/get-own-property-names",
-        getOwnPropertySymbols: "object/get-own-property-symbols",
-        getPrototypeOf: "object/get-prototype-of",
-        isExtensible: "object/is-extensible",
-        isFrozen: "object/is-frozen",
-        isSealed: "object/is-sealed",
-        is: "object/is",
-        keys: "object/keys",
-        preventExtensions: "object/prevent-extensions",
-        seal: "object/seal",
-        setPrototypeOf: "object/set-prototype-of",
-        values: "object/values",
-      },
-
-      ...(includeMathModule
-        ? {
-            Math: {
-              acosh: "math/acosh",
-              asinh: "math/asinh",
-              atanh: "math/atanh",
-              cbrt: "math/cbrt",
-              clz32: "math/clz32",
-              cosh: "math/cosh",
-              expm1: "math/expm1",
-              fround: "math/fround",
-              hypot: "math/hypot",
-              imul: "math/imul",
-              log10: "math/log10",
-              log1p: "math/log1p",
-              log2: "math/log2",
-              sign: "math/sign",
-              sinh: "math/sinh",
-              tanh: "math/tanh",
-              trunc: "math/trunc",
-            },
-          }
-        : {}),
-
-      Symbol: {
-        asyncIterator: "symbol/async-iterator",
-        for: "symbol/for",
-        hasInstance: "symbol/has-instance",
-        isConcatSpreadable: "symbol/is-concat-spreadable",
-        iterator: "symbol/iterator",
-        keyFor: "symbol/key-for",
-        match: "symbol/match",
-        replace: "symbol/replace",
-        search: "symbol/search",
-        species: "symbol/species",
-        split: "symbol/split",
-        toPrimitive: "symbol/to-primitive",
-        toStringTag: "symbol/to-string-tag",
-        unscopables: "symbol/unscopables",
-      },
-
-      String: {
-        at: "string/at",
-        fromCodePoint: "string/from-code-point",
-        raw: "string/raw",
-      },
-
-      Number: {
-        EPSILON: "number/epsilon",
-        isFinite: "number/is-finite",
-        isInteger: "number/is-integer",
-        isNaN: "number/is-nan",
-        isSafeInteger: "number/is-safe-integer",
-        MAX_SAFE_INTEGER: "number/max-safe-integer",
-        MIN_SAFE_INTEGER: "number/min-safe-integer",
-        parseFloat: "number/parse-float",
-        parseInt: "number/parse-int",
-      },
-
-      Reflect: {
-        apply: "reflect/apply",
-        construct: "reflect/construct",
-        defineProperty: "reflect/define-property",
-        deleteProperty: "reflect/delete-property",
-        getOwnPropertyDescriptor: "reflect/get-own-property-descriptor",
-        getPrototypeOf: "reflect/get-prototype-of",
-        get: "reflect/get",
-        has: "reflect/has",
-        isExtensible: "reflect/is-extensible",
-        ownKeys: "reflect/own-keys",
-        preventExtensions: "reflect/prevent-extensions",
-        setPrototypeOf: "reflect/set-prototype-of",
-        set: "reflect/set",
-      },
-
-      Date: {
-        now: "date/now",
-      },
-    },
-  };
-};
diff --git a/packages/babel-plugin-transform-runtime/src/helpers.js b/packages/babel-plugin-transform-runtime/src/helpers.js
new file mode 100644
index 000000000000..f99730dc9498
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/src/helpers.js
@@ -0,0 +1,46 @@
+import semver from "semver";
+import { types as t } from "@babel/core";
+
+export function hasMinVersion(minVersion, runtimeVersion) {
+  // If the range is unavailable, we're running the script during Babel's
+  // build process, and we want to assume that all versions are satisfied so
+  // that the built output will include all definitions.
+  if (!runtimeVersion) return true;
+
+  // semver.intersects() has some surprising behavior with comparing ranges
+  // with preprelease versions. We add '^' to ensure that we are always
+  // comparing ranges with ranges, which sidesteps this logic.
+  // For example:
+  //
+  //   semver.intersects(`<7.0.1`, "7.0.0-beta.0") // false - surprising
+  //   semver.intersects(`<7.0.1`, "^7.0.0-beta.0") // true - expected
+  //
+  // This is because the first falls back to
+  //
+  //   semver.satisfies("7.0.0-beta.0", `<7.0.1`) // false - surprising
+  //
+  // and this fails because a prerelease version can only satisfy a range
+  // if it is a prerelease within the same major/minor/patch range.
+  //
+  // Note: If this is found to have issues, please also revisit the logic in
+  // babel-core's availableHelper() API.
+  if (semver.valid(runtimeVersion)) runtimeVersion = `^${runtimeVersion}`;
+
+  return (
+    !semver.intersects(`<${minVersion}`, runtimeVersion) &&
+    !semver.intersects(`>=8.0.0`, runtimeVersion)
+  );
+}
+
+// Note: We can't use NodePath#couldBeBaseType because it doesn't support arrays.
+// Even if we added support for arrays, this package needs to be compatible with
+// ^7.0.0 so we can't rely on it.
+export function typeAnnotationToString(node) {
+  switch (node.type) {
+    case "GenericTypeAnnotation":
+      if (t.isIdentifier(node.id, { name: "Array" })) return "array";
+      break;
+    case "StringTypeAnnotation":
+      return "string";
+  }
+}
diff --git a/packages/babel-plugin-transform-runtime/src/index.js b/packages/babel-plugin-transform-runtime/src/index.js
index 4f3a854028e6..3b7ff68e9c2f 100644
--- a/packages/babel-plugin-transform-runtime/src/index.js
+++ b/packages/babel-plugin-transform-runtime/src/index.js
@@ -4,7 +4,9 @@ import { declare } from "@babel/helper-plugin-utils";
 import { addDefault, isModule } from "@babel/helper-module-imports";
 import { types as t } from "@babel/core";
 
-import getDefinitions from "./definitions";
+import getCoreJS2Definitions from "./runtime-corejs2-definitions";
+import getCoreJS3Definitions from "./runtime-corejs3-definitions";
+import { typeAnnotationToString } from "./helpers";
 
 function resolveAbsoluteRuntime(moduleName: string, dirname: string) {
   try {
@@ -33,7 +35,7 @@ export default declare((api, options, dirname) => {
   api.assertVersion(7);
 
   const {
-    corejs: corejsVersion = false,
+    corejs,
     helpers: useRuntimeHelpers = true,
     regenerator: useRuntimeRegenerator = true,
     useESModules = false,
@@ -41,21 +43,48 @@ export default declare((api, options, dirname) => {
     absoluteRuntime = false,
   } = options;
 
-  const definitions = getDefinitions(runtimeVersion);
+  let proposals = false;
+  let rawVersion;
+
+  if (typeof corejs === "object" && corejs !== null) {
+    rawVersion = corejs.version;
+    proposals = Boolean(corejs.proposals);
+  } else {
+    rawVersion = corejs;
+  }
+
+  const corejsVersion = rawVersion ? Number(rawVersion) : false;
+
+  if (![false, 2, 3].includes(corejsVersion)) {
+    throw new Error(
+      `The \`core-js\` version must be false, 2 or 3, but got ${JSON.stringify(
+        rawVersion,
+      )}.`,
+    );
+  }
+
+  if (proposals && (!corejsVersion || corejsVersion < 3)) {
+    throw new Error(
+      "The 'proposals' option is only supported when using 'corejs: 3'",
+    );
+  }
 
   if (typeof useRuntimeRegenerator !== "boolean") {
     throw new Error(
       "The 'regenerator' option must be undefined, or a boolean.",
     );
   }
+
   if (typeof useRuntimeHelpers !== "boolean") {
     throw new Error("The 'helpers' option must be undefined, or a boolean.");
   }
+
   if (typeof useESModules !== "boolean" && useESModules !== "auto") {
     throw new Error(
       "The 'useESModules' option must be undefined, or a boolean, or 'auto'.",
     );
   }
+
   if (
     typeof absoluteRuntime !== "boolean" &&
     typeof absoluteRuntime !== "string"
@@ -64,16 +93,7 @@ export default declare((api, options, dirname) => {
       "The 'absoluteRuntime' option must be undefined, a boolean, or a string.",
     );
   }
-  if (
-    corejsVersion !== false &&
-    (typeof corejsVersion !== "number" || corejsVersion !== 2) &&
-    (typeof corejsVersion !== "string" || corejsVersion !== "2")
-  ) {
-    throw new Error(
-      `The 'corejs' option must be undefined, false, 2 or '2', ` +
-        `but got ${JSON.stringify(corejsVersion)}.`,
-    );
-  }
+
   if (typeof runtimeVersion !== "string") {
     throw new Error(`The 'version' option must be a version string.`);
   }
@@ -81,6 +101,28 @@ export default declare((api, options, dirname) => {
   function has(obj, key) {
     return Object.prototype.hasOwnProperty.call(obj, key);
   }
+
+  function hasMapping(methods, name) {
+    return has(methods, name) && (proposals || methods[name].stable);
+  }
+
+  function hasStaticMapping(object, method) {
+    return (
+      has(StaticProperties, object) &&
+      hasMapping(StaticProperties[object], method)
+    );
+  }
+
+  function maybeNeedsPolyfill(path, methods, name) {
+    if (!methods[name].types) return true;
+
+    const typeAnnotation = path.get("object").getTypeAnnotation();
+    const type = typeAnnotationToString(typeAnnotation);
+    if (!type) return true;
+
+    return methods[name].types.some(name => name === type);
+  }
+
   if (has(options, "useBuiltIns")) {
     if (options.useBuiltIns) {
       throw new Error(
@@ -90,10 +132,11 @@ export default declare((api, options, dirname) => {
     } else {
       throw new Error(
         "The 'useBuiltIns' option has been removed. Use the 'corejs'" +
-          "option with value '2' to polyfill with CoreJS 2.x via @babel/runtime.",
+          "option to polyfill with `core-js` via @babel/runtime.",
       );
     }
   }
+
   if (has(options, "polyfill")) {
     if (options.polyfill === false) {
       throw new Error(
@@ -103,10 +146,11 @@ export default declare((api, options, dirname) => {
     } else {
       throw new Error(
         "The 'polyfill' option has been removed. Use the 'corejs'" +
-          "option with value '2' to polyfill with CoreJS 2.x via @babel/runtime.",
+          "option to polyfill with `core-js` via @babel/runtime.",
       );
     }
   }
+
   if (has(options, "moduleName")) {
     throw new Error(
       "The 'moduleName' option has been removed. @babel/transform-runtime " +
@@ -119,11 +163,22 @@ export default declare((api, options, dirname) => {
   const esModules =
     useESModules === "auto" ? api.caller(supportsStaticESM) : useESModules;
 
-  const injectCoreJS2 = `${corejsVersion}` === "2";
-  const moduleName = injectCoreJS2
+  const injectCoreJS2 = corejsVersion === 2;
+  const injectCoreJS3 = corejsVersion === 3;
+  const injectCoreJS = corejsVersion !== false;
+
+  const moduleName = injectCoreJS3
+    ? "@babel/runtime-corejs3"
+    : injectCoreJS2
     ? "@babel/runtime-corejs2"
     : "@babel/runtime";
 
+  const corejsRoot = injectCoreJS3 && !proposals ? "core-js-stable" : "core-js";
+
+  const { BuiltIns, StaticProperties, InstanceProperties } = (injectCoreJS2
+    ? getCoreJS2Definitions
+    : getCoreJS3Definitions)(runtimeVersion);
+
   const HEADER_HELPERS = ["interopRequireWildcard", "interopRequireDefault"];
 
   let modulePath = moduleName;
@@ -135,6 +190,8 @@ export default declare((api, options, dirname) => {
   }
 
   return {
+    name: "transform-runtime",
+
     pre(file) {
       if (useRuntimeHelpers) {
         file.set("helperGenerator", name => {
@@ -197,7 +254,10 @@ export default declare((api, options, dirname) => {
     visitor: {
       ReferencedIdentifier(path) {
         const { node, parent, scope } = path;
-        if (node.name === "regeneratorRuntime" && useRuntimeRegenerator) {
+        const { name } = node;
+
+        // transform `regeneratorRuntime`
+        if (name === "regeneratorRuntime" && useRuntimeRegenerator) {
           path.replaceWith(
             this.addDefaultImport(
               `${modulePath}/regenerator`,
@@ -207,50 +267,88 @@ export default declare((api, options, dirname) => {
           return;
         }
 
-        if (!injectCoreJS2) return;
+        if (!injectCoreJS) return;
 
         if (t.isMemberExpression(parent)) return;
-        if (!has(definitions.builtins, node.name)) return;
-        if (scope.getBindingIdentifier(node.name)) return;
+        if (!hasMapping(BuiltIns, name)) return;
+        if (scope.getBindingIdentifier(name)) return;
 
-        // Symbol() -> _core.Symbol(); new Promise -> new _core.Promise
+        // transform global built-ins like `Symbol()`, `new Promise`
         path.replaceWith(
           this.addDefaultImport(
-            `${modulePath}/core-js/${definitions.builtins[node.name]}`,
-            node.name,
+            `${modulePath}/${corejsRoot}/${BuiltIns[name].path}`,
+            name,
           ),
         );
       },
 
-      // arr[Symbol.iterator]() -> _core.$for.getIterator(arr)
       CallExpression(path) {
-        if (!injectCoreJS2) return;
+        if (!injectCoreJS) return;
 
-        // we can't compile this
-        if (path.node.arguments.length) return;
+        const { node } = path;
+        const { callee } = node;
 
-        const callee = path.node.callee;
         if (!t.isMemberExpression(callee)) return;
+
+        const { object, property } = callee;
+        const propertyName = property.name;
+
+        // transform calling instance methods like `something.includes()`
+        if (injectCoreJS3 && !hasStaticMapping(object.name, propertyName)) {
+          if (
+            hasMapping(InstanceProperties, propertyName) &&
+            maybeNeedsPolyfill(
+              path.get("callee"),
+              InstanceProperties,
+              propertyName,
+            )
+          ) {
+            let context1, context2;
+            if (t.isIdentifier(object)) {
+              context1 = object;
+              context2 = t.cloneNode(object);
+            } else {
+              context1 = path.scope.generateDeclaredUidIdentifier("context");
+              context2 = t.assignmentExpression("=", context1, object);
+            }
+            node.callee = t.memberExpression(
+              t.callExpression(
+                this.addDefaultImport(
+                  `${moduleName}/${corejsRoot}/instance/${
+                    InstanceProperties[propertyName].path
+                  }`,
+                  `${propertyName}InstanceProperty`,
+                ),
+                [context2],
+              ),
+              t.identifier("call"),
+            );
+            node.arguments.unshift(context1);
+            return;
+          }
+        }
+        // we can't compile this
+        if (node.arguments.length) return;
         if (!callee.computed) return;
         if (!path.get("callee.property").matchesPattern("Symbol.iterator")) {
           return;
         }
 
+        // transform `something[Symbol.iterator]()` to calling `getIterator(something)` helper
         path.replaceWith(
           t.callExpression(
             this.addDefaultImport(
               `${modulePath}/core-js/get-iterator`,
               "getIterator",
             ),
-            [callee.object],
+            [object],
           ),
         );
       },
 
-      // Symbol.iterator in arr -> core.$for.isIterable(arr)
+      // transform `Symbol.iterator in something` to calling `isIterable(something)` helper
       BinaryExpression(path) {
-        if (!injectCoreJS2) return;
-
+        if (!injectCoreJS) return;
         if (path.node.operator !== "in") return;
         if (!path.get("left").matchesPattern("Symbol.iterator")) return;
 
@@ -265,64 +363,91 @@ export default declare((api, options, dirname) => {
         );
       },
 
-      // Array.from -> _core.Array.from
+      // transform static built-ins methods like `Array.from`
       MemberExpression: {
         enter(path) {
-          if (!injectCoreJS2) return;
+          if (!injectCoreJS) return;
           if (!path.isReferenced()) return;
 
           const { node } = path;
-          const obj = node.object;
-          const prop = node.property;
-
-          if (!t.isReferenced(obj, node)) return;
-          if (node.computed) return;
-          if (!has(definitions.methods, obj.name)) return;
-
-          const methods = definitions.methods[obj.name];
-          if (!has(methods, prop.name)) return;
+          const { object, property } = node;
+
+          if (!t.isReferenced(object, node)) return;
+
+          if (node.computed) {
+            if (injectCoreJS2) return;
+            // transform `something[Symbol.iterator]` to calling `getIteratorMethod(something)` helper
+            if (path.get("property").matchesPattern("Symbol.iterator")) {
+              path.replaceWith(
+                t.callExpression(
+                  this.addDefaultImport(
+                    `${moduleName}/core-js/get-iterator-method`,
+                    "getIteratorMethod",
+                  ),
+                  [object],
+                ),
+              );
+            }
+            return;
+          }
 
+          const objectName = object.name;
+          const propertyName = property.name;
           // doesn't reference the global
-          if (path.scope.getBindingIdentifier(obj.name)) return;
-
-          // special case Object.defineProperty to not use core-js when using string keys
           if (
-            obj.name === "Object" &&
-            prop.name === "defineProperty" &&
-            path.parentPath.isCallExpression()
+            path.scope.getBindingIdentifier(objectName) ||
+            !hasStaticMapping(objectName, propertyName)
           ) {
-            const call = path.parentPath.node;
-            if (call.arguments.length === 3 && t.isLiteral(call.arguments[1])) {
-              return;
+            // transform getting of instance methods like `method = something.includes`
+            if (
+              injectCoreJS3 &&
+              hasMapping(InstanceProperties, propertyName) &&
+              maybeNeedsPolyfill(path, InstanceProperties, propertyName)
+            ) {
+              path.replaceWith(
+                t.callExpression(
+                  this.addDefaultImport(
+                    `${moduleName}/${corejsRoot}/instance/${
+                      InstanceProperties[propertyName].path
+                    }`,
+                    `${propertyName}InstanceProperty`,
+                  ),
+                  [object],
+                ),
+              );
             }
+            return;
           }
 
           path.replaceWith(
             this.addDefaultImport(
-              `${modulePath}/core-js/${methods[prop.name]}`,
-              `${obj.name}$${prop.name}`,
+              `${modulePath}/${corejsRoot}/${
+                StaticProperties[objectName][propertyName].path
+              }`,
+              `${objectName}$${propertyName}`,
             ),
           );
         },
 
         exit(path) {
-          if (!injectCoreJS2) return;
+          if (!injectCoreJS) return;
           if (!path.isReferenced()) return;
+          if (path.node.computed) return;
 
           const { node } = path;
-          const obj = node.object;
+          const { object } = node;
+          const { name } = object;
 
-          if (!has(definitions.builtins, obj.name)) return;
-          if (path.scope.getBindingIdentifier(obj.name)) return;
+          if (!hasMapping(BuiltIns, name)) return;
+          if (path.scope.getBindingIdentifier(name)) return;
 
           path.replaceWith(
             t.memberExpression(
               this.addDefaultImport(
-                `${modulePath}/core-js/${definitions.builtins[obj.name]}`,
-                obj.name,
+                `${modulePath}/${corejsRoot}/${BuiltIns[name].path}`,
+                name,
               ),
               node.property,
-              node.computed,
             ),
           );
         },
diff --git a/packages/babel-plugin-transform-runtime/src/runtime-corejs2-definitions.js b/packages/babel-plugin-transform-runtime/src/runtime-corejs2-definitions.js
new file mode 100644
index 000000000000..c65df3f4ee8d
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/src/runtime-corejs2-definitions.js
@@ -0,0 +1,155 @@
+import { hasMinVersion } from "./helpers";
+
+export default runtimeVersion => {
+  // Conditionally include 'Math' because it was not included in the 7.0.0
+  // release of '@babel/runtime'. See issue https://github.com/babel/babel/pull/8616.
+  const includeMathModule = hasMinVersion("7.0.1", runtimeVersion);
+
+  return {
+    BuiltIns: {
+      Symbol: { stable: true, path: "symbol" },
+      Promise: { stable: true, path: "promise" },
+      Map: { stable: true, path: "map" },
+      WeakMap: { stable: true, path: "weak-map" },
+      Set: { stable: true, path: "set" },
+      WeakSet: { stable: true, path: "weak-set" },
+      setImmediate: { stable: true, path: "set-immediate" },
+      clearImmediate: { stable: true, path: "clear-immediate" },
+      parseFloat: { stable: true, path: "parse-float" },
+      parseInt: { stable: true, path: "parse-int" },
+    },
+
+    StaticProperties: {
+      Array: {
+        from: { stable: true, path: "array/from" },
+        isArray: { stable: true, path: "array/is-array" },
+        of: { stable: true, path: "array/of" },
+      },
+
+      JSON: {
+        stringify: { stable: true, path: "json/stringify" },
+      },
+
+      Object: {
+        assign: { stable: true, path: "object/assign" },
+        create: { stable: true, path: "object/create" },
+        defineProperties: { stable: true, path: "object/define-properties" },
+        defineProperty: { stable: true, path: "object/define-property" },
+        entries: { stable: true, path: "object/entries" },
+        freeze: { stable: true, path: "object/freeze" },
+        getOwnPropertyDescriptor: {
+          stable: true,
+          path: "object/get-own-property-descriptor",
+        },
+        getOwnPropertyDescriptors: {
+          stable: true,
+          path: "object/get-own-property-descriptors",
+        },
+        getOwnPropertyNames: {
+          stable: true,
+          path: "object/get-own-property-names",
+        },
+        getOwnPropertySymbols: {
+          stable: true,
+          path: "object/get-own-property-symbols",
+        },
+        getPrototypeOf: { stable: true, path: "object/get-prototype-of" },
+        isExtensible: { stable: true, path: "object/is-extensible" },
+        isFrozen: { stable: true, path: "object/is-frozen" },
+        isSealed: { stable: true, path: "object/is-sealed" },
+        is: { stable: true, path: "object/is" },
+        keys: { stable: true, path: "object/keys" },
+        preventExtensions: { stable: true, path: "object/prevent-extensions" },
+        seal: { stable: true, path: "object/seal" },
+        setPrototypeOf: { stable: true, path: "object/set-prototype-of" },
+        values: { stable: true, path: "object/values" },
+      },
+
+      ...(includeMathModule
+        ? {
+            Math: {
+              acosh: { stable: true, path: "math/acosh" },
+              asinh: { stable: true, path: "math/asinh" },
+              atanh: { stable: true, path: "math/atanh" },
+              cbrt: { stable: true, path: "math/cbrt" },
+              clz32: { stable: true, path: "math/clz32" },
+              cosh: { stable: true, path: "math/cosh" },
+              expm1: { stable: true, path: "math/expm1" },
+              fround: { stable: true, path: "math/fround" },
+              hypot: { stable: true, path: "math/hypot" },
+              imul: { stable: true, path: "math/imul" },
+              log10: { stable: true, path: "math/log10" },
+              log1p: { stable: true, path: "math/log1p" },
+              log2: { stable: true, path: "math/log2" },
+              sign: { stable: true, path: "math/sign" },
+              sinh: { stable: true, path: "math/sinh" },
+              tanh: { stable: true, path: "math/tanh" },
+              trunc: { stable: true, path: "math/trunc" },
+            },
+          }
+        : {}),
+
+      Symbol: {
+        // FIXME: Disabled to work around zloirock/core-js#262.
+        // asyncIterator: { stable: true, path: "symbol/async-iterator" },
+        for: { stable: true, path: "symbol/for" },
+        hasInstance: { stable: true, path: "symbol/has-instance" },
+        isConcatSpreadable: {
+          stable: true,
+          path: "symbol/is-concat-spreadable",
+        },
+        iterator: { stable: true, path: "symbol/iterator" },
+        keyFor: { stable: true, path: "symbol/key-for" },
+        match: { stable: true, path: "symbol/match" },
+        replace: { stable: true, path: "symbol/replace" },
+        search: { stable: true, path: "symbol/search" },
+        species: { stable: true, path: "symbol/species" },
+        split: { stable: true, path: "symbol/split" },
+        toPrimitive: { stable: true, path: "symbol/to-primitive" },
+        toStringTag: { stable: true, path: "symbol/to-string-tag" },
+        unscopables: { stable: true, path: "symbol/unscopables" },
+      },
+
+      String: {
+        at: { stable: true, path: "string/at" },
+        fromCodePoint: { stable: true, path: "string/from-code-point" },
+        raw: { stable: true, path: "string/raw" },
+      },
+
+      Number: {
+        EPSILON: { stable: true, path: "number/epsilon" },
+        isFinite: { stable: true, path: "number/is-finite" },
+        isInteger: { stable: true, path: "number/is-integer" },
+        isNaN: { stable: true, path: "number/is-nan" },
+        isSafeInteger: { stable: true, path: "number/is-safe-integer" },
+        MAX_SAFE_INTEGER: { stable: true, path: "number/max-safe-integer" },
+        MIN_SAFE_INTEGER: { stable: true, path: "number/min-safe-integer" },
+        parseFloat: { stable: true, path: "number/parse-float" },
+        parseInt: { stable: true, path: "number/parse-int" },
+      },
+
+      Reflect: {
+        apply: { stable: true, path: "reflect/apply" },
+        construct: { stable: true, path: "reflect/construct" },
+        defineProperty: { stable: true, path: "reflect/define-property" },
+        deleteProperty: { stable: true, path: "reflect/delete-property" },
+        getOwnPropertyDescriptor: {
+          stable: true,
+          path: "reflect/get-own-property-descriptor",
+        },
+        getPrototypeOf: { stable: true, path: "reflect/get-prototype-of" },
+        get: { stable: true, path: "reflect/get" },
+        has: { stable: true, path: "reflect/has" },
+        isExtensible: { stable: true, path: "reflect/is-extensible" },
+        ownKeys: { stable: true, path: "reflect/own-keys" },
+        preventExtensions: { stable: true, path: "reflect/prevent-extensions" },
+        setPrototypeOf: { stable: true, path: "reflect/set-prototype-of" },
+        set: { stable: true, path: "reflect/set" },
+      },
+
+      Date: {
+        now: { stable: true, path: "date/now" },
+      },
+    },
+  };
+};
diff --git a/packages/babel-plugin-transform-runtime/src/runtime-corejs3-definitions.js b/packages/babel-plugin-transform-runtime/src/runtime-corejs3-definitions.js
new file mode 100644
index 000000000000..ab76a7eaaef7
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/src/runtime-corejs3-definitions.js
@@ -0,0 +1,231 @@
+export default () => {
+  return {
+    BuiltIns: {
+      AggregateError: { stable: false, path: "aggregate-error" },
+      Map: { stable: true, path: "map" },
+      Observable: { stable: false, path: "observable" },
+      Promise: { stable: true, path: "promise" },
+      Set: { stable: true, path: "set" },
+      Symbol: { stable: true, path: "symbol" },
+      URL: { stable: true, path: "url" },
+      URLSearchParams: { stable: true, path: "url-search-params" },
+      WeakMap: { stable: true, path: "weak-map" },
+      WeakSet: { stable: true, path: "weak-set" },
+      clearImmediate: { stable: true, path: "clear-immediate" },
+      compositeKey: { stable: false, path: "composite-key" },
+      compositeSymbol: { stable: false, path: "composite-symbol" },
+      globalThis: { stable: false, path: "global-this" },
+      parseFloat: { stable: true, path: "parse-float" },
+      parseInt: { stable: true, path: "parse-int" },
+      queueMicrotask: { stable: true, path: "queue-microtask" },
+      setImmediate: { stable: true, path: "set-immediate" },
+      setInterval: { stable: true, path: "set-interval" },
+      setTimeout: { stable: true, path: "set-timeout" },
+    },
+
+    StaticProperties: {
+      Array: {
+        from: { stable: true, path: "array/from" },
+        isArray: { stable: true, path: "array/is-array" },
+        of: { stable: true, path: "array/of" },
+      },
+
+      Date: {
+        now: { stable: true, path: "date/now" },
+      },
+
+      JSON: {
+        stringify: { stable: true, path: "json/stringify" },
+      },
+
+      Math: {
+        DEG_PER_RAD: { stable: false, path: "math/deg-per-rad" },
+        RAD_PER_DEG: { stable: false, path: "math/rad-per-deg" },
+        acosh: { stable: true, path: "math/acosh" },
+        asinh: { stable: true, path: "math/asinh" },
+        atanh: { stable: true, path: "math/atanh" },
+        cbrt: { stable: true, path: "math/cbrt" },
+        clamp: { stable: false, path: "math/clamp" },
+        clz32: { stable: true, path: "math/clz32" },
+        cosh: { stable: true, path: "math/cosh" },
+        degrees: { stable: false, path: "math/degrees" },
+        expm1: { stable: true, path: "math/expm1" },
+        fround: { stable: true, path: "math/fround" },
+        fscale: { stable: false, path: "math/fscale" },
+        hypot: { stable: true, path: "math/hypot" },
+        iaddh: { stable: false, path: "math/iaddh" },
+        imul: { stable: true, path: "math/imul" },
+        imulh: { stable: false, path: "math/imulh" },
+        isubh: { stable: false, path: "math/isubh" },
+        log10: { stable: true, path: "math/log10" },
+        log1p: { stable: true, path: "math/log1p" },
+        log2: { stable: true, path: "math/log2" },
+        radians: { stable: false, path: "math/radians" },
+        scale: { stable: false, path: "math/scale" },
+        seededPRNG: { stable: false, path: "math/seeded-prng" },
+        sign: { stable: true, path: "math/sign" },
+        signbit: { stable: false, path: "math/signbit" },
+        sinh: { stable: true, path: "math/sinh" },
+        tanh: { stable: true, path: "math/tanh" },
+        trunc: { stable: true, path: "math/trunc" },
+        umulh: { stable: false, path: "math/umulh" },
+      },
+
+      Number: {
+        EPSILON: { stable: true, path: "number/epsilon" },
+        MAX_SAFE_INTEGER: { stable: true, path: "number/max-safe-integer" },
+        MIN_SAFE_INTEGER: { stable: true, path: "number/min-safe-integer" },
+        fromString: { stable: false, path: "number/from-string" },
+        isFinite: { stable: true, path: "number/is-finite" },
+        isInteger: { stable: true, path: "number/is-integer" },
+        isNaN: { stable: true, path: "number/is-nan" },
+        isSafeInteger: { stable: true, path: "number/is-safe-integer" },
+        parseFloat: { stable: true, path: "number/parse-float" },
+        parseInt: { stable: true, path: "number/parse-int" },
+      },
+
+      Object: {
+        assign: { stable: true, path: "object/assign" },
+        create: { stable: true, path: "object/create" },
+        defineProperties: { stable: true, path: "object/define-properties" },
+        defineProperty: { stable: true, path: "object/define-property" },
+        entries: { stable: true, path: "object/entries" },
+        freeze: { stable: true, path: "object/freeze" },
+        fromEntries: { stable: true, path: "object/from-entries" },
+        getOwnPropertyDescriptor: {
+          stable: true,
+          path: "object/get-own-property-descriptor",
+        },
+        getOwnPropertyDescriptors: {
+          stable: true,
+          path: "object/get-own-property-descriptors",
+        },
+        getOwnPropertyNames: {
+          stable: true,
+          path: "object/get-own-property-names",
+        },
+        getOwnPropertySymbols: {
+          stable: true,
+          path: "object/get-own-property-symbols",
+        },
+        getPrototypeOf: { stable: true, path: "object/get-prototype-of" },
+        isExtensible: { stable: true, path: "object/is-extensible" },
+        isFrozen: { stable: true, path: "object/is-frozen" },
+        isSealed: { stable: true, path: "object/is-sealed" },
+        is: { stable: true, path: "object/is" },
+        keys: { stable: true, path: "object/keys" },
+        preventExtensions: { stable: true, path: "object/prevent-extensions" },
+        seal: { stable: true, path: "object/seal" },
+        setPrototypeOf: { stable: true, path: "object/set-prototype-of" },
+        values: { stable: true, path: "object/values" },
+      },
+
+      Reflect: {
+        apply: { stable: true, path: "reflect/apply" },
+        construct: { stable: true, path: "reflect/construct" },
+        defineMetadata: { stable: false, path: "reflect/define-metadata" },
+        defineProperty: { stable: true, path: "reflect/define-property" },
+        deleteMetadata: { stable: false, path: "reflect/delete-metadata" },
+        deleteProperty: { stable: true, path: "reflect/delete-property" },
+        getMetadata: { stable: false, path: "reflect/get-metadata" },
+        getMetadataKeys: { stable: false, path: "reflect/get-metadata-keys" },
+        getOwnMetadata: { stable: false, path: "reflect/get-own-metadata" },
+        getOwnMetadataKeys: {
+          stable: false,
+          path: "reflect/get-own-metadata-keys",
+        },
+        getOwnPropertyDescriptor: {
+          stable: true,
+          path: "reflect/get-own-property-descriptor",
+        },
+        getPrototypeOf: { stable: true, path: "reflect/get-prototype-of" },
+        get: { stable: true, path: "reflect/get" },
+        has: { stable: true, path: "reflect/has" },
+        hasMetadata: { stable: false, path: "reflect/has-metadata" },
+        hasOwnMetadata: { stable: false, path: "reflect/has-own-metadata" },
+        isExtensible: { stable: true, path: "reflect/is-extensible" },
+        metadata: { stable: false, path: "reflect/metadata" },
+        ownKeys: { stable: true, path: "reflect/own-keys" },
+        preventExtensions: { stable: true, path: "reflect/prevent-extensions" },
+        set: { stable: true, path: "reflect/set" },
+        setPrototypeOf: { stable: true, path: "reflect/set-prototype-of" },
+      },
+
+      String: {
+        fromCodePoint: { stable: true, path: "string/from-code-point" },
+        raw: { stable: true, path: "string/raw" },
+      },
+
+      Symbol: {
+        asyncIterator: { stable: true, path: "symbol/async-iterator" },
+        dispose: { stable: false, path: "symbol/dispose" },
+        for: { stable: true, path: "symbol/for" },
+        hasInstance: { stable: true, path: "symbol/has-instance" },
+        isConcatSpreadable: {
+          stable: true,
+          path: "symbol/is-concat-spreadable",
+        },
+        iterator: { stable: true, path: "symbol/iterator" },
+        keyFor: { stable: true, path: "symbol/key-for" },
+        match: { stable: true, path: "symbol/match" },
+        observable: { stable: false, path: "symbol/observable" },
+        patternMatch: { stable: false, path: "symbol/pattern-match" },
+        replace: { stable: true, path: "symbol/replace" },
+        search: { stable: true, path: "symbol/search" },
+        species: { stable: true, path: "symbol/species" },
+        split: { stable: true, path: "symbol/split" },
+        toPrimitive: { stable: true, path: "symbol/to-primitive" },
+        toStringTag: { stable: true, path: "symbol/to-string-tag" },
+        unscopables: { stable: true, path: "symbol/unscopables" },
+      },
+    },
+
+    // NOTE: You can specify the object types whose method needs to be polyfilled.
+    // e.g.  concat: { types: ["array"] }
+    // See ./helpers.js@typeAnnotationToString for the supported types
+
+    InstanceProperties: {
+      at: { stable: false, path: "at" },
+      bind: { stable: true, path: "bind" },
+      codePointAt: { stable: true, path: "code-point-at" },
+      codePoints: { stable: false, path: "code-points" },
+      concat: { stable: true, path: "concat", types: ["array"] },
+      copyWithin: { stable: true, path: "copy-within" },
+      endsWith: { stable: true, path: "ends-with" },
+      entries: { stable: true, path: "entries" },
+      every: { stable: true, path: "every" },
+      fill: { stable: true, path: "fill" },
+      filter: { stable: true, path: "filter" },
+      find: { stable: true, path: "find" },
+      findIndex: { stable: true, path: "find-index" },
+      flags: { stable: true, path: "flags" },
+      flatMap: { stable: true, path: "flat-map" },
+      flat: { stable: true, path: "flat" },
+      forEach: { stable: true, path: "for-each" },
+      includes: { stable: true, path: "includes" },
+      indexOf: { stable: true, path: "index-of" },
+      keys: { stable: true, path: "keys" },
+      lastIndexOf: { stable: true, path: "last-index-of" },
+      map: { stable: true, path: "map" },
+      matchAll: { stable: false, path: "match-all" },
+      padEnd: { stable: true, path: "pad-end" },
+      padStart: { stable: true, path: "pad-start" },
+      reduce: { stable: true, path: "reduce" },
+      reduceRight: { stable: true, path: "reduce-right" },
+      repeat: { stable: true, path: "repeat" },
+      replaceAll: { stable: false, path: "replace-all" },
+      reverse: { stable: true, path: "reverse" },
+      slice: { stable: true, path: "slice" },
+      some: { stable: true, path: "some" },
+      sort: { stable: true, path: "sort" },
+      splice: { stable: true, path: "splice" },
+      startsWith: { stable: true, path: "starts-with" },
+      trim: { stable: true, path: "trim" },
+      trimEnd: { stable: true, path: "trim-end" },
+      trimLeft: { stable: true, path: "trim-left" },
+      trimRight: { stable: true, path: "trim-right" },
+      trimStart: { stable: true, path: "trim-start" },
+      values: { stable: true, path: "values" },
+    },
+  };
+};
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/input.js
new file mode 100644
index 000000000000..e102e6fd7a2c
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/input.js
@@ -0,0 +1 @@
+require(`./locale/${lan}`);
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/options.json
new file mode 100644
index 000000000000..1a7c4b5b6328
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    ["transform-runtime", { "corejs": 3 }],
+    "transform-template-literals"
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/output.js
new file mode 100644
index 000000000000..57a591f39640
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/regression/issue-9753-webpack-require-template-compatibility/output.js
@@ -0,0 +1 @@
+require("./locale/".concat(lan));
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/full/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/full/output.mjs
index bb91155014fe..841a99d5778e 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/full/output.mjs
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/full/output.mjs
@@ -18,7 +18,7 @@ export function giveWord() {
       case "end":
         return _context.stop();
     }
-  }, _marked, this);
+  }, _marked);
 }
 foo;
 bar;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/input.js
new file mode 100644
index 000000000000..87ed431301c8
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/input.js
@@ -0,0 +1 @@
+bar[filter]()
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/options.json
new file mode 100644
index 000000000000..5c04c7763001
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 2 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/output.js
new file mode 100644
index 000000000000..fcaaf3063d97
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/instance-computed/output.js
@@ -0,0 +1 @@
+bar[filter]();
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js
index d7ece9528b1a..c3eab7f58ed2 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js
@@ -2,11 +2,11 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
 
-var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
-
 var _Object$keys = require("@babel/runtime-corejs2/core-js/object/keys");
 
-Object.defineProperty(exports, "__esModule", {
+var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+
+_Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/regenerator-runtime/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/regenerator-runtime/output.js
index a068476f9946..852c24b9c4a3 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/regenerator-runtime/output.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/regenerator-runtime/output.js
@@ -9,5 +9,5 @@ _regeneratorRuntime.mark(function _callee() {
       case "end":
         return _context.stop();
     }
-  }, _callee, this);
+  }, _callee);
 });
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/input.js
new file mode 100644
index 000000000000..b7c61b92b0ee
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/input.js
@@ -0,0 +1,7 @@
+obj.constructor === Object;
+obj.constructor === Promise;
+
+Symbol();
+Symbol("test");
+
+new Map();
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/output.js
new file mode 100644
index 000000000000..45bcce8ebc04
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/aliased-constructors/output.js
@@ -0,0 +1,14 @@
+var _Map = require("@babel/runtime-corejs3/core-js-stable/map");
+
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+
+var _Promise = require("@babel/runtime-corejs3/core-js-stable/promise");
+
+obj.constructor === Object;
+obj.constructor === _Promise;
+
+_Symbol();
+
+_Symbol("test");
+
+new _Map();
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/input.js
new file mode 100644
index 000000000000..a9c0ca44e510
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/input.js
@@ -0,0 +1,33 @@
+AggregateError
+Map
+Observable
+Promise
+Set
+Symbol
+URL
+URLSearchParams
+WeakMap
+WeakSet
+clearImmediate
+compositeKey
+compositeSymbol
+globalThis
+parseFloat
+parseInt
+queueMicrotask
+setImmediate
+setInterval
+setTimeout
+
+Array
+Boolean
+Date
+Infinity
+JSON
+NaN
+Number
+Object
+clearInterval
+clearTimeout
+
+something
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/options.json
new file mode 100644
index 000000000000..1e8ea7d11308
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": { "version": 3, "proposals": true } }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/output.js
new file mode 100644
index 000000000000..90766b4cd4be
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals-proposals/output.js
@@ -0,0 +1,71 @@
+var _setTimeout = require("@babel/runtime-corejs3/core-js/set-timeout");
+
+var _setInterval = require("@babel/runtime-corejs3/core-js/set-interval");
+
+var _setImmediate = require("@babel/runtime-corejs3/core-js/set-immediate");
+
+var _queueMicrotask = require("@babel/runtime-corejs3/core-js/queue-microtask");
+
+var _parseInt = require("@babel/runtime-corejs3/core-js/parse-int");
+
+var _parseFloat = require("@babel/runtime-corejs3/core-js/parse-float");
+
+var _globalThis = require("@babel/runtime-corejs3/core-js/global-this");
+
+var _compositeSymbol = require("@babel/runtime-corejs3/core-js/composite-symbol");
+
+var _compositeKey = require("@babel/runtime-corejs3/core-js/composite-key");
+
+var _clearImmediate = require("@babel/runtime-corejs3/core-js/clear-immediate");
+
+var _WeakSet = require("@babel/runtime-corejs3/core-js/weak-set");
+
+var _WeakMap = require("@babel/runtime-corejs3/core-js/weak-map");
+
+var _URLSearchParams = require("@babel/runtime-corejs3/core-js/url-search-params");
+
+var _URL = require("@babel/runtime-corejs3/core-js/url");
+
+var _Symbol = require("@babel/runtime-corejs3/core-js/symbol");
+
+var _Set = require("@babel/runtime-corejs3/core-js/set");
+
+var _Promise = require("@babel/runtime-corejs3/core-js/promise");
+
+var _Observable = require("@babel/runtime-corejs3/core-js/observable");
+
+var _Map = require("@babel/runtime-corejs3/core-js/map");
+
+var _AggregateError = require("@babel/runtime-corejs3/core-js/aggregate-error");
+
+_AggregateError;
+_Map;
+_Observable;
+_Promise;
+_Set;
+_Symbol;
+_URL;
+_URLSearchParams;
+_WeakMap;
+_WeakSet;
+_clearImmediate;
+_compositeKey;
+_compositeSymbol;
+_globalThis;
+_parseFloat;
+_parseInt;
+_queueMicrotask;
+_setImmediate;
+_setInterval;
+_setTimeout;
+Array;
+Boolean;
+Date;
+Infinity;
+JSON;
+NaN;
+Number;
+Object;
+clearInterval;
+clearTimeout;
+something;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/input.js
new file mode 100644
index 000000000000..a9c0ca44e510
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/input.js
@@ -0,0 +1,33 @@
+AggregateError
+Map
+Observable
+Promise
+Set
+Symbol
+URL
+URLSearchParams
+WeakMap
+WeakSet
+clearImmediate
+compositeKey
+compositeSymbol
+globalThis
+parseFloat
+parseInt
+queueMicrotask
+setImmediate
+setInterval
+setTimeout
+
+Array
+Boolean
+Date
+Infinity
+JSON
+NaN
+Number
+Object
+clearInterval
+clearTimeout
+
+something
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/options.json
new file mode 100644
index 000000000000..ea8bb9c3aa1c
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/output.js
new file mode 100644
index 000000000000..dc1abb21353d
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-globals/output.js
@@ -0,0 +1,61 @@
+var _setTimeout = require("@babel/runtime-corejs3/core-js-stable/set-timeout");
+
+var _setInterval = require("@babel/runtime-corejs3/core-js-stable/set-interval");
+
+var _setImmediate = require("@babel/runtime-corejs3/core-js-stable/set-immediate");
+
+var _queueMicrotask = require("@babel/runtime-corejs3/core-js-stable/queue-microtask");
+
+var _parseInt = require("@babel/runtime-corejs3/core-js-stable/parse-int");
+
+var _parseFloat = require("@babel/runtime-corejs3/core-js-stable/parse-float");
+
+var _clearImmediate = require("@babel/runtime-corejs3/core-js-stable/clear-immediate");
+
+var _WeakSet = require("@babel/runtime-corejs3/core-js-stable/weak-set");
+
+var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
+
+var _URLSearchParams = require("@babel/runtime-corejs3/core-js-stable/url-search-params");
+
+var _URL = require("@babel/runtime-corejs3/core-js-stable/url");
+
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+
+var _Set = require("@babel/runtime-corejs3/core-js-stable/set");
+
+var _Promise = require("@babel/runtime-corejs3/core-js-stable/promise");
+
+var _Map = require("@babel/runtime-corejs3/core-js-stable/map");
+
+AggregateError;
+_Map;
+Observable;
+_Promise;
+_Set;
+_Symbol;
+_URL;
+_URLSearchParams;
+_WeakMap;
+_WeakSet;
+_clearImmediate;
+compositeKey;
+compositeSymbol;
+globalThis;
+_parseFloat;
+_parseInt;
+_queueMicrotask;
+_setImmediate;
+_setInterval;
+_setTimeout;
+Array;
+Boolean;
+Date;
+Infinity;
+JSON;
+NaN;
+Number;
+Object;
+clearInterval;
+clearTimeout;
+something;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/input.js
new file mode 100644
index 000000000000..acc2a7ea7ae3
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/input.js
@@ -0,0 +1,88 @@
+object.at;
+object.bind;
+object.codePointAt;
+object.codePoints;
+object.concat;
+object.copyWithin;
+object.endsWith;
+object.entries;
+object.every;
+object.fill;
+object.filter;
+object.find;
+object.findIndex;
+object.flags;
+object.flatMap;
+object.flat;
+object.forEach;
+object.includes;
+object.indexOf;
+object.keys;
+object.lastIndexOf;
+object.map;
+object.matchAll;
+object.padEnd;
+object.padStart;
+object.reduce;
+object.reduceRight;
+object.repeat;
+object.replaceAll;
+object.reverse;
+object.slice;
+object.some;
+object.sort;
+object.splice;
+object.startsWith;
+object.trim;
+object.trimEnd;
+object.trimLeft;
+object.trimRight;
+object.trimStart;
+object.values;
+object.something;
+
+object.at(arg);
+object.bind(arg);
+object.codePointAt(arg);
+object.codePoints(arg);
+object.concat(arg);
+object.copyWithin(arg);
+object.endsWith(arg);
+object.entries(arg);
+object.every(arg);
+object.fill(arg);
+object.filter(arg);
+object.find(arg);
+object.findIndex(arg);
+object.flags(arg);
+object.flatMap(arg);
+object.flat(arg);
+object.forEach(arg);
+object.includes(arg);
+object.indexOf(arg);
+object.keys(arg);
+object.lastIndexOf(arg);
+object.map(arg);
+object.matchAll(arg);
+object.padEnd(arg);
+object.padStart(arg);
+object.reduce(arg);
+object.reduceRight(arg);
+object.repeat(arg);
+object.replaceAll(arg);
+object.reverse(arg);
+object.slice(arg);
+object.some(arg);
+object.sort(arg);
+object.splice(arg);
+object.startsWith(arg);
+object.trim(arg);
+object.trimEnd(arg);
+object.trimLeft(arg);
+object.trimRight(arg);
+object.trimStart(arg);
+object.values(arg);
+
+Function.bind
+
+object.something(arg);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/options.json
new file mode 100644
index 000000000000..1e8ea7d11308
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": { "version": 3, "proposals": true } }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/output.js
new file mode 100644
index 000000000000..3b89460c5163
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods-proposals/output.js
@@ -0,0 +1,251 @@
+var _valuesInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/values");
+
+var _trimStartInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/trim-start");
+
+var _trimRightInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/trim-right");
+
+var _trimLeftInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/trim-left");
+
+var _trimEndInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/trim-end");
+
+var _trimInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/trim");
+
+var _startsWithInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/starts-with");
+
+var _spliceInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/splice");
+
+var _sortInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/sort");
+
+var _someInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/some");
+
+var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/slice");
+
+var _reverseInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/reverse");
+
+var _replaceAllInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/replace-all");
+
+var _repeatInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/repeat");
+
+var _reduceRightInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/reduce-right");
+
+var _reduceInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/reduce");
+
+var _padStartInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/pad-start");
+
+var _padEndInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/pad-end");
+
+var _matchAllInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/match-all");
+
+var _mapInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/map");
+
+var _lastIndexOfInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/last-index-of");
+
+var _keysInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/keys");
+
+var _indexOfInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/index-of");
+
+var _includesInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/includes");
+
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/for-each");
+
+var _flatInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/flat");
+
+var _flatMapInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/flat-map");
+
+var _flagsInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/flags");
+
+var _findIndexInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/find-index");
+
+var _findInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/find");
+
+var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/filter");
+
+var _fillInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/fill");
+
+var _everyInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/every");
+
+var _entriesInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/entries");
+
+var _endsWithInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/ends-with");
+
+var _copyWithinInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/copy-within");
+
+var _concatInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/concat");
+
+var _codePointsInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/code-points");
+
+var _codePointAtInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/code-point-at");
+
+var _bindInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/bind");
+
+var _atInstanceProperty = require("@babel/runtime-corejs3/core-js/instance/at");
+
+_atInstanceProperty(object);
+
+_bindInstanceProperty(object);
+
+_codePointAtInstanceProperty(object);
+
+_codePointsInstanceProperty(object);
+
+_concatInstanceProperty(object);
+
+_copyWithinInstanceProperty(object);
+
+_endsWithInstanceProperty(object);
+
+_entriesInstanceProperty(object);
+
+_everyInstanceProperty(object);
+
+_fillInstanceProperty(object);
+
+_filterInstanceProperty(object);
+
+_findInstanceProperty(object);
+
+_findIndexInstanceProperty(object);
+
+_flagsInstanceProperty(object);
+
+_flatMapInstanceProperty(object);
+
+_flatInstanceProperty(object);
+
+_forEachInstanceProperty(object);
+
+_includesInstanceProperty(object);
+
+_indexOfInstanceProperty(object);
+
+_keysInstanceProperty(object);
+
+_lastIndexOfInstanceProperty(object);
+
+_mapInstanceProperty(object);
+
+_matchAllInstanceProperty(object);
+
+_padEndInstanceProperty(object);
+
+_padStartInstanceProperty(object);
+
+_reduceInstanceProperty(object);
+
+_reduceRightInstanceProperty(object);
+
+_repeatInstanceProperty(object);
+
+_replaceAllInstanceProperty(object);
+
+_reverseInstanceProperty(object);
+
+_sliceInstanceProperty(object);
+
+_someInstanceProperty(object);
+
+_sortInstanceProperty(object);
+
+_spliceInstanceProperty(object);
+
+_startsWithInstanceProperty(object);
+
+_trimInstanceProperty(object);
+
+_trimEndInstanceProperty(object);
+
+_trimLeftInstanceProperty(object);
+
+_trimRightInstanceProperty(object);
+
+_trimStartInstanceProperty(object);
+
+_valuesInstanceProperty(object);
+
+object.something;
+
+_atInstanceProperty(object).call(object, arg);
+
+_bindInstanceProperty(object).call(object, arg);
+
+_codePointAtInstanceProperty(object).call(object, arg);
+
+_codePointsInstanceProperty(object).call(object, arg);
+
+_concatInstanceProperty(object).call(object, arg);
+
+_copyWithinInstanceProperty(object).call(object, arg);
+
+_endsWithInstanceProperty(object).call(object, arg);
+
+_entriesInstanceProperty(object).call(object, arg);
+
+_everyInstanceProperty(object).call(object, arg);
+
+_fillInstanceProperty(object).call(object, arg);
+
+_filterInstanceProperty(object).call(object, arg);
+
+_findInstanceProperty(object).call(object, arg);
+
+_findIndexInstanceProperty(object).call(object, arg);
+
+_flagsInstanceProperty(object).call(object, arg);
+
+_flatMapInstanceProperty(object).call(object, arg);
+
+_flatInstanceProperty(object).call(object, arg);
+
+_forEachInstanceProperty(object).call(object, arg);
+
+_includesInstanceProperty(object).call(object, arg);
+
+_indexOfInstanceProperty(object).call(object, arg);
+
+_keysInstanceProperty(object).call(object, arg);
+
+_lastIndexOfInstanceProperty(object).call(object, arg);
+
+_mapInstanceProperty(object).call(object, arg);
+
+_matchAllInstanceProperty(object).call(object, arg);
+
+_padEndInstanceProperty(object).call(object, arg);
+
+_padStartInstanceProperty(object).call(object, arg);
+
+_reduceInstanceProperty(object).call(object, arg);
+
+_reduceRightInstanceProperty(object).call(object, arg);
+
+_repeatInstanceProperty(object).call(object, arg);
+
+_replaceAllInstanceProperty(object).call(object, arg);
+
+_reverseInstanceProperty(object).call(object, arg);
+
+_sliceInstanceProperty(object).call(object, arg);
+
+_someInstanceProperty(object).call(object, arg);
+
+_sortInstanceProperty(object).call(object, arg);
+
+_spliceInstanceProperty(object).call(object, arg);
+
+_startsWithInstanceProperty(object).call(object, arg);
+
+_trimInstanceProperty(object).call(object, arg);
+
+_trimEndInstanceProperty(object).call(object, arg);
+
+_trimLeftInstanceProperty(object).call(object, arg);
+
+_trimRightInstanceProperty(object).call(object, arg);
+
+_trimStartInstanceProperty(object).call(object, arg);
+
+_valuesInstanceProperty(object).call(object, arg);
+
+_bindInstanceProperty(Function);
+
+object.something(arg);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/input.js
new file mode 100644
index 000000000000..acc2a7ea7ae3
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/input.js
@@ -0,0 +1,88 @@
+object.at;
+object.bind;
+object.codePointAt;
+object.codePoints;
+object.concat;
+object.copyWithin;
+object.endsWith;
+object.entries;
+object.every;
+object.fill;
+object.filter;
+object.find;
+object.findIndex;
+object.flags;
+object.flatMap;
+object.flat;
+object.forEach;
+object.includes;
+object.indexOf;
+object.keys;
+object.lastIndexOf;
+object.map;
+object.matchAll;
+object.padEnd;
+object.padStart;
+object.reduce;
+object.reduceRight;
+object.repeat;
+object.replaceAll;
+object.reverse;
+object.slice;
+object.some;
+object.sort;
+object.splice;
+object.startsWith;
+object.trim;
+object.trimEnd;
+object.trimLeft;
+object.trimRight;
+object.trimStart;
+object.values;
+object.something;
+
+object.at(arg);
+object.bind(arg);
+object.codePointAt(arg);
+object.codePoints(arg);
+object.concat(arg);
+object.copyWithin(arg);
+object.endsWith(arg);
+object.entries(arg);
+object.every(arg);
+object.fill(arg);
+object.filter(arg);
+object.find(arg);
+object.findIndex(arg);
+object.flags(arg);
+object.flatMap(arg);
+object.flat(arg);
+object.forEach(arg);
+object.includes(arg);
+object.indexOf(arg);
+object.keys(arg);
+object.lastIndexOf(arg);
+object.map(arg);
+object.matchAll(arg);
+object.padEnd(arg);
+object.padStart(arg);
+object.reduce(arg);
+object.reduceRight(arg);
+object.repeat(arg);
+object.replaceAll(arg);
+object.reverse(arg);
+object.slice(arg);
+object.some(arg);
+object.sort(arg);
+object.splice(arg);
+object.startsWith(arg);
+object.trim(arg);
+object.trimEnd(arg);
+object.trimLeft(arg);
+object.trimRight(arg);
+object.trimStart(arg);
+object.values(arg);
+
+Function.bind
+
+object.something(arg);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/options.json
new file mode 100644
index 000000000000..ea8bb9c3aa1c
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/output.js
new file mode 100644
index 000000000000..8afcf571496b
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-instance-methods/output.js
@@ -0,0 +1,242 @@
+var _valuesInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/values");
+
+var _trimStartInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/trim-start");
+
+var _trimRightInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/trim-right");
+
+var _trimLeftInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/trim-left");
+
+var _trimEndInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/trim-end");
+
+var _trimInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/trim");
+
+var _startsWithInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/starts-with");
+
+var _spliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/splice");
+
+var _sortInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/sort");
+
+var _someInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/some");
+
+var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+
+var _reverseInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/reverse");
+
+var _repeatInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/repeat");
+
+var _reduceRightInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/reduce-right");
+
+var _reduceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/reduce");
+
+var _padStartInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/pad-start");
+
+var _padEndInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/pad-end");
+
+var _mapInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/map");
+
+var _lastIndexOfInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/last-index-of");
+
+var _keysInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/keys");
+
+var _indexOfInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/index-of");
+
+var _includesInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/includes");
+
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+
+var _flatInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/flat");
+
+var _flatMapInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/flat-map");
+
+var _flagsInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/flags");
+
+var _findIndexInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/find-index");
+
+var _findInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/find");
+
+var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
+
+var _fillInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/fill");
+
+var _everyInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/every");
+
+var _entriesInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/entries");
+
+var _endsWithInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/ends-with");
+
+var _copyWithinInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/copy-within");
+
+var _concatInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/concat");
+
+var _codePointAtInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/code-point-at");
+
+var _bindInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/bind");
+
+object.at;
+
+_bindInstanceProperty(object);
+
+_codePointAtInstanceProperty(object);
+
+object.codePoints;
+
+_concatInstanceProperty(object);
+
+_copyWithinInstanceProperty(object);
+
+_endsWithInstanceProperty(object);
+
+_entriesInstanceProperty(object);
+
+_everyInstanceProperty(object);
+
+_fillInstanceProperty(object);
+
+_filterInstanceProperty(object);
+
+_findInstanceProperty(object);
+
+_findIndexInstanceProperty(object);
+
+_flagsInstanceProperty(object);
+
+_flatMapInstanceProperty(object);
+
+_flatInstanceProperty(object);
+
+_forEachInstanceProperty(object);
+
+_includesInstanceProperty(object);
+
+_indexOfInstanceProperty(object);
+
+_keysInstanceProperty(object);
+
+_lastIndexOfInstanceProperty(object);
+
+_mapInstanceProperty(object);
+
+object.matchAll;
+
+_padEndInstanceProperty(object);
+
+_padStartInstanceProperty(object);
+
+_reduceInstanceProperty(object);
+
+_reduceRightInstanceProperty(object);
+
+_repeatInstanceProperty(object);
+
+object.replaceAll;
+
+_reverseInstanceProperty(object);
+
+_sliceInstanceProperty(object);
+
+_someInstanceProperty(object);
+
+_sortInstanceProperty(object);
+
+_spliceInstanceProperty(object);
+
+_startsWithInstanceProperty(object);
+
+_trimInstanceProperty(object);
+
+_trimEndInstanceProperty(object);
+
+_trimLeftInstanceProperty(object);
+
+_trimRightInstanceProperty(object);
+
+_trimStartInstanceProperty(object);
+
+_valuesInstanceProperty(object);
+
+object.something;
+object.at(arg);
+
+_bindInstanceProperty(object).call(object, arg);
+
+_codePointAtInstanceProperty(object).call(object, arg);
+
+object.codePoints(arg);
+
+_concatInstanceProperty(object).call(object, arg);
+
+_copyWithinInstanceProperty(object).call(object, arg);
+
+_endsWithInstanceProperty(object).call(object, arg);
+
+_entriesInstanceProperty(object).call(object, arg);
+
+_everyInstanceProperty(object).call(object, arg);
+
+_fillInstanceProperty(object).call(object, arg);
+
+_filterInstanceProperty(object).call(object, arg);
+
+_findInstanceProperty(object).call(object, arg);
+
+_findIndexInstanceProperty(object).call(object, arg);
+
+_flagsInstanceProperty(object).call(object, arg);
+
+_flatMapInstanceProperty(object).call(object, arg);
+
+_flatInstanceProperty(object).call(object, arg);
+
+_forEachInstanceProperty(object).call(object, arg);
+
+_includesInstanceProperty(object).call(object, arg);
+
+_indexOfInstanceProperty(object).call(object, arg);
+
+_keysInstanceProperty(object).call(object, arg);
+
+_lastIndexOfInstanceProperty(object).call(object, arg);
+
+_mapInstanceProperty(object).call(object, arg);
+
+object.matchAll(arg);
+
+_padEndInstanceProperty(object).call(object, arg);
+
+_padStartInstanceProperty(object).call(object, arg);
+
+_reduceInstanceProperty(object).call(object, arg);
+
+_reduceRightInstanceProperty(object).call(object, arg);
+
+_repeatInstanceProperty(object).call(object, arg);
+
+object.replaceAll(arg);
+
+_reverseInstanceProperty(object).call(object, arg);
+
+_sliceInstanceProperty(object).call(object, arg);
+
+_someInstanceProperty(object).call(object, arg);
+
+_sortInstanceProperty(object).call(object, arg);
+
+_spliceInstanceProperty(object).call(object, arg);
+
+_startsWithInstanceProperty(object).call(object, arg);
+
+_trimInstanceProperty(object).call(object, arg);
+
+_trimEndInstanceProperty(object).call(object, arg);
+
+_trimLeftInstanceProperty(object).call(object, arg);
+
+_trimRightInstanceProperty(object).call(object, arg);
+
+_trimStartInstanceProperty(object).call(object, arg);
+
+_valuesInstanceProperty(object).call(object, arg);
+
+_bindInstanceProperty(Function);
+
+object.something(arg);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/input.js
new file mode 100644
index 000000000000..3406e76937be
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/input.js
@@ -0,0 +1,123 @@
+Array.from
+Array.isArray
+Array.of
+
+Date.now
+
+JSON.stringify
+
+Math.DEG_PER_RAD
+Math.RAD_PER_DEG
+Math.acosh
+Math.asinh
+Math.atanh
+Math.cbrt
+Math.clamp
+Math.clz32
+Math.cosh
+Math.degrees
+Math.expm1
+Math.fround
+Math.fscale
+Math.hypot
+Math.iaddh
+Math.imul
+Math.imulh
+Math.isubh
+Math.log10
+Math.log1p
+Math.log2
+Math.radians
+Math.scale
+Math.seededPRNG
+Math.sign
+Math.signbit
+Math.sinh
+Math.tanh
+Math.trunc
+Math.umulh
+
+Number.EPSILON
+Number.MAX_SAFE_INTEGER
+Number.MIN_SAFE_INTEGER
+Number.fromString
+Number.isFinite
+Number.isInteger
+Number.isNaN
+Number.isSafeInteger
+Number.parseFloat
+Number.parseInt
+
+Object.assign
+Object.create
+Object.defineProperties
+Object.defineProperty
+Object.entries
+Object.freeze
+Object.fromEntries
+Object.getOwnPropertyDescriptor
+Object.getOwnPropertyDescriptors
+Object.getOwnPropertyNames
+Object.getOwnPropertySymbols
+Object.getPrototypeOf
+Object.isExtensible
+Object.isFrozen
+Object.isSealed
+Object.is
+Object.keys
+Object.preventExtensions
+Object.seal
+Object.setPrototypeOf
+Object.values
+
+Reflect.apply
+Reflect.construct
+Reflect.defineMetadata
+Reflect.defineProperty
+Reflect.deleteMetadata
+Reflect.deleteProperty
+Reflect.getMetadata
+Reflect.getMetadataKeys
+Reflect.getOwnMetadata
+Reflect.getOwnMetadataKeys
+Reflect.getOwnPropertyDescriptor
+Reflect.getPrototypeOf
+Reflect.get
+Reflect.has
+Reflect.hasMetadata
+Reflect.hasOwnMetadata
+Reflect.isExtensible
+Reflect.metadata
+Reflect.ownKeys
+Reflect.preventExtensions
+Reflect.set
+Reflect.setPrototypeOf
+
+String.fromCodePoint
+String.raw
+
+Symbol.asyncIterator
+Symbol.dispose
+Symbol.for
+Symbol.hasInstance
+Symbol.isConcatSpreadable
+Symbol.iterator
+Symbol.keyFor
+Symbol.match
+Symbol.observable
+Symbol.patternMatch
+Symbol.replace
+Symbol.search
+Symbol.species
+Symbol.split
+Symbol.toPrimitive
+Symbol.toStringTag
+Symbol.unscopables
+
+Foo.bar
+Array.something
+Date.something
+JSON.parse
+Math.pow
+
+Symbol.something
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/options.json
new file mode 100644
index 000000000000..1e8ea7d11308
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": { "version": 3, "proposals": true } }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/output.js
new file mode 100644
index 000000000000..179e6e640ee4
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods-proposals/output.js
@@ -0,0 +1,329 @@
+var _Symbol = require("@babel/runtime-corejs3/core-js/symbol");
+
+var _Symbol$unscopables = require("@babel/runtime-corejs3/core-js/symbol/unscopables");
+
+var _Symbol$toStringTag = require("@babel/runtime-corejs3/core-js/symbol/to-string-tag");
+
+var _Symbol$toPrimitive = require("@babel/runtime-corejs3/core-js/symbol/to-primitive");
+
+var _Symbol$split = require("@babel/runtime-corejs3/core-js/symbol/split");
+
+var _Symbol$species = require("@babel/runtime-corejs3/core-js/symbol/species");
+
+var _Symbol$search = require("@babel/runtime-corejs3/core-js/symbol/search");
+
+var _Symbol$replace = require("@babel/runtime-corejs3/core-js/symbol/replace");
+
+var _Symbol$patternMatch = require("@babel/runtime-corejs3/core-js/symbol/pattern-match");
+
+var _Symbol$observable = require("@babel/runtime-corejs3/core-js/symbol/observable");
+
+var _Symbol$match = require("@babel/runtime-corejs3/core-js/symbol/match");
+
+var _Symbol$keyFor = require("@babel/runtime-corejs3/core-js/symbol/key-for");
+
+var _Symbol$iterator = require("@babel/runtime-corejs3/core-js/symbol/iterator");
+
+var _Symbol$isConcatSpreadable = require("@babel/runtime-corejs3/core-js/symbol/is-concat-spreadable");
+
+var _Symbol$hasInstance = require("@babel/runtime-corejs3/core-js/symbol/has-instance");
+
+var _Symbol$for = require("@babel/runtime-corejs3/core-js/symbol/for");
+
+var _Symbol$dispose = require("@babel/runtime-corejs3/core-js/symbol/dispose");
+
+var _Symbol$asyncIterator = require("@babel/runtime-corejs3/core-js/symbol/async-iterator");
+
+var _String$raw = require("@babel/runtime-corejs3/core-js/string/raw");
+
+var _String$fromCodePoint = require("@babel/runtime-corejs3/core-js/string/from-code-point");
+
+var _Reflect$setPrototypeOf = require("@babel/runtime-corejs3/core-js/reflect/set-prototype-of");
+
+var _Reflect$set = require("@babel/runtime-corejs3/core-js/reflect/set");
+
+var _Reflect$preventExtensions = require("@babel/runtime-corejs3/core-js/reflect/prevent-extensions");
+
+var _Reflect$ownKeys = require("@babel/runtime-corejs3/core-js/reflect/own-keys");
+
+var _Reflect$metadata = require("@babel/runtime-corejs3/core-js/reflect/metadata");
+
+var _Reflect$isExtensible = require("@babel/runtime-corejs3/core-js/reflect/is-extensible");
+
+var _Reflect$hasOwnMetadata = require("@babel/runtime-corejs3/core-js/reflect/has-own-metadata");
+
+var _Reflect$hasMetadata = require("@babel/runtime-corejs3/core-js/reflect/has-metadata");
+
+var _Reflect$has = require("@babel/runtime-corejs3/core-js/reflect/has");
+
+var _Reflect$get = require("@babel/runtime-corejs3/core-js/reflect/get");
+
+var _Reflect$getPrototypeOf = require("@babel/runtime-corejs3/core-js/reflect/get-prototype-of");
+
+var _Reflect$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js/reflect/get-own-property-descriptor");
+
+var _Reflect$getOwnMetadataKeys = require("@babel/runtime-corejs3/core-js/reflect/get-own-metadata-keys");
+
+var _Reflect$getOwnMetadata = require("@babel/runtime-corejs3/core-js/reflect/get-own-metadata");
+
+var _Reflect$getMetadataKeys = require("@babel/runtime-corejs3/core-js/reflect/get-metadata-keys");
+
+var _Reflect$getMetadata = require("@babel/runtime-corejs3/core-js/reflect/get-metadata");
+
+var _Reflect$deleteProperty = require("@babel/runtime-corejs3/core-js/reflect/delete-property");
+
+var _Reflect$deleteMetadata = require("@babel/runtime-corejs3/core-js/reflect/delete-metadata");
+
+var _Reflect$defineProperty = require("@babel/runtime-corejs3/core-js/reflect/define-property");
+
+var _Reflect$defineMetadata = require("@babel/runtime-corejs3/core-js/reflect/define-metadata");
+
+var _Reflect$construct = require("@babel/runtime-corejs3/core-js/reflect/construct");
+
+var _Reflect$apply = require("@babel/runtime-corejs3/core-js/reflect/apply");
+
+var _Object$values = require("@babel/runtime-corejs3/core-js/object/values");
+
+var _Object$setPrototypeOf = require("@babel/runtime-corejs3/core-js/object/set-prototype-of");
+
+var _Object$seal = require("@babel/runtime-corejs3/core-js/object/seal");
+
+var _Object$preventExtensions = require("@babel/runtime-corejs3/core-js/object/prevent-extensions");
+
+var _Object$keys = require("@babel/runtime-corejs3/core-js/object/keys");
+
+var _Object$is = require("@babel/runtime-corejs3/core-js/object/is");
+
+var _Object$isSealed = require("@babel/runtime-corejs3/core-js/object/is-sealed");
+
+var _Object$isFrozen = require("@babel/runtime-corejs3/core-js/object/is-frozen");
+
+var _Object$isExtensible = require("@babel/runtime-corejs3/core-js/object/is-extensible");
+
+var _Object$getPrototypeOf = require("@babel/runtime-corejs3/core-js/object/get-prototype-of");
+
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js/object/get-own-property-symbols");
+
+var _Object$getOwnPropertyNames = require("@babel/runtime-corejs3/core-js/object/get-own-property-names");
+
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js/object/get-own-property-descriptors");
+
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js/object/get-own-property-descriptor");
+
+var _Object$fromEntries = require("@babel/runtime-corejs3/core-js/object/from-entries");
+
+var _Object$freeze = require("@babel/runtime-corejs3/core-js/object/freeze");
+
+var _Object$entries = require("@babel/runtime-corejs3/core-js/object/entries");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
+
+var _Object$defineProperties = require("@babel/runtime-corejs3/core-js/object/define-properties");
+
+var _Object$create = require("@babel/runtime-corejs3/core-js/object/create");
+
+var _Object$assign = require("@babel/runtime-corejs3/core-js/object/assign");
+
+var _Number$parseInt = require("@babel/runtime-corejs3/core-js/number/parse-int");
+
+var _Number$parseFloat = require("@babel/runtime-corejs3/core-js/number/parse-float");
+
+var _Number$isSafeInteger = require("@babel/runtime-corejs3/core-js/number/is-safe-integer");
+
+var _Number$isNaN = require("@babel/runtime-corejs3/core-js/number/is-nan");
+
+var _Number$isInteger = require("@babel/runtime-corejs3/core-js/number/is-integer");
+
+var _Number$isFinite = require("@babel/runtime-corejs3/core-js/number/is-finite");
+
+var _Number$fromString = require("@babel/runtime-corejs3/core-js/number/from-string");
+
+var _Number$MIN_SAFE_INTEGER = require("@babel/runtime-corejs3/core-js/number/min-safe-integer");
+
+var _Number$MAX_SAFE_INTEGER = require("@babel/runtime-corejs3/core-js/number/max-safe-integer");
+
+var _Number$EPSILON = require("@babel/runtime-corejs3/core-js/number/epsilon");
+
+var _Math$umulh = require("@babel/runtime-corejs3/core-js/math/umulh");
+
+var _Math$trunc = require("@babel/runtime-corejs3/core-js/math/trunc");
+
+var _Math$tanh = require("@babel/runtime-corejs3/core-js/math/tanh");
+
+var _Math$sinh = require("@babel/runtime-corejs3/core-js/math/sinh");
+
+var _Math$signbit = require("@babel/runtime-corejs3/core-js/math/signbit");
+
+var _Math$sign = require("@babel/runtime-corejs3/core-js/math/sign");
+
+var _Math$seededPRNG = require("@babel/runtime-corejs3/core-js/math/seeded-prng");
+
+var _Math$scale = require("@babel/runtime-corejs3/core-js/math/scale");
+
+var _Math$radians = require("@babel/runtime-corejs3/core-js/math/radians");
+
+var _Math$log2 = require("@babel/runtime-corejs3/core-js/math/log2");
+
+var _Math$log1p = require("@babel/runtime-corejs3/core-js/math/log1p");
+
+var _Math$log = require("@babel/runtime-corejs3/core-js/math/log10");
+
+var _Math$isubh = require("@babel/runtime-corejs3/core-js/math/isubh");
+
+var _Math$imulh = require("@babel/runtime-corejs3/core-js/math/imulh");
+
+var _Math$imul = require("@babel/runtime-corejs3/core-js/math/imul");
+
+var _Math$iaddh = require("@babel/runtime-corejs3/core-js/math/iaddh");
+
+var _Math$hypot = require("@babel/runtime-corejs3/core-js/math/hypot");
+
+var _Math$fscale = require("@babel/runtime-corejs3/core-js/math/fscale");
+
+var _Math$fround = require("@babel/runtime-corejs3/core-js/math/fround");
+
+var _Math$expm = require("@babel/runtime-corejs3/core-js/math/expm1");
+
+var _Math$degrees = require("@babel/runtime-corejs3/core-js/math/degrees");
+
+var _Math$cosh = require("@babel/runtime-corejs3/core-js/math/cosh");
+
+var _Math$clz = require("@babel/runtime-corejs3/core-js/math/clz32");
+
+var _Math$clamp = require("@babel/runtime-corejs3/core-js/math/clamp");
+
+var _Math$cbrt = require("@babel/runtime-corejs3/core-js/math/cbrt");
+
+var _Math$atanh = require("@babel/runtime-corejs3/core-js/math/atanh");
+
+var _Math$asinh = require("@babel/runtime-corejs3/core-js/math/asinh");
+
+var _Math$acosh = require("@babel/runtime-corejs3/core-js/math/acosh");
+
+var _Math$RAD_PER_DEG = require("@babel/runtime-corejs3/core-js/math/rad-per-deg");
+
+var _Math$DEG_PER_RAD = require("@babel/runtime-corejs3/core-js/math/deg-per-rad");
+
+var _JSON$stringify = require("@babel/runtime-corejs3/core-js/json/stringify");
+
+var _Date$now = require("@babel/runtime-corejs3/core-js/date/now");
+
+var _Array$of = require("@babel/runtime-corejs3/core-js/array/of");
+
+var _Array$isArray = require("@babel/runtime-corejs3/core-js/array/is-array");
+
+var _Array$from = require("@babel/runtime-corejs3/core-js/array/from");
+
+_Array$from;
+_Array$isArray;
+_Array$of;
+_Date$now;
+_JSON$stringify;
+_Math$DEG_PER_RAD;
+_Math$RAD_PER_DEG;
+_Math$acosh;
+_Math$asinh;
+_Math$atanh;
+_Math$cbrt;
+_Math$clamp;
+_Math$clz;
+_Math$cosh;
+_Math$degrees;
+_Math$expm;
+_Math$fround;
+_Math$fscale;
+_Math$hypot;
+_Math$iaddh;
+_Math$imul;
+_Math$imulh;
+_Math$isubh;
+_Math$log;
+_Math$log1p;
+_Math$log2;
+_Math$radians;
+_Math$scale;
+_Math$seededPRNG;
+_Math$sign;
+_Math$signbit;
+_Math$sinh;
+_Math$tanh;
+_Math$trunc;
+_Math$umulh;
+_Number$EPSILON;
+_Number$MAX_SAFE_INTEGER;
+_Number$MIN_SAFE_INTEGER;
+_Number$fromString;
+_Number$isFinite;
+_Number$isInteger;
+_Number$isNaN;
+_Number$isSafeInteger;
+_Number$parseFloat;
+_Number$parseInt;
+_Object$assign;
+_Object$create;
+_Object$defineProperties;
+_Object$defineProperty;
+_Object$entries;
+_Object$freeze;
+_Object$fromEntries;
+_Object$getOwnPropertyDescriptor;
+_Object$getOwnPropertyDescriptors;
+_Object$getOwnPropertyNames;
+_Object$getOwnPropertySymbols;
+_Object$getPrototypeOf;
+_Object$isExtensible;
+_Object$isFrozen;
+_Object$isSealed;
+_Object$is;
+_Object$keys;
+_Object$preventExtensions;
+_Object$seal;
+_Object$setPrototypeOf;
+_Object$values;
+_Reflect$apply;
+_Reflect$construct;
+_Reflect$defineMetadata;
+_Reflect$defineProperty;
+_Reflect$deleteMetadata;
+_Reflect$deleteProperty;
+_Reflect$getMetadata;
+_Reflect$getMetadataKeys;
+_Reflect$getOwnMetadata;
+_Reflect$getOwnMetadataKeys;
+_Reflect$getOwnPropertyDescriptor;
+_Reflect$getPrototypeOf;
+_Reflect$get;
+_Reflect$has;
+_Reflect$hasMetadata;
+_Reflect$hasOwnMetadata;
+_Reflect$isExtensible;
+_Reflect$metadata;
+_Reflect$ownKeys;
+_Reflect$preventExtensions;
+_Reflect$set;
+_Reflect$setPrototypeOf;
+_String$fromCodePoint;
+_String$raw;
+_Symbol$asyncIterator;
+_Symbol$dispose;
+_Symbol$for;
+_Symbol$hasInstance;
+_Symbol$isConcatSpreadable;
+_Symbol$iterator;
+_Symbol$keyFor;
+_Symbol$match;
+_Symbol$observable;
+_Symbol$patternMatch;
+_Symbol$replace;
+_Symbol$search;
+_Symbol$species;
+_Symbol$split;
+_Symbol$toPrimitive;
+_Symbol$toStringTag;
+_Symbol$unscopables;
+Foo.bar;
+Array.something;
+Date.something;
+JSON.parse;
+Math.pow;
+_Symbol.something;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/input.js
new file mode 100644
index 000000000000..3406e76937be
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/input.js
@@ -0,0 +1,123 @@
+Array.from
+Array.isArray
+Array.of
+
+Date.now
+
+JSON.stringify
+
+Math.DEG_PER_RAD
+Math.RAD_PER_DEG
+Math.acosh
+Math.asinh
+Math.atanh
+Math.cbrt
+Math.clamp
+Math.clz32
+Math.cosh
+Math.degrees
+Math.expm1
+Math.fround
+Math.fscale
+Math.hypot
+Math.iaddh
+Math.imul
+Math.imulh
+Math.isubh
+Math.log10
+Math.log1p
+Math.log2
+Math.radians
+Math.scale
+Math.seededPRNG
+Math.sign
+Math.signbit
+Math.sinh
+Math.tanh
+Math.trunc
+Math.umulh
+
+Number.EPSILON
+Number.MAX_SAFE_INTEGER
+Number.MIN_SAFE_INTEGER
+Number.fromString
+Number.isFinite
+Number.isInteger
+Number.isNaN
+Number.isSafeInteger
+Number.parseFloat
+Number.parseInt
+
+Object.assign
+Object.create
+Object.defineProperties
+Object.defineProperty
+Object.entries
+Object.freeze
+Object.fromEntries
+Object.getOwnPropertyDescriptor
+Object.getOwnPropertyDescriptors
+Object.getOwnPropertyNames
+Object.getOwnPropertySymbols
+Object.getPrototypeOf
+Object.isExtensible
+Object.isFrozen
+Object.isSealed
+Object.is
+Object.keys
+Object.preventExtensions
+Object.seal
+Object.setPrototypeOf
+Object.values
+
+Reflect.apply
+Reflect.construct
+Reflect.defineMetadata
+Reflect.defineProperty
+Reflect.deleteMetadata
+Reflect.deleteProperty
+Reflect.getMetadata
+Reflect.getMetadataKeys
+Reflect.getOwnMetadata
+Reflect.getOwnMetadataKeys
+Reflect.getOwnPropertyDescriptor
+Reflect.getPrototypeOf
+Reflect.get
+Reflect.has
+Reflect.hasMetadata
+Reflect.hasOwnMetadata
+Reflect.isExtensible
+Reflect.metadata
+Reflect.ownKeys
+Reflect.preventExtensions
+Reflect.set
+Reflect.setPrototypeOf
+
+String.fromCodePoint
+String.raw
+
+Symbol.asyncIterator
+Symbol.dispose
+Symbol.for
+Symbol.hasInstance
+Symbol.isConcatSpreadable
+Symbol.iterator
+Symbol.keyFor
+Symbol.match
+Symbol.observable
+Symbol.patternMatch
+Symbol.replace
+Symbol.search
+Symbol.species
+Symbol.split
+Symbol.toPrimitive
+Symbol.toStringTag
+Symbol.unscopables
+
+Foo.bar
+Array.something
+Date.something
+JSON.parse
+Math.pow
+
+Symbol.something
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/options.json
new file mode 100644
index 000000000000..ea8bb9c3aa1c
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/output.js
new file mode 100644
index 000000000000..28156f8a6e85
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/built-in-static-methods/output.js
@@ -0,0 +1,277 @@
+var _Symbol$unscopables = require("@babel/runtime-corejs3/core-js-stable/symbol/unscopables");
+
+var _Symbol$toStringTag = require("@babel/runtime-corejs3/core-js-stable/symbol/to-string-tag");
+
+var _Symbol$toPrimitive = require("@babel/runtime-corejs3/core-js-stable/symbol/to-primitive");
+
+var _Symbol$split = require("@babel/runtime-corejs3/core-js-stable/symbol/split");
+
+var _Symbol$species = require("@babel/runtime-corejs3/core-js-stable/symbol/species");
+
+var _Symbol$search = require("@babel/runtime-corejs3/core-js-stable/symbol/search");
+
+var _Symbol$replace = require("@babel/runtime-corejs3/core-js-stable/symbol/replace");
+
+var _Symbol$match = require("@babel/runtime-corejs3/core-js-stable/symbol/match");
+
+var _Symbol$keyFor = require("@babel/runtime-corejs3/core-js-stable/symbol/key-for");
+
+var _Symbol$iterator = require("@babel/runtime-corejs3/core-js-stable/symbol/iterator");
+
+var _Symbol$isConcatSpreadable = require("@babel/runtime-corejs3/core-js-stable/symbol/is-concat-spreadable");
+
+var _Symbol$hasInstance = require("@babel/runtime-corejs3/core-js-stable/symbol/has-instance");
+
+var _Symbol$for = require("@babel/runtime-corejs3/core-js-stable/symbol/for");
+
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+
+var _Symbol$asyncIterator = require("@babel/runtime-corejs3/core-js-stable/symbol/async-iterator");
+
+var _String$raw = require("@babel/runtime-corejs3/core-js-stable/string/raw");
+
+var _String$fromCodePoint = require("@babel/runtime-corejs3/core-js-stable/string/from-code-point");
+
+var _Reflect$setPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/reflect/set-prototype-of");
+
+var _Reflect$set = require("@babel/runtime-corejs3/core-js-stable/reflect/set");
+
+var _Reflect$preventExtensions = require("@babel/runtime-corejs3/core-js-stable/reflect/prevent-extensions");
+
+var _Reflect$ownKeys = require("@babel/runtime-corejs3/core-js-stable/reflect/own-keys");
+
+var _Reflect$isExtensible = require("@babel/runtime-corejs3/core-js-stable/reflect/is-extensible");
+
+var _Reflect$has = require("@babel/runtime-corejs3/core-js-stable/reflect/has");
+
+var _Reflect$get = require("@babel/runtime-corejs3/core-js-stable/reflect/get");
+
+var _Reflect$getPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/reflect/get-prototype-of");
+
+var _Reflect$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/reflect/get-own-property-descriptor");
+
+var _Reflect$deleteProperty = require("@babel/runtime-corejs3/core-js-stable/reflect/delete-property");
+
+var _Reflect$defineProperty = require("@babel/runtime-corejs3/core-js-stable/reflect/define-property");
+
+var _Reflect$construct = require("@babel/runtime-corejs3/core-js-stable/reflect/construct");
+
+var _Reflect$apply = require("@babel/runtime-corejs3/core-js-stable/reflect/apply");
+
+var _Object$values = require("@babel/runtime-corejs3/core-js-stable/object/values");
+
+var _Object$setPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/object/set-prototype-of");
+
+var _Object$seal = require("@babel/runtime-corejs3/core-js-stable/object/seal");
+
+var _Object$preventExtensions = require("@babel/runtime-corejs3/core-js-stable/object/prevent-extensions");
+
+var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+
+var _Object$is = require("@babel/runtime-corejs3/core-js-stable/object/is");
+
+var _Object$isSealed = require("@babel/runtime-corejs3/core-js-stable/object/is-sealed");
+
+var _Object$isFrozen = require("@babel/runtime-corejs3/core-js-stable/object/is-frozen");
+
+var _Object$isExtensible = require("@babel/runtime-corejs3/core-js-stable/object/is-extensible");
+
+var _Object$getPrototypeOf = require("@babel/runtime-corejs3/core-js-stable/object/get-prototype-of");
+
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
+
+var _Object$getOwnPropertyNames = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-names");
+
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
+
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+
+var _Object$fromEntries = require("@babel/runtime-corejs3/core-js-stable/object/from-entries");
+
+var _Object$freeze = require("@babel/runtime-corejs3/core-js-stable/object/freeze");
+
+var _Object$entries = require("@babel/runtime-corejs3/core-js-stable/object/entries");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+
+var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
+
+var _Object$create = require("@babel/runtime-corejs3/core-js-stable/object/create");
+
+var _Object$assign = require("@babel/runtime-corejs3/core-js-stable/object/assign");
+
+var _Number$parseInt = require("@babel/runtime-corejs3/core-js-stable/number/parse-int");
+
+var _Number$parseFloat = require("@babel/runtime-corejs3/core-js-stable/number/parse-float");
+
+var _Number$isSafeInteger = require("@babel/runtime-corejs3/core-js-stable/number/is-safe-integer");
+
+var _Number$isNaN = require("@babel/runtime-corejs3/core-js-stable/number/is-nan");
+
+var _Number$isInteger = require("@babel/runtime-corejs3/core-js-stable/number/is-integer");
+
+var _Number$isFinite = require("@babel/runtime-corejs3/core-js-stable/number/is-finite");
+
+var _Number$MIN_SAFE_INTEGER = require("@babel/runtime-corejs3/core-js-stable/number/min-safe-integer");
+
+var _Number$MAX_SAFE_INTEGER = require("@babel/runtime-corejs3/core-js-stable/number/max-safe-integer");
+
+var _Number$EPSILON = require("@babel/runtime-corejs3/core-js-stable/number/epsilon");
+
+var _Math$trunc = require("@babel/runtime-corejs3/core-js-stable/math/trunc");
+
+var _Math$tanh = require("@babel/runtime-corejs3/core-js-stable/math/tanh");
+
+var _Math$sinh = require("@babel/runtime-corejs3/core-js-stable/math/sinh");
+
+var _Math$sign = require("@babel/runtime-corejs3/core-js-stable/math/sign");
+
+var _Math$log2 = require("@babel/runtime-corejs3/core-js-stable/math/log2");
+
+var _Math$log1p = require("@babel/runtime-corejs3/core-js-stable/math/log1p");
+
+var _Math$log = require("@babel/runtime-corejs3/core-js-stable/math/log10");
+
+var _Math$imul = require("@babel/runtime-corejs3/core-js-stable/math/imul");
+
+var _Math$hypot = require("@babel/runtime-corejs3/core-js-stable/math/hypot");
+
+var _Math$fround = require("@babel/runtime-corejs3/core-js-stable/math/fround");
+
+var _Math$expm = require("@babel/runtime-corejs3/core-js-stable/math/expm1");
+
+var _Math$cosh = require("@babel/runtime-corejs3/core-js-stable/math/cosh");
+
+var _Math$clz = require("@babel/runtime-corejs3/core-js-stable/math/clz32");
+
+var _Math$cbrt = require("@babel/runtime-corejs3/core-js-stable/math/cbrt");
+
+var _Math$atanh = require("@babel/runtime-corejs3/core-js-stable/math/atanh");
+
+var _Math$asinh = require("@babel/runtime-corejs3/core-js-stable/math/asinh");
+
+var _Math$acosh = require("@babel/runtime-corejs3/core-js-stable/math/acosh");
+
+var _JSON$stringify = require("@babel/runtime-corejs3/core-js-stable/json/stringify");
+
+var _Date$now = require("@babel/runtime-corejs3/core-js-stable/date/now");
+
+var _Array$of = require("@babel/runtime-corejs3/core-js-stable/array/of");
+
+var _Array$isArray = require("@babel/runtime-corejs3/core-js-stable/array/is-array");
+
+var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
+
+_Array$from;
+_Array$isArray;
+_Array$of;
+_Date$now;
+_JSON$stringify;
+Math.DEG_PER_RAD;
+Math.RAD_PER_DEG;
+_Math$acosh;
+_Math$asinh;
+_Math$atanh;
+_Math$cbrt;
+Math.clamp;
+_Math$clz;
+_Math$cosh;
+Math.degrees;
+_Math$expm;
+_Math$fround;
+Math.fscale;
+_Math$hypot;
+Math.iaddh;
+_Math$imul;
+Math.imulh;
+Math.isubh;
+_Math$log;
+_Math$log1p;
+_Math$log2;
+Math.radians;
+Math.scale;
+Math.seededPRNG;
+_Math$sign;
+Math.signbit;
+_Math$sinh;
+_Math$tanh;
+_Math$trunc;
+Math.umulh;
+_Number$EPSILON;
+_Number$MAX_SAFE_INTEGER;
+_Number$MIN_SAFE_INTEGER;
+Number.fromString;
+_Number$isFinite;
+_Number$isInteger;
+_Number$isNaN;
+_Number$isSafeInteger;
+_Number$parseFloat;
+_Number$parseInt;
+_Object$assign;
+_Object$create;
+_Object$defineProperties;
+_Object$defineProperty;
+_Object$entries;
+_Object$freeze;
+_Object$fromEntries;
+_Object$getOwnPropertyDescriptor;
+_Object$getOwnPropertyDescriptors;
+_Object$getOwnPropertyNames;
+_Object$getOwnPropertySymbols;
+_Object$getPrototypeOf;
+_Object$isExtensible;
+_Object$isFrozen;
+_Object$isSealed;
+_Object$is;
+_Object$keys;
+_Object$preventExtensions;
+_Object$seal;
+_Object$setPrototypeOf;
+_Object$values;
+_Reflect$apply;
+_Reflect$construct;
+Reflect.defineMetadata;
+_Reflect$defineProperty;
+Reflect.deleteMetadata;
+_Reflect$deleteProperty;
+Reflect.getMetadata;
+Reflect.getMetadataKeys;
+Reflect.getOwnMetadata;
+Reflect.getOwnMetadataKeys;
+_Reflect$getOwnPropertyDescriptor;
+_Reflect$getPrototypeOf;
+_Reflect$get;
+_Reflect$has;
+Reflect.hasMetadata;
+Reflect.hasOwnMetadata;
+_Reflect$isExtensible;
+Reflect.metadata;
+_Reflect$ownKeys;
+_Reflect$preventExtensions;
+_Reflect$set;
+_Reflect$setPrototypeOf;
+_String$fromCodePoint;
+_String$raw;
+_Symbol$asyncIterator;
+_Symbol.dispose;
+_Symbol$for;
+_Symbol$hasInstance;
+_Symbol$isConcatSpreadable;
+_Symbol$iterator;
+_Symbol$keyFor;
+_Symbol$match;
+_Symbol.observable;
+_Symbol.patternMatch;
+_Symbol$replace;
+_Symbol$search;
+_Symbol$species;
+_Symbol$split;
+_Symbol$toPrimitive;
+_Symbol$toStringTag;
+_Symbol$unscopables;
+Foo.bar;
+Array.something;
+Date.something;
+JSON.parse;
+Math.pow;
+_Symbol.something;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/input.js
new file mode 100644
index 000000000000..8e9b31529424
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/input.js
@@ -0,0 +1 @@
+Promise.resolve;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/output.js
new file mode 100644
index 000000000000..5e5d7dce0288
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/catch-all/output.js
@@ -0,0 +1,3 @@
+var _Promise = require("@babel/runtime-corejs3/core-js-stable/promise");
+
+_Promise.resolve;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/input.js
new file mode 100644
index 000000000000..4e6a6de65314
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/input.js
@@ -0,0 +1 @@
+class Foo {}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/options.json
new file mode 100644
index 000000000000..e7b25dd45e31
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-classes"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/output.js
new file mode 100644
index 000000000000..093be2446f56
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/output.js
@@ -0,0 +1,7 @@
+var _classCallCheck = require("@babel/runtime-corejs3/helpers/classCallCheck");
+
+let Foo = function Foo() {
+  "use strict";
+
+  _classCallCheck(this, Foo);
+};
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/input.js
new file mode 100644
index 000000000000..48e5f59b2c6b
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/input.js
@@ -0,0 +1,3 @@
+for (var i of arr) {
+
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/options.json
new file mode 100644
index 000000000000..79f4e0ec1085
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-for-of", ["transform-runtime", { "corejs": 3 }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/output.js
new file mode 100644
index 000000000000..2bb4ba66cbc7
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/es6-for-of/output.js
@@ -0,0 +1,24 @@
+var _getIterator = require("@babel/runtime-corejs3/core-js/get-iterator");
+
+var _iteratorNormalCompletion = true;
+var _didIteratorError = false;
+var _iteratorError = undefined;
+
+try {
+  for (var _iterator = _getIterator(arr), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    var i = _step.value;
+  }
+} catch (err) {
+  _didIteratorError = true;
+  _iteratorError = err;
+} finally {
+  try {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
+      _iterator.return();
+    }
+  } finally {
+    if (_didIteratorError) {
+      throw _iteratorError;
+    }
+  }
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/input.mjs
new file mode 100644
index 000000000000..0340999129f1
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/input.mjs
@@ -0,0 +1,9 @@
+import foo, * as bar from "someModule";
+
+export const myWord = Symbol("abc");
+export function* giveWord () {
+  yield myWord;
+}
+
+foo;
+bar;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/output.mjs
new file mode 100644
index 000000000000..e0183d2e2afd
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/full/output.mjs
@@ -0,0 +1,24 @@
+import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
+import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
+
+var _marked =
+/*#__PURE__*/
+_regeneratorRuntime.mark(giveWord);
+
+import foo, * as bar from "someModule";
+export const myWord = _Symbol("abc");
+export function giveWord() {
+  return _regeneratorRuntime.wrap(function giveWord$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        _context.next = 2;
+        return myWord;
+
+      case 2:
+      case "end":
+        return _context.stop();
+    }
+  }, _marked);
+}
+foo;
+bar;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/input.js
new file mode 100644
index 000000000000..ba560a3e3e1e
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/input.js
@@ -0,0 +1,7 @@
+foo.includes(1, 2, 3, 4);
+
+[1, 2, 3, 4].includes(1);
+
+'1234'.includes('1');
+
+keys(bar).includes(1, 2);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/options.json
new file mode 100644
index 000000000000..ea8bb9c3aa1c
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/output.js
new file mode 100644
index 000000000000..36aa68a81998
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-call/output.js
@@ -0,0 +1,11 @@
+var _includesInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/includes");
+
+var _context, _context2, _context3;
+
+_includesInstanceProperty(foo).call(foo, 1, 2, 3, 4);
+
+_includesInstanceProperty(_context = [1, 2, 3, 4]).call(_context, 1);
+
+_includesInstanceProperty(_context2 = '1234').call(_context2, '1');
+
+_includesInstanceProperty(_context3 = keys(bar)).call(_context3, 1, 2);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/input.js
new file mode 100644
index 000000000000..87ed431301c8
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/input.js
@@ -0,0 +1 @@
+bar[filter]()
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/output.js
new file mode 100644
index 000000000000..983b263388cf
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-computed/output.js
@@ -0,0 +1,3 @@
+var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
+
+_filterInstanceProperty(bar).call(bar);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/input.js
new file mode 100644
index 000000000000..058b73e37aac
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/input.js
@@ -0,0 +1,7 @@
+foo.includes;
+
+keys(bar).includes;
+
+foo.includes.apply(bar, [1, 2]);
+
+foo.includes = 42;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/options.json
new file mode 100644
index 000000000000..ea8bb9c3aa1c
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/output.js
new file mode 100644
index 000000000000..ae165e25b1e7
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-get/output.js
@@ -0,0 +1,9 @@
+var _includesInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/includes");
+
+_includesInstanceProperty(foo);
+
+_includesInstanceProperty(keys(bar));
+
+_includesInstanceProperty(foo).apply(bar, [1, 2]);
+
+foo.includes = 42;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/input.js
new file mode 100644
index 000000000000..d1368df1566b
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/input.js
@@ -0,0 +1,3 @@
+"".concat(b);
+[].concat(b);
+a.concat(b);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/options.json
new file mode 100644
index 000000000000..ea8bb9c3aa1c
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }]]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/output.js
new file mode 100644
index 000000000000..fe473d9f3f88
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/instance-inference-optimization/output.js
@@ -0,0 +1,9 @@
+var _concatInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/concat");
+
+var _context;
+
+"".concat(b);
+
+_concatInstanceProperty(_context = []).call(_context, b);
+
+_concatInstanceProperty(a).call(a, b);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/input.mjs
new file mode 100644
index 000000000000..368b10631035
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/input.mjs
@@ -0,0 +1,5 @@
+import foo from "foo";
+
+class Example {
+  method() {}
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/options.json
new file mode 100644
index 000000000000..364602872e85
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    ["transform-runtime", { "corejs": 3 }],
+    "transform-modules-commonjs",
+    "transform-classes"
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/output.js
new file mode 100644
index 000000000000..cef08c661a7f
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/output.js
@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
+
+var _foo = _interopRequireDefault(require("foo"));
+
+let Example =
+/*#__PURE__*/
+function () {
+  function Example() {
+    (0, _classCallCheck2.default)(this, Example);
+  }
+
+  (0, _createClass2.default)(Example, [{
+    key: "method",
+    value: function method() {}
+  }]);
+  return Example;
+}();
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/input.mjs
new file mode 100644
index 000000000000..95dcac89ee76
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/input.mjs
@@ -0,0 +1,5 @@
+import foo from "bar";
+import { baz } from "fuz";
+
+export const exp = foo + baz;
+export * from "mod";
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/options.json
new file mode 100644
index 000000000000..259d5d965179
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    ["transform-runtime", { "corejs": 3 }],
+    ["transform-modules-commonjs", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js
new file mode 100644
index 000000000000..2a1a8fe7aa92
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js
@@ -0,0 +1,30 @@
+"use strict";
+
+var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+
+var _context;
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+var _exportNames = {
+  exp: true
+};
+exports.exp = void 0;
+
+var _bar = _interopRequireDefault(require("bar"));
+
+var _fuz = require("fuz");
+
+var _mod = require("mod");
+
+_forEachInstanceProperty(_context = _Object$keys(_mod)).call(_context, function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  exports[key] = _mod[key];
+});
+
+const exp = _bar.default + _fuz.baz;
+exports.exp = exp;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/input.mjs
new file mode 100644
index 000000000000..55ed3b8abceb
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/input.mjs
@@ -0,0 +1,5 @@
+import foo from "bar";
+import { baz } from "fuz";
+
+export const exp = foo + baz;
+export * from "mod";
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/options.json
new file mode 100644
index 000000000000..35b3816c5fe6
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    ["transform-runtime", { "corejs": 3 }],
+    "transform-modules-commonjs"
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js
new file mode 100644
index 000000000000..75793607c414
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js
@@ -0,0 +1,41 @@
+"use strict";
+
+var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+
+var _context;
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _exportNames = {
+  exp: true
+};
+exports.exp = void 0;
+
+var _bar = _interopRequireDefault(require("bar"));
+
+var _fuz = require("fuz");
+
+var _mod = require("mod");
+
+_forEachInstanceProperty(_context = _Object$keys(_mod)).call(_context, function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+
+  _Object$defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _mod[key];
+    }
+  });
+});
+
+const exp = _bar.default + _fuz.baz;
+exports.exp = exp;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/input.js
new file mode 100644
index 000000000000..4e6a6de65314
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/input.js
@@ -0,0 +1 @@
+class Foo {}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/options.json
new file mode 100644
index 000000000000..9a112ff067c2
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    ["transform-runtime", { "helpers": false, "corejs": 3 }],
+    "transform-classes"
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/output.js
new file mode 100644
index 000000000000..b8dfb3198372
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/no-helpers/output.js
@@ -0,0 +1,7 @@
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+let Foo = function Foo() {
+  "use strict";
+
+  _classCallCheck(this, Foo);
+};
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/input.js
new file mode 100644
index 000000000000..ae6cc4d8c8f1
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/input.js
@@ -0,0 +1,2 @@
+void function* () {
+};
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/output.js
new file mode 100644
index 000000000000..217ed8f6dc06
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/regenerator-runtime/output.js
@@ -0,0 +1,13 @@
+var _regeneratorRuntime = require("@babel/runtime-corejs3/regenerator");
+
+void
+/*#__PURE__*/
+_regeneratorRuntime.mark(function _callee() {
+  return _regeneratorRuntime.wrap(function _callee$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+      case "end":
+        return _context.stop();
+    }
+  }, _callee);
+});
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/input.js
new file mode 100644
index 000000000000..7bb9c5a9362e
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/input.js
@@ -0,0 +1 @@
+const method = array[Symbol.iterator];
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/output.js
new file mode 100644
index 000000000000..4b9498983c1a
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get-method/output.js
@@ -0,0 +1,3 @@
+var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
+
+const method = _getIteratorMethod(array);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/input.js
new file mode 100644
index 000000000000..7064b69069aa
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/input.js
@@ -0,0 +1 @@
+const iterator = array[Symbol.iterator]();
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/output.js
new file mode 100644
index 000000000000..2627981407a6
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-get/output.js
@@ -0,0 +1,3 @@
+var _getIterator = require("@babel/runtime-corejs3/core-js/get-iterator");
+
+const iterator = _getIterator(array);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/input.js
new file mode 100644
index 000000000000..49e71aa52d70
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/input.js
@@ -0,0 +1 @@
+Symbol.iterator in Object(arr);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/output.js
new file mode 100644
index 000000000000..42b70766acdd
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator-in/output.js
@@ -0,0 +1,3 @@
+var _isIterable = require("@babel/runtime-corejs3/core-js/is-iterable");
+
+_isIterable(Object(arr));
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/input.js
new file mode 100644
index 000000000000..ae1f0b9df59b
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/input.js
@@ -0,0 +1 @@
+Symbol.iterator;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/options.json
new file mode 100644
index 000000000000..e41c386f01ea
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-runtime", { "corejs": 3 }], "transform-regenerator"]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/output.js
new file mode 100644
index 000000000000..936e4485756e
--- /dev/null
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/symbol-iterator/output.js
@@ -0,0 +1,3 @@
+var _Symbol$iterator = require("@babel/runtime-corejs3/core-js-stable/symbol/iterator");
+
+_Symbol$iterator;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/output.mjs
index 7fe64e68c7b5..2576947e3dd3 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/output.mjs
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/full/output.mjs
@@ -17,7 +17,7 @@ export function giveWord() {
       case "end":
         return _context.stop();
     }
-  }, _marked, this);
+  }, _marked);
 }
 foo;
 bar;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/output.js
index 8aeb9a7d5019..5bd92072ae8f 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/output.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/output.js
@@ -9,5 +9,5 @@ _regeneratorRuntime.mark(function _callee() {
       case "end":
         return _context.stop();
     }
-  }, _callee, this);
+  }, _callee);
 });
diff --git a/packages/babel-plugin-transform-shorthand-properties/package.json b/packages/babel-plugin-transform-shorthand-properties/package.json
index a3443de13770..5233742c2adf 100644
--- a/packages/babel-plugin-transform-shorthand-properties/package.json
+++ b/packages/babel-plugin-transform-shorthand-properties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-shorthand-properties",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Compile ES2015 shorthand properties to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-shorthand-properties",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-shorthand-properties/src/index.js b/packages/babel-plugin-transform-shorthand-properties/src/index.js
index 482607c37019..191e67d72691 100644
--- a/packages/babel-plugin-transform-shorthand-properties/src/index.js
+++ b/packages/babel-plugin-transform-shorthand-properties/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-shorthand-properties",
+
     visitor: {
       ObjectMethod(path) {
         const { node } = path;
diff --git a/packages/babel-plugin-transform-spread/package.json b/packages/babel-plugin-transform-spread/package.json
index 40efc0cb2d9e..5c051240523d 100644
--- a/packages/babel-plugin-transform-spread/package.json
+++ b/packages/babel-plugin-transform-spread/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-spread",
-  "version": "7.0.0",
+  "version": "7.2.2",
   "description": "Compile ES2015 spread to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-spread",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.2",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-spread/src/index.js b/packages/babel-plugin-transform-spread/src/index.js
index 50592fafbf12..16af42b08fd6 100644
--- a/packages/babel-plugin-transform-spread/src/index.js
+++ b/packages/babel-plugin-transform-spread/src/index.js
@@ -48,6 +48,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "transform-spread",
+
     visitor: {
       ArrayExpression(path) {
         const { node, scope } = path;
@@ -55,13 +57,29 @@ export default declare((api, options) => {
         if (!hasSpread(elements)) return;
 
         const nodes = build(elements, scope);
-        const first = nodes.shift();
+        let first = nodes[0];
 
-        if (nodes.length === 0 && first !== elements[0].argument) {
+        // If there is only one element in the ArrayExpression and
+        // the element was transformed (Array.prototype.slice.call or toConsumableArray)
+        // we know that the transformed code already takes care of cloning the array.
+        // So we can simply return that element.
+        if (nodes.length === 1 && first !== elements[0].argument) {
           path.replaceWith(first);
           return;
         }
 
+        // If the first element is a ArrayExpression we can directly call
+        // concat on it.
+        // `[..].concat(..)`
+        // If not then we have to use `[].concat(arr)` and not `arr.concat`
+        // because `arr` could be extended/modified (e.g. Immutable) and we do not know exactly
+        // what concat would produce.
+        if (!t.isArrayExpression(first)) {
+          first = t.arrayExpression([]);
+        } else {
+          nodes.shift();
+        }
+
         path.replaceWith(
           t.callExpression(
             t.memberExpression(first, t.identifier("concat")),
diff --git a/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/exec.js b/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/exec.js
new file mode 100644
index 000000000000..9e3bfb579c24
--- /dev/null
+++ b/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/exec.js
@@ -0,0 +1,11 @@
+const arr = [];
+
+arr.concat = () => {
+    throw new Error('Should not be called');
+};
+let x;
+expect(() => {
+    x = [...arr];
+}).not.toThrow();
+
+expect(x).not.toBe(arr);
diff --git a/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/input.js b/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/input.js
new file mode 100644
index 000000000000..b95bf724af4f
--- /dev/null
+++ b/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/input.js
@@ -0,0 +1,7 @@
+const arr = [];
+
+arr.concat = () => {
+    throw new Error('Should not be called');
+};
+
+const x = [...arr];
diff --git a/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/output.js b/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/output.js
new file mode 100644
index 000000000000..60793535cb80
--- /dev/null
+++ b/packages/babel-plugin-transform-spread/test/fixtures/regression/issue-8907/output.js
@@ -0,0 +1,7 @@
+const arr = [];
+
+arr.concat = () => {
+  throw new Error('Should not be called');
+};
+
+const x = [].concat(arr);
diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/arguments-array/exec.js b/packages/babel-plugin-transform-spread/test/fixtures/spread/arguments-array/exec.js
new file mode 100644
index 000000000000..d9c77d1f1d73
--- /dev/null
+++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/arguments-array/exec.js
@@ -0,0 +1,9 @@
+// test that toConsumableArray clones the array.
+
+function foo() {
+  const x = [...arguments];
+
+  expect(x).not.toBe(arguments);
+}
+
+foo(1,2);
diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/array-literal-first/output.js b/packages/babel-plugin-transform-spread/test/fixtures/spread/array-literal-first/output.js
index fbe8da8f82ea..1da8c64e8363 100644
--- a/packages/babel-plugin-transform-spread/test/fixtures/spread/array-literal-first/output.js
+++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/array-literal-first/output.js
@@ -1 +1 @@
-var lyrics = babelHelpers.toConsumableArray(parts).concat(["head", "and", "toes"]);
+var lyrics = [].concat(babelHelpers.toConsumableArray(parts), ["head", "and", "toes"]);
diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/known-rest/output.js b/packages/babel-plugin-transform-spread/test/fixtures/spread/known-rest/output.js
index 64c67e4ca8d7..4cd381b32416 100644
--- a/packages/babel-plugin-transform-spread/test/fixtures/spread/known-rest/output.js
+++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/known-rest/output.js
@@ -3,5 +3,5 @@ function foo() {
     bar[_key] = arguments[_key];
   }
 
-  return bar.concat();
+  return [].concat(bar);
 }
diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/single/exec.js b/packages/babel-plugin-transform-spread/test/fixtures/spread/single/exec.js
new file mode 100644
index 000000000000..2c77b9a47736
--- /dev/null
+++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/single/exec.js
@@ -0,0 +1,7 @@
+// test that toConsumableArray clones the array.
+const arr = [];
+const foo = () => arr;
+
+const x = [...foo()];
+
+expect(x).not.toBe(arr);
diff --git a/packages/babel-plugin-transform-sticky-regex/package.json b/packages/babel-plugin-transform-sticky-regex/package.json
index d643470debde..0ff694871615 100644
--- a/packages/babel-plugin-transform-sticky-regex/package.json
+++ b/packages/babel-plugin-transform-sticky-regex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-sticky-regex",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "Compile ES2015 sticky regex to an ES5 RegExp constructor",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-sticky-regex",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-sticky-regex/src/index.js b/packages/babel-plugin-transform-sticky-regex/src/index.js
index ee7a0aa5db5f..e5961dfee699 100644
--- a/packages/babel-plugin-transform-sticky-regex/src/index.js
+++ b/packages/babel-plugin-transform-sticky-regex/src/index.js
@@ -6,6 +6,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-sticky-regex",
+
     visitor: {
       RegExpLiteral(path) {
         const { node } = path;
diff --git a/packages/babel-plugin-transform-strict-mode/package.json b/packages/babel-plugin-transform-strict-mode/package.json
index fec6a0363e06..bb59d8c74be0 100644
--- a/packages/babel-plugin-transform-strict-mode/package.json
+++ b/packages/babel-plugin-transform-strict-mode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-strict-mode",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "This plugin places a 'use strict'; directive at the top of all files to enable strict mode",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-strict-mode",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-strict-mode/src/index.js b/packages/babel-plugin-transform-strict-mode/src/index.js
index 4dd2823b12d1..9be2ae2f1507 100644
--- a/packages/babel-plugin-transform-strict-mode/src/index.js
+++ b/packages/babel-plugin-transform-strict-mode/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-strict-mode",
+
     visitor: {
       Program(path) {
         const { node } = path;
diff --git a/packages/babel-plugin-transform-template-literals/package.json b/packages/babel-plugin-transform-template-literals/package.json
index 4eb558db7f8a..0cf36ea7c2ed 100644
--- a/packages/babel-plugin-transform-template-literals/package.json
+++ b/packages/babel-plugin-transform-template-literals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-template-literals",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Compile ES2015 template literals to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-template-literals",
   "license": "MIT",
@@ -19,7 +19,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-template-literals/src/index.js b/packages/babel-plugin-transform-template-literals/src/index.js
index b59567837487..ba1bc4eae6bd 100644
--- a/packages/babel-plugin-transform-template-literals/src/index.js
+++ b/packages/babel-plugin-transform-template-literals/src/index.js
@@ -23,7 +23,7 @@ export default declare((api, options) => {
    * the second member and convert that one, which reflects the spec behavior
    * of template literals.
    */
-  function buildConcatCallExressions(items) {
+  function buildConcatCallExpressions(items) {
     let avail = true;
     return items.reduce(function(left, right) {
       let canBeInserted = t.isLiteral(right);
@@ -44,6 +44,8 @@ export default declare((api, options) => {
   }
 
   return {
+    name: "transform-template-literals",
+
     visitor: {
       TaggedTemplateExpression(path) {
         const { node } = path;
@@ -131,7 +133,7 @@ export default declare((api, options) => {
             root = t.binaryExpression("+", root, nodes[i]);
           }
         } else if (nodes.length > 1) {
-          root = buildConcatCallExressions(nodes);
+          root = buildConcatCallExpressions(nodes);
         }
 
         path.replaceWith(root);
diff --git a/packages/babel-plugin-transform-typeof-symbol/package.json b/packages/babel-plugin-transform-typeof-symbol/package.json
index 7b5cdb2bddce..e893284ebc60 100644
--- a/packages/babel-plugin-transform-typeof-symbol/package.json
+++ b/packages/babel-plugin-transform-typeof-symbol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-typeof-symbol",
-  "version": "7.0.0",
+  "version": "7.2.0",
   "description": "This transformer wraps all typeof expressions with a method that replicates native behaviour. (ie. returning “symbol” for symbols)",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-typeof-symbol",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.2.0",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-typeof-symbol/src/index.js b/packages/babel-plugin-transform-typeof-symbol/src/index.js
index 70d1a65ca05d..b969f216d7c8 100644
--- a/packages/babel-plugin-transform-typeof-symbol/src/index.js
+++ b/packages/babel-plugin-transform-typeof-symbol/src/index.js
@@ -5,6 +5,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-typeof-symbol",
+
     visitor: {
       Scope({ scope }) {
         if (!scope.getBinding("Symbol")) {
diff --git a/packages/babel-plugin-transform-typescript/package.json b/packages/babel-plugin-transform-typescript/package.json
index 9452b5a83d88..7f146e81339b 100644
--- a/packages/babel-plugin-transform-typescript/package.json
+++ b/packages/babel-plugin-transform-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-typescript",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Transform TypeScript into ES.next",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-typescript",
   "license": "MIT",
@@ -13,14 +13,15 @@
     "typescript"
   ],
   "dependencies": {
+    "@babel/helper-create-class-features-plugin": "^7.5.5",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-syntax-typescript": "^7.0.0"
+    "@babel/plugin-syntax-typescript": "^7.2.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-typescript/src/enum.js b/packages/babel-plugin-transform-typescript/src/enum.js
index fbede7f9f547..11c7b5376d83 100644
--- a/packages/babel-plugin-transform-typescript/src/enum.js
+++ b/packages/babel-plugin-transform-typescript/src/enum.js
@@ -24,7 +24,9 @@ export default function transpileEnum(path, t) {
         path.remove();
       } else {
         const isGlobal = t.isProgram(path.parent); // && !path.parent.body.some(t.isModuleDeclaration);
-        path.replaceWith(makeVar(node.id, t, isGlobal ? "var" : "let"));
+        path.scope.registerDeclaration(
+          path.replaceWith(makeVar(node.id, t, isGlobal ? "var" : "let"))[0],
+        );
       }
       break;
     }
diff --git a/packages/babel-plugin-transform-typescript/src/index.js b/packages/babel-plugin-transform-typescript/src/index.js
index 34261f03932d..c89e2dbe8185 100644
--- a/packages/babel-plugin-transform-typescript/src/index.js
+++ b/packages/babel-plugin-transform-typescript/src/index.js
@@ -1,8 +1,10 @@
 import { declare } from "@babel/helper-plugin-utils";
 import syntaxTypeScript from "@babel/plugin-syntax-typescript";
-import { types as t } from "@babel/core";
+import { types as t, template } from "@babel/core";
+import { injectInitialization } from "@babel/helper-create-class-features-plugin";
 
 import transpileEnum from "./enum";
+import transpileNamespace from "./namespace";
 
 function isInType(path) {
   switch (path.parent.type) {
@@ -16,309 +18,389 @@ function isInType(path) {
   }
 }
 
-interface State {
-  programPath: any;
+const PARSED_PARAMS = new WeakSet();
+const GLOBAL_TYPES = new WeakMap();
+
+function isGlobalType(path, name) {
+  const program = path.find(path => path.isProgram()).node;
+  if (path.scope.hasOwnBinding(name)) return false;
+  if (GLOBAL_TYPES.get(program).has(name)) return true;
+
+  console.warn(
+    `The exported identifier "${name}" is not declared in Babel's scope tracker\n` +
+      `as a JavaScript value binding, and "@babel/plugin-transform-typescript"\n` +
+      `never encountered it as a TypeScript type declaration.\n` +
+      `It will be treated as a JavaScript value.\n\n` +
+      `This problem is likely caused by another plugin injecting\n` +
+      `"${name}" without registering it in the scope tracker. If you are the author\n` +
+      ` of that plugin, please use "scope.registerDeclaration(declarationPath)".`,
+  );
+
+  return false;
 }
 
-const PARSED_PARAMS = new WeakSet();
+function registerGlobalType(programScope, name) {
+  GLOBAL_TYPES.get(programScope.path.node).add(name);
+}
 
-export default declare((api, { jsxPragma = "React" }) => {
-  api.assertVersion(7);
-
-  return {
-    inherits: syntaxTypeScript,
-    visitor: {
-      //"Pattern" alias doesn't include Identifier or RestElement.
-      Pattern: visitPattern,
-      Identifier: visitPattern,
-      RestElement: visitPattern,
-
-      Program(path, state: State) {
-        state.programPath = path;
-
-        // remove type imports
-        for (const stmt of path.get("body")) {
-          if (t.isImportDeclaration(stmt)) {
-            // Note: this will allow both `import { } from "m"` and `import "m";`.
-            // In TypeScript, the former would be elided.
-            if (stmt.node.specifiers.length === 0) {
-              continue;
-            }
+export default declare(
+  (api, { jsxPragma = "React", allowNamespaces = false }) => {
+    api.assertVersion(7);
 
-            let allElided = true;
-            const importsToRemove: Path<Node>[] = [];
+    const JSX_ANNOTATION_REGEX = /\*?\s*@jsx\s+([^\s]+)/;
 
-            for (const specifier of stmt.node.specifiers) {
-              const binding = stmt.scope.getBinding(specifier.local.name);
+    return {
+      name: "transform-typescript",
+      inherits: syntaxTypeScript,
 
-              // The binding may not exist if the import node was explicitly
-              // injected by another plugin. Currently core does not do a good job
-              // of keeping scope bindings synchronized with the AST. For now we
-              // just bail if there is no binding, since chances are good that if
-              // the import statement was injected then it wasn't a typescript type
-              // import anyway.
-              if (binding && isImportTypeOnly(binding, state.programPath)) {
-                importsToRemove.push(binding.path);
-              } else {
-                allElided = false;
-              }
-            }
+      visitor: {
+        //"Pattern" alias doesn't include Identifier or RestElement.
+        Pattern: visitPattern,
+        Identifier: visitPattern,
+        RestElement: visitPattern,
+
+        Program(path, state) {
+          const { file } = state;
+          let fileJsxPragma = null;
+
+          if (!GLOBAL_TYPES.has(path.node)) {
+            GLOBAL_TYPES.set(path.node, new Set());
+          }
 
-            if (allElided) {
-              stmt.remove();
-            } else {
-              for (const importPath of importsToRemove) {
-                importPath.remove();
+          if (file.ast.comments) {
+            for (const comment of (file.ast.comments: Array<Object>)) {
+              const jsxMatches = JSX_ANNOTATION_REGEX.exec(comment.value);
+              if (jsxMatches) {
+                fileJsxPragma = jsxMatches[1];
               }
             }
           }
-        }
-      },
-
-      TSDeclareFunction(path) {
-        path.remove();
-      },
-
-      TSDeclareMethod(path) {
-        path.remove();
-      },
-
-      VariableDeclaration(path) {
-        if (path.node.declare) path.remove();
-      },
-
-      VariableDeclarator({ node }) {
-        if (node.definite) node.definite = null;
-      },
-
-      ClassMethod(path) {
-        const { node } = path;
 
-        if (node.accessibility) node.accessibility = null;
-        if (node.abstract) node.abstract = null;
-        if (node.optional) node.optional = null;
-
-        // Rest handled by Function visitor
-      },
+          // remove type imports
+          for (let stmt of path.get("body")) {
+            if (t.isImportDeclaration(stmt)) {
+              // Note: this will allow both `import { } from "m"` and `import "m";`.
+              // In TypeScript, the former would be elided.
+              if (stmt.node.specifiers.length === 0) {
+                continue;
+              }
 
-      ClassProperty(path) {
-        const { node } = path;
+              let allElided = true;
+              const importsToRemove: Path<Node>[] = [];
+
+              for (const specifier of stmt.node.specifiers) {
+                const binding = stmt.scope.getBinding(specifier.local.name);
+
+                // The binding may not exist if the import node was explicitly
+                // injected by another plugin. Currently core does not do a good job
+                // of keeping scope bindings synchronized with the AST. For now we
+                // just bail if there is no binding, since chances are good that if
+                // the import statement was injected then it wasn't a typescript type
+                // import anyway.
+                if (
+                  binding &&
+                  isImportTypeOnly({
+                    binding,
+                    programPath: path,
+                    jsxPragma: fileJsxPragma || jsxPragma,
+                  })
+                ) {
+                  importsToRemove.push(binding.path);
+                } else {
+                  allElided = false;
+                }
+              }
 
-        if (node.accessibility) node.accessibility = null;
-        if (node.abstract) node.abstract = null;
-        if (node.readonly) node.readonly = null;
-        if (node.optional) node.optional = null;
-        if (node.definite) node.definite = null;
-        if (node.typeAnnotation) node.typeAnnotation = null;
-      },
+              if (allElided) {
+                stmt.remove();
+              } else {
+                for (const importPath of importsToRemove) {
+                  importPath.remove();
+                }
+              }
 
-      TSIndexSignature(path) {
-        path.remove();
-      },
+              continue;
+            }
 
-      ClassDeclaration(path) {
-        const { node } = path;
-        if (node.declare) {
-          path.remove();
-          return;
-        }
-        if (node.abstract) node.abstract = null;
-      },
+            if (stmt.isExportDeclaration()) {
+              stmt = stmt.get("declaration");
+            }
 
-      Class(path) {
-        const { node } = path;
-
-        if (node.typeParameters) node.typeParameters = null;
-        if (node.superTypeParameters) node.superTypeParameters = null;
-        if (node.implements) node.implements = null;
-
-        // Similar to the logic in `transform-flow-strip-types`, we need to
-        // handle `TSParameterProperty` and `ClassProperty` here because the
-        // class transform would transform the class, causing more specific
-        // visitors to not run.
-        path.get("body.body").forEach(child => {
-          const childNode = child.node;
-
-          if (t.isClassMethod(childNode, { kind: "constructor" })) {
-            // Collects parameter properties so that we can add an assignment
-            // for each of them in the constructor body
-            //
-            // We use a WeakSet to ensure an assignment for a parameter
-            // property is only added once. This is necessary for cases like
-            // using `transform-classes`, which causes this visitor to run
-            // twice.
-            const parameterProperties = [];
-            for (const param of childNode.params) {
-              if (
-                param.type === "TSParameterProperty" &&
-                !PARSED_PARAMS.has(param.parameter)
-              ) {
-                PARSED_PARAMS.add(param.parameter);
-                parameterProperties.push(param.parameter);
+            if (stmt.isVariableDeclaration({ declare: true })) {
+              for (const name of Object.keys(stmt.getBindingIdentifiers())) {
+                registerGlobalType(path.scope, name);
               }
+            } else if (
+              stmt.isTSTypeAliasDeclaration() ||
+              stmt.isTSDeclareFunction() ||
+              stmt.isTSInterfaceDeclaration() ||
+              stmt.isClassDeclaration({ declare: true }) ||
+              stmt.isTSEnumDeclaration({ declare: true }) ||
+              (stmt.isTSModuleDeclaration({ declare: true }) &&
+                stmt.get("id").isIdentifier())
+            ) {
+              registerGlobalType(path.scope, stmt.node.id.name);
             }
+          }
+        },
+
+        ExportNamedDeclaration(path) {
+          // remove export declaration if it's exporting only types
+          if (
+            !path.node.source &&
+            path.node.specifiers.length > 0 &&
+            path.node.specifiers.every(({ local }) =>
+              isGlobalType(path, local.name),
+            )
+          ) {
+            path.remove();
+          }
+        },
 
-            if (parameterProperties.length) {
-              const assigns = parameterProperties.map(p => {
-                let name;
-                if (t.isIdentifier(p)) {
-                  name = p.name;
-                } else if (t.isAssignmentPattern(p) && t.isIdentifier(p.left)) {
-                  name = p.left.name;
-                } else {
-                  throw path.buildCodeFrameError(
-                    "Parameter properties can not be destructuring patterns.",
-                  );
-                }
+        ExportSpecifier(path) {
+          // remove type exports
+          if (!path.parent.source && isGlobalType(path, path.node.local.name)) {
+            path.remove();
+          }
+        },
+
+        ExportDefaultDeclaration(path) {
+          // remove whole declaration if it's exporting a TS type
+          if (
+            t.isIdentifier(path.node.declaration) &&
+            isGlobalType(path, path.node.declaration.name)
+          ) {
+            path.remove();
+          }
+        },
 
-                const assign = t.assignmentExpression(
-                  "=",
-                  t.memberExpression(t.thisExpression(), t.identifier(name)),
-                  t.identifier(name),
-                );
-                return t.expressionStatement(assign);
-              });
-
-              const statements = childNode.body.body;
-
-              const first = statements[0];
-
-              const startsWithSuperCall =
-                first !== undefined &&
-                t.isExpressionStatement(first) &&
-                t.isCallExpression(first.expression) &&
-                t.isSuper(first.expression.callee);
-
-              // Make sure to put parameter properties *after* the `super`
-              // call. TypeScript will enforce that a 'super()' call is the
-              // first statement when there are parameter properties.
-              childNode.body.body = startsWithSuperCall
-                ? [first, ...assigns, ...statements.slice(1)]
-                : [...assigns, ...statements];
-            }
-          } else if (child.isClassProperty()) {
-            childNode.typeAnnotation = null;
+        TSDeclareFunction(path) {
+          path.remove();
+        },
 
-            if (!childNode.value && !childNode.decorators) {
-              child.remove();
-            }
+        TSDeclareMethod(path) {
+          path.remove();
+        },
+
+        VariableDeclaration(path) {
+          if (path.node.declare) {
+            path.remove();
           }
-        });
-      },
+        },
 
-      Function({ node }) {
-        if (node.typeParameters) node.typeParameters = null;
-        if (node.returnType) node.returnType = null;
+        VariableDeclarator({ node }) {
+          if (node.definite) node.definite = null;
+        },
 
-        const p0 = node.params[0];
-        if (p0 && t.isIdentifier(p0) && p0.name === "this") {
-          node.params.shift();
-        }
+        ClassMethod(path) {
+          const { node } = path;
 
-        // We replace `TSParameterProperty` here so that transforms that
-        // rely on a `Function` visitor to deal with arguments, like
-        // `transform-parameters`, work properly.
-        node.params = node.params.map(p => {
-          return p.type === "TSParameterProperty" ? p.parameter : p;
-        });
-      },
+          if (node.accessibility) node.accessibility = null;
+          if (node.abstract) node.abstract = null;
+          if (node.optional) node.optional = null;
 
-      TSModuleDeclaration(path) {
-        if (!path.node.declare && path.node.id.type !== "StringLiteral") {
-          throw path.buildCodeFrameError("Namespaces are not supported.");
-        }
-        path.remove();
-      },
+          // Rest handled by Function visitor
+        },
 
-      TSInterfaceDeclaration(path) {
-        path.remove();
-      },
+        ClassProperty(path) {
+          const { node } = path;
 
-      TSTypeAliasDeclaration(path) {
-        path.remove();
-      },
+          if (node.accessibility) node.accessibility = null;
+          if (node.abstract) node.abstract = null;
+          if (node.readonly) node.readonly = null;
+          if (node.optional) node.optional = null;
+          if (node.definite) node.definite = null;
+          if (node.typeAnnotation) node.typeAnnotation = null;
+        },
 
-      TSEnumDeclaration(path) {
-        transpileEnum(path, t);
-      },
+        TSIndexSignature(path) {
+          path.remove();
+        },
 
-      TSImportEqualsDeclaration(path) {
-        throw path.buildCodeFrameError(
-          "`import =` is not supported by @babel/plugin-transform-typescript\n" +
-            "Please consider using " +
-            "`import <moduleName> from '<moduleName>';` alongside " +
-            "Typescript's --allowSyntheticDefaultImports option.",
-        );
-      },
+        ClassDeclaration(path) {
+          const { node } = path;
+          if (node.declare) {
+            path.remove();
+            return;
+          }
+        },
+
+        Class(path) {
+          const { node } = path;
+
+          if (node.typeParameters) node.typeParameters = null;
+          if (node.superTypeParameters) node.superTypeParameters = null;
+          if (node.implements) node.implements = null;
+          if (node.abstract) node.abstract = null;
+
+          // Similar to the logic in `transform-flow-strip-types`, we need to
+          // handle `TSParameterProperty` and `ClassProperty` here because the
+          // class transform would transform the class, causing more specific
+          // visitors to not run.
+          path.get("body.body").forEach(child => {
+            const childNode = child.node;
+
+            if (t.isClassMethod(childNode, { kind: "constructor" })) {
+              // Collects parameter properties so that we can add an assignment
+              // for each of them in the constructor body
+              //
+              // We use a WeakSet to ensure an assignment for a parameter
+              // property is only added once. This is necessary for cases like
+              // using `transform-classes`, which causes this visitor to run
+              // twice.
+              const parameterProperties = [];
+              for (const param of childNode.params) {
+                if (
+                  param.type === "TSParameterProperty" &&
+                  !PARSED_PARAMS.has(param.parameter)
+                ) {
+                  PARSED_PARAMS.add(param.parameter);
+                  parameterProperties.push(param.parameter);
+                }
+              }
 
-      TSExportAssignment(path) {
-        throw path.buildCodeFrameError(
-          "`export =` is not supported by @babel/plugin-transform-typescript\n" +
-            "Please consider using `export <value>;`.",
-        );
-      },
+              if (parameterProperties.length) {
+                const assigns = parameterProperties.map(p => {
+                  let id;
+                  if (t.isIdentifier(p)) {
+                    id = p;
+                  } else if (
+                    t.isAssignmentPattern(p) &&
+                    t.isIdentifier(p.left)
+                  ) {
+                    id = p.left;
+                  } else {
+                    throw path.buildCodeFrameError(
+                      "Parameter properties can not be destructuring patterns.",
+                    );
+                  }
+
+                  return template.statement.ast`this.${id} = ${id}`;
+                });
+
+                injectInitialization(path, child, assigns);
+              }
+            } else if (child.isClassProperty()) {
+              childNode.typeAnnotation = null;
 
-      TSTypeAssertion(path) {
-        path.replaceWith(path.node.expression);
-      },
+              if (!childNode.value && !childNode.decorators) {
+                child.remove();
+              }
+            }
+          });
+        },
 
-      TSAsExpression(path) {
-        let { node } = path;
-        do {
-          node = node.expression;
-        } while (t.isTSAsExpression(node));
-        path.replaceWith(node);
-      },
+        Function({ node }) {
+          if (node.typeParameters) node.typeParameters = null;
+          if (node.returnType) node.returnType = null;
 
-      TSNonNullExpression(path) {
-        path.replaceWith(path.node.expression);
-      },
+          const p0 = node.params[0];
+          if (p0 && t.isIdentifier(p0) && p0.name === "this") {
+            node.params.shift();
+          }
 
-      CallExpression(path) {
-        path.node.typeParameters = null;
-      },
+          // We replace `TSParameterProperty` here so that transforms that
+          // rely on a `Function` visitor to deal with arguments, like
+          // `transform-parameters`, work properly.
+          node.params = node.params.map(p => {
+            return p.type === "TSParameterProperty" ? p.parameter : p;
+          });
+        },
 
-      NewExpression(path) {
-        path.node.typeParameters = null;
-      },
+        TSModuleDeclaration(path) {
+          transpileNamespace(path, t, allowNamespaces);
+        },
 
-      JSXOpeningElement(path) {
-        path.node.typeParameters = null;
-      },
+        TSInterfaceDeclaration(path) {
+          path.remove();
+        },
 
-      TaggedTemplateExpression(path) {
-        path.node.typeParameters = null;
+        TSTypeAliasDeclaration(path) {
+          path.remove();
+        },
+
+        TSEnumDeclaration(path) {
+          transpileEnum(path, t);
+        },
+
+        TSImportEqualsDeclaration(path) {
+          throw path.buildCodeFrameError(
+            "`import =` is not supported by @babel/plugin-transform-typescript\n" +
+              "Please consider using " +
+              "`import <moduleName> from '<moduleName>';` alongside " +
+              "Typescript's --allowSyntheticDefaultImports option.",
+          );
+        },
+
+        TSExportAssignment(path) {
+          throw path.buildCodeFrameError(
+            "`export =` is not supported by @babel/plugin-transform-typescript\n" +
+              "Please consider using `export <value>;`.",
+          );
+        },
+
+        TSTypeAssertion(path) {
+          path.replaceWith(path.node.expression);
+        },
+
+        TSAsExpression(path) {
+          let { node } = path;
+          do {
+            node = node.expression;
+          } while (t.isTSAsExpression(node));
+          path.replaceWith(node);
+        },
+
+        TSNonNullExpression(path) {
+          path.replaceWith(path.node.expression);
+        },
+
+        CallExpression(path) {
+          path.node.typeParameters = null;
+        },
+
+        NewExpression(path) {
+          path.node.typeParameters = null;
+        },
+
+        JSXOpeningElement(path) {
+          path.node.typeParameters = null;
+        },
+
+        TaggedTemplateExpression(path) {
+          path.node.typeParameters = null;
+        },
       },
-    },
-  };
+    };
 
-  function visitPattern({ node }) {
-    if (node.typeAnnotation) node.typeAnnotation = null;
-    if (t.isIdentifier(node) && node.optional) node.optional = null;
-    // 'access' and 'readonly' are only for parameter properties, so constructor visitor will handle them.
-  }
+    function visitPattern({ node }) {
+      if (node.typeAnnotation) node.typeAnnotation = null;
+      if (t.isIdentifier(node) && node.optional) node.optional = null;
+      // 'access' and 'readonly' are only for parameter properties, so constructor visitor will handle them.
+    }
 
-  function isImportTypeOnly(binding, programPath) {
-    for (const path of binding.referencePaths) {
-      if (!isInType(path)) {
-        return false;
+    function isImportTypeOnly({ binding, programPath, jsxPragma }) {
+      for (const path of binding.referencePaths) {
+        if (!isInType(path)) {
+          return false;
+        }
       }
-    }
 
-    if (binding.identifier.name !== jsxPragma) {
-      return true;
-    }
+      if (binding.identifier.name !== jsxPragma) {
+        return true;
+      }
 
-    // "React" or the JSX pragma is referenced as a value if there are any JSX elements in the code.
-    let sourceFileHasJsx = false;
-    programPath.traverse({
-      JSXElement() {
-        sourceFileHasJsx = true;
-      },
-      JSXFragment() {
-        sourceFileHasJsx = true;
-      },
-    });
-    return !sourceFileHasJsx;
-  }
-});
+      // "React" or the JSX pragma is referenced as a value if there are any JSX elements in the code.
+      let sourceFileHasJsx = false;
+      programPath.traverse({
+        JSXElement() {
+          sourceFileHasJsx = true;
+        },
+        JSXFragment() {
+          sourceFileHasJsx = true;
+        },
+      });
+      return !sourceFileHasJsx;
+    }
+  },
+);
diff --git a/packages/babel-plugin-transform-typescript/src/namespace.js b/packages/babel-plugin-transform-typescript/src/namespace.js
new file mode 100644
index 000000000000..32d53447a80a
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/src/namespace.js
@@ -0,0 +1,171 @@
+import { template } from "@babel/core";
+
+export default function transpileNamespace(path, t, allowNamespaces) {
+  if (path.node.declare || path.node.id.type === "StringLiteral") {
+    path.remove();
+    return;
+  }
+
+  if (!allowNamespaces) {
+    throw path.hub.file.buildCodeFrameError(
+      path.node.id,
+      "Namespace not marked type-only declare." +
+        " Non-declarative namespaces are only supported experimentally in Babel." +
+        " To enable and review caveats see:" +
+        " https://babeljs.io/docs/en/babel-plugin-transform-typescript",
+    );
+  }
+
+  const name = path.node.id.name;
+  const value = handleNested(path, t, t.cloneDeep(path.node));
+  const bound = path.scope.hasOwnBinding(name);
+  if (path.parent.type === "ExportNamedDeclaration") {
+    if (!bound) {
+      path.parentPath.insertAfter(value);
+      path.replaceWith(getDeclaration(t, name));
+      path.scope.registerDeclaration(path.parentPath);
+    } else {
+      path.parentPath.replaceWith(value);
+    }
+  } else if (bound) {
+    path.replaceWith(value);
+  } else {
+    path.scope.registerDeclaration(
+      path.replaceWithMultiple([getDeclaration(t, name), value])[0],
+    );
+  }
+}
+
+function getDeclaration(t, name) {
+  return t.variableDeclaration("let", [
+    t.variableDeclarator(t.identifier(name)),
+  ]);
+}
+
+function getMemberExpression(t, name, itemName) {
+  return t.memberExpression(t.identifier(name), t.identifier(itemName));
+}
+
+function handleNested(path, t, node, parentExport) {
+  const names = new Set();
+  const realName = node.id;
+  const name = path.scope.generateUid(realName.name);
+  const namespaceTopLevel = node.body.body;
+  for (let i = 0; i < namespaceTopLevel.length; i++) {
+    const subNode = namespaceTopLevel[i];
+
+    // The first switch is mainly to detect name usage. Only export
+    // declarations require further transformation.
+    switch (subNode.type) {
+      case "TSModuleDeclaration": {
+        const transformed = handleNested(path, t, subNode);
+        const moduleName = subNode.id.name;
+        if (names.has(moduleName)) {
+          namespaceTopLevel[i] = transformed;
+        } else {
+          names.add(moduleName);
+          namespaceTopLevel.splice(
+            i++,
+            1,
+            getDeclaration(t, moduleName),
+            transformed,
+          );
+        }
+        continue;
+      }
+      case "TSEnumDeclaration":
+      case "FunctionDeclaration":
+      case "ClassDeclaration":
+        names.add(subNode.id.name);
+        continue;
+      case "VariableDeclaration":
+        for (const variable of subNode.declarations) {
+          names.add(variable.id.name);
+        }
+        continue;
+      default:
+        // Neither named declaration nor export, continue to next item.
+        continue;
+      case "ExportNamedDeclaration":
+      // Export declarations get parsed using the next switch.
+    }
+
+    // Transform the export declarations that occur inside of a namespace.
+    switch (subNode.declaration.type) {
+      case "TSEnumDeclaration":
+      case "FunctionDeclaration":
+      case "ClassDeclaration": {
+        const itemName = subNode.declaration.id.name;
+        names.add(itemName);
+        namespaceTopLevel.splice(
+          i++,
+          1,
+          subNode.declaration,
+          t.expressionStatement(
+            t.assignmentExpression(
+              "=",
+              getMemberExpression(t, name, itemName),
+              t.identifier(itemName),
+            ),
+          ),
+        );
+        break;
+      }
+      case "VariableDeclaration":
+        if (subNode.declaration.kind !== "const") {
+          throw path.hub.file.buildCodeFrameError(
+            subNode.declaration,
+            "Namespaces exporting non-const are not supported by Babel." +
+              " Change to const or see:" +
+              " https://babeljs.io/docs/en/babel-plugin-transform-typescript",
+          );
+        }
+        for (const variable of subNode.declaration.declarations) {
+          variable.init = t.assignmentExpression(
+            "=",
+            getMemberExpression(t, name, variable.id.name),
+            variable.init,
+          );
+        }
+        namespaceTopLevel[i] = subNode.declaration;
+        break;
+      case "TSModuleDeclaration": {
+        const transformed = handleNested(
+          path,
+          t,
+          subNode.declaration,
+          t.identifier(name),
+        );
+        const moduleName = subNode.declaration.id.name;
+        if (names.has(moduleName)) {
+          namespaceTopLevel[i] = transformed;
+        } else {
+          names.add(moduleName);
+          namespaceTopLevel.splice(
+            i++,
+            1,
+            getDeclaration(t, moduleName),
+            transformed,
+          );
+        }
+      }
+    }
+  }
+
+  // {}
+  let fallthroughValue = t.objectExpression([]);
+
+  if (parentExport) {
+    fallthroughValue = template.expression.ast`
+      ${parentExport}.${realName} || (
+        ${parentExport}.${realName} = ${fallthroughValue}
+      )
+    `;
+  }
+
+  return template.statement.ast`
+    (function (${t.identifier(name)}) {
+      ${namespaceTopLevel}
+    })(${realName} || (${realName} = ${fallthroughValue}));
+  `;
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/cast/as-expression/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/cast/as-expression/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/cast/as-expression/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/cast/as-expression/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/cast/multiple-assert-and-assign/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/cast/multiple-assert-and-assign/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/cast/multiple-assert-and-assign/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/cast/multiple-assert-and-assign/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/cast/non-null-assertion/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/cast/non-null-assertion/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/cast/non-null-assertion/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/cast/non-null-assertion/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/cast/type-assertion/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/cast/type-assertion/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/cast/type-assertion/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/cast/type-assertion/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/input.ts
new file mode 100644
index 000000000000..c004b41cd8c5
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/input.ts
@@ -0,0 +1,5 @@
+import { computed } from 'mobx';
+
+abstract class Foo {
+  @computed get id() {}
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/options.json
new file mode 100644
index 000000000000..8549cff84993
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/options.json
@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    "transform-typescript",
+    [
+      "proposal-decorators",
+      {
+        "legacy": true
+      }
+    ]
+  ],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/output.mjs
new file mode 100644
index 000000000000..ab375fbe480b
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/output.mjs
@@ -0,0 +1,9 @@
+var _class;
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+import { computed } from 'mobx';
+let Foo = (_class = class Foo {
+  get id() {}
+
+}, (_applyDecoratedDescriptor(_class.prototype, "id", [computed], Object.getOwnPropertyDescriptor(_class.prototype, "id"), _class.prototype)), _class);
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/input.ts
new file mode 100644
index 000000000000..d210c98e4608
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/input.ts
@@ -0,0 +1,5 @@
+import { observable } from 'mobx';
+
+abstract class Foo {
+  @observable id = null;
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/options.json
new file mode 100644
index 000000000000..8549cff84993
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/options.json
@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    "transform-typescript",
+    [
+      "proposal-decorators",
+      {
+        "legacy": true
+      }
+    ]
+  ],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/output.mjs
new file mode 100644
index 000000000000..e8982550efbf
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/output.mjs
@@ -0,0 +1,17 @@
+var _class, _descriptor;
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and set to use loose mode. ' + 'To use proposal-class-properties in spec mode with decorators, wait for ' + 'the next major version of decorators in stage 2.'); }
+
+import { observable } from 'mobx';
+let Foo = (_class = class Foo {
+  id = _initializerWarningHelper(_descriptor, this);
+}, (_descriptor = _applyDecoratedDescriptor(_class.prototype, "id", [observable], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return null;
+  }
+})), _class);
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/input.ts
new file mode 100644
index 000000000000..d1c59625af1e
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/input.ts
@@ -0,0 +1,4 @@
+import { observer } from 'mobx-react';
+
+@observer
+abstract class Foo {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/options.json
new file mode 100644
index 000000000000..8549cff84993
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/options.json
@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    "transform-typescript",
+    [
+      "proposal-decorators",
+      {
+        "legacy": true
+      }
+    ]
+  ],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/output.mjs
new file mode 100644
index 000000000000..7c0e001398b4
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated/output.mjs
@@ -0,0 +1,5 @@
+var _class;
+
+import { observer } from 'mobx-react';
+
+let Foo = observer(_class = class Foo {}) || _class;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/export-default-abstract/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/class/export-default-abstract/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/export-default-abstract/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/export-default-abstract/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/export-default-abstract/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/class/export-default-abstract/options.json
new file mode 100644
index 000000000000..d5e8a7e4201b
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/export-default-abstract/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-typescript"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/head/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/head/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/head/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/head/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/index-signature/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/index-signature/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/index-signature/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/index-signature/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/methods/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/methods/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/methods/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/methods/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/input.ts
new file mode 100644
index 000000000000..00ec8f809849
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/input.ts
@@ -0,0 +1,9 @@
+class B extends A {
+  constructor(public p: string) {
+    console.log('anything before super');
+    if (p) super();
+    else {
+      super();
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/options.json
new file mode 100644
index 000000000000..5c79172a6082
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-typescript"]
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/output.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/output.js
new file mode 100644
index 000000000000..2f5c7109252a
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-late-super/output.js
@@ -0,0 +1,14 @@
+class B extends A {
+  constructor(p) {
+    console.log('anything before super');
+
+    if (p) {
+      super();
+      this.p = p;
+    } else {
+      super();
+      this.p = p;
+    }
+  }
+
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/options.json
index e4c16fc7dcbf..767a4f891cc2 100644
--- a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/options.json
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-parameters/options.json
@@ -1,3 +1,4 @@
 {
-  "plugins": ["transform-typescript", "transform-parameters"]
+  "plugins": ["transform-typescript", "transform-parameters"],
+  "sourceType": "module"
 }
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-super/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-super/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-super/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-super/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/properties/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/properties/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/class/properties/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/class/properties/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/input.mjs
deleted file mode 100644
index a8fbeee28ef8..000000000000
--- a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/input.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-declare const x: number;
-declare function f(): void;
-declare class C {}
-declare enum E {}
-declare module "m" {}
-declare module M {}
-declare namespace N {}
-export interface I {}
-export type T = number;
-export class C2 {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/input.ts
new file mode 100644
index 000000000000..f108285b88d7
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/input.ts
@@ -0,0 +1,10 @@
+; // Otherwise-empty file
+declare const x: number;
+declare function f(): void;
+declare class C {}
+declare enum E {}
+declare module "m" {}
+declare module M {}
+declare namespace N {}
+export interface I {}
+export type T = number;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/options.json
new file mode 100644
index 000000000000..d5e8a7e4201b
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-typescript"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/output.mjs
index efd6dcc73555..dab5d3d1c154 100644
--- a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/output.mjs
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/erased/output.mjs
@@ -1 +1 @@
-export class C2 {}
+; // Otherwise-empty file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/nested-namespace/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/nested-namespace/input.mjs
new file mode 100644
index 000000000000..8d01bb41f132
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/nested-namespace/input.mjs
@@ -0,0 +1,4 @@
+; // Otherwise-empty file
+export declare namespace P {
+  export namespace C {}
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/declarations/nested-namespace/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/nested-namespace/output.mjs
new file mode 100644
index 000000000000..dab5d3d1c154
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/declarations/nested-namespace/output.mjs
@@ -0,0 +1 @@
+; // Otherwise-empty file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/boolean-value/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/boolean-value/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/boolean-value/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/boolean-value/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/const/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/const/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/const/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/const/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/constant-folding/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/constant-folding/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/constant-folding/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/constant-folding/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/export/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/enum/export/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/export/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/export/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/export/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/enum/export/options.json
new file mode 100644
index 000000000000..d5e8a7e4201b
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/enum/export/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-typescript"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/inferred/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/inferred/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/inferred/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/inferred/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/inner-references/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/inner-references/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/inner-references/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/inner-references/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/non-foldable-constant/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/non-foldable-constant/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/non-foldable-constant/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/non-foldable-constant/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/non-scoped/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/non-scoped/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/non-scoped/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/non-scoped/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/scoped/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/scoped/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/scoped/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/scoped/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values-computed/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values-computed/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values-computed/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values-computed/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/enum/string-values/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/declare-namespace/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declare-namespace/input.ts
new file mode 100644
index 000000000000..86cfc89f0616
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declare-namespace/input.ts
@@ -0,0 +1,11 @@
+export class N {
+  f1(value: N.I) {
+    value.f2();
+  }
+}
+export declare namespace N {
+  export interface I {
+    f2();
+  }
+}
+export default N;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/declare-namespace/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declare-namespace/output.mjs
new file mode 100644
index 000000000000..a98de5c76ae2
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declare-namespace/output.mjs
@@ -0,0 +1,7 @@
+export class N {
+  f1(value) {
+    value.f2();
+  }
+
+}
+export default N;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/declared-types/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declared-types/input.ts
new file mode 100644
index 000000000000..91b2439a426f
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declared-types/input.ts
@@ -0,0 +1,48 @@
+declare const x: number;
+declare function f(): void;
+declare class C {}
+declare enum E {}
+declare module "m" {}
+declare module M {}
+declare namespace N {}
+export interface I {}
+export type T = number;
+export class C2 {}
+
+export { x, f, E, C }; // Not-even E
+export { M, N, I as I1, T as T1 }; // everything removed
+export {
+  x as x2,
+  f as f2,
+  C as CC2,
+  E as E2,
+  M as M2,
+  N as N2,
+  I as I2,
+  T as T2,
+  C2 as C3
+}; // only C2->C3
+
+interface II2 {}
+type AA = {};
+enum BB {
+  K
+}
+enum BB {
+  L = "LL"
+}
+export { II2, AA, BB };  // only BB
+export { II2 as II3, AA as AA2 };  // everything removed
+export { BB as BB1 }; // BB->BB1
+
+interface II3 {}
+type AA2 = {};
+enum BB2 {}
+function foo() {}
+export { II3 as default, AA2 as A, BB2 as BB3, foo }; // only BB2->BB3 and foo
+
+// export an interface before declaration
+export default Bar;
+export { Bar } // everything removed
+export { Bar as Bar2, C2 as C4 } // only C2->C4
+interface Bar {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/declared-types/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declared-types/output.mjs
new file mode 100644
index 000000000000..649830090ae3
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/declared-types/output.mjs
@@ -0,0 +1,30 @@
+export class C2 {}
+// everything removed
+export { C2 as C3 }; // only C2->C3
+
+var BB;
+
+(function (BB) {
+  BB[BB["K"] = 0] = "K";
+})(BB || (BB = {}));
+
+(function (BB) {
+  BB["L"] = "LL";
+})(BB || (BB = {}));
+
+export { BB }; // only BB
+
+// everything removed
+export { BB as BB1 }; // BB->BB1
+
+var BB2;
+
+(function (BB2) {})(BB2 || (BB2 = {}));
+
+function foo() {}
+
+export { BB2 as BB3, foo }; // only BB2->BB3 and foo
+// export an interface before declaration
+
+// everything removed
+export { C2 as C4 }; // only C2->C4
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/default-literal/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/exports/default-literal/input.ts
new file mode 100644
index 000000000000..60c6c8d8b04f
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/default-literal/input.ts
@@ -0,0 +1 @@
+export default "foo";
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/default-literal/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/default-literal/output.mjs
new file mode 100644
index 000000000000..60c6c8d8b04f
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/default-literal/output.mjs
@@ -0,0 +1 @@
+export default "foo";
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/export-from/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/exports/export-from/input.ts
new file mode 100644
index 000000000000..d376df966a38
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/export-from/input.ts
@@ -0,0 +1 @@
+export { bar } from './bar';
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/export-from/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/export-from/output.mjs
new file mode 100644
index 000000000000..d376df966a38
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/export-from/output.mjs
@@ -0,0 +1 @@
+export { bar } from './bar';
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/options.json
index 8d3baef9620f..9ba7cc5c5f3a 100644
--- a/packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/options.json
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/export=/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`export =` is not supported by @babel/plugin-transform-typescript\nPlease consider using `export <value>;`."
+  "throws": "`export =` is not supported by @babel/plugin-transform-typescript\nPlease consider using `export <value>;`."
 }
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/input.mjs
deleted file mode 100644
index 7049da8742da..000000000000
--- a/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/input.mjs
+++ /dev/null
@@ -1,2 +0,0 @@
-export interface I {}
-export default interface A {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/input.ts
new file mode 100644
index 000000000000..a5fe433822a8
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/input.ts
@@ -0,0 +1,3 @@
+; // Otherwise-empty file
+export interface I {}
+export default interface A {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/output.mjs
new file mode 100644
index 000000000000..dab5d3d1c154
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/interface/output.mjs
@@ -0,0 +1 @@
+; // Otherwise-empty file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/exports/options.json
new file mode 100644
index 000000000000..d5e8a7e4201b
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-typescript"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/simple/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/exports/simple/input.ts
new file mode 100644
index 000000000000..36bbc0609b63
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/simple/input.ts
@@ -0,0 +1,2 @@
+export class N {}
+export default N;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/exports/simple/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/exports/simple/output.mjs
new file mode 100644
index 000000000000..36bbc0609b63
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/exports/simple/output.mjs
@@ -0,0 +1,2 @@
+export class N {}
+export default N;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/function/overloads/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/function/overloads/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/function/overloads/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/function/overloads/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/function/parameters/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/function/parameters/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/function/parameters/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/function/parameters/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/input.js
deleted file mode 100644
index 420e20481467..000000000000
--- a/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/input.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function f(this: {}) {}
-const o = {
-    m(this: {}) {}
-};
-class C {
-    m(this: {}) {}
-}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/input.ts
new file mode 100644
index 000000000000..bcc3eb3624b3
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/input.ts
@@ -0,0 +1,13 @@
+function f(this: {}) {}
+const o = {
+    m(this: {}) {}
+};
+class C {
+    m(this: {}) {}
+}
+const g = {
+    get m(this: {}) {}
+};
+const s = {
+    set m(this: {}, value: {}) {}
+};
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/output.js b/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/output.js
index ded864e231dd..24b0164ac9cd 100644
--- a/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/output.js
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/function/this-parameter/output.js
@@ -9,3 +9,12 @@ class C {
   m() {}
 
 }
+
+const g = {
+  get m() {}
+
+};
+const s = {
+  set m(value) {}
+
+};
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/function/tuple-parameter/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/function/tuple-parameter/input.ts
new file mode 100644
index 000000000000..954c72a82aaa
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/function/tuple-parameter/input.ts
@@ -0,0 +1 @@
+function foo(...args: [number, string?, ...number[]]) {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/function/tuple-parameter/output.js b/packages/babel-plugin-transform-typescript/test/fixtures/function/tuple-parameter/output.js
new file mode 100644
index 000000000000..3b940d105755
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/function/tuple-parameter/output.js
@@ -0,0 +1 @@
+function foo(...args) {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-injected/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/input.ts
new file mode 100644
index 000000000000..450c0667d19c
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/input.ts
@@ -0,0 +1,4 @@
+/* @jsx htm */
+// Don't elide htm if a JSX element appears somewhere.
+import { htm } from "fake-jsx-package";
+<div></div>;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/options.json
new file mode 100644
index 000000000000..2c7aa7bce294
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": [["transform-typescript", { "isTSX": true }]]
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/output.mjs
new file mode 100644
index 000000000000..450c0667d19c
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-jsx-pragma-no/output.mjs
@@ -0,0 +1,4 @@
+/* @jsx htm */
+// Don't elide htm if a JSX element appears somewhere.
+import { htm } from "fake-jsx-package";
+<div></div>;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-no-import-specifiers/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-no-import-specifiers/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-no-import-specifiers/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-no-import-specifiers/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact-no/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact-no/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact-no/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact-no/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-preact/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-2/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-2/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-2/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-2/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-3/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-3/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-3/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no-3/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react-no/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-react/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-typeof/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-typeof/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-typeof/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elide-typeof/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-locations/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-locations/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-locations/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-locations/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-qualifiedname/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-qualifiedname/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-qualifiedname/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-qualifiedname/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-rename/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-rename/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-rename/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elision-rename/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/elision/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/elision/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/elision/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/input.ts
new file mode 100644
index 000000000000..f46a82c360a2
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/input.ts
@@ -0,0 +1,2 @@
+import { A } from 'lib'
+enum Enum { A };
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/output.mjs
new file mode 100644
index 000000000000..628c6ba0ff86
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-id/output.mjs
@@ -0,0 +1,7 @@
+var Enum;
+
+(function (Enum) {
+  Enum[Enum["A"] = 0] = "A";
+})(Enum || (Enum = {}));
+
+;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/input.ts
new file mode 100644
index 000000000000..727760d0ed26
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/input.ts
@@ -0,0 +1,2 @@
+import { A } from 'lib'
+enum Enum { id = A };
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/output.mjs
new file mode 100644
index 000000000000..88a2cffb8392
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/enum-value/output.mjs
@@ -0,0 +1,8 @@
+import { A } from 'lib';
+var Enum;
+
+(function (Enum) {
+  Enum[Enum["id"] = A] = "id";
+})(Enum || (Enum = {}));
+
+;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/input.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/input.mjs
rename to packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/options.json
index a8811f52ea61..596239c2e1c0 100644
--- a/packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/options.json
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/import=/options.json
@@ -1,4 +1,3 @@
 {
-  "throws":
-    "`import =` is not supported by @babel/plugin-transform-typescript\nPlease consider using `import <moduleName> from '<moduleName>';` alongside Typescript's --allowSyntheticDefaultImports option."
+  "throws": "`import =` is not supported by @babel/plugin-transform-typescript\nPlease consider using `import <moduleName> from '<moduleName>';` alongside Typescript's --allowSyntheticDefaultImports option."
 }
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/imports/options.json
new file mode 100644
index 000000000000..d5e8a7e4201b
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-typescript"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/input.ts
new file mode 100644
index 000000000000..8f6ad6135d1c
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/input.ts
@@ -0,0 +1,6 @@
+import { NgModule, Optional, SkipSelf } from '@angular/core';
+
+@NgModule({})
+export class CoreModule {
+  constructor(@Optional() @SkipSelf() parentModule) { }
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/options.json
new file mode 100644
index 000000000000..dcdc6eed36c0
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/options.json
@@ -0,0 +1,12 @@
+{
+  "plugins": [
+    "transform-typescript",
+    [
+      "proposal-decorators",
+      {
+        "legacy": true
+      }
+    ],
+    "./plugin"
+  ]
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/output.mjs
new file mode 100644
index 000000000000..24111bc8df9a
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/output.mjs
@@ -0,0 +1,9 @@
+var _dec, _class;
+
+import { NgModule, Optional, SkipSelf } from '@angular/core';
+export let CoreModule = (_dec = NgModule({}), _dec(_class = class CoreModule {
+  constructor(_parentModule) {
+    var _parentModule2 = Optional()(SkipSelf()(_parentModule));
+  }
+
+}) || _class);
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/plugin.js b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/plugin.js
new file mode 100644
index 000000000000..a066043915fa
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/parameter-decorators/plugin.js
@@ -0,0 +1,54 @@
+"use strict";
+// https://github.com/benderTheCrime/babel-plugin-transform-function-parameter-decorators/
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+
+exports.default = function(_ref) {
+  var types = _ref.types;
+
+  return {
+    visitor: {
+      Function: function parseFunctionPath(path) {
+        (path.get("params") || [])
+          .slice()
+          .reverse()
+          .forEach(function(param) {
+            var name = param.node.name;
+            var paramUidName = path.scope.generateUidIdentifier(name).name;
+            var resultantDecorator = void 0;
+
+            (param.node.decorators || [])
+              .slice()
+              .reverse()
+              .forEach(function(decorator) {
+                resultantDecorator = types.callExpression(
+                  decorator.expression,
+                  [resultantDecorator || types.Identifier(paramUidName)]
+                );
+              });
+
+            if (resultantDecorator) {
+              var decoratedParamUidName = path.scope.generateUidIdentifier(name)
+                .name;
+
+              path.scope.rename(name, decoratedParamUidName);
+              param.parentPath
+                .get("body")
+                .unshiftContainer(
+                  "body",
+                  types.variableDeclaration("var", [
+                    types.variableDeclarator(
+                      types.Identifier(decoratedParamUidName),
+                      resultantDecorator
+                    ),
+                  ])
+                );
+              param.replaceWith(types.Identifier(paramUidName));
+            }
+          });
+      },
+    },
+  };
+};
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/input.ts
new file mode 100644
index 000000000000..7e242846479e
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/input.ts
@@ -0,0 +1,2 @@
+import { A } from 'lib'
+const obj: { A: A } = { A: 'foo' };
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/output.mjs
new file mode 100644
index 000000000000..cba06b741a87
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/imports/property-signature/output.mjs
@@ -0,0 +1,3 @@
+const obj = {
+  A: 'foo'
+};
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/lvalues/as-expression/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/lvalues/as-expression/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/lvalues/as-expression/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/lvalues/as-expression/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/lvalues/non-null/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/lvalues/non-null/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/lvalues/non-null/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/lvalues/non-null/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/lvalues/type-assertion/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/lvalues/type-assertion/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/lvalues/type-assertion/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/lvalues/type-assertion/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/canonical/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/canonical/input.ts
new file mode 100644
index 000000000000..58f6b5b21389
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/canonical/input.ts
@@ -0,0 +1,35 @@
+namespace Validation {
+  export interface StringValidator {
+    isAcceptable(s: string): boolean;
+  }
+
+  const lettersRegexp = /^[A-Za-z]+$/;
+  const numberRegexp = /^[0-9]+$/;
+
+  export class LettersOnlyValidator implements StringValidator {
+    constructor() {
+      console.log("1");
+    }
+    isAcceptable(s: string) {
+      return lettersRegexp.test(s);
+    }
+  }
+
+  export class ZipCodeValidator implements StringValidator {
+    isAcceptable(s: string) {
+      return s.length === 5 && numberRegexp.test(s);
+    }
+  }
+}
+
+let strings = ["Hello", "98052", "101"];
+
+let validators: { [s: string]: Validation.StringValidator; } = {};
+validators["ZIP code"] = new Validation.ZipCodeValidator();
+validators["Letters only"] = new Validation.LettersOnlyValidator();
+
+for (let s of strings) {
+  for (let name in validators) {
+    console.log(`"${ s }" - ${ validators[name].isAcceptable(s) ? "matches" : "does not match" } ${ name }`);
+  }
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/canonical/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/canonical/output.mjs
new file mode 100644
index 000000000000..f6993c98b8f4
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/canonical/output.mjs
@@ -0,0 +1,39 @@
+let Validation;
+
+(function (_Validation) {
+  const lettersRegexp = /^[A-Za-z]+$/;
+  const numberRegexp = /^[0-9]+$/;
+
+  class LettersOnlyValidator {
+    constructor() {
+      console.log("1");
+    }
+
+    isAcceptable(s) {
+      return lettersRegexp.test(s);
+    }
+
+  }
+
+  _Validation.LettersOnlyValidator = LettersOnlyValidator;
+
+  class ZipCodeValidator {
+    isAcceptable(s) {
+      return s.length === 5 && numberRegexp.test(s);
+    }
+
+  }
+
+  _Validation.ZipCodeValidator = ZipCodeValidator;
+})(Validation || (Validation = {}));
+
+let strings = ["Hello", "98052", "101"];
+let validators = {};
+validators["ZIP code"] = new Validation.ZipCodeValidator();
+validators["Letters only"] = new Validation.LettersOnlyValidator();
+
+for (let s of strings) {
+  for (let name in validators) {
+    console.log(`"${s}" - ${validators[name].isAcceptable(s) ? "matches" : "does not match"} ${name}`);
+  }
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-class/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-class/input.ts
new file mode 100644
index 000000000000..f8debe984b83
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-class/input.ts
@@ -0,0 +1,4 @@
+class A { }
+namespace A {
+  export const B = 1;
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-class/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-class/output.mjs
new file mode 100644
index 000000000000..98c88f006331
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-class/output.mjs
@@ -0,0 +1,5 @@
+class A {}
+
+(function (_A) {
+  const B = _A.B = 1;
+})(A || (A = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-enum/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-enum/input.ts
new file mode 100644
index 000000000000..7b569657b080
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-enum/input.ts
@@ -0,0 +1,6 @@
+enum A {
+  C = 2,
+}
+namespace A {
+  export const B = 1;
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-enum/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-enum/output.mjs
new file mode 100644
index 000000000000..5a1aa715f308
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-enum/output.mjs
@@ -0,0 +1,9 @@
+var A;
+
+(function (A) {
+  A[A["C"] = 2] = "C";
+})(A || (A = {}));
+
+(function (_A) {
+  const B = _A.B = 1;
+})(A || (A = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-export/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-export/input.ts
new file mode 100644
index 000000000000..8122f8e6cce5
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-export/input.ts
@@ -0,0 +1,3 @@
+export class N {}
+export namespace N {}
+export default N;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-export/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-export/output.mjs
new file mode 100644
index 000000000000..e7bc977078a7
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-export/output.mjs
@@ -0,0 +1,5 @@
+export class N {}
+
+(function (_N) {})(N || (N = {}));
+
+export default N;
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-import/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-import/input.ts
new file mode 100644
index 000000000000..ef68acd5adb9
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-import/input.ts
@@ -0,0 +1,3 @@
+import N from 'n';
+
+namespace N {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-import/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-import/output.mjs
new file mode 100644
index 000000000000..5ee84b002fe6
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/clobber-import/output.mjs
@@ -0,0 +1,3 @@
+import N from 'n';
+
+(function (_N) {})(N || (N = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/contentious-names/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/contentious-names/input.ts
new file mode 100644
index 000000000000..efc42d05c9c9
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/contentious-names/input.ts
@@ -0,0 +1,36 @@
+namespace N {
+  namespace N {}
+  namespace constructor {}
+  namespace length {}
+  namespace concat {}
+  namespace copyWithin {}
+  namespace fill {}
+  namespace find {}
+  namespace findIndex {}
+  namespace lastIndexOf {}
+  namespace pop {}
+  namespace push {}
+  namespace reverse {}
+  namespace shift {}
+  namespace unshift {}
+  namespace slice {}
+  namespace sort {}
+  namespace splice {}
+  namespace includes {}
+  namespace indexOf {}
+  namespace join {}
+  namespace keys {}
+  namespace entries {}
+  namespace values {}
+  namespace forEach {}
+  namespace filter {}
+  namespace map {}
+  namespace every {}
+  namespace some {}
+  namespace reduce {}
+  namespace reduceRight {}
+  namespace toLocaleString {}
+  namespace toString {}
+  namespace flat {}
+  namespace flatMap {}
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/contentious-names/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/contentious-names/output.mjs
new file mode 100644
index 000000000000..749100aaa780
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/contentious-names/output.mjs
@@ -0,0 +1,139 @@
+let N;
+
+(function (_N) {
+  let N;
+
+  (function (_N2) {})(N || (N = {}));
+
+  let constructor;
+
+  (function (_constructor) {})(constructor || (constructor = {}));
+
+  let length;
+
+  (function (_length) {})(length || (length = {}));
+
+  let concat;
+
+  (function (_concat) {})(concat || (concat = {}));
+
+  let copyWithin;
+
+  (function (_copyWithin) {})(copyWithin || (copyWithin = {}));
+
+  let fill;
+
+  (function (_fill) {})(fill || (fill = {}));
+
+  let find;
+
+  (function (_find) {})(find || (find = {}));
+
+  let findIndex;
+
+  (function (_findIndex) {})(findIndex || (findIndex = {}));
+
+  let lastIndexOf;
+
+  (function (_lastIndexOf) {})(lastIndexOf || (lastIndexOf = {}));
+
+  let pop;
+
+  (function (_pop) {})(pop || (pop = {}));
+
+  let push;
+
+  (function (_push) {})(push || (push = {}));
+
+  let reverse;
+
+  (function (_reverse) {})(reverse || (reverse = {}));
+
+  let shift;
+
+  (function (_shift) {})(shift || (shift = {}));
+
+  let unshift;
+
+  (function (_unshift) {})(unshift || (unshift = {}));
+
+  let slice;
+
+  (function (_slice) {})(slice || (slice = {}));
+
+  let sort;
+
+  (function (_sort) {})(sort || (sort = {}));
+
+  let splice;
+
+  (function (_splice) {})(splice || (splice = {}));
+
+  let includes;
+
+  (function (_includes) {})(includes || (includes = {}));
+
+  let indexOf;
+
+  (function (_indexOf) {})(indexOf || (indexOf = {}));
+
+  let join;
+
+  (function (_join) {})(join || (join = {}));
+
+  let keys;
+
+  (function (_keys) {})(keys || (keys = {}));
+
+  let entries;
+
+  (function (_entries) {})(entries || (entries = {}));
+
+  let values;
+
+  (function (_values) {})(values || (values = {}));
+
+  let forEach;
+
+  (function (_forEach) {})(forEach || (forEach = {}));
+
+  let filter;
+
+  (function (_filter) {})(filter || (filter = {}));
+
+  let map;
+
+  (function (_map) {})(map || (map = {}));
+
+  let every;
+
+  (function (_every) {})(every || (every = {}));
+
+  let some;
+
+  (function (_some) {})(some || (some = {}));
+
+  let reduce;
+
+  (function (_reduce) {})(reduce || (reduce = {}));
+
+  let reduceRight;
+
+  (function (_reduceRight) {})(reduceRight || (reduceRight = {}));
+
+  let toLocaleString;
+
+  (function (_toLocaleString) {})(toLocaleString || (toLocaleString = {}));
+
+  let toString;
+
+  (function (_toString) {})(toString || (toString = {}));
+
+  let flat;
+
+  (function (_flat) {})(flat || (flat = {}));
+
+  let flatMap;
+
+  (function (_flatMap) {})(flatMap || (flatMap = {}));
+})(N || (N = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/export/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/export/input.ts
new file mode 100644
index 000000000000..a27f292cbf1c
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/export/input.ts
@@ -0,0 +1 @@
+export namespace N {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/export/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/export/output.mjs
new file mode 100644
index 000000000000..edd98b8f9582
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/export/output.mjs
@@ -0,0 +1,3 @@
+export let N;
+
+(function (_N) {})(N || (N = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/fails/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/fails/input.js
deleted file mode 100644
index 4db486e32f06..000000000000
--- a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/fails/input.js
+++ /dev/null
@@ -1 +0,0 @@
-namespace N {}
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/fails/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/fails/options.json
deleted file mode 100644
index 8449a74304e1..000000000000
--- a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/fails/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Namespaces are not supported."
-}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested-export/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested-export/input.ts
new file mode 100644
index 000000000000..51ddaf01e872
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested-export/input.ts
@@ -0,0 +1,12 @@
+export module src {
+  export namespace ns1 {
+    export class foo {
+      F1: string;
+    }
+  }
+  export namespace ns2 {
+    export class foo {
+      F1: string;
+    }
+  }
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested-export/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested-export/output.mjs
new file mode 100644
index 000000000000..a3839919a8bd
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested-export/output.mjs
@@ -0,0 +1,19 @@
+export let src;
+
+(function (_src) {
+  let ns1;
+
+  (function (_ns) {
+    class foo {}
+
+    _ns.foo = foo;
+  })(ns1 || (ns1 = _src.ns1 || (_src.ns1 = {})));
+
+  let ns2;
+
+  (function (_ns2) {
+    class foo {}
+
+    _ns2.foo = foo;
+  })(ns2 || (ns2 = _src.ns2 || (_src.ns2 = {})));
+})(src || (src = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested/input.ts
new file mode 100644
index 000000000000..5a579dbf5007
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested/input.ts
@@ -0,0 +1,12 @@
+module src {
+  export namespace ns1 {
+    export class foo {
+      F1: string;
+    }
+  }
+  export namespace ns2 {
+    export class foo {
+      F1: string;
+    }
+  }
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested/output.mjs
new file mode 100644
index 000000000000..407dcf9ba825
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/module-nested/output.mjs
@@ -0,0 +1,19 @@
+let src;
+
+(function (_src) {
+  let ns1;
+
+  (function (_ns) {
+    class foo {}
+
+    _ns.foo = foo;
+  })(ns1 || (ns1 = _src.ns1 || (_src.ns1 = {})));
+
+  let ns2;
+
+  (function (_ns2) {
+    class foo {}
+
+    _ns2.foo = foo;
+  })(ns2 || (ns2 = _src.ns2 || (_src.ns2 = {})));
+})(src || (src = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/multiple/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/multiple/input.ts
new file mode 100644
index 000000000000..35c080283606
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/multiple/input.ts
@@ -0,0 +1,2 @@
+namespace N {}
+namespace N {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/multiple/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/multiple/output.mjs
new file mode 100644
index 000000000000..12b4c7a92253
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/multiple/output.mjs
@@ -0,0 +1,5 @@
+let N;
+
+(function (_N) {})(N || (N = {}));
+
+(function (_N2) {})(N || (N = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/mutable-fail/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/mutable-fail/input.ts
new file mode 100644
index 000000000000..167274d7aee5
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/mutable-fail/input.ts
@@ -0,0 +1,3 @@
+namespace N {
+  export let V;
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/mutable-fail/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/mutable-fail/options.json
new file mode 100644
index 000000000000..1a58e10cc896
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/mutable-fail/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Namespaces exporting non-const are not supported by Babel. Change to const or see: https://babeljs.io/docs/en/babel-plugin-transform-typescript"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/namespace-flag/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/namespace-flag/input.ts
new file mode 100644
index 000000000000..fe71f4004e4a
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/namespace-flag/input.ts
@@ -0,0 +1 @@
+namespace N {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/namespace-flag/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/namespace-flag/options.json
new file mode 100644
index 000000000000..186a430133f0
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/namespace-flag/options.json
@@ -0,0 +1,4 @@
+{
+  "throws": "Namespace not marked type-only declare. Non-declarative namespaces are only supported experimentally in Babel. To enable and review caveats see: https://babeljs.io/docs/en/babel-plugin-transform-typescript",
+  "plugins": [["transform-typescript", { "allowNamespaces": false }]]
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/nested/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/nested/input.ts
new file mode 100644
index 000000000000..87dd9140b28f
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/nested/input.ts
@@ -0,0 +1,26 @@
+class A { }
+namespace A {
+  export namespace C {
+    export class G {}
+    export const E = 7;
+  }
+  function M() {}
+  namespace M {
+    export const N = C.E;
+  }
+  export function D() {}
+  export namespace D {
+    const C = 5;
+    export enum H {
+      I = 11,
+      J = 13,
+      K = 17,
+    }
+  }
+  class F {}
+  namespace F {}
+  namespace G {}
+  enum L {
+    M = 19,
+  }
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/nested/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/nested/output.mjs
new file mode 100644
index 000000000000..1e85423d2c94
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/nested/output.mjs
@@ -0,0 +1,49 @@
+class A {}
+
+(function (_A) {
+  let C;
+
+  (function (_C) {
+    class G {}
+
+    _C.G = G;
+    const E = _C.E = 7;
+  })(C || (C = _A.C || (_A.C = {})));
+
+  function M() {}
+
+  (function (_M) {
+    const N = _M.N = C.E;
+  })(M || (M = {}));
+
+  function D() {}
+
+  _A.D = D;
+
+  (function (_D) {
+    const C = 5;
+    let H;
+
+    (function (H) {
+      H[H["I"] = 11] = "I";
+      H[H["J"] = 13] = "J";
+      H[H["K"] = 17] = "K";
+    })(H || (H = {}));
+
+    _D.H = H;
+  })(D || (D = _A.D || (_A.D = {})));
+
+  class F {}
+
+  (function (_F) {})(F || (F = {}));
+
+  let G;
+
+  (function (_G) {})(G || (G = {}));
+
+  let L;
+
+  (function (L) {
+    L[L["M"] = 19] = "M";
+  })(L || (L = {}));
+})(A || (A = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/options.json
new file mode 100644
index 000000000000..97510b096f8c
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": [["transform-typescript", { "allowNamespaces": true }]],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/same-name/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/same-name/input.ts
new file mode 100644
index 000000000000..ff59e9d4fa36
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/same-name/input.ts
@@ -0,0 +1,12 @@
+namespace N {
+  namespace _N7 {}
+  export namespace N {
+    export function _N3() {}
+  }
+  export namespace N {
+    export class _N5 {}
+  }
+  export namespace N {
+    export enum _N {}
+  }
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/same-name/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/same-name/output.mjs
new file mode 100644
index 000000000000..b8db977b690f
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/same-name/output.mjs
@@ -0,0 +1,29 @@
+let N;
+
+(function (_N2) {
+  let _N7;
+
+  (function (_N4) {})(_N7 || (_N7 = {}));
+
+  let N;
+
+  (function (_N6) {
+    function _N3() {}
+
+    _N6._N3 = _N3;
+  })(N || (N = _N2.N || (_N2.N = {})));
+
+  (function (_N8) {
+    class _N5 {}
+
+    _N8._N5 = _N5;
+  })(N || (N = _N2.N || (_N2.N = {})));
+
+  (function (_N9) {
+    let _N;
+
+    (function (_N) {})(_N || (_N = {}));
+
+    _N9._N = _N;
+  })(N || (N = _N2.N || (_N2.N = {})));
+})(N || (N = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/undeclared/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/undeclared/input.ts
new file mode 100644
index 000000000000..fe71f4004e4a
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/undeclared/input.ts
@@ -0,0 +1 @@
+namespace N {}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/namespace/undeclared/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/undeclared/output.mjs
new file mode 100644
index 000000000000..eca9b4570a75
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/namespace/undeclared/output.mjs
@@ -0,0 +1,3 @@
+let N;
+
+(function (_N) {})(N || (N = {}));
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/input.ts b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/input.ts
new file mode 100644
index 000000000000..350b30f5eb5d
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/input.ts
@@ -0,0 +1 @@
+export default 2;
\ No newline at end of file
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/options.json b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/options.json
new file mode 100644
index 000000000000..d70f2d214aa4
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["./plugin.js", "transform-typescript"],
+  "sourceType": "module"
+}
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/output.mjs
new file mode 100644
index 000000000000..6b7714ba4938
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/output.mjs
@@ -0,0 +1,3 @@
+const foo = 2;
+export default foo;
+["The exported identifier \"foo\" is not declared in Babel's scope tracker\nas a JavaScript value binding, and \"@babel/plugin-transform-typescript\"\nnever encountered it as a TypeScript type declaration.\nIt will be treated as a JavaScript value.\n\nThis problem is likely caused by another plugin injecting\n\"foo\" without registering it in the scope tracker. If you are the author\n of that plugin, please use \"scope.registerDeclaration(declarationPath)\"."];
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/plugin.js b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/plugin.js
new file mode 100644
index 000000000000..ce5dbd4fd093
--- /dev/null
+++ b/packages/babel-plugin-transform-typescript/test/fixtures/regression/10162/plugin.js
@@ -0,0 +1,30 @@
+"use strict";
+
+module.exports = function({ template, types: t }) {
+  const warnings = [];
+  let consoleWarn;
+
+  return {
+    pre() {
+      consoleWarn = console.warn;
+      console.warn = msg => warnings.push(msg);
+    },
+
+    post({ path }) {
+      console.warn = consoleWarn;
+
+      const stmt = t.expressionStatement(t.valueToNode(warnings));
+      path.pushContainer("body", stmt);
+    },
+
+    visitor: {
+      ExportDefaultDeclaration(path) {
+        path.insertBefore(template.statement.ast`
+          const foo = ${path.node.declaration};
+        `);
+
+        path.node.declaration = t.identifier("foo");
+      },
+    },
+  };
+};
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/call/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/call/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/call/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/call/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/new/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/new/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/new/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/new/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tagged-template/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tagged-template/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tagged-template/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tagged-template/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tsx/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tsx/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tsx/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/type-arguments/tsx/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/exclamation/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/exclamation/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/exclamation/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/exclamation/input.ts
diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/types-erased/input.js b/packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/types-erased/input.ts
similarity index 100%
rename from packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/types-erased/input.js
rename to packages/babel-plugin-transform-typescript/test/fixtures/variable-declaration/types-erased/input.ts
diff --git a/packages/babel-plugin-transform-unicode-regex/package.json b/packages/babel-plugin-transform-unicode-regex/package.json
index 53587d4fbeb8..32610f9c7d4b 100644
--- a/packages/babel-plugin-transform-unicode-regex/package.json
+++ b/packages/babel-plugin-transform-unicode-regex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/plugin-transform-unicode-regex",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Compile ES2015 Unicode regex to ES5",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-unicode-regex",
   "license": "MIT",
@@ -13,14 +13,14 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-regex": "^7.0.0",
-    "regexpu-core": "^4.1.3"
+    "@babel/helper-regex": "^7.4.4",
+    "regexpu-core": "^4.5.4"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.4.4",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-plugin-transform-unicode-regex/src/index.js b/packages/babel-plugin-transform-unicode-regex/src/index.js
index 6b0e434ddad9..88593e055917 100644
--- a/packages/babel-plugin-transform-unicode-regex/src/index.js
+++ b/packages/babel-plugin-transform-unicode-regex/src/index.js
@@ -6,6 +6,8 @@ export default declare(api => {
   api.assertVersion(7);
 
   return {
+    name: "transform-unicode-regex",
+
     visitor: {
       RegExpLiteral({ node }) {
         if (!regex.is(node, "u")) return;
diff --git a/packages/babel-polyfill/README.md b/packages/babel-polyfill/README.md
index 5f29e0f5a795..b02409f27f2d 100644
--- a/packages/babel-polyfill/README.md
+++ b/packages/babel-polyfill/README.md
@@ -2,6 +2,9 @@
 
 > Provides polyfills necessary for a full ES2015+ environment
 
+
+**This package has been deprecated in favor of separate inclusion of required parts of [`core-js`](https://github.com/zloirock/core-js) and [`regenerator-runtime`](https://www.npmjs.com/package/regenerator-runtime). See our website [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill.html) for more information.**
+
 See our website [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill.html) for more information or the [issues](https://github.com/babel/babel/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%22pkg%3A%20polyfill%22+is%3Aopen) associated with this package.
 
 ## Install
@@ -9,11 +12,11 @@ See our website [@babel/polyfill](https://babeljs.io/docs/en/next/babel-polyfill
 Using npm:
 
 ```sh
-npm install --save-dev @babel/polyfill
+npm install --save @babel/polyfill
 ```
 
 or using yarn:
 
 ```sh
-yarn add @babel/polyfill --dev
-```
+yarn add @babel/polyfill 
+```
\ No newline at end of file
diff --git a/packages/babel-polyfill/package.json b/packages/babel-polyfill/package.json
index 3e5ed2cba3ee..9fb6d4b92eea 100644
--- a/packages/babel-polyfill/package.json
+++ b/packages/babel-polyfill/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/polyfill",
-  "version": "7.0.0",
+  "version": "7.4.4",
   "description": "Provides polyfills necessary for a full ES2015+ environment",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -11,7 +11,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-polyfill",
   "main": "lib/index.js",
   "dependencies": {
-    "core-js": "^2.5.7",
-    "regenerator-runtime": "^0.12.0"
+    "core-js": "^2.6.5",
+    "regenerator-runtime": "^0.13.2"
   }
 }
diff --git a/packages/babel-polyfill/src/index.js b/packages/babel-polyfill/src/index.js
index d2bea4df332d..aa1b4639f18f 100644
--- a/packages/babel-polyfill/src/index.js
+++ b/packages/babel-polyfill/src/index.js
@@ -1,20 +1,6 @@
-// Cover all standardized ES6 APIs.
-import "core-js/es6";
+import "./noConflict";
 
-// Standard now
-import "core-js/fn/array/includes";
-import "core-js/fn/string/pad-start";
-import "core-js/fn/string/pad-end";
-import "core-js/fn/symbol/async-iterator";
-import "core-js/fn/object/get-own-property-descriptors";
-import "core-js/fn/object/values";
-import "core-js/fn/object/entries";
-import "core-js/fn/promise/finally";
-
-// Ensure that we polyfill ES6 compat for anything web-related, if it exists.
-import "core-js/web";
-
-import "regenerator-runtime/runtime";
+import global from "core-js/library/fn/global";
 
 if (global._babelPolyfill && typeof console !== "undefined" && console.warn) {
   console.warn(
diff --git a/packages/babel-polyfill/src/noConflict.js b/packages/babel-polyfill/src/noConflict.js
index ec7c002ffffe..9e2bcad5d8c1 100644
--- a/packages/babel-polyfill/src/noConflict.js
+++ b/packages/babel-polyfill/src/noConflict.js
@@ -3,8 +3,11 @@ import "core-js/es6";
 
 // Standard now
 import "core-js/fn/array/includes";
+import "core-js/fn/array/flat-map";
 import "core-js/fn/string/pad-start";
 import "core-js/fn/string/pad-end";
+import "core-js/fn/string/trim-start";
+import "core-js/fn/string/trim-end";
 import "core-js/fn/symbol/async-iterator";
 import "core-js/fn/object/get-own-property-descriptors";
 import "core-js/fn/object/values";
diff --git a/packages/babel-preset-env-standalone/package.json b/packages/babel-preset-env-standalone/package.json
index 5f799bb5c835..410419bb4d58 100644
--- a/packages/babel-preset-env-standalone/package.json
+++ b/packages/babel-preset-env-standalone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/preset-env-standalone",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Standalone build of babel-prest-env for use in non-Node.js environments.",
   "main": "babel-preset-env.js",
   "files": [
@@ -9,10 +9,12 @@
     "src"
   ],
   "devDependencies": {
+    "@babel/plugin-proposal-dynamic-import": "^7.5.0",
     "@babel/plugin-proposal-json-strings": "^7.0.0",
-    "@babel/plugin-transform-new-target": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/standalone": "^7.0.0"
+    "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+    "@babel/plugin-transform-new-target": "^7.4.4",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/standalone": "^7.5.5"
   },
   "keywords": [
     "babel",
diff --git a/packages/babel-preset-env-standalone/scripts/prepublish.js b/packages/babel-preset-env-standalone/scripts/prepublish.js
new file mode 100644
index 000000000000..bff650fb032d
--- /dev/null
+++ b/packages/babel-preset-env-standalone/scripts/prepublish.js
@@ -0,0 +1,11 @@
+// This file is executed by lerna before publishing,
+// @babel/preset-env-standalone so that it has the
+// new version and not the old one.
+
+require("child_process").execSync(
+  "make prepublish-build-preset-env-standalone",
+  {
+    cwd: require("path").resolve(__dirname, "../../.."),
+    stdio: "inherit",
+  }
+);
diff --git a/packages/babel-preset-env-standalone/src/available-plugins.js b/packages/babel-preset-env-standalone/src/available-plugins.js
index b149f981bb36..9d9e68640234 100644
--- a/packages/babel-preset-env-standalone/src/available-plugins.js
+++ b/packages/babel-preset-env-standalone/src/available-plugins.js
@@ -1,8 +1,10 @@
 import { availablePlugins, registerPlugin } from "@babel/standalone";
 
 const notIncludedPlugins = {
+  "transform-named-capturing-groups-regex": require("@babel/plugin-transform-named-capturing-groups-regex"),
   "transform-new-target": require("@babel/plugin-transform-new-target"),
   "proposal-json-strings": require("@babel/plugin-proposal-json-strings"),
+  "proposal-dynamic-import": require("@babel/plugin-proposal-dynamic-import"),
 };
 
 Object.keys(notIncludedPlugins).forEach(pluginName => {
diff --git a/packages/babel-preset-env/CONTRIBUTING.md b/packages/babel-preset-env/CONTRIBUTING.md
index 5b485a6935ef..de861d996e6d 100644
--- a/packages/babel-preset-env/CONTRIBUTING.md
+++ b/packages/babel-preset-env/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-## Adding a new plugin to support (when approved in the next ECMAScript version)
+## Adding a new plugin or polyfill to support (when approved in the next ECMAScript version)
 
 ### Update [`plugin-features.js`](https://github.com/babel/babel/blob/master/packages/babel-preset-env/data/plugin-features.js)
 
@@ -27,7 +27,7 @@ And add them in this structure:
 },
 ```
 
-### Update [`built-in-features.js`](https://github.com/babel/babel/blob/master/packages/babel-preset-env/data/built-in-features.js)
+### Update data for `core-js@2` polyfilling
 
 *Example:*
 
@@ -38,19 +38,29 @@ and split it with `/`:
 
 `Object static methods / Object.values`
 
-Find the corresponding module on [core-js](https://github.com/zloirock/core-js/tree/master/modules):
+Find the corresponding module on [`core-js@2`](https://github.com/zloirock/core-js/tree/v2/modules):
 
 `es7.object.values.js`
 
-Find required ES version in [`built-in-features.js`](https://github.com/babel/babel/blob/master/packages/babel-preset-env/data/built-in-features.js) and add the new feature:
+Find required ES version in [`corejs2-built-in-features.js`](https://github.com/babel/babel/blob/master/packages/babel-preset-env/data/corejs2-built-in-features.js) and add the new feature:
 
 ```js
-const es2017 = {
+const es = {
   //...
   "es7.object.values": "Object static methods / Object.values"
 }
 ```
 
+If you wan to transform a new built-in by `useBuiltIns: 'usage'`, add mapping to related `core-js` modules to [this file](https://github.com/babel/babel/blob/master/packages/babel-preset-env/polyfills/corejs2/built-in-definitions.js).
+
+### Update data for `core-js@3` polyfilling
+
+Just update the version of [`core-js-compat`](https://github.com/zloirock/core-js/tree/master/packages/core-js-compat) in dependencies.
+
+If you wan to transform a new built-in by `useBuiltIns: 'usage'`, add mapping to related [`core-js`](https://github.com/zloirock/core-js/tree/master/packages/core-js/modules) modules to [this file](https://github.com/babel/babel/blob/master/packages/babel-preset-env/polyfills/corejs3/built-in-definitions.js).
+
+If you want to mark a new proposal as shipped, add it to [this list](https://github.com/babel/babel/blob/master/packages/babel-preset-env/polyfills/corejs3/shipped-proposals.js).
+
 ### Update [`plugins.json`](https://github.com/babel/babel/blob/master/packages/babel-preset-env/data/plugins.json)
 
 Until `compat-table` is a standalone npm module for data we are using the git url
diff --git a/packages/babel-preset-env/data/built-in-features.js b/packages/babel-preset-env/data/built-in-features.js
deleted file mode 100644
index b8672b091ea5..000000000000
--- a/packages/babel-preset-env/data/built-in-features.js
+++ /dev/null
@@ -1,331 +0,0 @@
-const typedArrayMethods = [
-  "typed arrays / %TypedArray%.from",
-  "typed arrays / %TypedArray%.of",
-  "typed arrays / %TypedArray%.prototype.subarray",
-  "typed arrays / %TypedArray%.prototype.join",
-  "typed arrays / %TypedArray%.prototype.indexOf",
-  "typed arrays / %TypedArray%.prototype.lastIndexOf",
-  "typed arrays / %TypedArray%.prototype.slice",
-  "typed arrays / %TypedArray%.prototype.every",
-  "typed arrays / %TypedArray%.prototype.filter",
-  "typed arrays / %TypedArray%.prototype.forEach",
-  "typed arrays / %TypedArray%.prototype.map",
-  "typed arrays / %TypedArray%.prototype.reduce",
-  "typed arrays / %TypedArray%.prototype.reduceRight",
-  "typed arrays / %TypedArray%.prototype.reverse",
-  "typed arrays / %TypedArray%.prototype.some",
-  "typed arrays / %TypedArray%.prototype.sort",
-  "typed arrays / %TypedArray%.prototype.copyWithin",
-  "typed arrays / %TypedArray%.prototype.find",
-  "typed arrays / %TypedArray%.prototype.findIndex",
-  "typed arrays / %TypedArray%.prototype.fill",
-  "typed arrays / %TypedArray%.prototype.keys",
-  "typed arrays / %TypedArray%.prototype.values",
-  "typed arrays / %TypedArray%.prototype.entries",
-  "typed arrays / %TypedArray%.prototype[Symbol.iterator]",
-  "typed arrays / %TypedArray%[Symbol.species]",
-];
-
-const es = {
-  // compat-table missing babel6 mapping
-  // "es6.array.concat": {
-  //   features: [
-  //     "well-known symbols / Symbol.isConcatSpreadable",
-  //     "well-known symbols / Symbol.species, Array.prototype.concat",
-  //   ]
-  // },
-  "es6.array.copy-within": "Array.prototype methods / Array.prototype.copyWithin",
-  "es6.array.every": "Array methods / Array.prototype.every",
-  "es6.array.fill": "Array.prototype methods / Array.prototype.fill",
-  "es6.array.filter": {
-    features: [
-      "Array methods / Array.prototype.filter",
-      // compat-table missing babel6 mapping
-      // "well-known symbols / Symbol.species, Array.prototype.filter",
-    ],
-  },
-  "es6.array.find": "Array.prototype methods / Array.prototype.find",
-  "es6.array.find-index": "Array.prototype methods / Array.prototype.findIndex",
-  "es6.array.for-each": "Array methods / Array.prototype.forEach",
-  "es6.array.from": "Array static methods / Array.from",
-  "es7.array.includes": "Array.prototype.includes",
-  "es6.array.index-of": "Array methods / Array.prototype.indexOf",
-  "es6.array.is-array": "Array methods / Array.isArray",
-  // "es.array.join": "", required tests for that
-  "es6.array.iterator": {
-    features: [
-      "Array.prototype methods / Array.prototype.keys",
-      // can use Symbol.iterator, not implemented in many environments
-      // "Array.prototype methods / Array.prototype.values",
-      "Array.prototype methods / Array.prototype.entries",
-    ],
-  },
-  "es6.array.last-index-of": "Array methods / Array.prototype.lastIndexOf",
-  "es6.array.map": {
-    features: [
-      "Array methods / Array.prototype.map",
-      // compat-table missing babel6 mapping
-      // "well-known symbols / Symbol.species, Array.prototype.map",
-    ],
-  },
-  "es6.array.of": "Array static methods / Array.of",
-  "es6.array.reduce": "Array methods / Array.prototype.reduce",
-  "es6.array.reduce-right": "Array methods / Array.prototype.reduceRight",
-  // compat-table missing babel6 mapping
-  // "es6.array.slice": "well-known symbols / Symbol.species, Array.prototype.slice",
-  "es6.array.some": "Array methods / Array.prototype.some",
-  "es6.array.sort": "Array methods / Array.prototype.sort",
-  "es6.array.species": "Array static methods / Array[Symbol.species]",
-  // compat-table missing babel6 mapping
-  //"es6.array.splice": "well-known symbols / Symbol.species, Array.prototype.splice",
-
-  "es6.date.now": "Date methods / Date.now",
-  "es6.date.to-iso-string": "Date methods / Date.prototype.toISOString",
-  "es6.date.to-json": "Date methods / Date.prototype.toJSON",
-  "es6.date.to-primitive": "Date.prototype[Symbol.toPrimitive]",
-  "es6.date.to-string": "miscellaneous / Invalid Date",
-
-  "es6.function.bind": "Function.prototype.bind",
-  "es6.function.has-instance": "well-known symbols / Symbol.hasInstance",
-  "es6.function.name": {
-    features: [
-      "function \"name\" property / function statements",
-      "function \"name\" property / function expressions",
-    ],
-  },
-
-  "es6.map": "Map",
-
-  "es6.math.acosh": "Math methods / Math.acosh",
-  "es6.math.asinh": "Math methods / Math.asinh",
-  "es6.math.atanh": "Math methods / Math.atanh",
-  "es6.math.cbrt": "Math methods / Math.cbrt",
-  "es6.math.clz32": "Math methods / Math.clz32",
-  "es6.math.cosh": "Math methods / Math.cosh",
-  "es6.math.expm1": "Math methods / Math.expm1",
-  "es6.math.fround": "Math methods / Math.fround",
-  "es6.math.hypot": "Math methods / Math.hypot",
-  "es6.math.imul": "Math methods / Math.imul",
-  "es6.math.log1p": "Math methods / Math.log1p",
-  "es6.math.log10": "Math methods / Math.log10",
-  "es6.math.log2": "Math methods / Math.log2",
-  "es6.math.sign": "Math methods / Math.sign",
-  "es6.math.sinh": "Math methods / Math.sinh",
-  "es6.math.tanh": "Math methods / Math.tanh",
-  "es6.math.trunc": "Math methods / Math.trunc",
-
-  "es6.number.constructor": {
-    features: [
-      "octal and binary literals / octal supported by Number()",
-      "octal and binary literals / binary supported by Number()",
-    ],
-  },
-  "es6.number.epsilon": "Number properties / Number.EPSILON",
-  "es6.number.is-finite": "Number properties / Number.isFinite",
-  "es6.number.is-integer": "Number properties / Number.isInteger",
-  "es6.number.is-nan": "Number properties / Number.isNaN",
-  "es6.number.is-safe-integer": "Number properties / Number.isSafeInteger",
-  "es6.number.max-safe-integer": "Number properties / Number.MAX_SAFE_INTEGER",
-  "es6.number.min-safe-integer": "Number properties / Number.MIN_SAFE_INTEGER",
-  "es6.number.parse-float": "Number properties / Number.parseFloat",
-  "es6.number.parse-int": "Number properties / Number.parseInt",
-
-  "es6.object.assign": {
-    features: ["Object static methods / Object.assign", "Symbol"],
-  },
-  "es6.object.create": "Object static methods / Object.create",
-  "es7.object.define-getter": {
-    features: [
-      "Object.prototype getter/setter methods / __defineGetter__",
-      "Object.prototype getter/setter methods / __defineGetter__, symbols",
-      "Object.prototype getter/setter methods / __defineGetter__, ToObject(this)",
-    ],
-  },
-  "es7.object.define-setter": {
-    features: [
-      "Object.prototype getter/setter methods / __defineSetter__",
-      "Object.prototype getter/setter methods / __defineSetter__, symbols",
-      "Object.prototype getter/setter methods / __defineSetter__, ToObject(this)",
-    ],
-  },
-  "es6.object.define-property": "Object static methods / Object.defineProperty",
-  "es6.object.define-properties": "Object static methods / Object.defineProperties",
-  "es7.object.entries": "Object static methods / Object.entries",
-  "es6.object.freeze": "Object static methods accept primitives / Object.freeze",
-  "es6.object.get-own-property-descriptor": "Object static methods accept primitives / Object.getOwnPropertyDescriptor",
-  "es7.object.get-own-property-descriptors": "Object static methods / Object.getOwnPropertyDescriptors",
-  "es6.object.get-own-property-names": "Object static methods accept primitives / Object.getOwnPropertyNames",
-  "es6.object.get-prototype-of": "Object static methods accept primitives / Object.getPrototypeOf",
-  "es7.object.lookup-getter": {
-    features: [
-      "Object.prototype getter/setter methods / __lookupGetter__",
-      "Object.prototype getter/setter methods / __lookupGetter__, prototype chain",
-      "Object.prototype getter/setter methods / __lookupGetter__, symbols",
-      "Object.prototype getter/setter methods / __lookupGetter__, ToObject(this)",
-      "Object.prototype getter/setter methods / __lookupGetter__, data properties can shadow accessors",
-    ],
-  },
-  "es7.object.lookup-setter": {
-    features: [
-      "Object.prototype getter/setter methods / __lookupSetter__",
-      "Object.prototype getter/setter methods / __lookupSetter__, prototype chain",
-      "Object.prototype getter/setter methods / __lookupSetter__, symbols",
-      "Object.prototype getter/setter methods / __lookupSetter__, ToObject(this)",
-      "Object.prototype getter/setter methods / __lookupSetter__, data properties can shadow accessors",
-    ],
-  },
-  "es6.object.prevent-extensions": "Object static methods accept primitives / Object.preventExtensions",
-  "es6.object.is": "Object static methods / Object.is",
-  "es6.object.is-frozen": "Object static methods accept primitives / Object.isFrozen",
-  "es6.object.is-sealed": "Object static methods accept primitives / Object.isSealed",
-  "es6.object.is-extensible": "Object static methods accept primitives / Object.isExtensible",
-  "es6.object.keys": "Object static methods accept primitives / Object.keys",
-  "es6.object.seal": "Object static methods accept primitives / Object.seal",
-  "es6.object.set-prototype-of": "Object static methods / Object.setPrototypeOf",
-  "es7.object.values": "Object static methods / Object.values",
-
-  "es6.promise": {
-    features: [
-      // required unhandled rejection tracking tests
-      "Promise",
-      "well-known symbols / Symbol.species, Promise.prototype.then",
-    ],
-  },
-  "es7.promise.finally": "Promise.prototype.finally",
-
-  "es6.reflect.apply": "Reflect / Reflect.apply",
-  "es6.reflect.construct": "Reflect / Reflect.construct",
-  "es6.reflect.define-property": "Reflect / Reflect.defineProperty",
-  "es6.reflect.delete-property": "Reflect / Reflect.deleteProperty",
-  "es6.reflect.get": "Reflect / Reflect.get",
-  "es6.reflect.get-own-property-descriptor": "Reflect / Reflect.getOwnPropertyDescriptor",
-  "es6.reflect.get-prototype-of": "Reflect / Reflect.getPrototypeOf",
-  "es6.reflect.has": "Reflect / Reflect.has",
-  "es6.reflect.is-extensible": "Reflect / Reflect.isExtensible",
-  "es6.reflect.own-keys": "Reflect / Reflect.ownKeys",
-  "es6.reflect.prevent-extensions": "Reflect / Reflect.preventExtensions",
-  "es6.reflect.set": "Reflect / Reflect.set",
-  "es6.reflect.set-prototype-of": "Reflect / Reflect.setPrototypeOf",
-
-  "es6.regexp.constructor": {
-    features: [
-      "miscellaneous / RegExp constructor can alter flags",
-      "well-known symbols / Symbol.match, RegExp constructor",
-    ],
-  },
-  "es6.regexp.flags": "RegExp.prototype properties / RegExp.prototype.flags",
-  "es6.regexp.match": "RegExp.prototype properties / RegExp.prototype[Symbol.match]",
-  "es6.regexp.replace": "RegExp.prototype properties / RegExp.prototype[Symbol.replace]",
-  "es6.regexp.split": "RegExp.prototype properties / RegExp.prototype[Symbol.split]",
-  "es6.regexp.search": "RegExp.prototype properties / RegExp.prototype[Symbol.search]",
-  "es6.regexp.to-string": "miscellaneous / RegExp.prototype.toString generic and uses \"flags\" property",
-
-  // This is explicit due to prevent the stage-1 Set proposals under the
-  // category "Set methods" from being included.
-  "es6.set": {
-    features: [
-      "Set / basic functionality",
-      "Set / constructor arguments",
-      "Set / constructor requires new",
-      "Set / constructor accepts null",
-      "Set / constructor invokes add",
-      "Set / iterator closing",
-      "Set / Set.prototype.add returns this",
-      "Set / -0 key converts to +0",
-      "Set / Set.prototype.size",
-      "Set / Set.prototype.delete",
-      "Set / Set.prototype.clear",
-      "Set / Set.prototype.forEach",
-      "Set / Set.prototype.keys",
-      "Set / Set.prototype.values",
-      "Set / Set.prototype.entries",
-      "Set / Set.prototype[Symbol.iterator]",
-      "Set / Set.prototype isn't an instance",
-      "Set / Set iterator prototype chain",
-      "Set / Set[Symbol.species]",
-    ],
-  },
-
-  "es6.symbol": {
-    features: [
-      "Symbol",
-      "Object static methods / Object.getOwnPropertySymbols",
-      "well-known symbols / Symbol.hasInstance",
-      "well-known symbols / Symbol.isConcatSpreadable",
-      "well-known symbols / Symbol.iterator",
-      "well-known symbols / Symbol.match",
-      "well-known symbols / Symbol.replace",
-      "well-known symbols / Symbol.search",
-      "well-known symbols / Symbol.species",
-      "well-known symbols / Symbol.split",
-      "well-known symbols / Symbol.toPrimitive",
-      "well-known symbols / Symbol.toStringTag",
-      "well-known symbols / Symbol.unscopables",
-    ],
-  },
-  "es7.symbol.async-iterator": "Asynchronous Iterators",
-
-  "es6.string.anchor": "String.prototype HTML methods",
-  "es6.string.big": "String.prototype HTML methods",
-  "es6.string.blink": "String.prototype HTML methods",
-  "es6.string.bold": "String.prototype HTML methods",
-  "es6.string.code-point-at": "String.prototype methods / String.prototype.codePointAt",
-  "es6.string.ends-with": "String.prototype methods / String.prototype.endsWith",
-  "es6.string.fixed": "String.prototype HTML methods",
-  "es6.string.fontcolor": "String.prototype HTML methods",
-  "es6.string.fontsize": "String.prototype HTML methods",
-  "es6.string.from-code-point": "String static methods / String.fromCodePoint",
-  "es6.string.includes": "String.prototype methods / String.prototype.includes",
-  "es6.string.italics": "String.prototype HTML methods",
-  "es6.string.iterator": "String.prototype methods / String.prototype[Symbol.iterator]",
-  "es6.string.link": "String.prototype HTML methods",
-  // "String.prototype methods / String.prototype.normalize" not implemented
-  "es7.string.pad-start": "String padding / String.prototype.padStart",
-  "es7.string.pad-end": "String padding / String.prototype.padEnd",
-  "es6.string.raw": "String static methods / String.raw",
-  "es6.string.repeat": "String.prototype methods / String.prototype.repeat",
-  "es6.string.small": "String.prototype HTML methods",
-  "es6.string.starts-with": "String.prototype methods / String.prototype.startsWith",
-  "es6.string.strike": "String.prototype HTML methods",
-  "es6.string.sub": "String.prototype HTML methods",
-  "es6.string.sup": "String.prototype HTML methods",
-  "es6.string.trim": "String properties and methods / String.prototype.trim",
-
-  "es6.typed.array-buffer": "typed arrays / ArrayBuffer[Symbol.species]",
-  "es6.typed.data-view": "typed arrays / DataView",
-  "es6.typed.int8-array": {
-    features: ["typed arrays / Int8Array"].concat(typedArrayMethods),
-  },
-  "es6.typed.uint8-array": {
-    features: ["typed arrays / Uint8Array"].concat(typedArrayMethods),
-  },
-  "es6.typed.uint8-clamped-array": {
-    features: ["typed arrays / Uint8ClampedArray"].concat(typedArrayMethods),
-  },
-  "es6.typed.int16-array": {
-    features: ["typed arrays / Int16Array"].concat(typedArrayMethods),
-  },
-  "es6.typed.uint16-array": {
-    features: ["typed arrays / Uint16Array"].concat(typedArrayMethods),
-  },
-  "es6.typed.int32-array": {
-    features: ["typed arrays / Int32Array"].concat(typedArrayMethods),
-  },
-  "es6.typed.uint32-array": {
-    features: ["typed arrays / Uint32Array"].concat(typedArrayMethods),
-  },
-  "es6.typed.float32-array": {
-    features: ["typed arrays / Float32Array"].concat(typedArrayMethods),
-  },
-  "es6.typed.float64-array": {
-    features: ["typed arrays / Float64Array"].concat(typedArrayMethods),
-  },
-
-  "es6.weak-map": "WeakMap",
-
-  "es6.weak-set": "WeakSet",
-};
-
-const proposals = require("./shipped-proposals").builtIns;
-
-module.exports = Object.assign({}, es, proposals);
diff --git a/packages/babel-preset-env/data/built-in-modules.json b/packages/babel-preset-env/data/built-in-modules.json
index 9bd7f2aa0016..5bada5f51b38 100644
--- a/packages/babel-preset-env/data/built-in-modules.json
+++ b/packages/babel-preset-env/data/built-in-modules.json
@@ -6,6 +6,7 @@
     "safari": "10.1",
     "opera": "48",
     "ios_saf": "10.3",
-    "and_ff": "60"
+    "and_chr": "71",
+    "and_ff": "64"
   }
 }
diff --git a/packages/babel-preset-env/data/built-ins.json b/packages/babel-preset-env/data/built-ins.json
deleted file mode 100644
index a22f5d446032..000000000000
--- a/packages/babel-preset-env/data/built-ins.json
+++ /dev/null
@@ -1,1445 +0,0 @@
-{
-  "es6.array.copy-within": {
-    "chrome": "45",
-    "edge": "12",
-    "firefox": "32",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "32",
-    "electron": "0.35"
-  },
-  "es6.array.every": {
-    "chrome": "5",
-    "opera": "10.10",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.fill": {
-    "chrome": "45",
-    "edge": "12",
-    "firefox": "31",
-    "safari": "7.1",
-    "node": "4",
-    "ios": "8",
-    "opera": "32",
-    "electron": "0.35"
-  },
-  "es6.array.filter": {
-    "chrome": "5",
-    "opera": "10.10",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.find": {
-    "chrome": "45",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "4",
-    "ios": "8",
-    "opera": "32",
-    "electron": "0.35"
-  },
-  "es6.array.find-index": {
-    "chrome": "45",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "4",
-    "ios": "8",
-    "opera": "32",
-    "electron": "0.35"
-  },
-  "es6.array.for-each": {
-    "chrome": "5",
-    "opera": "10.10",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.from": {
-    "chrome": "51",
-    "edge": "15",
-    "firefox": "36",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es7.array.includes": {
-    "chrome": "47",
-    "edge": "14",
-    "firefox": "43",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "34",
-    "electron": "0.36"
-  },
-  "es6.array.index-of": {
-    "chrome": "5",
-    "opera": "10.10",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.is-array": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "4",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.iterator": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "28",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.array.last-index-of": {
-    "chrome": "5",
-    "opera": "10.10",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.map": {
-    "chrome": "5",
-    "opera": "10.10",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.of": {
-    "chrome": "45",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "32",
-    "electron": "0.35"
-  },
-  "es6.array.reduce": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "3",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.reduce-right": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "3",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.some": {
-    "chrome": "5",
-    "opera": "10.10",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.array.sort": {
-    "chrome": "63",
-    "opera": "50",
-    "edge": "12",
-    "firefox": "5",
-    "safari": "10.1",
-    "ie": "9",
-    "ios": "10.3",
-    "electron": "3"
-  },
-  "es6.array.species": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.date.now": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.date.to-iso-string": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "3.5",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.date.to-json": {
-    "chrome": "5",
-    "opera": "12.10",
-    "edge": "12",
-    "firefox": "4",
-    "safari": "10",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "10",
-    "electron": "1.1"
-  },
-  "es6.date.to-primitive": {
-    "chrome": "47",
-    "edge": "15",
-    "firefox": "44",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "34",
-    "electron": "0.36"
-  },
-  "es6.date.to-string": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "3.1",
-    "node": "0.12",
-    "ie": "10",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.function.bind": {
-    "chrome": "7",
-    "opera": "12",
-    "edge": "12",
-    "firefox": "4",
-    "safari": "5.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "7"
-  },
-  "es6.function.has-instance": {
-    "chrome": "51",
-    "edge": "15",
-    "firefox": "50",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.function.name": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "2",
-    "safari": "4",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.map": {
-    "chrome": "51",
-    "edge": "15",
-    "firefox": "53",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.math.acosh": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.asinh": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.atanh": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.cbrt": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.clz32": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "31",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.cosh": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.expm1": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.fround": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "26",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.hypot": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "27",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.imul": {
-    "chrome": "30",
-    "edge": "12",
-    "firefox": "23",
-    "safari": "7",
-    "node": "0.12",
-    "android": "4.4",
-    "ios": "7",
-    "opera": "17",
-    "electron": "0.2"
-  },
-  "es6.math.log1p": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.log10": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.log2": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.sign": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.sinh": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.tanh": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.math.trunc": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "7.1",
-    "node": "0.12",
-    "ios": "8",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.number.constructor": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "36",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.number.epsilon": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es6.number.is-finite": {
-    "chrome": "19",
-    "edge": "12",
-    "firefox": "16",
-    "safari": "9",
-    "node": "0.12",
-    "android": "4.1",
-    "ios": "9",
-    "electron": "0.2"
-  },
-  "es6.number.is-integer": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "16",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es6.number.is-nan": {
-    "chrome": "19",
-    "edge": "12",
-    "firefox": "15",
-    "safari": "9",
-    "node": "0.12",
-    "android": "4.1",
-    "ios": "9",
-    "electron": "0.2"
-  },
-  "es6.number.is-safe-integer": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "32",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es6.number.max-safe-integer": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "31",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es6.number.min-safe-integer": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "31",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es6.number.parse-float": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es6.number.parse-int": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "25",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es6.object.assign": {
-    "chrome": "49",
-    "edge": "13",
-    "firefox": "36",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.object.create": {
-    "chrome": "5",
-    "opera": "12",
-    "edge": "12",
-    "firefox": "4",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es7.object.define-getter": {
-    "chrome": "62",
-    "edge": "16",
-    "firefox": "48",
-    "safari": "9",
-    "node": "8.10",
-    "ios": "9",
-    "opera": "49",
-    "electron": "3"
-  },
-  "es7.object.define-setter": {
-    "chrome": "62",
-    "edge": "16",
-    "firefox": "48",
-    "safari": "9",
-    "node": "8.10",
-    "ios": "9",
-    "opera": "49",
-    "electron": "3"
-  },
-  "es6.object.define-property": {
-    "chrome": "5",
-    "opera": "12",
-    "edge": "12",
-    "firefox": "4",
-    "safari": "5.1",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.object.define-properties": {
-    "chrome": "5",
-    "opera": "12",
-    "edge": "12",
-    "firefox": "4",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es7.object.entries": {
-    "chrome": "54",
-    "edge": "14",
-    "firefox": "47",
-    "safari": "10.1",
-    "node": "7",
-    "ios": "10.3",
-    "opera": "41",
-    "electron": "1.5"
-  },
-  "es6.object.freeze": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es6.object.get-own-property-descriptor": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es7.object.get-own-property-descriptors": {
-    "chrome": "54",
-    "edge": "15",
-    "firefox": "50",
-    "safari": "10.1",
-    "node": "7",
-    "ios": "10.3",
-    "opera": "41",
-    "electron": "1.5"
-  },
-  "es6.object.get-own-property-names": {
-    "chrome": "40",
-    "edge": "12",
-    "firefox": "33",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "27",
-    "electron": "0.21"
-  },
-  "es6.object.get-prototype-of": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "3.5",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es7.object.lookup-getter": {
-    "chrome": "62",
-    "firefox": "36",
-    "safari": "9",
-    "node": "8.10",
-    "ios": "9",
-    "opera": "49",
-    "electron": "3"
-  },
-  "es7.object.lookup-setter": {
-    "chrome": "62",
-    "firefox": "36",
-    "safari": "9",
-    "node": "8.10",
-    "ios": "9",
-    "opera": "49",
-    "electron": "3"
-  },
-  "es6.object.prevent-extensions": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es6.object.is": {
-    "chrome": "19",
-    "edge": "12",
-    "firefox": "22",
-    "safari": "9",
-    "node": "0.12",
-    "android": "4.1",
-    "ios": "9",
-    "electron": "0.2"
-  },
-  "es6.object.is-frozen": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es6.object.is-sealed": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es6.object.is-extensible": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es6.object.keys": {
-    "chrome": "40",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "27",
-    "electron": "0.21"
-  },
-  "es6.object.seal": {
-    "chrome": "44",
-    "edge": "12",
-    "firefox": "35",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "31",
-    "electron": "0.31"
-  },
-  "es6.object.set-prototype-of": {
-    "chrome": "34",
-    "edge": "12",
-    "firefox": "31",
-    "safari": "9",
-    "node": "0.12",
-    "ie": "11",
-    "ios": "9",
-    "opera": "21",
-    "electron": "0.2"
-  },
-  "es7.object.values": {
-    "chrome": "54",
-    "edge": "14",
-    "firefox": "47",
-    "safari": "10.1",
-    "node": "7",
-    "ios": "10.3",
-    "opera": "41",
-    "electron": "1.5"
-  },
-  "es6.promise": {
-    "chrome": "51",
-    "edge": "14",
-    "firefox": "45",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es7.promise.finally": {
-    "chrome": "63",
-    "firefox": "58",
-    "safari": "11.1",
-    "ios": "11.3",
-    "opera": "50",
-    "electron": "3"
-  },
-  "es6.reflect.apply": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.construct": {
-    "chrome": "49",
-    "edge": "13",
-    "firefox": "44",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.define-property": {
-    "chrome": "49",
-    "edge": "13",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.delete-property": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.get": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.get-own-property-descriptor": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.get-prototype-of": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.has": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.is-extensible": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.own-keys": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.prevent-extensions": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.set": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.reflect.set-prototype-of": {
-    "chrome": "49",
-    "edge": "12",
-    "firefox": "42",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.regexp.constructor": {
-    "chrome": "50",
-    "firefox": "40",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "37",
-    "electron": "1.1"
-  },
-  "es6.regexp.flags": {
-    "chrome": "49",
-    "firefox": "37",
-    "safari": "9",
-    "node": "6",
-    "ios": "9",
-    "opera": "36",
-    "electron": "1"
-  },
-  "es6.regexp.match": {
-    "chrome": "50",
-    "firefox": "49",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "37",
-    "electron": "1.1"
-  },
-  "es6.regexp.replace": {
-    "chrome": "50",
-    "firefox": "49",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "37",
-    "electron": "1.1"
-  },
-  "es6.regexp.split": {
-    "chrome": "50",
-    "firefox": "49",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "37",
-    "electron": "1.1"
-  },
-  "es6.regexp.search": {
-    "chrome": "50",
-    "firefox": "49",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "37",
-    "electron": "1.1"
-  },
-  "es6.regexp.to-string": {
-    "chrome": "50",
-    "firefox": "39",
-    "safari": "10",
-    "node": "6",
-    "ios": "10",
-    "opera": "37",
-    "electron": "1.1"
-  },
-  "es6.set": {
-    "chrome": "51",
-    "edge": "15",
-    "firefox": "53",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.symbol": {
-    "chrome": "51",
-    "firefox": "51",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es7.symbol.async-iterator": {
-    "chrome": "63",
-    "firefox": "57",
-    "safari": "12",
-    "opera": "50",
-    "electron": "3"
-  },
-  "es6.string.anchor": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.big": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.blink": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.bold": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.code-point-at": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "29",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.string.ends-with": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "29",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.string.fixed": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.fontcolor": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.fontsize": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.from-code-point": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "29",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.string.includes": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "40",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.string.italics": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.iterator": {
-    "chrome": "38",
-    "edge": "12",
-    "firefox": "36",
-    "safari": "9",
-    "node": "0.12",
-    "ios": "9",
-    "opera": "25",
-    "electron": "0.2"
-  },
-  "es6.string.link": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es7.string.pad-start": {
-    "chrome": "57",
-    "edge": "15",
-    "firefox": "48",
-    "safari": "10",
-    "node": "8",
-    "ios": "10",
-    "opera": "44",
-    "electron": "1.7"
-  },
-  "es7.string.pad-end": {
-    "chrome": "57",
-    "edge": "15",
-    "firefox": "48",
-    "safari": "10",
-    "node": "8",
-    "ios": "10",
-    "opera": "44",
-    "electron": "1.7"
-  },
-  "es6.string.raw": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "34",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.string.repeat": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "24",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.string.small": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.starts-with": {
-    "chrome": "41",
-    "edge": "12",
-    "firefox": "29",
-    "safari": "9",
-    "node": "4",
-    "ios": "9",
-    "opera": "28",
-    "electron": "0.24"
-  },
-  "es6.string.strike": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.sub": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.sup": {
-    "chrome": "5",
-    "edge": "12",
-    "firefox": "17",
-    "safari": "6",
-    "node": "0.12",
-    "android": "4.0",
-    "ios": "7",
-    "electron": "1.1"
-  },
-  "es6.string.trim": {
-    "chrome": "5",
-    "opera": "10.50",
-    "edge": "12",
-    "firefox": "3.5",
-    "safari": "4",
-    "node": "0.10",
-    "ie": "9",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.typed.array-buffer": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.data-view": {
-    "chrome": "5",
-    "opera": "12",
-    "edge": "12",
-    "firefox": "15",
-    "safari": "5.1",
-    "node": "0.12",
-    "ie": "10",
-    "android": "4.0",
-    "ios": "6",
-    "electron": "1.1"
-  },
-  "es6.typed.int8-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.uint8-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.uint8-clamped-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.int16-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.uint16-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.int32-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.uint32-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.float32-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.typed.float64-array": {
-    "chrome": "51",
-    "edge": "13",
-    "firefox": "48",
-    "safari": "10",
-    "node": "6.5",
-    "ios": "10",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.weak-map": {
-    "chrome": "51",
-    "edge": "15",
-    "firefox": "53",
-    "safari": "9",
-    "node": "6.5",
-    "ios": "9",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es6.weak-set": {
-    "chrome": "51",
-    "edge": "15",
-    "firefox": "53",
-    "safari": "9",
-    "node": "6.5",
-    "ios": "9",
-    "opera": "38",
-    "electron": "1.2"
-  },
-  "es7.array.flat-map": {
-    "chrome": "69",
-    "firefox": "62",
-    "safari": "12",
-    "opera": "56"
-  }
-}
diff --git a/packages/babel-preset-env/data/built-ins.json.js b/packages/babel-preset-env/data/built-ins.json.js
new file mode 100644
index 000000000000..38f8a09add7a
--- /dev/null
+++ b/packages/babel-preset-env/data/built-ins.json.js
@@ -0,0 +1,4 @@
+// TODO: Remove in Babel 8
+// https://github.com/vuejs/vue-cli/issues/3671
+
+module.exports = require("./corejs2-built-ins.json");
diff --git a/packages/babel-preset-env/data/corejs2-built-in-features.js b/packages/babel-preset-env/data/corejs2-built-in-features.js
new file mode 100644
index 000000000000..f18244b4c9ad
--- /dev/null
+++ b/packages/babel-preset-env/data/corejs2-built-in-features.js
@@ -0,0 +1,335 @@
+const typedArrayMethods = [
+  "typed arrays / %TypedArray%.from",
+  "typed arrays / %TypedArray%.of",
+  "typed arrays / %TypedArray%.prototype.subarray",
+  "typed arrays / %TypedArray%.prototype.join",
+  "typed arrays / %TypedArray%.prototype.indexOf",
+  "typed arrays / %TypedArray%.prototype.lastIndexOf",
+  "typed arrays / %TypedArray%.prototype.slice",
+  "typed arrays / %TypedArray%.prototype.every",
+  "typed arrays / %TypedArray%.prototype.filter",
+  "typed arrays / %TypedArray%.prototype.forEach",
+  "typed arrays / %TypedArray%.prototype.map",
+  "typed arrays / %TypedArray%.prototype.reduce",
+  "typed arrays / %TypedArray%.prototype.reduceRight",
+  "typed arrays / %TypedArray%.prototype.reverse",
+  "typed arrays / %TypedArray%.prototype.some",
+  "typed arrays / %TypedArray%.prototype.sort",
+  "typed arrays / %TypedArray%.prototype.copyWithin",
+  "typed arrays / %TypedArray%.prototype.find",
+  "typed arrays / %TypedArray%.prototype.findIndex",
+  "typed arrays / %TypedArray%.prototype.fill",
+  "typed arrays / %TypedArray%.prototype.keys",
+  "typed arrays / %TypedArray%.prototype.values",
+  "typed arrays / %TypedArray%.prototype.entries",
+  "typed arrays / %TypedArray%.prototype[Symbol.iterator]",
+  "typed arrays / %TypedArray%[Symbol.species]",
+];
+
+const es = {
+  // compat-table missing babel6 mapping
+  // "es6.array.concat": {
+  //   features: [
+  //     "well-known symbols / Symbol.isConcatSpreadable",
+  //     "well-known symbols / Symbol.species, Array.prototype.concat",
+  //   ]
+  // },
+  "es6.array.copy-within": "Array.prototype methods / Array.prototype.copyWithin",
+  "es6.array.every": "Array methods / Array.prototype.every",
+  "es6.array.fill": "Array.prototype methods / Array.prototype.fill",
+  "es6.array.filter": {
+    features: [
+      "Array methods / Array.prototype.filter",
+      // compat-table missing babel6 mapping
+      // "well-known symbols / Symbol.species, Array.prototype.filter",
+    ],
+  },
+  "es6.array.find": "Array.prototype methods / Array.prototype.find",
+  "es6.array.find-index": "Array.prototype methods / Array.prototype.findIndex",
+  "es7.array.flat-map": "Array.prototype.{flat, flatMap} / Array.prototype.flatMap",
+  "es6.array.for-each": "Array methods / Array.prototype.forEach",
+  "es6.array.from": "Array static methods / Array.from",
+  "es7.array.includes": "Array.prototype.includes",
+  "es6.array.index-of": "Array methods / Array.prototype.indexOf",
+  "es6.array.is-array": "Array methods / Array.isArray",
+  // "es.array.join": "", required tests for that
+  "es6.array.iterator": {
+    features: [
+      "Array.prototype methods / Array.prototype.keys",
+      // can use Symbol.iterator, not implemented in many environments
+      // "Array.prototype methods / Array.prototype.values",
+      "Array.prototype methods / Array.prototype.entries",
+    ],
+  },
+  "es6.array.last-index-of": "Array methods / Array.prototype.lastIndexOf",
+  "es6.array.map": {
+    features: [
+      "Array methods / Array.prototype.map",
+      // compat-table missing babel6 mapping
+      // "well-known symbols / Symbol.species, Array.prototype.map",
+    ],
+  },
+  "es6.array.of": "Array static methods / Array.of",
+  "es6.array.reduce": "Array methods / Array.prototype.reduce",
+  "es6.array.reduce-right": "Array methods / Array.prototype.reduceRight",
+  // compat-table missing babel6 mapping
+  // "es6.array.slice": "well-known symbols / Symbol.species, Array.prototype.slice",
+  "es6.array.some": "Array methods / Array.prototype.some",
+  "es6.array.sort": "Array methods / Array.prototype.sort",
+  "es6.array.species": "Array static methods / Array[Symbol.species]",
+  // compat-table missing babel6 mapping
+  //"es6.array.splice": "well-known symbols / Symbol.species, Array.prototype.splice",
+
+  "es6.date.now": "Date methods / Date.now",
+  "es6.date.to-iso-string": "Date methods / Date.prototype.toISOString",
+  "es6.date.to-json": "Date methods / Date.prototype.toJSON",
+  "es6.date.to-primitive": "Date.prototype[Symbol.toPrimitive]",
+  "es6.date.to-string": "miscellaneous / Invalid Date",
+
+  "es6.function.bind": "Function.prototype.bind",
+  "es6.function.has-instance": "well-known symbols / Symbol.hasInstance",
+  "es6.function.name": {
+    features: [
+      "function \"name\" property / function statements",
+      "function \"name\" property / function expressions",
+    ],
+  },
+
+  "es6.map": "Map",
+
+  "es6.math.acosh": "Math methods / Math.acosh",
+  "es6.math.asinh": "Math methods / Math.asinh",
+  "es6.math.atanh": "Math methods / Math.atanh",
+  "es6.math.cbrt": "Math methods / Math.cbrt",
+  "es6.math.clz32": "Math methods / Math.clz32",
+  "es6.math.cosh": "Math methods / Math.cosh",
+  "es6.math.expm1": "Math methods / Math.expm1",
+  "es6.math.fround": "Math methods / Math.fround",
+  "es6.math.hypot": "Math methods / Math.hypot",
+  "es6.math.imul": "Math methods / Math.imul",
+  "es6.math.log1p": "Math methods / Math.log1p",
+  "es6.math.log10": "Math methods / Math.log10",
+  "es6.math.log2": "Math methods / Math.log2",
+  "es6.math.sign": "Math methods / Math.sign",
+  "es6.math.sinh": "Math methods / Math.sinh",
+  "es6.math.tanh": "Math methods / Math.tanh",
+  "es6.math.trunc": "Math methods / Math.trunc",
+
+  "es6.number.constructor": {
+    features: [
+      "octal and binary literals / octal supported by Number()",
+      "octal and binary literals / binary supported by Number()",
+    ],
+  },
+  "es6.number.epsilon": "Number properties / Number.EPSILON",
+  "es6.number.is-finite": "Number properties / Number.isFinite",
+  "es6.number.is-integer": "Number properties / Number.isInteger",
+  "es6.number.is-nan": "Number properties / Number.isNaN",
+  "es6.number.is-safe-integer": "Number properties / Number.isSafeInteger",
+  "es6.number.max-safe-integer": "Number properties / Number.MAX_SAFE_INTEGER",
+  "es6.number.min-safe-integer": "Number properties / Number.MIN_SAFE_INTEGER",
+  "es6.number.parse-float": "Number properties / Number.parseFloat",
+  "es6.number.parse-int": "Number properties / Number.parseInt",
+
+  "es6.object.assign": {
+    features: ["Object static methods / Object.assign", "Symbol"],
+  },
+  "es6.object.create": "Object static methods / Object.create",
+  "es7.object.define-getter": {
+    features: [
+      "Object.prototype getter/setter methods / __defineGetter__",
+      "Object.prototype getter/setter methods / __defineGetter__, symbols",
+      "Object.prototype getter/setter methods / __defineGetter__, ToObject(this)",
+    ],
+  },
+  "es7.object.define-setter": {
+    features: [
+      "Object.prototype getter/setter methods / __defineSetter__",
+      "Object.prototype getter/setter methods / __defineSetter__, symbols",
+      "Object.prototype getter/setter methods / __defineSetter__, ToObject(this)",
+    ],
+  },
+  "es6.object.define-property": "Object static methods / Object.defineProperty",
+  "es6.object.define-properties": "Object static methods / Object.defineProperties",
+  "es7.object.entries": "Object static methods / Object.entries",
+  "es6.object.freeze": "Object static methods accept primitives / Object.freeze",
+  "es6.object.get-own-property-descriptor": "Object static methods accept primitives / Object.getOwnPropertyDescriptor",
+  "es7.object.get-own-property-descriptors": "Object static methods / Object.getOwnPropertyDescriptors",
+  "es6.object.get-own-property-names": "Object static methods accept primitives / Object.getOwnPropertyNames",
+  "es6.object.get-prototype-of": "Object static methods accept primitives / Object.getPrototypeOf",
+  "es7.object.lookup-getter": {
+    features: [
+      "Object.prototype getter/setter methods / __lookupGetter__",
+      "Object.prototype getter/setter methods / __lookupGetter__, prototype chain",
+      "Object.prototype getter/setter methods / __lookupGetter__, symbols",
+      "Object.prototype getter/setter methods / __lookupGetter__, ToObject(this)",
+      "Object.prototype getter/setter methods / __lookupGetter__, data properties can shadow accessors",
+    ],
+  },
+  "es7.object.lookup-setter": {
+    features: [
+      "Object.prototype getter/setter methods / __lookupSetter__",
+      "Object.prototype getter/setter methods / __lookupSetter__, prototype chain",
+      "Object.prototype getter/setter methods / __lookupSetter__, symbols",
+      "Object.prototype getter/setter methods / __lookupSetter__, ToObject(this)",
+      "Object.prototype getter/setter methods / __lookupSetter__, data properties can shadow accessors",
+    ],
+  },
+  "es6.object.prevent-extensions": "Object static methods accept primitives / Object.preventExtensions",
+  "es6.object.to-string": "well-known symbols / Symbol.toStringTag",
+  "es6.object.is": "Object static methods / Object.is",
+  "es6.object.is-frozen": "Object static methods accept primitives / Object.isFrozen",
+  "es6.object.is-sealed": "Object static methods accept primitives / Object.isSealed",
+  "es6.object.is-extensible": "Object static methods accept primitives / Object.isExtensible",
+  "es6.object.keys": "Object static methods accept primitives / Object.keys",
+  "es6.object.seal": "Object static methods accept primitives / Object.seal",
+  "es6.object.set-prototype-of": "Object static methods / Object.setPrototypeOf",
+  "es7.object.values": "Object static methods / Object.values",
+
+  "es6.promise": {
+    features: [
+      // required unhandled rejection tracking tests
+      "Promise",
+      "well-known symbols / Symbol.species, Promise.prototype.then",
+    ],
+  },
+  "es7.promise.finally": "Promise.prototype.finally",
+
+  "es6.reflect.apply": "Reflect / Reflect.apply",
+  "es6.reflect.construct": "Reflect / Reflect.construct",
+  "es6.reflect.define-property": "Reflect / Reflect.defineProperty",
+  "es6.reflect.delete-property": "Reflect / Reflect.deleteProperty",
+  "es6.reflect.get": "Reflect / Reflect.get",
+  "es6.reflect.get-own-property-descriptor": "Reflect / Reflect.getOwnPropertyDescriptor",
+  "es6.reflect.get-prototype-of": "Reflect / Reflect.getPrototypeOf",
+  "es6.reflect.has": "Reflect / Reflect.has",
+  "es6.reflect.is-extensible": "Reflect / Reflect.isExtensible",
+  "es6.reflect.own-keys": "Reflect / Reflect.ownKeys",
+  "es6.reflect.prevent-extensions": "Reflect / Reflect.preventExtensions",
+  "es6.reflect.set": "Reflect / Reflect.set",
+  "es6.reflect.set-prototype-of": "Reflect / Reflect.setPrototypeOf",
+
+  "es6.regexp.constructor": {
+    features: [
+      "miscellaneous / RegExp constructor can alter flags",
+      "well-known symbols / Symbol.match, RegExp constructor",
+    ],
+  },
+  "es6.regexp.flags": "RegExp.prototype properties / RegExp.prototype.flags",
+  "es6.regexp.match": "RegExp.prototype properties / RegExp.prototype[Symbol.match]",
+  "es6.regexp.replace": "RegExp.prototype properties / RegExp.prototype[Symbol.replace]",
+  "es6.regexp.split": "RegExp.prototype properties / RegExp.prototype[Symbol.split]",
+  "es6.regexp.search": "RegExp.prototype properties / RegExp.prototype[Symbol.search]",
+  "es6.regexp.to-string": "miscellaneous / RegExp.prototype.toString generic and uses \"flags\" property",
+
+  // This is explicit due to prevent the stage-1 Set proposals under the
+  // category "Set methods" from being included.
+  "es6.set": {
+    features: [
+      "Set / basic functionality",
+      "Set / constructor arguments",
+      "Set / constructor requires new",
+      "Set / constructor accepts null",
+      "Set / constructor invokes add",
+      "Set / iterator closing",
+      "Set / Set.prototype.add returns this",
+      "Set / -0 key converts to +0",
+      "Set / Set.prototype.size",
+      "Set / Set.prototype.delete",
+      "Set / Set.prototype.clear",
+      "Set / Set.prototype.forEach",
+      "Set / Set.prototype.keys",
+      "Set / Set.prototype.values",
+      "Set / Set.prototype.entries",
+      "Set / Set.prototype[Symbol.iterator]",
+      "Set / Set.prototype isn't an instance",
+      "Set / Set iterator prototype chain",
+      "Set / Set[Symbol.species]",
+    ],
+  },
+
+  "es6.symbol": {
+    features: [
+      "Symbol",
+      "Object static methods / Object.getOwnPropertySymbols",
+      "well-known symbols / Symbol.hasInstance",
+      "well-known symbols / Symbol.isConcatSpreadable",
+      "well-known symbols / Symbol.iterator",
+      "well-known symbols / Symbol.match",
+      "well-known symbols / Symbol.replace",
+      "well-known symbols / Symbol.search",
+      "well-known symbols / Symbol.species",
+      "well-known symbols / Symbol.split",
+      "well-known symbols / Symbol.toPrimitive",
+      "well-known symbols / Symbol.toStringTag",
+      "well-known symbols / Symbol.unscopables",
+    ],
+  },
+  "es7.symbol.async-iterator": "Asynchronous Iterators",
+
+  "es6.string.anchor": "String.prototype HTML methods",
+  "es6.string.big": "String.prototype HTML methods",
+  "es6.string.blink": "String.prototype HTML methods",
+  "es6.string.bold": "String.prototype HTML methods",
+  "es6.string.code-point-at": "String.prototype methods / String.prototype.codePointAt",
+  "es6.string.ends-with": "String.prototype methods / String.prototype.endsWith",
+  "es6.string.fixed": "String.prototype HTML methods",
+  "es6.string.fontcolor": "String.prototype HTML methods",
+  "es6.string.fontsize": "String.prototype HTML methods",
+  "es6.string.from-code-point": "String static methods / String.fromCodePoint",
+  "es6.string.includes": "String.prototype methods / String.prototype.includes",
+  "es6.string.italics": "String.prototype HTML methods",
+  "es6.string.iterator": "String.prototype methods / String.prototype[Symbol.iterator]",
+  "es6.string.link": "String.prototype HTML methods",
+  // "String.prototype methods / String.prototype.normalize" not implemented
+  "es7.string.pad-start": "String padding / String.prototype.padStart",
+  "es7.string.pad-end": "String padding / String.prototype.padEnd",
+  "es6.string.raw": "String static methods / String.raw",
+  "es6.string.repeat": "String.prototype methods / String.prototype.repeat",
+  "es6.string.small": "String.prototype HTML methods",
+  "es6.string.starts-with": "String.prototype methods / String.prototype.startsWith",
+  "es6.string.strike": "String.prototype HTML methods",
+  "es6.string.sub": "String.prototype HTML methods",
+  "es6.string.sup": "String.prototype HTML methods",
+  "es6.string.trim": "String properties and methods / String.prototype.trim",
+  "es7.string.trim-left": "string trimming / String.prototype.trimStart",
+  "es7.string.trim-right": "string trimming / String.prototype.trimEnd",
+
+  "es6.typed.array-buffer": "typed arrays / ArrayBuffer[Symbol.species]",
+  "es6.typed.data-view": "typed arrays / DataView",
+  "es6.typed.int8-array": {
+    features: ["typed arrays / Int8Array"].concat(typedArrayMethods),
+  },
+  "es6.typed.uint8-array": {
+    features: ["typed arrays / Uint8Array"].concat(typedArrayMethods),
+  },
+  "es6.typed.uint8-clamped-array": {
+    features: ["typed arrays / Uint8ClampedArray"].concat(typedArrayMethods),
+  },
+  "es6.typed.int16-array": {
+    features: ["typed arrays / Int16Array"].concat(typedArrayMethods),
+  },
+  "es6.typed.uint16-array": {
+    features: ["typed arrays / Uint16Array"].concat(typedArrayMethods),
+  },
+  "es6.typed.int32-array": {
+    features: ["typed arrays / Int32Array"].concat(typedArrayMethods),
+  },
+  "es6.typed.uint32-array": {
+    features: ["typed arrays / Uint32Array"].concat(typedArrayMethods),
+  },
+  "es6.typed.float32-array": {
+    features: ["typed arrays / Float32Array"].concat(typedArrayMethods),
+  },
+  "es6.typed.float64-array": {
+    features: ["typed arrays / Float64Array"].concat(typedArrayMethods),
+  },
+
+  "es6.weak-map": "WeakMap",
+
+  "es6.weak-set": "WeakSet",
+};
+
+const proposals = require("./shipped-proposals").builtIns;
+
+module.exports = Object.assign({}, es, proposals);
diff --git a/packages/babel-preset-env/data/corejs2-built-ins.json b/packages/babel-preset-env/data/corejs2-built-ins.json
new file mode 100644
index 000000000000..2079f1c3d74a
--- /dev/null
+++ b/packages/babel-preset-env/data/corejs2-built-ins.json
@@ -0,0 +1,1657 @@
+{
+  "es6.array.copy-within": {
+    "chrome": "45",
+    "edge": "12",
+    "firefox": "32",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "5",
+    "opera": "32",
+    "electron": "0.35"
+  },
+  "es6.array.every": {
+    "chrome": "5",
+    "opera": "10.10",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.fill": {
+    "chrome": "45",
+    "edge": "12",
+    "firefox": "31",
+    "safari": "7.1",
+    "node": "4",
+    "ios": "8",
+    "samsung": "5",
+    "opera": "32",
+    "electron": "0.35"
+  },
+  "es6.array.filter": {
+    "chrome": "5",
+    "opera": "10.10",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.find": {
+    "chrome": "45",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "4",
+    "ios": "8",
+    "samsung": "5",
+    "opera": "32",
+    "electron": "0.35"
+  },
+  "es6.array.find-index": {
+    "chrome": "45",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "4",
+    "ios": "8",
+    "samsung": "5",
+    "opera": "32",
+    "electron": "0.35"
+  },
+  "es7.array.flat-map": {
+    "chrome": "69",
+    "firefox": "62",
+    "safari": "12",
+    "node": "11",
+    "ios": "12",
+    "opera": "56",
+    "electron": "4"
+  },
+  "es6.array.for-each": {
+    "chrome": "5",
+    "opera": "10.10",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.from": {
+    "chrome": "51",
+    "edge": "15",
+    "firefox": "36",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es7.array.includes": {
+    "chrome": "47",
+    "edge": "14",
+    "firefox": "43",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "34",
+    "electron": "0.36"
+  },
+  "es6.array.index-of": {
+    "chrome": "5",
+    "opera": "10.10",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.is-array": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "4",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.iterator": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "28",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.array.last-index-of": {
+    "chrome": "5",
+    "opera": "10.10",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.map": {
+    "chrome": "5",
+    "opera": "10.10",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.of": {
+    "chrome": "45",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "5",
+    "opera": "32",
+    "electron": "0.35"
+  },
+  "es6.array.reduce": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "3",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.reduce-right": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "3",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.some": {
+    "chrome": "5",
+    "opera": "10.10",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.array.sort": {
+    "chrome": "63",
+    "opera": "50",
+    "edge": "12",
+    "firefox": "5",
+    "safari": "12",
+    "node": "10",
+    "ie": "9",
+    "ios": "12",
+    "samsung": "8.2",
+    "electron": "3.1"
+  },
+  "es6.array.species": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.date.now": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.date.to-iso-string": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "3.5",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.date.to-json": {
+    "chrome": "5",
+    "opera": "12.10",
+    "edge": "12",
+    "firefox": "4",
+    "safari": "10",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "10",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.date.to-primitive": {
+    "chrome": "47",
+    "edge": "15",
+    "firefox": "44",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "34",
+    "electron": "0.36"
+  },
+  "es6.date.to-string": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "10",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.function.bind": {
+    "chrome": "7",
+    "opera": "12",
+    "edge": "12",
+    "firefox": "4",
+    "safari": "5.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "5"
+  },
+  "es6.function.has-instance": {
+    "chrome": "51",
+    "edge": "15",
+    "firefox": "50",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.function.name": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "14",
+    "firefox": "2",
+    "safari": "4",
+    "node": "0.10",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.map": {
+    "chrome": "51",
+    "edge": "15",
+    "firefox": "53",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.math.acosh": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.asinh": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.atanh": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.cbrt": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.clz32": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "31",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.cosh": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.expm1": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.fround": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "26",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.hypot": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "27",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.imul": {
+    "chrome": "30",
+    "edge": "12",
+    "firefox": "23",
+    "safari": "7",
+    "node": "0.12",
+    "android": "4.4",
+    "ios": "7",
+    "samsung": "2.1",
+    "opera": "17",
+    "electron": "0.2"
+  },
+  "es6.math.log1p": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.log10": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.log2": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.sign": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.sinh": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.tanh": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.math.trunc": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "7.1",
+    "node": "0.12",
+    "ios": "8",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.number.constructor": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "36",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.number.epsilon": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es6.number.is-finite": {
+    "chrome": "19",
+    "edge": "12",
+    "firefox": "16",
+    "safari": "9",
+    "node": "0.12",
+    "android": "4.1",
+    "ios": "9",
+    "samsung": "2.1",
+    "electron": "0.2"
+  },
+  "es6.number.is-integer": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "16",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es6.number.is-nan": {
+    "chrome": "19",
+    "edge": "12",
+    "firefox": "15",
+    "safari": "9",
+    "node": "0.12",
+    "android": "4.1",
+    "ios": "9",
+    "samsung": "2.1",
+    "electron": "0.2"
+  },
+  "es6.number.is-safe-integer": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "32",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es6.number.max-safe-integer": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "31",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es6.number.min-safe-integer": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "31",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es6.number.parse-float": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es6.number.parse-int": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "25",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es6.object.assign": {
+    "chrome": "49",
+    "edge": "13",
+    "firefox": "36",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.object.create": {
+    "chrome": "5",
+    "opera": "12",
+    "edge": "12",
+    "firefox": "4",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es7.object.define-getter": {
+    "chrome": "62",
+    "edge": "16",
+    "firefox": "48",
+    "safari": "9",
+    "node": "8.10",
+    "ios": "9",
+    "samsung": "8.2",
+    "opera": "49",
+    "electron": "3.1"
+  },
+  "es7.object.define-setter": {
+    "chrome": "62",
+    "edge": "16",
+    "firefox": "48",
+    "safari": "9",
+    "node": "8.10",
+    "ios": "9",
+    "samsung": "8.2",
+    "opera": "49",
+    "electron": "3.1"
+  },
+  "es6.object.define-property": {
+    "chrome": "5",
+    "opera": "12",
+    "edge": "12",
+    "firefox": "4",
+    "safari": "5.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.object.define-properties": {
+    "chrome": "5",
+    "opera": "12",
+    "edge": "12",
+    "firefox": "4",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es7.object.entries": {
+    "chrome": "54",
+    "edge": "14",
+    "firefox": "47",
+    "safari": "10.1",
+    "node": "7",
+    "ios": "10.3",
+    "samsung": "6.2",
+    "opera": "41",
+    "electron": "1.5"
+  },
+  "es6.object.freeze": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.get-own-property-descriptor": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es7.object.get-own-property-descriptors": {
+    "chrome": "54",
+    "edge": "15",
+    "firefox": "50",
+    "safari": "10.1",
+    "node": "7",
+    "ios": "10.3",
+    "samsung": "6.2",
+    "opera": "41",
+    "electron": "1.5"
+  },
+  "es6.object.get-own-property-names": {
+    "chrome": "40",
+    "edge": "12",
+    "firefox": "33",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "27",
+    "electron": "0.21"
+  },
+  "es6.object.get-prototype-of": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es7.object.lookup-getter": {
+    "chrome": "62",
+    "firefox": "36",
+    "safari": "9",
+    "node": "8.10",
+    "ios": "9",
+    "samsung": "8.2",
+    "opera": "49",
+    "electron": "3.1"
+  },
+  "es7.object.lookup-setter": {
+    "chrome": "62",
+    "firefox": "36",
+    "safari": "9",
+    "node": "8.10",
+    "ios": "9",
+    "samsung": "8.2",
+    "opera": "49",
+    "electron": "3.1"
+  },
+  "es6.object.prevent-extensions": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.to-string": {
+    "chrome": "57",
+    "edge": "15",
+    "firefox": "51",
+    "safari": "10",
+    "node": "8",
+    "ios": "10",
+    "samsung": "7.2",
+    "opera": "44",
+    "electron": "1.7"
+  },
+  "es6.object.is": {
+    "chrome": "19",
+    "edge": "12",
+    "firefox": "22",
+    "safari": "9",
+    "node": "0.12",
+    "android": "4.1",
+    "ios": "9",
+    "samsung": "2.1",
+    "electron": "0.2"
+  },
+  "es6.object.is-frozen": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.is-sealed": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.is-extensible": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.keys": {
+    "chrome": "40",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "27",
+    "electron": "0.21"
+  },
+  "es6.object.seal": {
+    "chrome": "44",
+    "edge": "12",
+    "firefox": "35",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "4",
+    "opera": "31",
+    "electron": "0.31"
+  },
+  "es6.object.set-prototype-of": {
+    "chrome": "34",
+    "edge": "12",
+    "firefox": "31",
+    "safari": "9",
+    "node": "0.12",
+    "ie": "11",
+    "ios": "9",
+    "samsung": "2.1",
+    "opera": "21",
+    "electron": "0.2"
+  },
+  "es7.object.values": {
+    "chrome": "54",
+    "edge": "14",
+    "firefox": "47",
+    "safari": "10.1",
+    "node": "7",
+    "ios": "10.3",
+    "samsung": "6.2",
+    "opera": "41",
+    "electron": "1.5"
+  },
+  "es6.promise": {
+    "chrome": "51",
+    "edge": "14",
+    "firefox": "45",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es7.promise.finally": {
+    "chrome": "63",
+    "edge": "18",
+    "firefox": "58",
+    "safari": "11.1",
+    "node": "10",
+    "ios": "11.3",
+    "samsung": "8.2",
+    "opera": "50",
+    "electron": "3.1"
+  },
+  "es6.reflect.apply": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.construct": {
+    "chrome": "49",
+    "edge": "13",
+    "firefox": "49",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.define-property": {
+    "chrome": "49",
+    "edge": "13",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.delete-property": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.get": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.get-own-property-descriptor": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.get-prototype-of": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.has": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.is-extensible": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.own-keys": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.prevent-extensions": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.set": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.reflect.set-prototype-of": {
+    "chrome": "49",
+    "edge": "12",
+    "firefox": "42",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.regexp.constructor": {
+    "chrome": "50",
+    "firefox": "40",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "37",
+    "electron": "1.1"
+  },
+  "es6.regexp.flags": {
+    "chrome": "49",
+    "firefox": "37",
+    "safari": "9",
+    "node": "6",
+    "ios": "9",
+    "samsung": "5",
+    "opera": "36",
+    "electron": "1"
+  },
+  "es6.regexp.match": {
+    "chrome": "50",
+    "firefox": "49",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "37",
+    "electron": "1.1"
+  },
+  "es6.regexp.replace": {
+    "chrome": "50",
+    "firefox": "49",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "37",
+    "electron": "1.1"
+  },
+  "es6.regexp.split": {
+    "chrome": "50",
+    "firefox": "49",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "37",
+    "electron": "1.1"
+  },
+  "es6.regexp.search": {
+    "chrome": "50",
+    "firefox": "49",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "37",
+    "electron": "1.1"
+  },
+  "es6.regexp.to-string": {
+    "chrome": "50",
+    "firefox": "39",
+    "safari": "10",
+    "node": "6",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "37",
+    "electron": "1.1"
+  },
+  "es6.set": {
+    "chrome": "51",
+    "edge": "15",
+    "firefox": "53",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.symbol": {
+    "chrome": "51",
+    "firefox": "51",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es7.symbol.async-iterator": {
+    "chrome": "63",
+    "firefox": "57",
+    "safari": "12",
+    "node": "10",
+    "ios": "12",
+    "samsung": "8.2",
+    "opera": "50",
+    "electron": "3.1"
+  },
+  "es6.string.anchor": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.big": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.blink": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.bold": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.code-point-at": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "29",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.string.ends-with": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "29",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.string.fixed": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.fontcolor": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.fontsize": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.from-code-point": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "29",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.string.includes": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "40",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.string.italics": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.iterator": {
+    "chrome": "38",
+    "edge": "12",
+    "firefox": "36",
+    "safari": "9",
+    "node": "0.12",
+    "ios": "9",
+    "samsung": "3",
+    "opera": "25",
+    "electron": "0.2"
+  },
+  "es6.string.link": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es7.string.pad-start": {
+    "chrome": "57",
+    "edge": "15",
+    "firefox": "48",
+    "safari": "10",
+    "node": "8",
+    "ios": "10",
+    "samsung": "7.2",
+    "opera": "44",
+    "electron": "1.7"
+  },
+  "es7.string.pad-end": {
+    "chrome": "57",
+    "edge": "15",
+    "firefox": "48",
+    "safari": "10",
+    "node": "8",
+    "ios": "10",
+    "samsung": "7.2",
+    "opera": "44",
+    "electron": "1.7"
+  },
+  "es6.string.raw": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "34",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.string.repeat": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "24",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.string.small": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.starts-with": {
+    "chrome": "41",
+    "edge": "12",
+    "firefox": "29",
+    "safari": "9",
+    "node": "4",
+    "ios": "9",
+    "samsung": "3.4",
+    "opera": "28",
+    "electron": "0.24"
+  },
+  "es6.string.strike": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.sub": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.sup": {
+    "chrome": "5",
+    "edge": "12",
+    "firefox": "17",
+    "safari": "6",
+    "node": "0.10",
+    "android": "4",
+    "ios": "7",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.string.trim": {
+    "chrome": "5",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "3.5",
+    "safari": "4",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es7.string.trim-left": {
+    "chrome": "66",
+    "firefox": "61",
+    "safari": "12",
+    "node": "10",
+    "ios": "12",
+    "opera": "53",
+    "electron": "3.1"
+  },
+  "es7.string.trim-right": {
+    "chrome": "66",
+    "firefox": "61",
+    "safari": "12",
+    "node": "10",
+    "ios": "12",
+    "opera": "53",
+    "electron": "3.1"
+  },
+  "es6.typed.array-buffer": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.data-view": {
+    "chrome": "5",
+    "opera": "12",
+    "edge": "12",
+    "firefox": "15",
+    "safari": "5.1",
+    "node": "0.10",
+    "ie": "10",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "1.1"
+  },
+  "es6.typed.int8-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.uint8-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.uint8-clamped-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.int16-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.uint16-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.int32-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.uint32-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.float32-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.typed.float64-array": {
+    "chrome": "51",
+    "edge": "13",
+    "firefox": "48",
+    "safari": "10",
+    "node": "6.5",
+    "ios": "10",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.weak-map": {
+    "chrome": "51",
+    "edge": "15",
+    "firefox": "53",
+    "safari": "9",
+    "node": "6.5",
+    "ios": "9",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  },
+  "es6.weak-set": {
+    "chrome": "51",
+    "edge": "15",
+    "firefox": "53",
+    "safari": "9",
+    "node": "6.5",
+    "ios": "9",
+    "samsung": "5",
+    "opera": "38",
+    "electron": "1.2"
+  }
+}
diff --git a/packages/babel-preset-env/data/plugin-features.js b/packages/babel-preset-env/data/plugin-features.js
index e31b3e3e2b65..3a84be381683 100644
--- a/packages/babel-preset-env/data/plugin-features.js
+++ b/packages/babel-preset-env/data/plugin-features.js
@@ -49,6 +49,7 @@ const es = {
     features: [
       'RegExp "y" and "u" flags / "u" flag, case folding',
       'RegExp "y" and "u" flags / "u" flag, Unicode code point escapes',
+      'RegExp "y" and "u" flags / "u" flag, non-BMP Unicode characters',
       'RegExp "y" and "u" flags / "u" flag',
     ],
   },
@@ -57,13 +58,16 @@ const es = {
     features: "spread syntax for iterable objects",
   },
   "transform-parameters": {
-    features: ["default function parameters", "rest parameters"],
+    features: [
+      "default function parameters",
+      "rest parameters",
+      "destructuring, parameters / defaults, arrow function",
+    ],
   },
   "transform-destructuring": {
     features: [
       "destructuring, assignment",
       "destructuring, declarations",
-      "destructuring, parameters",
     ],
   },
   "transform-block-scoping": {
@@ -91,8 +95,12 @@ const es = {
   "proposal-object-rest-spread": "object rest/spread properties",
   "proposal-unicode-property-regex": "RegExp Unicode Property Escapes",
 
-  "proposal-json-strings": "", // Awaiting mapping in compat-table
+  "proposal-json-strings": "JSON superset",
   "proposal-optional-catch-binding": "optional catch binding",
+  "transform-named-capturing-groups-regex": "RegExp named capture groups",
+  "transform-member-expression-literals": "Object/array literal extensions / Reserved words as property names",
+  "transform-property-literals": "Object/array literal extensions / Reserved words as property names",
+  "transform-reserved-words": "Miscellaneous / Unreserved words",
 };
 
 const proposals = require("./shipped-proposals").features;
diff --git a/packages/babel-preset-env/data/plugins.json b/packages/babel-preset-env/data/plugins.json
index 26345cee3198..382a51399431 100644
--- a/packages/babel-preset-env/data/plugins.json
+++ b/packages/babel-preset-env/data/plugins.json
@@ -3,9 +3,8 @@
     "chrome": "41",
     "edge": "13",
     "firefox": "34",
-    "safari": "9",
     "node": "4",
-    "ios": "9",
+    "samsung": "3.4",
     "opera": "28",
     "electron": "0.24"
   },
@@ -16,6 +15,7 @@
     "safari": "9",
     "node": "4",
     "ios": "9",
+    "samsung": "4",
     "opera": "31",
     "electron": "0.31"
   },
@@ -25,6 +25,7 @@
     "safari": "10",
     "node": "6.5",
     "ios": "10",
+    "samsung": "5",
     "opera": "38",
     "electron": "1.2"
   },
@@ -35,6 +36,7 @@
     "safari": "10",
     "node": "6",
     "ios": "10",
+    "samsung": "5",
     "opera": "34",
     "electron": "0.36"
   },
@@ -46,6 +48,7 @@
     "node": "4",
     "ie": "11",
     "ios": "10",
+    "samsung": "3.4",
     "opera": "28",
     "electron": "0.24"
   },
@@ -56,6 +59,7 @@
     "safari": "10",
     "node": "5",
     "ios": "10",
+    "samsung": "5",
     "opera": "33",
     "electron": "0.36"
   },
@@ -66,6 +70,7 @@
     "safari": "10",
     "node": "5",
     "ios": "10",
+    "samsung": "5",
     "opera": "33",
     "electron": "0.36"
   },
@@ -76,6 +81,7 @@
     "safari": "9",
     "node": "4",
     "ios": "9",
+    "samsung": "4",
     "opera": "30",
     "electron": "0.29"
   },
@@ -86,6 +92,7 @@
     "safari": "9",
     "node": "4",
     "ios": "9",
+    "samsung": "3.4",
     "opera": "29",
     "electron": "0.27"
   },
@@ -96,6 +103,7 @@
     "safari": "7.1",
     "node": "4",
     "ios": "8",
+    "samsung": "4",
     "opera": "31",
     "electron": "0.31"
   },
@@ -106,6 +114,7 @@
     "safari": "10",
     "node": "6.5",
     "ios": "10",
+    "samsung": "5",
     "opera": "38",
     "electron": "1.2"
   },
@@ -116,6 +125,7 @@
     "safari": "10",
     "node": "6",
     "ios": "10",
+    "samsung": "5",
     "opera": "36",
     "electron": "1"
   },
@@ -124,16 +134,18 @@
     "safari": "11.1",
     "node": "8.10",
     "ios": "11.3",
+    "samsung": "8.2",
     "opera": "49",
-    "electron": "3"
+    "electron": "3.1"
   },
   "transform-unicode-regex": {
     "chrome": "50",
     "edge": "13",
     "firefox": "46",
-    "safari": "10",
+    "safari": "12",
     "node": "6",
-    "ios": "10",
+    "ios": "12",
+    "samsung": "5",
     "opera": "37",
     "electron": "1.1"
   },
@@ -144,25 +156,29 @@
     "safari": "10",
     "node": "5",
     "ios": "10",
+    "samsung": "5",
     "opera": "33",
     "electron": "0.36"
   },
   "transform-parameters": {
     "chrome": "49",
-    "edge": "14",
+    "edge": "18",
     "firefox": "53",
     "safari": "10",
     "node": "6",
     "ios": "10",
+    "samsung": "5",
     "opera": "36",
     "electron": "1"
   },
   "transform-destructuring": {
     "chrome": "51",
+    "edge": "15",
     "firefox": "53",
     "safari": "10",
     "node": "6.5",
     "ios": "10",
+    "samsung": "5",
     "opera": "38",
     "electron": "1.2"
   },
@@ -170,9 +186,10 @@
     "chrome": "49",
     "edge": "14",
     "firefox": "51",
-    "safari": "10",
+    "safari": "11",
     "node": "6",
-    "ios": "10",
+    "ios": "11",
+    "samsung": "5",
     "opera": "36",
     "electron": "1"
   },
@@ -183,6 +200,7 @@
     "safari": "9",
     "node": "0.12",
     "ios": "9",
+    "samsung": "3",
     "opera": "25",
     "electron": "0.2"
   },
@@ -193,6 +211,7 @@
     "safari": "10",
     "node": "5",
     "ios": "10",
+    "samsung": "5",
     "opera": "33",
     "electron": "0.36"
   },
@@ -203,6 +222,7 @@
     "safari": "10",
     "node": "6",
     "ios": "10",
+    "samsung": "5",
     "opera": "37",
     "electron": "1.1"
   },
@@ -213,6 +233,7 @@
     "safari": "10.1",
     "node": "7",
     "ios": "10.3",
+    "samsung": "6.2",
     "opera": "39",
     "electron": "1.3"
   },
@@ -220,9 +241,10 @@
     "chrome": "55",
     "edge": "15",
     "firefox": "52",
-    "safari": "10.1",
+    "safari": "11",
     "node": "7.6",
-    "ios": "10.3",
+    "ios": "11",
+    "samsung": "6.2",
     "opera": "42",
     "electron": "1.6"
   },
@@ -230,8 +252,11 @@
     "chrome": "63",
     "firefox": "57",
     "safari": "12",
+    "node": "10",
+    "ios": "12",
+    "samsung": "8.2",
     "opera": "50",
-    "electron": "3"
+    "electron": "3.1"
   },
   "proposal-object-rest-spread": {
     "chrome": "60",
@@ -239,23 +264,84 @@
     "safari": "11.1",
     "node": "8.3",
     "ios": "11.3",
+    "samsung": "8.2",
     "opera": "47",
-    "electron": "2"
+    "electron": "2.1"
   },
   "proposal-unicode-property-regex": {
     "chrome": "64",
     "safari": "11.1",
+    "node": "10",
     "ios": "11.3",
     "opera": "51",
-    "electron": "3"
+    "electron": "3.1"
+  },
+  "proposal-json-strings": {
+    "chrome": "66",
+    "firefox": "62",
+    "safari": "12",
+    "node": "10",
+    "ios": "12",
+    "opera": "53",
+    "electron": "3.1"
   },
-  "proposal-json-strings": {},
   "proposal-optional-catch-binding": {
     "chrome": "66",
     "firefox": "58",
     "safari": "11.1",
+    "node": "10",
     "ios": "11.3",
     "opera": "53",
-    "electron": "3"
+    "electron": "3.1"
+  },
+  "transform-named-capturing-groups-regex": {
+    "chrome": "64",
+    "safari": "11.1",
+    "node": "10",
+    "ios": "11.3",
+    "opera": "51",
+    "electron": "3.1"
+  },
+  "transform-member-expression-literals": {
+    "chrome": "7",
+    "opera": "12",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "5.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "5"
+  },
+  "transform-property-literals": {
+    "chrome": "7",
+    "opera": "12",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "5.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "5"
+  },
+  "transform-reserved-words": {
+    "chrome": "13",
+    "opera": "10.50",
+    "edge": "12",
+    "firefox": "2",
+    "safari": "3.1",
+    "node": "0.10",
+    "ie": "9",
+    "android": "4.4",
+    "ios": "6",
+    "phantom": "2",
+    "samsung": "2.1",
+    "electron": "0.2"
   }
 }
diff --git a/packages/babel-preset-env/data/shipped-proposals.js b/packages/babel-preset-env/data/shipped-proposals.js
index a5723716ca8c..90864b6c94b6 100644
--- a/packages/babel-preset-env/data/shipped-proposals.js
+++ b/packages/babel-preset-env/data/shipped-proposals.js
@@ -1,11 +1,7 @@
-// These mappings represent the builtin/feature proposals that have been
+// These mappings represent the syntax proposals that have been
 // shipped by browsers, and are enabled by the `shippedProposals` option.
 
-const builtIns = {
-  "es7.array.flat-map": "Array.prototype.{flat, flatMap} / Array.prototype.flatMap"
-};
-
-const features = {};
+const proposalPlugins = {};
 
 const pluginSyntaxMap = new Map([
   ["proposal-async-generator-functions", "syntax-async-generators"],
@@ -15,4 +11,4 @@ const pluginSyntaxMap = new Map([
   ["proposal-json-strings", "syntax-json-strings"],
 ]);
 
-module.exports = { builtIns, features, pluginSyntaxMap };
+module.exports = { proposalPlugins, pluginSyntaxMap };
diff --git a/packages/babel-preset-env/package.json b/packages/babel-preset-env/package.json
index a4799b78ca94..0e4230400a87 100644
--- a/packages/babel-preset-env/package.json
+++ b/packages/babel-preset-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/preset-env",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "A Babel preset for each environment.",
   "author": "Henry Zhu <hi@henryzoo.com>",
   "homepage": "https://babeljs.io/",
@@ -16,56 +16,66 @@
   "dependencies": {
     "@babel/helper-module-imports": "^7.0.0",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-proposal-async-generator-functions": "^7.1.0",
-    "@babel/plugin-proposal-json-strings": "^7.0.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
-    "@babel/plugin-proposal-unicode-property-regex": "^7.0.0",
-    "@babel/plugin-syntax-async-generators": "^7.0.0",
-    "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-    "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
-    "@babel/plugin-transform-arrow-functions": "^7.0.0",
-    "@babel/plugin-transform-async-to-generator": "^7.1.0",
-    "@babel/plugin-transform-block-scoped-functions": "^7.0.0",
-    "@babel/plugin-transform-block-scoping": "^7.0.0",
-    "@babel/plugin-transform-classes": "^7.1.0",
-    "@babel/plugin-transform-computed-properties": "^7.0.0",
-    "@babel/plugin-transform-destructuring": "^7.0.0",
-    "@babel/plugin-transform-dotall-regex": "^7.0.0",
-    "@babel/plugin-transform-duplicate-keys": "^7.0.0",
-    "@babel/plugin-transform-exponentiation-operator": "^7.1.0",
-    "@babel/plugin-transform-for-of": "^7.0.0",
-    "@babel/plugin-transform-function-name": "^7.1.0",
-    "@babel/plugin-transform-literals": "^7.0.0",
-    "@babel/plugin-transform-modules-amd": "^7.1.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.1.0",
-    "@babel/plugin-transform-modules-systemjs": "^7.0.0",
-    "@babel/plugin-transform-modules-umd": "^7.1.0",
-    "@babel/plugin-transform-new-target": "^7.0.0",
-    "@babel/plugin-transform-object-super": "^7.1.0",
-    "@babel/plugin-transform-parameters": "^7.1.0",
-    "@babel/plugin-transform-regenerator": "^7.0.0",
-    "@babel/plugin-transform-shorthand-properties": "^7.0.0",
-    "@babel/plugin-transform-spread": "^7.0.0",
-    "@babel/plugin-transform-sticky-regex": "^7.0.0",
-    "@babel/plugin-transform-template-literals": "^7.0.0",
-    "@babel/plugin-transform-typeof-symbol": "^7.0.0",
-    "@babel/plugin-transform-unicode-regex": "^7.0.0",
-    "browserslist": "^4.1.0",
+    "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+    "@babel/plugin-proposal-dynamic-import": "^7.5.0",
+    "@babel/plugin-proposal-json-strings": "^7.2.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
+    "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+    "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+    "@babel/plugin-syntax-async-generators": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-syntax-json-strings": "^7.2.0",
+    "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+    "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+    "@babel/plugin-transform-arrow-functions": "^7.2.0",
+    "@babel/plugin-transform-async-to-generator": "^7.5.0",
+    "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+    "@babel/plugin-transform-block-scoping": "^7.5.5",
+    "@babel/plugin-transform-classes": "^7.5.5",
+    "@babel/plugin-transform-computed-properties": "^7.2.0",
+    "@babel/plugin-transform-destructuring": "^7.5.0",
+    "@babel/plugin-transform-dotall-regex": "^7.4.4",
+    "@babel/plugin-transform-duplicate-keys": "^7.5.0",
+    "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+    "@babel/plugin-transform-for-of": "^7.4.4",
+    "@babel/plugin-transform-function-name": "^7.4.4",
+    "@babel/plugin-transform-literals": "^7.2.0",
+    "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+    "@babel/plugin-transform-modules-amd": "^7.5.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+    "@babel/plugin-transform-modules-systemjs": "^7.5.0",
+    "@babel/plugin-transform-modules-umd": "^7.2.0",
+    "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+    "@babel/plugin-transform-new-target": "^7.4.4",
+    "@babel/plugin-transform-object-super": "^7.5.5",
+    "@babel/plugin-transform-parameters": "^7.4.4",
+    "@babel/plugin-transform-property-literals": "^7.2.0",
+    "@babel/plugin-transform-regenerator": "^7.4.5",
+    "@babel/plugin-transform-reserved-words": "^7.2.0",
+    "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+    "@babel/plugin-transform-spread": "^7.2.0",
+    "@babel/plugin-transform-sticky-regex": "^7.2.0",
+    "@babel/plugin-transform-template-literals": "^7.4.4",
+    "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+    "@babel/plugin-transform-unicode-regex": "^7.4.4",
+    "@babel/types": "^7.5.5",
+    "browserslist": "^4.6.0",
+    "core-js-compat": "^3.1.1",
     "invariant": "^2.2.2",
     "js-levenshtein": "^1.1.3",
-    "semver": "^5.3.0"
+    "semver": "^5.5.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/helper-fixtures": "^7.0.0",
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/helper-fixtures": "^7.5.5",
     "@babel/helper-plugin-test-runner": "^7.0.0",
-    "caniuse-db": "1.0.30000851",
-    "compat-table": "kangax/compat-table#ce39b436201a8d037cc1b943770a21e07769d684",
-    "electron-to-chromium": "1.3.55"
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "caniuse-db": "1.0.30000969",
+    "compat-table": "kangax/compat-table#071b478a44694cbf72a78db8ab39189c5ae31b2c",
+    "electron-to-chromium": "1.3.113"
   }
 }
diff --git a/packages/babel-preset-env/scripts/build-data.js b/packages/babel-preset-env/scripts/build-data.js
index 1f4735d5bbcc..d4502ddaa91f 100644
--- a/packages/babel-preset-env/scripts/build-data.js
+++ b/packages/babel-preset-env/scripts/build-data.js
@@ -132,6 +132,7 @@ const environments = [
   "android",
   "ios",
   "phantom",
+  "samsung",
 ];
 
 const compatibilityTests = flattenDeep(
@@ -162,22 +163,16 @@ const getLowestImplementedVersion = ({ features }, env) => {
       );
     })
     .reduce((result, test) => {
-      const isBuiltIn =
-        test.category === "built-ins" ||
-        test.category === "built-in extensions";
-
       if (!test.subtests) {
         result.push({
           name: test.name,
           res: test.res,
-          isBuiltIn,
         });
       } else {
         test.subtests.forEach(subtest =>
           result.push({
             name: `${test.name}/${subtest.name}`,
             res: subtest.res,
-            isBuiltIn,
           })
         );
       }
@@ -186,34 +181,44 @@ const getLowestImplementedVersion = ({ features }, env) => {
     }, []);
 
   const unreleasedLabelForEnv = unreleasedLabels[env];
-  const envTests = tests.map(({ res: test, isBuiltIn }, i) => {
-    // Babel itself doesn't implement the feature correctly,
-    // don't count against it
-    // only doing this for built-ins atm
-    //
-    // NOTE: when/if compat-table adds a babel7 key, we'll want to update this
-    if (!test.babel6 && isBuiltIn) {
-      return "-1";
-    }
+  const envTests = tests.map(({ res: test }, i) => {
+    const reportedVersions = Object.keys(test)
+      .filter(t => t.startsWith(env))
+      .map(t => {
+        const version = t.replace(/_/g, ".").replace(env, "");
+        return {
+          version,
+          semver: semver.coerce(version) || version,
+          // Babel assumes strict mode
+          implements: tests[i].res[t] === true || tests[i].res[t] === "strict",
+        };
+      })
+      // version must be label from the unreleasedLabels (like tp) or number.
+      .filter(
+        version =>
+          unreleasedLabelForEnv === version.version ||
+          !isNaN(parseFloat(version.version))
+      )
+      // Sort in desc order, with unreleasedLabelForEnv coming last.
+      .sort(({ semver: av }, { semver: bv }) => {
+        if (av === unreleasedLabelForEnv) return -1;
+        if (bv === unreleasedLabelForEnv) return 1;
+        if (semver.gt(av, bv)) return -1;
+        if (semver.gt(bv, av)) return 1;
+        return 0;
+      });
 
-    return (
-      Object.keys(test)
-        .filter(t => t.startsWith(env))
-        // Babel assumes strict mode
-        .filter(
-          test => tests[i].res[test] === true || tests[i].res[test] === "strict"
-        )
-        // normalize some keys and get version from full string.
-        .map(test => {
-          return test.replace("_", ".").replace(env, "");
-        })
-        // version must be label from the unreleasedLabels (like tp) or number.
-        .filter(
-          version =>
-            unreleasedLabelForEnv === version || !isNaN(parseFloat(version))
-        )
-        .shift()
-    );
+    // Find the lowest version such that all higher versions implement it.
+    // Eg, given { chrome70: true, chrome60: false, chrome50: true }, the
+    // lowest version is chrome70, not chrome50.
+    let lowest = null;
+    for (const version of reportedVersions) {
+      if (!version.implements) {
+        break;
+      }
+      lowest = version;
+    }
+    return lowest;
   });
 
   const envFiltered = envTests.filter(t => t);
@@ -229,12 +234,15 @@ const getLowestImplementedVersion = ({ features }, env) => {
     return null;
   }
 
-  return envTests.map(str => str.replace(env, "")).reduce((a, b) => {
-    if (b === unreleasedLabelForEnv) {
-      return b;
+  return envFiltered.reduce((a, b) => {
+    if (
+      a.semver === unreleasedLabelForEnv ||
+      b.semver === unreleasedLabelForEnv
+    ) {
+      return unreleasedLabelForEnv;
     }
 
-    return semver.lt(semver.coerce(a), semver.coerce(b)) ? b : a;
+    return semver.lt(a.semver, b.semver) ? b : a;
   });
 };
 
@@ -252,7 +260,14 @@ const generateData = (environments, features) => {
       const version = getLowestImplementedVersion(options, env);
 
       if (version !== null) {
-        plugin[env] = version.toString();
+        const versionString = version.version;
+
+        // NOTE(bng): A number of environments in compat-table changed to
+        // include a trailing zero (node10 -> node10_0), so for now stripping
+        // it to be consistent
+        plugin[env] = versionString.endsWith(".0")
+          ? versionString.slice(0, -2)
+          : versionString;
       }
     });
 
@@ -275,7 +290,7 @@ const generateData = (environments, features) => {
   });
 };
 
-["plugin", "built-in"].forEach(target => {
+["plugin", "corejs2-built-in"].forEach(target => {
   const newData = generateData(
     environments,
     require(`../data/${target}-features`)
diff --git a/packages/babel-preset-env/scripts/build-modules-support.js b/packages/babel-preset-env/scripts/build-modules-support.js
index 1ce611078c15..40add39e0cb0 100644
--- a/packages/babel-preset-env/scripts/build-modules-support.js
+++ b/packages/babel-preset-env/scripts/build-modules-support.js
@@ -3,23 +3,22 @@ const fs = require("fs");
 
 const moduleSupport = require("caniuse-db/features-json/es6-module.json");
 
-const acceptedWithCaveats = {
-  safari: true,
-  ios_saf: true,
-};
+const skipList = new Set(["android", "samsung"]);
+const acceptedWithCaveats = new Set(["safari", "ios_saf"]);
 
 const { stats } = moduleSupport;
 
 const allowedBrowsers = {};
 
 Object.keys(stats).forEach(browser => {
-  if (browser !== "and_chr") {
+  if (!skipList.has(browser)) {
     const browserVersions = stats[browser];
     const allowedVersions = Object.keys(browserVersions)
       .filter(value => {
-        return acceptedWithCaveats[browser]
+        // Edge 16/17 are marked as "y #6"
+        return acceptedWithCaveats.has(browser)
           ? browserVersions[value][0] === "a"
-          : browserVersions[value] === "y";
+          : browserVersions[value].startsWith("y");
       })
       .sort((a, b) => a - b);
 
diff --git a/packages/babel-preset-env/src/available-plugins.js b/packages/babel-preset-env/src/available-plugins.js
index 559e5478a4b3..77da4ff02cf0 100644
--- a/packages/babel-preset-env/src/available-plugins.js
+++ b/packages/babel-preset-env/src/available-plugins.js
@@ -1,9 +1,14 @@
+// @flow
+
 export default {
   "syntax-async-generators": require("@babel/plugin-syntax-async-generators"),
+  "syntax-dynamic-import": require("@babel/plugin-syntax-dynamic-import"),
+  "syntax-json-strings": require("@babel/plugin-syntax-json-strings"),
   "syntax-object-rest-spread": require("@babel/plugin-syntax-object-rest-spread"),
   "syntax-optional-catch-binding": require("@babel/plugin-syntax-optional-catch-binding"),
   "transform-async-to-generator": require("@babel/plugin-transform-async-to-generator"),
   "proposal-async-generator-functions": require("@babel/plugin-proposal-async-generator-functions"),
+  "proposal-dynamic-import": require("@babel/plugin-proposal-dynamic-import"),
   "proposal-json-strings": require("@babel/plugin-proposal-json-strings"),
   "transform-arrow-functions": require("@babel/plugin-transform-arrow-functions"),
   "transform-block-scoped-functions": require("@babel/plugin-transform-block-scoped-functions"),
@@ -16,12 +21,16 @@ export default {
   "transform-for-of": require("@babel/plugin-transform-for-of"),
   "transform-function-name": require("@babel/plugin-transform-function-name"),
   "transform-literals": require("@babel/plugin-transform-literals"),
+  "transform-member-expression-literals": require("@babel/plugin-transform-member-expression-literals"),
   "transform-modules-amd": require("@babel/plugin-transform-modules-amd"),
   "transform-modules-commonjs": require("@babel/plugin-transform-modules-commonjs"),
   "transform-modules-systemjs": require("@babel/plugin-transform-modules-systemjs"),
   "transform-modules-umd": require("@babel/plugin-transform-modules-umd"),
+  "transform-named-capturing-groups-regex": require("@babel/plugin-transform-named-capturing-groups-regex"),
   "transform-object-super": require("@babel/plugin-transform-object-super"),
   "transform-parameters": require("@babel/plugin-transform-parameters"),
+  "transform-property-literals": require("@babel/plugin-transform-property-literals"),
+  "transform-reserved-words": require("@babel/plugin-transform-reserved-words"),
   "transform-shorthand-properties": require("@babel/plugin-transform-shorthand-properties"),
   "transform-spread": require("@babel/plugin-transform-spread"),
   "transform-sticky-regex": require("@babel/plugin-transform-sticky-regex"),
diff --git a/packages/babel-preset-env/src/built-in-definitions.js b/packages/babel-preset-env/src/built-in-definitions.js
deleted file mode 100644
index bcad0d8651d5..000000000000
--- a/packages/babel-preset-env/src/built-in-definitions.js
+++ /dev/null
@@ -1,182 +0,0 @@
-const ArrayNatureIterators = [
-  "es6.object.to-string",
-  "es6.array.iterator",
-  "web.dom.iterable",
-];
-
-const CommonIterators = ["es6.string.iterator"].concat(ArrayNatureIterators);
-
-// TODO: this is the opposite of built-in-features so maybe generate one from the other?
-export const definitions = {
-  builtins: {
-    DataView: "es6.typed.data-view",
-    Float32Array: "es6.typed.float32-array",
-    Float64Array: "es6.typed.float64-array",
-    Int8Array: "es6.typed.int8-array",
-    Int16Array: "es6.typed.int16-array",
-    Int32Array: "es6.typed.int32-array",
-    Map: ["es6.map"].concat(CommonIterators),
-    Number: "es6.number.constructor",
-    Promise: ["es6.object.to-string", "es6.promise"],
-    RegExp: ["es6.regexp.constructor"],
-    Set: ["es6.set"].concat(CommonIterators),
-    Symbol: ["es6.symbol", "es7.symbol.async-iterator"],
-    Uint8Array: "es6.typed.uint8-array",
-    Uint8ClampedArray: "es6.typed.uint8-clamped-array",
-    Uint16Array: "es6.typed.uint16-array",
-    Uint32Array: "es6.typed.uint32-array",
-    WeakMap: ["es6.weak-map"].concat(CommonIterators),
-    WeakSet: ["es6.weak-set"].concat(CommonIterators),
-  },
-
-  instanceMethods: {
-    __defineGetter__: ["es7.object.define-getter"],
-    __defineSetter__: ["es7.object.define-setter"],
-    __lookupGetter__: ["es7.object.lookup-getter"],
-    __lookupSetter__: ["es7.object.lookup-setter"],
-    anchor: ["es6.string.anchor"],
-    big: ["es6.string.big"],
-    bind: ["es6.function.bind"],
-    blink: ["es6.string.blink"],
-    bold: ["es6.string.bold"],
-    codePointAt: ["es6.string.code-point-at"],
-    copyWithin: ["es6.array.copy-within"],
-    endsWith: ["es6.string.ends-with"],
-    entries: ArrayNatureIterators,
-    every: ["es6.array.is-array"],
-    fill: ["es6.array.fill"],
-    filter: ["es6.array.filter"],
-    finally: ["es7.promise.finally"],
-    find: ["es6.array.find"],
-    findIndex: ["es6.array.find-index"],
-    fixed: ["es6.string.fixed"],
-    flags: ["es6.regexp.flags"],
-    fontcolor: ["es6.string.fontcolor"],
-    fontsize: ["es6.string.fontsize"],
-    forEach: ["es6.array.for-each", "web.dom.iterable"],
-    includes: ["es6.string.includes", "es7.array.includes"],
-    indexOf: ["es6.array.index-of"],
-    italics: ["es6.string.italics"],
-    keys: ArrayNatureIterators,
-    lastIndexOf: ["es6.array.last-index-of"],
-    link: ["es6.string.link"],
-    map: ["es6.array.map"],
-    match: ["es6.regexp.match"],
-    name: ["es6.function.name"],
-    padStart: ["es7.string.pad-start"],
-    padEnd: ["es7.string.pad-end"],
-    reduce: ["es6.array.reduce"],
-    reduceRight: ["es6.array.reduce-right"],
-    repeat: ["es6.string.repeat"],
-    replace: ["es6.regexp.replace"],
-    search: ["es6.regexp.search"],
-    slice: ["es6.array.slice"],
-    small: ["es6.string.small"],
-    some: ["es6.array.some"],
-    sort: ["es6.array.sort"],
-    split: ["es6.regexp.split"],
-    startsWith: ["es6.string.starts-with"],
-    strike: ["es6.string.strike"],
-    sub: ["es6.string.sub"],
-    sup: ["es6.string.sup"],
-    toISOString: ["es6.date.to-iso-string"],
-    toJSON: ["es6.date.to-json"],
-    toString: [
-      "es6.object.to-string",
-      "es6.date.to-string",
-      "es6.regexp.to-string",
-    ],
-    trim: ["es6.string.trim"],
-    values: ArrayNatureIterators,
-  },
-
-  staticMethods: {
-    Array: {
-      from: ["es6.array.from", "es6.string.iterator"],
-      isArray: "es6.array.is-array",
-      of: "es6.array.of",
-    },
-
-    Date: {
-      now: "es6.date.now",
-    },
-
-    Object: {
-      assign: "es6.object.assign",
-      create: "es6.object.create",
-      defineProperty: "es6.object.define-property",
-      defineProperties: "es6.object.define-properties",
-      entries: "es7.object.entries",
-      freeze: "es6.object.freeze",
-      getOwnPropertyDescriptors: "es7.object.get-own-property-descriptors",
-      getOwnPropertySymbols: "es6.object.get-own-property-symbols",
-      is: "es6.object.is",
-      isExtensible: "es6.object.is-extensible",
-      isFrozen: "es6.object.is-frozen",
-      isSealed: "es6.object.is-sealed",
-      keys: "es6.object.keys",
-      preventExtensions: "es6.object.prevent-extensions",
-      seal: "es6.object.seal",
-      setPrototypeOf: "es6.object.set-prototype-of",
-      values: "es7.object.values",
-    },
-
-    Math: {
-      acosh: "es6.math.acosh",
-      asinh: "es6.math.asinh",
-      atanh: "es6.math.atanh",
-      cbrt: "es6.math.cbrt",
-      clz32: "es6.math.clz32",
-      cosh: "es6.math.cosh",
-      expm1: "es6.math.expm1",
-      fround: "es6.math.fround",
-      hypot: "es6.math.hypot",
-      imul: "es6.math.imul",
-      log1p: "es6.math.log1p",
-      log10: "es6.math.log10",
-      log2: "es6.math.log2",
-      sign: "es6.math.sign",
-      sinh: "es6.math.sinh",
-      tanh: "es6.math.tanh",
-      trunc: "es6.math.trunc",
-    },
-
-    String: {
-      fromCodePoint: "es6.string.from-code-point",
-      raw: "es6.string.raw",
-    },
-
-    Number: {
-      EPSILON: "es6.number.epsilon",
-      MIN_SAFE_INTEGER: "es6.number.min-safe-integer",
-      MAX_SAFE_INTEGER: "es6.number.max-safe-integer",
-      isFinite: "es6.number.is-finite",
-      isInteger: "es6.number.is-integer",
-      isSafeInteger: "es6.number.is-safe-integer",
-      isNaN: "es6.number.is-nan",
-      parseFloat: "es6.number.parse-float",
-      parseInt: "es6.number.parse-int",
-    },
-
-    Promise: {
-      all: CommonIterators,
-      race: CommonIterators,
-    },
-
-    Reflect: {
-      apply: "es6.reflect.apply",
-      construct: "es6.reflect.construct",
-      defineProperty: "es6.reflect.define-property",
-      deleteProperty: "es6.reflect.delete-property",
-      get: "es6.reflect.get",
-      getOwnPropertyDescriptor: "es6.reflect.get-own-property-descriptor",
-      getPrototypeOf: "es6.reflect.get-prototype-of",
-      has: "es6.reflect.has",
-      isExtensible: "es6.reflect.is-extensible",
-      ownKeys: "es6.reflect.own-keys",
-      preventExtensions: "es6.reflect.prevent-extensions",
-      set: "es6.reflect.set",
-      setPrototypeOf: "es6.reflect.set-prototype-of",
-    },
-  },
-};
diff --git a/packages/babel-preset-env/src/debug.js b/packages/babel-preset-env/src/debug.js
index ddf65a5c28be..db72cf0c3e3e 100644
--- a/packages/babel-preset-env/src/debug.js
+++ b/packages/babel-preset-env/src/debug.js
@@ -1,20 +1,21 @@
+// @flow
 /*eslint quotes: ["error", "double", { "avoidEscape": true }]*/
 import semver from "semver";
 import { isUnreleasedVersion, prettifyVersion, semverify } from "./utils";
 
-const wordEnds = size => {
-  return size > 1 ? "s" : "";
-};
+import type { Targets } from "./types";
 
-export const logMessage = (message, context) => {
-  const pre = context ? `[${context}] ` : "";
-  const logStr = `  ${pre}${message}`;
-  console.log(logStr);
+const wordEnds = (size: number) => {
+  return size > 1 ? "s" : "";
 };
 
 // Outputs a message that shows which target(s) caused an item to be included:
 // transform-foo { "edge":"13", "firefox":"49", "ie":"10" }
-export const logPlugin = (item, targetVersions, list, context) => {
+export const logPluginOrPolyfill = (
+  item: string,
+  targetVersions: Targets,
+  list: { [key: string]: Targets },
+) => {
   const minVersions = list[item] || {};
 
   const filteredList = Object.keys(targetVersions).reduce((result, env) => {
@@ -29,7 +30,8 @@ export const logPlugin = (item, targetVersions, list, context) => {
 
       if (
         !targetIsUnreleased &&
-        (minIsUnreleased || semver.lt(targetVersion, semverify(minVersion)))
+        (minIsUnreleased ||
+          semver.lt(targetVersion.toString(), semverify(minVersion)))
       ) {
         result[env] = prettifyVersion(targetVersion);
       }
@@ -43,50 +45,56 @@ export const logPlugin = (item, targetVersions, list, context) => {
     .replace(/^\{"/, '{ "')
     .replace(/"\}$/, '" }');
 
-  logMessage(`${item} ${formattedTargets}`, context);
+  console.log(`  ${item} ${formattedTargets}`);
 };
 
 export const logEntryPolyfills = (
-  importPolyfillIncluded,
-  polyfills,
-  filename,
-  onDebug,
+  polyfillName: string,
+  importPolyfillIncluded: boolean,
+  polyfills: Set<string>,
+  filename: string,
+  polyfillTargets: Targets,
+  allBuiltInsList: { [key: string]: Targets },
 ) => {
   if (!importPolyfillIncluded) {
-    console.log(
-      `
-[${filename}] \`import '@babel/polyfill'\` was not found.`,
-    );
+    console.log(`\n[${filename}] Import of ${polyfillName} was not found.`);
     return;
   }
   if (!polyfills.size) {
     console.log(
-      `
-[${filename}] Based on your targets, none were added.`,
+      `\n[${filename}] Based on your targets, polyfills were not added.`,
     );
     return;
   }
 
   console.log(
-    `
-[${filename}] Replaced \`@babel/polyfill\` with the following polyfill${wordEnds(
+    `\n[${filename}] Replaced ${polyfillName} entries with the following polyfill${wordEnds(
       polyfills.size,
     )}:`,
   );
-  onDebug(polyfills);
+  for (const polyfill of polyfills) {
+    logPluginOrPolyfill(polyfill, polyfillTargets, allBuiltInsList);
+  }
 };
 
-export const logUsagePolyfills = (polyfills, filename, onDebug) => {
+export const logUsagePolyfills = (
+  polyfills: Set<string>,
+  filename: string,
+  polyfillTargets: Targets,
+  allBuiltInsList: { [key: string]: Targets },
+) => {
   if (!polyfills.size) {
     console.log(
-      `
-[${filename}] Based on your code and targets, none were added.`,
+      `\n[${filename}] Based on your code and targets, core-js polyfills were not added.`,
     );
     return;
   }
   console.log(
-    `
-[${filename}] Added following polyfill${wordEnds(polyfills.size)}:`,
+    `\n[${filename}] Added following core-js polyfill${wordEnds(
+      polyfills.size,
+    )}:`,
   );
-  onDebug(polyfills);
+  for (const polyfill of polyfills) {
+    logPluginOrPolyfill(polyfill, polyfillTargets, allBuiltInsList);
+  }
 };
diff --git a/packages/babel-preset-env/src/default-includes.js b/packages/babel-preset-env/src/default-includes.js
deleted file mode 100644
index f99eec728ac4..000000000000
--- a/packages/babel-preset-env/src/default-includes.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export const defaultWebIncludes = [
-  "web.timers",
-  "web.immediate",
-  "web.dom.iterable",
-];
diff --git a/packages/babel-preset-env/src/defaults.js b/packages/babel-preset-env/src/defaults.js
deleted file mode 100644
index 8806a5229ab6..000000000000
--- a/packages/babel-preset-env/src/defaults.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { Targets } from "./types";
-
-const defaultWebIncludes = ["web.timers", "web.immediate", "web.dom.iterable"];
-const defaultExcludesForLooseMode = ["transform-typeof-symbol"];
-
-export const getPlatformSpecificDefaultFor = (
-  targets: Targets,
-): ?Array<string> => {
-  const targetNames = Object.keys(targets);
-  const isAnyTarget = !targetNames.length;
-  const isWebTarget = targetNames.some(name => name !== "node");
-
-  return isAnyTarget || isWebTarget ? defaultWebIncludes : null;
-};
-
-export const getOptionSpecificExcludesFor = ({
-  loose,
-}: {
-  loose: boolean,
-}): ?Array<string> => {
-  if (loose) {
-    return defaultExcludesForLooseMode;
-  }
-  return null;
-};
diff --git a/packages/babel-preset-env/src/filter-items.js b/packages/babel-preset-env/src/filter-items.js
new file mode 100644
index 000000000000..7d9c07026eba
--- /dev/null
+++ b/packages/babel-preset-env/src/filter-items.js
@@ -0,0 +1,87 @@
+// @flow
+import semver from "semver";
+import { semverify, isUnreleasedVersion } from "./utils";
+
+import type { Targets } from "./types";
+
+export function isPluginRequired(
+  supportedEnvironments: Targets,
+  plugin: Targets,
+) {
+  const targetEnvironments = Object.keys(supportedEnvironments);
+
+  if (targetEnvironments.length === 0) {
+    return true;
+  }
+
+  const isRequiredForEnvironments = targetEnvironments.filter(environment => {
+    // Feature is not implemented in that environment
+    if (!plugin[environment]) {
+      return true;
+    }
+
+    const lowestImplementedVersion = plugin[environment];
+    const lowestTargetedVersion = supportedEnvironments[environment];
+
+    // If targets has unreleased value as a lowest version, then don't require a plugin.
+    if (isUnreleasedVersion(lowestTargetedVersion, environment)) {
+      return false;
+    }
+
+    // Include plugin if it is supported in the unreleased environment, which wasn't specified in targets
+    if (isUnreleasedVersion(lowestImplementedVersion, environment)) {
+      return true;
+    }
+
+    if (!semver.valid(lowestTargetedVersion.toString())) {
+      throw new Error(
+        `Invalid version passed for target "${environment}": "${lowestTargetedVersion}". ` +
+          "Versions must be in semver format (major.minor.patch)",
+      );
+    }
+
+    return semver.gt(
+      semverify(lowestImplementedVersion),
+      lowestTargetedVersion.toString(),
+    );
+  });
+
+  return isRequiredForEnvironments.length > 0;
+}
+
+export default function(
+  list: { [feature: string]: Targets },
+  includes: Set<string>,
+  excludes: Set<string>,
+  targets: Targets,
+  defaultIncludes: Array<string> | null,
+  defaultExcludes?: Array<string> | null,
+  pluginSyntaxMap?: Map<string, string | null>,
+) {
+  const result = new Set<string>();
+
+  for (const item in list) {
+    if (
+      !excludes.has(item) &&
+      (isPluginRequired(targets, list[item]) || includes.has(item))
+    ) {
+      result.add(item);
+    } else if (pluginSyntaxMap) {
+      const shippedProposalsSyntax = pluginSyntaxMap.get(item);
+
+      if (shippedProposalsSyntax) {
+        result.add(shippedProposalsSyntax);
+      }
+    }
+  }
+
+  if (defaultIncludes) {
+    defaultIncludes.forEach(item => !excludes.has(item) && result.add(item));
+  }
+
+  if (defaultExcludes) {
+    defaultExcludes.forEach(item => !includes.has(item) && result.delete(item));
+  }
+
+  return result;
+}
diff --git a/packages/babel-preset-env/src/get-option-specific-excludes.js b/packages/babel-preset-env/src/get-option-specific-excludes.js
new file mode 100644
index 000000000000..d9bcc60bde74
--- /dev/null
+++ b/packages/babel-preset-env/src/get-option-specific-excludes.js
@@ -0,0 +1,7 @@
+// @flow
+
+const defaultExcludesForLooseMode = ["transform-typeof-symbol"];
+
+export default function({ loose }: { loose: boolean }): null | string[] {
+  return loose ? defaultExcludesForLooseMode : null;
+}
diff --git a/packages/babel-preset-env/src/index.js b/packages/babel-preset-env/src/index.js
index 338a25a6ab07..85a784476b83 100644
--- a/packages/babel-preset-env/src/index.js
+++ b/packages/babel-preset-env/src/index.js
@@ -1,33 +1,32 @@
 //@flow
 
-import semver from "semver";
-import builtInsList from "../data/built-ins.json";
-import { logPlugin } from "./debug";
-import {
-  getPlatformSpecificDefaultFor,
-  getOptionSpecificExcludesFor,
-} from "./defaults";
+import { logPluginOrPolyfill } from "./debug";
+import getOptionSpecificExcludesFor from "./get-option-specific-excludes";
+import filterItems from "./filter-items";
 import moduleTransformations from "./module-transformations";
-import normalizeOptions from "./normalize-options.js";
+import normalizeOptions from "./normalize-options";
 import pluginList from "../data/plugins.json";
-import {
-  builtIns as proposalBuiltIns,
-  features as proposalPlugins,
-  pluginSyntaxMap,
-} from "../data/shipped-proposals.js";
-import useBuiltInsEntryPlugin from "./use-built-ins-entry-plugin";
-import addUsedBuiltInsPlugin from "./use-built-ins-plugin";
+import { proposalPlugins, pluginSyntaxMap } from "../data/shipped-proposals";
+
+import addCoreJS2UsagePlugin from "./polyfills/corejs2/usage-plugin";
+import addCoreJS3UsagePlugin from "./polyfills/corejs3/usage-plugin";
+import addRegeneratorUsagePlugin from "./polyfills/regenerator/usage-plugin";
+import replaceCoreJS2EntryPlugin from "./polyfills/corejs2/entry-plugin";
+import replaceCoreJS3EntryPlugin from "./polyfills/corejs3/entry-plugin";
+import removeRegeneratorEntryPlugin from "./polyfills/regenerator/entry-plugin";
+
 import getTargets from "./targets-parser";
 import availablePlugins from "./available-plugins";
-import {
-  filterStageFromList,
-  prettifyTargets,
-  semverify,
-  isUnreleasedVersion,
-} from "./utils";
-import type { Targets } from "./types";
+import { filterStageFromList, prettifyTargets } from "./utils";
 import { declare } from "@babel/helper-plugin-utils";
 
+export { isPluginRequired } from "./filter-items";
+
+const pluginListWithoutProposals = filterStageFromList(
+  pluginList,
+  proposalPlugins,
+);
+
 const getPlugin = (pluginName: string) => {
   const plugin = availablePlugins[pluginName];
 
@@ -40,74 +39,12 @@ const getPlugin = (pluginName: string) => {
   return plugin;
 };
 
-const builtInsListWithoutProposals = filterStageFromList(
-  builtInsList,
-  proposalBuiltIns,
-);
-
-const pluginListWithoutProposals = filterStageFromList(
-  pluginList,
-  proposalPlugins,
-);
-
-export const isPluginRequired = (
-  supportedEnvironments: Targets,
-  plugin: Targets,
-): boolean => {
-  const targetEnvironments: Array<string> = Object.keys(supportedEnvironments);
-
-  if (targetEnvironments.length === 0) {
-    return true;
-  }
-
-  const isRequiredForEnvironments: Array<string> = targetEnvironments.filter(
-    environment => {
-      // Feature is not implemented in that environment
-      if (!plugin[environment]) {
-        return true;
-      }
-
-      const lowestImplementedVersion: string = plugin[environment];
-      const lowestTargetedVersion: string = supportedEnvironments[environment];
-      // If targets has unreleased value as a lowest version, then don't require a plugin.
-      if (isUnreleasedVersion(lowestTargetedVersion, environment)) {
-        return false;
-        // Include plugin if it is supported in the unreleased environment, which wasn't specified in targets
-      } else if (isUnreleasedVersion(lowestImplementedVersion, environment)) {
-        return true;
-      }
-
-      if (!semver.valid(lowestTargetedVersion)) {
-        throw new Error(
-          `Invalid version passed for target "${environment}": "${lowestTargetedVersion}". ` +
-            "Versions must be in semver format (major.minor.patch)",
-        );
-      }
-
-      return semver.gt(
-        semverify(lowestImplementedVersion),
-        lowestTargetedVersion,
-      );
-    },
-  );
-
-  return isRequiredForEnvironments.length > 0;
-};
-
-const getBuiltInTargets = targets => {
-  const builtInTargets = {
-    ...targets,
-  };
-  if (builtInTargets.uglify != null) {
-    delete builtInTargets.uglify;
-  }
-  return builtInTargets;
-};
-
 export const transformIncludesAndExcludes = (opts: Array<string>): Object => {
   return opts.reduce(
     (result, opt) => {
-      const target = opt.match(/^(es\d+|web)\./) ? "builtIns" : "plugins";
+      const target = opt.match(/^(es|es6|es7|esnext|web)\./)
+        ? "builtIns"
+        : "plugins";
       result[target].add(opt);
       return result;
     },
@@ -119,46 +56,14 @@ export const transformIncludesAndExcludes = (opts: Array<string>): Object => {
   );
 };
 
-const filterItems = (
-  list,
-  includes,
-  excludes,
-  targets,
-  defaultIncludes,
-  defaultExcludes,
-): Set<string> => {
-  const result = new Set();
-
-  for (const item in list) {
-    if (
-      !excludes.has(item) &&
-      (isPluginRequired(targets, list[item]) || includes.has(item))
-    ) {
-      result.add(item);
-    } else {
-      const shippedProposalsSyntax = pluginSyntaxMap.get(item);
-
-      if (shippedProposalsSyntax) {
-        result.add(shippedProposalsSyntax);
-      }
-    }
-  }
-
-  if (defaultIncludes) {
-    defaultIncludes.forEach(item => !excludes.has(item) && result.add(item));
-  }
-
-  if (defaultExcludes) {
-    defaultExcludes.forEach(item => !includes.has(item) && result.delete(item));
-  }
-
-  return result;
-};
-
 function supportsStaticESM(caller) {
   return !!(caller && caller.supportsStaticESM);
 }
 
+function supportsDynamicImport(caller) {
+  return !!(caller && caller.supportsDynamicImport);
+}
+
 export default declare((api, opts) => {
   api.assertVersion(7);
 
@@ -175,6 +80,7 @@ export default declare((api, opts) => {
     spec,
     targets: optionsTargets,
     useBuiltIns,
+    corejs: { version: corejs, proposals },
   } = normalizeOptions(opts);
   // TODO: remove this in next major
   let hasUglifyTarget = false;
@@ -216,36 +122,43 @@ export default declare((api, opts) => {
     transformTargets,
     null,
     getOptionSpecificExcludesFor({ loose }),
+    pluginSyntaxMap,
   );
 
-  let polyfills;
-  let polyfillTargets;
-
-  if (useBuiltIns) {
-    polyfillTargets = getBuiltInTargets(targets);
-
-    polyfills = filterItems(
-      shippedProposals ? builtInsList : builtInsListWithoutProposals,
-      include.builtIns,
-      exclude.builtIns,
-      polyfillTargets,
-      getPlatformSpecificDefaultFor(polyfillTargets),
-    );
-  }
-
   const plugins = [];
   const pluginUseBuiltIns = useBuiltIns !== false;
 
-  if (
-    modules !== false &&
-    moduleTransformations[modules] &&
+  if (modules !== false && moduleTransformations[modules]) {
     // TODO: Remove the 'api.caller' check eventually. Just here to prevent
     // unnecessary breakage in the short term for users on older betas/RCs.
-    (modules !== "auto" || !api.caller || !api.caller(supportsStaticESM))
-  ) {
-    // NOTE: not giving spec here yet to avoid compatibility issues when
-    // transform-modules-commonjs gets its spec mode
-    plugins.push([getPlugin(moduleTransformations[modules]), { loose }]);
+    const shouldTransformESM =
+      modules !== "auto" || !api.caller || !api.caller(supportsStaticESM);
+    const shouldTransformDynamicImport =
+      modules !== "auto" || !api.caller || !api.caller(supportsDynamicImport);
+
+    if (shouldTransformESM) {
+      // NOTE: not giving spec here yet to avoid compatibility issues when
+      // transform-modules-commonjs gets its spec mode
+      plugins.push([getPlugin(moduleTransformations[modules]), { loose }]);
+    }
+
+    if (
+      shouldTransformDynamicImport &&
+      shouldTransformESM &&
+      modules !== "umd"
+    ) {
+      plugins.push([getPlugin("proposal-dynamic-import"), { loose }]);
+    } else {
+      if (shouldTransformDynamicImport) {
+        console.warn(
+          "Dynamic import can only be supported when transforming ES modules" +
+            " to AMD, CommonJS or SystemJS. Only the parser plugin will be enabled.",
+        );
+      }
+      plugins.push(getPlugin("syntax-dynamic-import"));
+    }
+  } else {
+    plugins.push(getPlugin("syntax-dynamic-import"));
   }
 
   transformations.forEach(pluginName =>
@@ -255,8 +168,6 @@ export default declare((api, opts) => {
     ]),
   );
 
-  const regenerator = transformations.has("transform-regenerator");
-
   if (debug) {
     console.log("@babel/preset-env: `DEBUG` option");
     console.log("\nUsing targets:");
@@ -264,7 +175,7 @@ export default declare((api, opts) => {
     console.log(`\nUsing modules transform: ${modules.toString()}`);
     console.log("\nUsing plugins:");
     transformations.forEach(transform => {
-      logPlugin(transform, targets, pluginList);
+      logPluginOrPolyfill(transform, targets, pluginList);
     });
 
     if (!useBuiltIns) {
@@ -272,32 +183,46 @@ export default declare((api, opts) => {
         "\nUsing polyfills: No polyfills were added, since the `useBuiltIns` option was not set.",
       );
     } else {
-      console.log(
-        `
-Using polyfills with \`${useBuiltIns}\` option:`,
-      );
+      console.log(`\nUsing polyfills with \`${useBuiltIns}\` option:`);
     }
   }
 
   if (useBuiltIns === "usage" || useBuiltIns === "entry") {
+    const regenerator = transformations.has("transform-regenerator");
+
     const pluginOptions = {
-      debug,
-      polyfills,
+      corejs,
+      polyfillTargets: targets,
+      include: include.builtIns,
+      exclude: exclude.builtIns,
+      proposals,
+      shippedProposals,
       regenerator,
-      onDebug: (polyfills, context) => {
-        polyfills.forEach(polyfill =>
-          logPlugin(polyfill, polyfillTargets, builtInsList, context),
-        );
-      },
+      debug,
     };
 
-    plugins.push([
-      useBuiltIns === "usage" ? addUsedBuiltInsPlugin : useBuiltInsEntryPlugin,
-      pluginOptions,
-    ]);
+    if (corejs) {
+      if (useBuiltIns === "usage") {
+        if (corejs.major === 2) {
+          plugins.push([addCoreJS2UsagePlugin, pluginOptions]);
+        } else {
+          plugins.push([addCoreJS3UsagePlugin, pluginOptions]);
+        }
+        if (regenerator) {
+          plugins.push([addRegeneratorUsagePlugin, pluginOptions]);
+        }
+      } else {
+        if (corejs.major === 2) {
+          plugins.push([replaceCoreJS2EntryPlugin, pluginOptions]);
+        } else {
+          plugins.push([replaceCoreJS3EntryPlugin, pluginOptions]);
+          if (!regenerator) {
+            plugins.push([removeRegeneratorEntryPlugin, pluginOptions]);
+          }
+        }
+      }
+    }
   }
 
-  return {
-    plugins,
-  };
+  return { plugins };
 });
diff --git a/packages/babel-preset-env/src/module-transformations.js b/packages/babel-preset-env/src/module-transformations.js
index a98f8dd04461..6c9affe6b7ce 100644
--- a/packages/babel-preset-env/src/module-transformations.js
+++ b/packages/babel-preset-env/src/module-transformations.js
@@ -1,8 +1,12 @@
-export default {
+// @flow
+
+import typeof AvailablePlugins from "./available-plugins";
+
+export default ({
   auto: "transform-modules-commonjs",
   amd: "transform-modules-amd",
   commonjs: "transform-modules-commonjs",
   cjs: "transform-modules-commonjs",
   systemjs: "transform-modules-systemjs",
   umd: "transform-modules-umd",
-};
+}: { [transform: string]: $Keys<AvailablePlugins> });
diff --git a/packages/babel-preset-env/src/normalize-options.js b/packages/babel-preset-env/src/normalize-options.js
index 75144356e137..76b13f5a7e39 100644
--- a/packages/babel-preset-env/src/normalize-options.js
+++ b/packages/babel-preset-env/src/normalize-options.js
@@ -1,20 +1,29 @@
-//@flow
-
+// @flow
+import corejs3Polyfills from "core-js-compat/data";
 import invariant from "invariant";
-import browserslist from "browserslist";
-import builtInsList from "../data/built-ins.json";
-import { defaultWebIncludes } from "./default-includes";
-import moduleTransformations from "./module-transformations";
-import { isBrowsersQueryValid } from "./targets-parser";
-import { getValues, findSuggestion } from "./utils";
+import { coerce, SemVer } from "semver";
+import corejs2Polyfills from "../data/corejs2-built-ins.json";
 import pluginsList from "../data/plugins.json";
+import moduleTransformations from "./module-transformations";
 import { TopLevelOptions, ModulesOption, UseBuiltInsOption } from "./options";
-import type { Targets, Options, ModuleOption, BuiltInsOption } from "./types";
+import { defaultWebIncludes } from "./polyfills/corejs2/get-platform-specific-default";
+import { isBrowsersQueryValid } from "./targets-parser";
+import { findSuggestion } from "./utils";
+
+import type {
+  BuiltInsOption,
+  CorejsOption,
+  ModuleOption,
+  Options,
+  PluginListItem,
+  PluginListOption,
+} from "./types";
 
 const validateTopLevelOptions = (options: Options) => {
+  const validOptions = Object.keys(TopLevelOptions);
+
   for (const option in options) {
     if (!TopLevelOptions[option]) {
-      const validOptions = getValues(TopLevelOptions);
       throw new Error(
         `Invalid Option: ${option} is not a valid top-level option.
         Maybe you meant to use '${findSuggestion(validOptions, option)}'?`,
@@ -23,14 +32,25 @@ const validateTopLevelOptions = (options: Options) => {
   }
 };
 
-const validIncludesAndExcludes = new Set([
+const allPluginsList = [
   ...Object.keys(pluginsList),
   ...Object.keys(moduleTransformations).map(m => moduleTransformations[m]),
-  ...Object.keys(builtInsList),
+];
+
+const validIncludesAndExcludesWithoutCoreJS = new Set(allPluginsList);
+
+const validIncludesAndExcludesWithCoreJS2 = new Set([
+  ...allPluginsList,
+  ...Object.keys(corejs2Polyfills),
   ...defaultWebIncludes,
 ]);
 
-const pluginToRegExp = (plugin: any): ?RegExp => {
+const validIncludesAndExcludesWithCoreJS3 = new Set([
+  ...allPluginsList,
+  ...Object.keys(corejs3Polyfills),
+]);
+
+const pluginToRegExp = (plugin: PluginListItem) => {
   if (plugin instanceof RegExp) return plugin;
   try {
     return new RegExp(`^${normalizePluginName(plugin)}$`);
@@ -39,21 +59,26 @@ const pluginToRegExp = (plugin: any): ?RegExp => {
   }
 };
 
-const selectPlugins = (regexp: ?RegExp): Array<string> =>
-  Array.from(validIncludesAndExcludes).filter(
-    item => regexp instanceof RegExp && regexp.test(item),
-  );
+const selectPlugins = (regexp: RegExp | null, corejs: number | false) =>
+  Array.from(
+    corejs
+      ? corejs == 2
+        ? validIncludesAndExcludesWithCoreJS2
+        : validIncludesAndExcludesWithCoreJS3
+      : validIncludesAndExcludesWithoutCoreJS,
+  ).filter(item => regexp instanceof RegExp && regexp.test(item));
 
-const flatten = array => [].concat(...array);
+const flatten = <T>(array: Array<Array<T>>): Array<T> => [].concat(...array);
 
 const expandIncludesAndExcludes = (
-  plugins: Array<string | RegExp> = [],
-  type: string,
-): Array<string> => {
+  plugins: PluginListOption = [],
+  type: "include" | "exclude",
+  corejs: number | false,
+) => {
   if (plugins.length === 0) return [];
 
   const selectedPlugins = plugins.map(plugin =>
-    selectPlugins(pluginToRegExp(plugin)),
+    selectPlugins(pluginToRegExp(plugin), corejs),
   );
   const invalidRegExpList = plugins.filter(
     (p, i) => selectedPlugins[i].length === 0,
@@ -67,21 +92,16 @@ const expandIncludesAndExcludes = (
     valid. Please check data/[plugin-features|built-in-features].js in babel-preset-env`,
   );
 
-  return flatten(selectedPlugins);
+  return flatten<string>(selectedPlugins);
 };
 
-const validBrowserslistTargets = [
-  ...Object.keys(browserslist.data),
-  ...Object.keys(browserslist.aliases),
-];
-
-export const normalizePluginName = (plugin: string): string =>
-  plugin.replace(/^babel-plugin-/, "");
+export const normalizePluginName = (plugin: string) =>
+  plugin.replace(/^(@babel\/|babel-)(plugin-)?/, "");
 
 export const checkDuplicateIncludeExcludes = (
   include: Array<string> = [],
   exclude: Array<string> = [],
-): void => {
+) => {
   const duplicates = include.filter(opt => exclude.indexOf(opt) >= 0);
 
   invariant(
@@ -93,7 +113,7 @@ export const checkDuplicateIncludeExcludes = (
   );
 };
 
-const normalizeTargets = (targets: any): Targets => {
+const normalizeTargets = targets => {
   // TODO: Allow to use only query or strings as a targets from next breaking change.
   if (isBrowsersQueryValid(targets)) {
     return { browsers: targets };
@@ -115,7 +135,7 @@ export const validateConfigPathOption = (
 
 export const validateBoolOption = (
   name: string,
-  value: ?boolean,
+  value?: boolean,
   defaultValue: boolean,
 ) => {
   if (typeof value === "undefined") {
@@ -142,8 +162,8 @@ export const validateModulesOption = (
   modulesOpt: ModuleOption = ModulesOption.auto,
 ) => {
   invariant(
-    ModulesOption[modulesOpt] ||
-      ModulesOption[modulesOpt] === ModulesOption.false,
+    ModulesOption[modulesOpt.toString()] ||
+      ModulesOption[modulesOpt.toString()] === ModulesOption.false,
     `Invalid Option: The 'modules' option must be one of \n` +
       ` - 'false' to indicate no module processing\n` +
       ` - a specific module type: 'commonjs', 'amd', 'umd', 'systemjs'` +
@@ -154,22 +174,12 @@ export const validateModulesOption = (
   return modulesOpt;
 };
 
-export const objectToBrowserslist = (object: Targets): Array<string> => {
-  return Object.keys(object).reduce((list, targetName) => {
-    if (validBrowserslistTargets.indexOf(targetName) >= 0) {
-      const targetVersion = object[targetName];
-      return list.concat(`${targetName} ${targetVersion}`);
-    }
-    return list;
-  }, []);
-};
-
 export const validateUseBuiltInsOption = (
   builtInsOpt: BuiltInsOption = false,
-): BuiltInsOption => {
+) => {
   invariant(
-    UseBuiltInsOption[builtInsOpt] ||
-      UseBuiltInsOption[builtInsOpt] === UseBuiltInsOption.false,
+    UseBuiltInsOption[builtInsOpt.toString()] ||
+      UseBuiltInsOption[builtInsOpt.toString()] === UseBuiltInsOption.false,
     `Invalid Option: The 'useBuiltIns' option must be either
     'false' (default) to indicate no polyfill,
     '"entry"' to indicate replacing the entry polyfill, or
@@ -179,22 +189,89 @@ export const validateUseBuiltInsOption = (
   return builtInsOpt;
 };
 
+export type NormalizedCorejsOption = {
+  proposals: boolean,
+  version: typeof SemVer | null | false,
+};
+
+export function normalizeCoreJSOption(
+  corejs?: CorejsOption,
+  useBuiltIns: BuiltInsOption,
+): NormalizedCorejsOption {
+  let proposals = false;
+  let rawVersion;
+
+  if (useBuiltIns && corejs === undefined) {
+    rawVersion = 2;
+    console.warn(
+      "\nWARNING: We noticed you're using the `useBuiltIns` option without declaring a " +
+        "core-js version. Currently, we assume version 2.x when no version " +
+        "is passed. Since this default version will likely change in future " +
+        "versions of Babel, we recommend explicitly setting the core-js version " +
+        "you are using via the `corejs` option.\n" +
+        "\nYou should also be sure that the version you pass to the `corejs` " +
+        "option matches the version specified in your `package.json`'s " +
+        "`dependencies` section. If it doesn't, you need to run one of the " +
+        "following commands:\n\n" +
+        "  npm install --save core-js@2    npm install --save core-js@3\n" +
+        "  yarn add core-js@2              yarn add core-js@3\n",
+    );
+  } else if (typeof corejs === "object" && corejs !== null) {
+    rawVersion = corejs.version;
+    proposals = Boolean(corejs.proposals);
+  } else {
+    rawVersion = corejs;
+  }
+
+  const version = rawVersion ? coerce(String(rawVersion)) : false;
+
+  if (!useBuiltIns && version) {
+    console.log(
+      "\nThe `corejs` option only has an effect when the `useBuiltIns` option is not `false`\n",
+    );
+  }
+
+  if (useBuiltIns && (!version || version.major < 2 || version.major > 3)) {
+    throw new RangeError(
+      "Invalid Option: The version passed to `corejs` is invalid. Currently, " +
+        "only core-js@2 and core-js@3 are supported.",
+    );
+  }
+
+  return { version, proposals };
+}
+
 export default function normalizeOptions(opts: Options) {
   validateTopLevelOptions(opts);
 
+  const useBuiltIns = validateUseBuiltInsOption(opts.useBuiltIns);
+
+  const corejs = normalizeCoreJSOption(opts.corejs, useBuiltIns);
+
   const include = expandIncludesAndExcludes(
     opts.include,
     TopLevelOptions.include,
+    !!corejs.version && corejs.version.major,
   );
+
   const exclude = expandIncludesAndExcludes(
     opts.exclude,
     TopLevelOptions.exclude,
+    !!corejs.version && corejs.version.major,
   );
 
   checkDuplicateIncludeExcludes(include, exclude);
 
+  const shippedProposals =
+    validateBoolOption(
+      TopLevelOptions.shippedProposals,
+      opts.shippedProposals,
+      false,
+    ) || corejs.proposals;
+
   return {
     configPath: validateConfigPathOption(opts.configPath),
+    corejs,
     debug: validateBoolOption(TopLevelOptions.debug, opts.debug, false),
     include,
     exclude,
@@ -208,13 +285,9 @@ export default function normalizeOptions(opts: Options) {
     ),
     loose: validateBoolOption(TopLevelOptions.loose, opts.loose, false),
     modules: validateModulesOption(opts.modules),
-    shippedProposals: validateBoolOption(
-      TopLevelOptions.shippedProposals,
-      opts.shippedProposals,
-      false,
-    ),
+    shippedProposals,
     spec: validateBoolOption(TopLevelOptions.spec, opts.spec, false),
     targets: normalizeTargets(opts.targets),
-    useBuiltIns: validateUseBuiltInsOption(opts.useBuiltIns),
+    useBuiltIns: useBuiltIns,
   };
 }
diff --git a/packages/babel-preset-env/src/options.js b/packages/babel-preset-env/src/options.js
index e1f08ccd9be3..f8bf5d0bba6c 100644
--- a/packages/babel-preset-env/src/options.js
+++ b/packages/babel-preset-env/src/options.js
@@ -1,5 +1,8 @@
+// @flow
+
 export const TopLevelOptions = {
   configPath: "configPath",
+  corejs: "corejs",
   debug: "debug",
   exclude: "exclude",
   forceAllTransforms: "forceAllTransforms",
@@ -42,4 +45,8 @@ export const TargetNames = {
   ios: "ios",
   android: "android",
   electron: "electron",
+  samsung: "samsung",
+
+  // deprecated
+  uglify: "uglify",
 };
diff --git a/packages/babel-preset-env/src/polyfills/corejs2/built-in-definitions.js b/packages/babel-preset-env/src/polyfills/corejs2/built-in-definitions.js
new file mode 100644
index 000000000000..10ba84eb9a92
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs2/built-in-definitions.js
@@ -0,0 +1,190 @@
+// @flow
+
+type ObjectMap<V> = { [name: string]: V };
+
+const ArrayNatureIterators = [
+  "es6.object.to-string",
+  "es6.array.iterator",
+  "web.dom.iterable",
+];
+
+const CommonIterators = ["es6.string.iterator", ...ArrayNatureIterators];
+
+const PromiseDependencies = ["es6.object.to-string", "es6.promise"];
+
+export const BuiltIns: ObjectMap<string | string[]> = {
+  DataView: "es6.typed.data-view",
+  Float32Array: "es6.typed.float32-array",
+  Float64Array: "es6.typed.float64-array",
+  Int8Array: "es6.typed.int8-array",
+  Int16Array: "es6.typed.int16-array",
+  Int32Array: "es6.typed.int32-array",
+  Map: ["es6.map", ...CommonIterators],
+  Number: "es6.number.constructor",
+  Promise: PromiseDependencies,
+  RegExp: ["es6.regexp.constructor"],
+  Set: ["es6.set", ...CommonIterators],
+  Symbol: ["es6.symbol", "es7.symbol.async-iterator"],
+  Uint8Array: "es6.typed.uint8-array",
+  Uint8ClampedArray: "es6.typed.uint8-clamped-array",
+  Uint16Array: "es6.typed.uint16-array",
+  Uint32Array: "es6.typed.uint32-array",
+  WeakMap: ["es6.weak-map", ...CommonIterators],
+  WeakSet: ["es6.weak-set", ...CommonIterators],
+};
+
+export const InstanceProperties: ObjectMap<string[]> = {
+  __defineGetter__: ["es7.object.define-getter"],
+  __defineSetter__: ["es7.object.define-setter"],
+  __lookupGetter__: ["es7.object.lookup-getter"],
+  __lookupSetter__: ["es7.object.lookup-setter"],
+  anchor: ["es6.string.anchor"],
+  big: ["es6.string.big"],
+  bind: ["es6.function.bind"],
+  blink: ["es6.string.blink"],
+  bold: ["es6.string.bold"],
+  codePointAt: ["es6.string.code-point-at"],
+  copyWithin: ["es6.array.copy-within"],
+  endsWith: ["es6.string.ends-with"],
+  entries: ArrayNatureIterators,
+  every: ["es6.array.is-array"],
+  fill: ["es6.array.fill"],
+  filter: ["es6.array.filter"],
+  finally: ["es7.promise.finally", ...PromiseDependencies],
+  find: ["es6.array.find"],
+  findIndex: ["es6.array.find-index"],
+  fixed: ["es6.string.fixed"],
+  flags: ["es6.regexp.flags"],
+  flatMap: ["es7.array.flat-map"],
+  fontcolor: ["es6.string.fontcolor"],
+  fontsize: ["es6.string.fontsize"],
+  forEach: ["es6.array.for-each"],
+  includes: ["es6.string.includes", "es7.array.includes"],
+  indexOf: ["es6.array.index-of"],
+  italics: ["es6.string.italics"],
+  keys: ArrayNatureIterators,
+  lastIndexOf: ["es6.array.last-index-of"],
+  link: ["es6.string.link"],
+  map: ["es6.array.map"],
+  match: ["es6.regexp.match"],
+  name: ["es6.function.name"],
+  padStart: ["es7.string.pad-start"],
+  padEnd: ["es7.string.pad-end"],
+  reduce: ["es6.array.reduce"],
+  reduceRight: ["es6.array.reduce-right"],
+  repeat: ["es6.string.repeat"],
+  replace: ["es6.regexp.replace"],
+  search: ["es6.regexp.search"],
+  slice: ["es6.array.slice"],
+  small: ["es6.string.small"],
+  some: ["es6.array.some"],
+  sort: ["es6.array.sort"],
+  split: ["es6.regexp.split"],
+  startsWith: ["es6.string.starts-with"],
+  strike: ["es6.string.strike"],
+  sub: ["es6.string.sub"],
+  sup: ["es6.string.sup"],
+  toISOString: ["es6.date.to-iso-string"],
+  toJSON: ["es6.date.to-json"],
+  toString: [
+    "es6.object.to-string",
+    "es6.date.to-string",
+    "es6.regexp.to-string",
+  ],
+  trim: ["es6.string.trim"],
+  trimEnd: ["es7.string.trim-right"],
+  trimLeft: ["es7.string.trim-left"],
+  trimRight: ["es7.string.trim-right"],
+  trimStart: ["es7.string.trim-left"],
+  values: ArrayNatureIterators,
+};
+
+export const StaticProperties: ObjectMap<ObjectMap<string | string[]>> = {
+  Array: {
+    from: ["es6.array.from", "es6.string.iterator"],
+    isArray: "es6.array.is-array",
+    of: "es6.array.of",
+  },
+
+  Date: {
+    now: "es6.date.now",
+  },
+
+  Object: {
+    assign: "es6.object.assign",
+    create: "es6.object.create",
+    defineProperty: "es6.object.define-property",
+    defineProperties: "es6.object.define-properties",
+    entries: "es7.object.entries",
+    freeze: "es6.object.freeze",
+    getOwnPropertyDescriptors: "es7.object.get-own-property-descriptors",
+    getOwnPropertySymbols: "es6.symbol",
+    is: "es6.object.is",
+    isExtensible: "es6.object.is-extensible",
+    isFrozen: "es6.object.is-frozen",
+    isSealed: "es6.object.is-sealed",
+    keys: "es6.object.keys",
+    preventExtensions: "es6.object.prevent-extensions",
+    seal: "es6.object.seal",
+    setPrototypeOf: "es6.object.set-prototype-of",
+    values: "es7.object.values",
+  },
+
+  Math: {
+    acosh: "es6.math.acosh",
+    asinh: "es6.math.asinh",
+    atanh: "es6.math.atanh",
+    cbrt: "es6.math.cbrt",
+    clz32: "es6.math.clz32",
+    cosh: "es6.math.cosh",
+    expm1: "es6.math.expm1",
+    fround: "es6.math.fround",
+    hypot: "es6.math.hypot",
+    imul: "es6.math.imul",
+    log1p: "es6.math.log1p",
+    log10: "es6.math.log10",
+    log2: "es6.math.log2",
+    sign: "es6.math.sign",
+    sinh: "es6.math.sinh",
+    tanh: "es6.math.tanh",
+    trunc: "es6.math.trunc",
+  },
+
+  String: {
+    fromCodePoint: "es6.string.from-code-point",
+    raw: "es6.string.raw",
+  },
+
+  Number: {
+    EPSILON: "es6.number.epsilon",
+    MIN_SAFE_INTEGER: "es6.number.min-safe-integer",
+    MAX_SAFE_INTEGER: "es6.number.max-safe-integer",
+    isFinite: "es6.number.is-finite",
+    isInteger: "es6.number.is-integer",
+    isSafeInteger: "es6.number.is-safe-integer",
+    isNaN: "es6.number.is-nan",
+    parseFloat: "es6.number.parse-float",
+    parseInt: "es6.number.parse-int",
+  },
+
+  Promise: {
+    all: CommonIterators,
+    race: CommonIterators,
+  },
+
+  Reflect: {
+    apply: "es6.reflect.apply",
+    construct: "es6.reflect.construct",
+    defineProperty: "es6.reflect.define-property",
+    deleteProperty: "es6.reflect.delete-property",
+    get: "es6.reflect.get",
+    getOwnPropertyDescriptor: "es6.reflect.get-own-property-descriptor",
+    getPrototypeOf: "es6.reflect.get-prototype-of",
+    has: "es6.reflect.has",
+    isExtensible: "es6.reflect.is-extensible",
+    ownKeys: "es6.reflect.own-keys",
+    preventExtensions: "es6.reflect.prevent-extensions",
+    set: "es6.reflect.set",
+    setPrototypeOf: "es6.reflect.set-prototype-of",
+  },
+};
diff --git a/packages/babel-preset-env/src/polyfills/corejs2/entry-plugin.js b/packages/babel-preset-env/src/polyfills/corejs2/entry-plugin.js
new file mode 100644
index 000000000000..82fa4dd9f237
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs2/entry-plugin.js
@@ -0,0 +1,85 @@
+// @flow
+
+import corejs2Polyfills from "../../../data/corejs2-built-ins.json";
+import getPlatformSpecificDefaultFor from "./get-platform-specific-default";
+import filterItems from "../../filter-items";
+import {
+  createImport,
+  isPolyfillSource,
+  getImportSource,
+  getRequireSource,
+} from "../../utils";
+import { logEntryPolyfills } from "../../debug";
+
+import type { InternalPluginOptions } from "../../types";
+import type { NodePath } from "@babel/traverse";
+
+export default function(
+  _: any,
+  {
+    include,
+    exclude,
+    polyfillTargets,
+    regenerator,
+    debug,
+  }: InternalPluginOptions,
+) {
+  const polyfills = filterItems(
+    corejs2Polyfills,
+    include,
+    exclude,
+    polyfillTargets,
+    getPlatformSpecificDefaultFor(polyfillTargets),
+  );
+
+  const isPolyfillImport = {
+    ImportDeclaration(path: NodePath) {
+      if (isPolyfillSource(getImportSource(path))) {
+        this.replaceBySeparateModulesImport(path);
+      }
+    },
+    Program(path: NodePath) {
+      path.get("body").forEach(bodyPath => {
+        if (isPolyfillSource(getRequireSource(bodyPath))) {
+          this.replaceBySeparateModulesImport(bodyPath);
+        }
+      });
+    },
+  };
+
+  return {
+    name: "corejs2-entry",
+    visitor: isPolyfillImport,
+    pre() {
+      this.importPolyfillIncluded = false;
+
+      this.replaceBySeparateModulesImport = function(path) {
+        this.importPolyfillIncluded = true;
+
+        if (regenerator) {
+          createImport(path, "regenerator-runtime");
+        }
+
+        const modules = Array.from(polyfills).reverse();
+
+        for (const module of modules) {
+          createImport(path, module);
+        }
+
+        path.remove();
+      };
+    },
+    post() {
+      if (debug) {
+        logEntryPolyfills(
+          "@babel/polyfill",
+          this.importPolyfillIncluded,
+          polyfills,
+          this.file.opts.filename,
+          polyfillTargets,
+          corejs2Polyfills,
+        );
+      }
+    },
+  };
+}
diff --git a/packages/babel-preset-env/src/polyfills/corejs2/get-platform-specific-default.js b/packages/babel-preset-env/src/polyfills/corejs2/get-platform-specific-default.js
new file mode 100644
index 000000000000..aa89ebfb1900
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs2/get-platform-specific-default.js
@@ -0,0 +1,17 @@
+// @flow
+
+import type { Targets } from "../../types";
+
+export const defaultWebIncludes = [
+  "web.timers",
+  "web.immediate",
+  "web.dom.iterable",
+];
+
+export default function(targets: Targets): null | string[] {
+  const targetNames = Object.keys(targets);
+  const isAnyTarget = !targetNames.length;
+  const isWebTarget = targetNames.some(name => name !== "node");
+
+  return isAnyTarget || isWebTarget ? defaultWebIncludes : null;
+}
diff --git a/packages/babel-preset-env/src/polyfills/corejs2/usage-plugin.js b/packages/babel-preset-env/src/polyfills/corejs2/usage-plugin.js
new file mode 100644
index 000000000000..038736100841
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs2/usage-plugin.js
@@ -0,0 +1,216 @@
+// @flow
+
+import corejs2Polyfills from "../../../data/corejs2-built-ins.json";
+import getPlatformSpecificDefaultFor from "./get-platform-specific-default";
+import filterItems from "../../filter-items";
+import {
+  BuiltIns,
+  StaticProperties,
+  InstanceProperties,
+} from "./built-in-definitions";
+import {
+  createImport,
+  getType,
+  has,
+  isPolyfillSource,
+  getImportSource,
+  getRequireSource,
+} from "../../utils";
+import { logUsagePolyfills } from "../../debug";
+
+import type { InternalPluginOptions } from "../../types";
+import type { NodePath } from "@babel/traverse";
+
+const NO_DIRECT_POLYFILL_IMPORT = `
+  When setting \`useBuiltIns: 'usage'\`, polyfills are automatically imported when needed.
+  Please remove the \`import '@babel/polyfill'\` call or use \`useBuiltIns: 'entry'\` instead.`;
+
+export default function(
+  { types: t }: { types: Object },
+  { include, exclude, polyfillTargets, debug }: InternalPluginOptions,
+) {
+  const polyfills = filterItems(
+    corejs2Polyfills,
+    include,
+    exclude,
+    polyfillTargets,
+    getPlatformSpecificDefaultFor(polyfillTargets),
+  );
+
+  const addAndRemovePolyfillImports = {
+    ImportDeclaration(path: NodePath) {
+      if (isPolyfillSource(getImportSource(path))) {
+        console.warn(NO_DIRECT_POLYFILL_IMPORT);
+        path.remove();
+      }
+    },
+
+    Program(path: NodePath) {
+      path.get("body").forEach(bodyPath => {
+        if (isPolyfillSource(getRequireSource(bodyPath))) {
+          console.warn(NO_DIRECT_POLYFILL_IMPORT);
+          bodyPath.remove();
+        }
+      });
+    },
+
+    // Symbol()
+    // new Promise
+    ReferencedIdentifier({ node: { name }, parent, scope }: NodePath) {
+      if (t.isMemberExpression(parent)) return;
+      if (!has(BuiltIns, name)) return;
+      if (scope.getBindingIdentifier(name)) return;
+
+      const BuiltInDependencies = BuiltIns[name];
+      this.addUnsupported(BuiltInDependencies);
+    },
+
+    // arr[Symbol.iterator]()
+    CallExpression(path: NodePath) {
+      // we can't compile this
+      if (path.node.arguments.length) return;
+
+      const callee = path.node.callee;
+
+      if (!t.isMemberExpression(callee)) return;
+      if (!callee.computed) return;
+      if (!path.get("callee.property").matchesPattern("Symbol.iterator")) {
+        return;
+      }
+
+      this.addImport("web.dom.iterable");
+    },
+
+    // Symbol.iterator in arr
+    BinaryExpression(path: NodePath) {
+      if (path.node.operator !== "in") return;
+      if (!path.get("left").matchesPattern("Symbol.iterator")) return;
+
+      this.addImport("web.dom.iterable");
+    },
+
+    // yield*
+    YieldExpression(path: NodePath) {
+      if (path.node.delegate) {
+        this.addImport("web.dom.iterable");
+      }
+    },
+
+    // Array.from
+    MemberExpression: {
+      enter(path: NodePath) {
+        const { node } = path;
+        const { object, property } = node;
+
+        let evaluatedPropType = object.name;
+        let propertyName = property.name;
+        let instanceType = "";
+
+        if (node.computed) {
+          if (t.isStringLiteral(property)) {
+            propertyName = property.value;
+          } else {
+            const result = path.get("property").evaluate();
+            if (result.confident && result.value) {
+              propertyName = result.value;
+            }
+          }
+        }
+
+        if (path.scope.getBindingIdentifier(object.name)) {
+          const result = path.get("object").evaluate();
+          if (result.value) {
+            instanceType = getType(result.value);
+          } else if (result.deopt && result.deopt.isIdentifier()) {
+            evaluatedPropType = result.deopt.node.name;
+          }
+        }
+
+        if (has(StaticProperties, evaluatedPropType)) {
+          const BuiltInProperties = StaticProperties[evaluatedPropType];
+          if (has(BuiltInProperties, propertyName)) {
+            const StaticPropertyDependencies = BuiltInProperties[propertyName];
+            this.addUnsupported(StaticPropertyDependencies);
+          }
+        }
+
+        if (has(InstanceProperties, propertyName)) {
+          let InstancePropertyDependencies = InstanceProperties[propertyName];
+          if (instanceType) {
+            InstancePropertyDependencies = InstancePropertyDependencies.filter(
+              module => module.includes(instanceType),
+            );
+          }
+          this.addUnsupported(InstancePropertyDependencies);
+        }
+      },
+
+      // Symbol.match
+      exit(path: NodePath) {
+        const { name } = path.node.object;
+
+        if (!has(BuiltIns, name)) return;
+        if (path.scope.getBindingIdentifier(name)) return;
+
+        const BuiltInDependencies = BuiltIns[name];
+        this.addUnsupported(BuiltInDependencies);
+      },
+    },
+
+    // var { repeat, startsWith } = String
+    VariableDeclarator(path: NodePath) {
+      const { node } = path;
+      const { id, init } = node;
+
+      if (!t.isObjectPattern(id)) return;
+
+      // doesn't reference the global
+      if (init && path.scope.getBindingIdentifier(init.name)) return;
+
+      for (const { key } of id.properties) {
+        if (
+          !node.computed &&
+          t.isIdentifier(key) &&
+          has(InstanceProperties, key.name)
+        ) {
+          const InstancePropertyDependencies = InstanceProperties[key.name];
+          this.addUnsupported(InstancePropertyDependencies);
+        }
+      }
+    },
+  };
+
+  return {
+    name: "corejs2-usage",
+    pre({ path }: { path: NodePath }) {
+      this.polyfillsSet = new Set();
+
+      this.addImport = function(builtIn) {
+        if (!this.polyfillsSet.has(builtIn)) {
+          this.polyfillsSet.add(builtIn);
+          createImport(path, builtIn);
+        }
+      };
+
+      this.addUnsupported = function(builtIn) {
+        const modules = Array.isArray(builtIn) ? builtIn : [builtIn];
+        for (const module of modules) {
+          if (polyfills.has(module)) {
+            this.addImport(module);
+          }
+        }
+      };
+    },
+    post() {
+      if (debug) {
+        logUsagePolyfills(
+          this.polyfillsSet,
+          this.file.opts.filename,
+          polyfillTargets,
+          corejs2Polyfills,
+        );
+      }
+    },
+    visitor: addAndRemovePolyfillImports,
+  };
+}
diff --git a/packages/babel-preset-env/src/polyfills/corejs3/built-in-definitions.js b/packages/babel-preset-env/src/polyfills/corejs3/built-in-definitions.js
new file mode 100644
index 000000000000..656738f16fee
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs3/built-in-definitions.js
@@ -0,0 +1,443 @@
+// @flow
+
+type ObjectMap<V> = { [name: string]: V };
+
+const ArrayNatureIterators = [
+  "es.array.iterator",
+  "web.dom-collections.iterator",
+];
+
+export const CommonIterators = ["es.string.iterator", ...ArrayNatureIterators];
+
+const ArrayNatureIteratorsWithTag = [
+  "es.object.to-string",
+  ...ArrayNatureIterators,
+];
+
+const CommonIteratorsWithTag = ["es.object.to-string", ...CommonIterators];
+
+const TypedArrayDependencies = [
+  "es.typed-array.copy-within",
+  "es.typed-array.every",
+  "es.typed-array.fill",
+  "es.typed-array.filter",
+  "es.typed-array.find",
+  "es.typed-array.find-index",
+  "es.typed-array.for-each",
+  "es.typed-array.includes",
+  "es.typed-array.index-of",
+  "es.typed-array.iterator",
+  "es.typed-array.join",
+  "es.typed-array.last-index-of",
+  "es.typed-array.map",
+  "es.typed-array.reduce",
+  "es.typed-array.reduce-right",
+  "es.typed-array.reverse",
+  "es.typed-array.set",
+  "es.typed-array.slice",
+  "es.typed-array.some",
+  "es.typed-array.sort",
+  "es.typed-array.subarray",
+  "es.typed-array.to-locale-string",
+  "es.typed-array.to-string",
+  "es.object.to-string",
+  "es.array.iterator",
+  "es.array-buffer.slice",
+];
+
+const TypedArrayStaticMethods = {
+  from: "es.typed-array.from",
+  of: "es.typed-array.of",
+};
+
+export const PromiseDependencies = ["es.promise", "es.object.to-string"];
+
+const PromiseDependenciesWithIterators = [
+  ...PromiseDependencies,
+  ...CommonIterators,
+];
+
+const SymbolDependencies = [
+  "es.symbol",
+  "es.symbol.description",
+  "es.object.to-string",
+];
+
+const MapDependencies = [
+  "es.map",
+  "esnext.map.delete-all",
+  "esnext.map.every",
+  "esnext.map.filter",
+  "esnext.map.find",
+  "esnext.map.find-key",
+  "esnext.map.includes",
+  "esnext.map.key-of",
+  "esnext.map.map-keys",
+  "esnext.map.map-values",
+  "esnext.map.merge",
+  "esnext.map.reduce",
+  "esnext.map.some",
+  "esnext.map.update",
+  ...CommonIteratorsWithTag,
+];
+
+const SetDependencies = [
+  "es.set",
+  "esnext.set.add-all",
+  "esnext.set.delete-all",
+  "esnext.set.difference",
+  "esnext.set.every",
+  "esnext.set.filter",
+  "esnext.set.find",
+  "esnext.set.intersection",
+  "esnext.set.is-disjoint-from",
+  "esnext.set.is-subset-of",
+  "esnext.set.is-superset-of",
+  "esnext.set.join",
+  "esnext.set.map",
+  "esnext.set.reduce",
+  "esnext.set.some",
+  "esnext.set.symmetric-difference",
+  "esnext.set.union",
+  ...CommonIteratorsWithTag,
+];
+
+const WeakMapDependencies = [
+  "es.weak-map",
+  "esnext.weak-map.delete-all",
+  ...CommonIteratorsWithTag,
+];
+
+const WeakSetDependencies = [
+  "es.weak-set",
+  "esnext.weak-set.add-all",
+  "esnext.weak-set.delete-all",
+  ...CommonIteratorsWithTag,
+];
+
+const URLSearchParamsDependencies = ["web.url", ...CommonIteratorsWithTag];
+
+export const BuiltIns: ObjectMap<string[]> = {
+  AggregateError: ["esnext.aggregate-error", ...CommonIterators],
+  ArrayBuffer: [
+    "es.array-buffer.constructor",
+    "es.array-buffer.slice",
+    "es.object.to-string",
+  ],
+  DataView: ["es.data-view", "es.array-buffer.slice", "es.object.to-string"],
+  Date: ["es.date.to-string"],
+  Float32Array: ["es.typed-array.float32-array", ...TypedArrayDependencies],
+  Float64Array: ["es.typed-array.float64-array", ...TypedArrayDependencies],
+  Int8Array: ["es.typed-array.int8-array", ...TypedArrayDependencies],
+  Int16Array: ["es.typed-array.int16-array", ...TypedArrayDependencies],
+  Int32Array: ["es.typed-array.int32-array", ...TypedArrayDependencies],
+  Uint8Array: ["es.typed-array.uint8-array", ...TypedArrayDependencies],
+  Uint8ClampedArray: [
+    "es.typed-array.uint8-clamped-array",
+    ...TypedArrayDependencies,
+  ],
+  Uint16Array: ["es.typed-array.uint16-array", ...TypedArrayDependencies],
+  Uint32Array: ["es.typed-array.uint32-array", ...TypedArrayDependencies],
+  Map: MapDependencies,
+  Number: ["es.number.constructor"],
+  Observable: [
+    "esnext.observable",
+    "esnext.symbol.observable",
+    "es.object.to-string",
+    ...CommonIteratorsWithTag,
+  ],
+  Promise: PromiseDependencies,
+  RegExp: ["es.regexp.constructor", "es.regexp.exec", "es.regexp.to-string"],
+  Set: SetDependencies,
+  Symbol: SymbolDependencies,
+  URL: ["web.url", ...URLSearchParamsDependencies],
+  URLSearchParams: URLSearchParamsDependencies,
+  WeakMap: WeakMapDependencies,
+  WeakSet: WeakSetDependencies,
+  clearImmediate: ["web.immediate"],
+  compositeKey: ["esnext.composite-key"],
+  compositeSymbol: ["esnext.composite-symbol", ...SymbolDependencies],
+  fetch: PromiseDependencies,
+  globalThis: ["esnext.global-this"],
+  parseFloat: ["es.parse-float"],
+  parseInt: ["es.parse-int"],
+  queueMicrotask: ["web.queue-microtask"],
+  setTimeout: ["web.timers"],
+  setInterval: ["web.timers"],
+  setImmediate: ["web.immediate"],
+};
+
+export const InstanceProperties: ObjectMap<string[]> = {
+  at: ["esnext.string.at"],
+  anchor: ["es.string.anchor"],
+  big: ["es.string.big"],
+  bind: ["es.function.bind"],
+  blink: ["es.string.blink"],
+  bold: ["es.string.bold"],
+  codePointAt: ["es.string.code-point-at"],
+  codePoints: ["esnext.string.code-points"],
+  concat: ["es.array.concat"],
+  copyWithin: ["es.array.copy-within"],
+  description: ["es.symbol", "es.symbol.description"],
+  endsWith: ["es.string.ends-with"],
+  entries: ArrayNatureIteratorsWithTag,
+  every: ["es.array.every"],
+  exec: ["es.regexp.exec"],
+  fill: ["es.array.fill"],
+  filter: ["es.array.filter"],
+  finally: ["es.promise.finally", ...PromiseDependencies],
+  find: ["es.array.find"],
+  findIndex: ["es.array.find-index"],
+  fixed: ["es.string.fixed"],
+  flags: ["es.regexp.flags"],
+  flat: ["es.array.flat", "es.array.unscopables.flat"],
+  flatMap: ["es.array.flat-map", "es.array.unscopables.flat-map"],
+  fontcolor: ["es.string.fontcolor"],
+  fontsize: ["es.string.fontsize"],
+  forEach: ["es.array.for-each", "web.dom-collections.for-each"],
+  includes: ["es.array.includes", "es.string.includes"],
+  indexOf: ["es.array.index-of"],
+  italic: ["es.string.italics"],
+  join: ["es.array.join"],
+  keys: ArrayNatureIteratorsWithTag,
+  lastIndex: ["esnext.array.last-index"],
+  lastIndexOf: ["es.array.last-index-of"],
+  lastItem: ["esnext.array.last-item"],
+  link: ["es.string.link"],
+  match: ["es.string.match", "es.regexp.exec"],
+  matchAll: ["esnext.string.match-all"],
+  map: ["es.array.map"],
+  name: ["es.function.name"],
+  padEnd: ["es.string.pad-end"],
+  padStart: ["es.string.pad-start"],
+  reduce: ["es.array.reduce"],
+  reduceRight: ["es.array.reduce-right"],
+  repeat: ["es.string.repeat"],
+  replace: ["es.string.replace", "es.regexp.exec"],
+  replaceAll: ["esnext.string.replace-all"],
+  reverse: ["es.string.reverse"],
+  search: ["es.string.search", "es.regexp.exec"],
+  slice: ["es.array.slice"],
+  small: ["es.string.small"],
+  some: ["es.array.some"],
+  sort: ["es.array.sort"],
+  splice: ["es.array.splice"],
+  split: ["es.string.split", "es.regexp.exec"],
+  startsWith: ["es.string.starts-with"],
+  strike: ["es.string.strike"],
+  sub: ["es.string.sub"],
+  sup: ["es.string.sup"],
+  toFixed: ["es.number.to-fixed"],
+  toISOString: ["es.date.to-iso-string"],
+  toJSON: ["es.date.to-json", "web.url.to-json"],
+  toPrecision: ["es.number.to-precision"],
+  toString: ["es.object.to-string", "es.regexp.to-string", "es.date.to-string"],
+  trim: ["es.string.trim"],
+  trimEnd: ["es.string.trim-end"],
+  trimLeft: ["es.string.trim-start"],
+  trimRight: ["es.string.trim-end"],
+  trimStart: ["es.string.trim-start"],
+  values: ArrayNatureIteratorsWithTag,
+  __defineGetter__: ["es.object.define-getter"],
+  __defineSetter__: ["es.object.define-setter"],
+  __lookupGetter__: ["es.object.lookup-getter"],
+  __lookupSetter__: ["es.object.lookup-setter"],
+};
+
+export const StaticProperties: ObjectMap<ObjectMap<string | string[]>> = {
+  Array: {
+    from: ["es.array.from", "es.string.iterator"],
+    isArray: ["es.array.is-array"],
+    of: ["es.array.of"],
+  },
+
+  Date: {
+    now: "es.date.now",
+  },
+
+  Object: {
+    assign: "es.object.assign",
+    create: "es.object.create",
+    defineProperty: "es.object.define-property",
+    defineProperties: "es.object.define-properties",
+    entries: "es.object.entries",
+    freeze: "es.object.freeze",
+    fromEntries: ["es.object.from-entries", "es.array.iterator"],
+    getOwnPropertyDescriptor: "es.object.get-own-property-descriptor",
+    getOwnPropertyDescriptors: "es.object.get-own-property-descriptors",
+    getOwnPropertyNames: "es.object.get-own-property-names",
+    getOwnPropertySymbols: "es.symbol",
+    getPrototypeOf: "es.object.get-prototype-of",
+    is: "es.object.is",
+    isExtensible: "es.object.is-extensible",
+    isFrozen: "es.object.is-frozen",
+    isSealed: "es.object.is-sealed",
+    keys: "es.object.keys",
+    preventExtensions: "es.object.prevent-extensions",
+    seal: "es.object.seal",
+    setPrototypeOf: "es.object.set-prototype-of",
+    values: "es.object.values",
+  },
+
+  Math: {
+    DEG_PER_RAD: "esnext.math.deg-per-rad",
+    RAD_PER_DEG: "esnext.math.rad-per-deg",
+    acosh: "es.math.acosh",
+    asinh: "es.math.asinh",
+    atanh: "es.math.atanh",
+    cbrt: "es.math.cbrt",
+    clamp: "esnext.math.clamp",
+    clz32: "es.math.clz32",
+    cosh: "es.math.cosh",
+    degrees: "esnext.math.degrees",
+    expm1: "es.math.expm1",
+    fround: "es.math.fround",
+    fscale: "esnext.math.fscale",
+    hypot: "es.math.hypot",
+    iaddh: "esnext.math.iaddh",
+    imul: "es.math.imul",
+    imulh: "esnext.math.imulh",
+    isubh: "esnext.math.isubh",
+    log1p: "es.math.log1p",
+    log10: "es.math.log10",
+    log2: "es.math.log2",
+    radians: "esnext.math.radians",
+    scale: "esnext.math.scale",
+    seededPRNG: "esnext.math.seeded-prng",
+    sign: "es.math.sign",
+    signbit: "esnext.math.signbit",
+    sinh: "es.math.sinh",
+    tanh: "es.math.tanh",
+    trunc: "es.math.trunc",
+    umulh: "esnext.math.umulh",
+  },
+
+  String: {
+    fromCodePoint: "es.string.from-code-point",
+    raw: "es.string.raw",
+  },
+
+  Number: {
+    EPSILON: "es.number.epsilon",
+    MIN_SAFE_INTEGER: "es.number.min-safe-integer",
+    MAX_SAFE_INTEGER: "es.number.max-safe-integer",
+    fromString: "esnext.number.from-string",
+    isFinite: "es.number.is-finite",
+    isInteger: "es.number.is-integer",
+    isSafeInteger: "es.number.is-safe-integer",
+    isNaN: "es.number.is-nan",
+    parseFloat: "es.number.parse-float",
+    parseInt: "es.number.parse-int",
+  },
+
+  Map: {
+    from: ["esnext.map.from", ...MapDependencies],
+    groupBy: ["esnext.map.group-by", ...MapDependencies],
+    keyBy: ["esnext.map.key-by", ...MapDependencies],
+    of: ["esnext.map.of", ...MapDependencies],
+  },
+
+  Set: {
+    from: ["esnext.set.from", ...SetDependencies],
+    of: ["esnext.set.of", ...SetDependencies],
+  },
+
+  WeakMap: {
+    from: ["esnext.weak-map.from", ...WeakMapDependencies],
+    of: ["esnext.weak-map.of", ...WeakMapDependencies],
+  },
+
+  WeakSet: {
+    from: ["esnext.weak-set.from", ...WeakSetDependencies],
+    of: ["esnext.weak-set.of", ...WeakSetDependencies],
+  },
+
+  Promise: {
+    all: PromiseDependenciesWithIterators,
+    allSettled: [
+      "esnext.promise.all-settled",
+      ...PromiseDependenciesWithIterators,
+    ],
+    any: ["esnext.promise.any", ...PromiseDependenciesWithIterators],
+    race: PromiseDependenciesWithIterators,
+    try: ["esnext.promise.try", ...PromiseDependenciesWithIterators],
+  },
+
+  Reflect: {
+    apply: "es.reflect.apply",
+    construct: "es.reflect.construct",
+    defineMetadata: "esnext.reflect.define-metadata",
+    defineProperty: "es.reflect.define-property",
+    deleteMetadata: "esnext.reflect.delete-metadata",
+    deleteProperty: "es.reflect.delete-property",
+    get: "es.reflect.get",
+    getMetadata: "esnext.reflect.get-metadata",
+    getMetadataKeys: "esnext.reflect.get-metadata-keys",
+    getOwnMetadata: "esnext.reflect.get-own-metadata",
+    getOwnMetadataKeys: "esnext.reflect.get-own-metadata-keys",
+    getOwnPropertyDescriptor: "es.reflect.get-own-property-descriptor",
+    getPrototypeOf: "es.reflect.get-prototype-of",
+    has: "es.reflect.has",
+    hasMetadata: "esnext.reflect.has-metadata",
+    hasOwnMetadata: "esnext.reflect.has-own-metadata",
+    isExtensible: "es.reflect.is-extensible",
+    metadata: "esnext.reflect.metadata",
+    ownKeys: "es.reflect.own-keys",
+    preventExtensions: "es.reflect.prevent-extensions",
+    set: "es.reflect.set",
+    setPrototypeOf: "es.reflect.set-prototype-of",
+  },
+
+  Symbol: {
+    asyncIterator: ["es.symbol.async-iterator"],
+    dispose: ["esnext.symbol.dispose"],
+    hasInstance: ["es.symbol.has-instance", "es.function.has-instance"],
+    isConcatSpreadable: ["es.symbol.is-concat-spreadable", "es.array.concat"],
+    iterator: ["es.symbol.iterator", ...CommonIteratorsWithTag],
+    match: ["es.symbol.match", "es.string.match"],
+    observable: ["esnext.symbol.observable"],
+    patternMatch: ["esnext.symbol.pattern-match"],
+    replace: ["es.symbol.replace", "es.string.replace"],
+    search: ["es.symbol.search", "es.string.search"],
+    species: ["es.symbol.species", "es.array.species"],
+    split: ["es.symbol.split", "es.string.split"],
+    toPrimitive: ["es.symbol.to-primitive", "es.date.to-primitive"],
+    toStringTag: [
+      "es.symbol.to-string-tag",
+      "es.object.to-string",
+      "es.math.to-string-tag",
+      "es.json.to-string-tag",
+    ],
+    unscopables: ["es.symbol.unscopables"],
+  },
+
+  ArrayBuffer: {
+    isView: ["es.array-buffer.is-view"],
+  },
+
+  Int8Array: TypedArrayStaticMethods,
+  Uint8Array: TypedArrayStaticMethods,
+  Uint8ClampedArray: TypedArrayStaticMethods,
+  Int16Array: TypedArrayStaticMethods,
+  Uint16Array: TypedArrayStaticMethods,
+  Int32Array: TypedArrayStaticMethods,
+  Uint32Array: TypedArrayStaticMethods,
+  Float32Array: TypedArrayStaticMethods,
+  Float64Array: TypedArrayStaticMethods,
+};
+
+export const CommonInstanceDependencies = new Set<string>([
+  "es.object.to-string",
+  "es.object.define-getter",
+  "es.object.define-setter",
+  "es.object.lookup-getter",
+  "es.object.lookup-setter",
+  "es.regexp.exec",
+]);
+
+export const PossibleGlobalObjects = new Set<string>([
+  "global",
+  "globalThis",
+  "self",
+  "window",
+]);
diff --git a/packages/babel-preset-env/src/polyfills/corejs3/entry-plugin.js b/packages/babel-preset-env/src/polyfills/corejs3/entry-plugin.js
new file mode 100644
index 000000000000..1d8d3df0a2fa
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs3/entry-plugin.js
@@ -0,0 +1,114 @@
+// @flow
+
+import corejs3Polyfills from "core-js-compat/data";
+import corejsEntries from "core-js-compat/entries";
+import getModulesListForTargetVersion from "core-js-compat/get-modules-list-for-target-version";
+import filterItems from "../../filter-items";
+import {
+  has,
+  intersection,
+  createImport,
+  getImportSource,
+  getRequireSource,
+} from "../../utils";
+import { logEntryPolyfills } from "../../debug";
+
+import type { InternalPluginOptions } from "../../types";
+import type { NodePath } from "@babel/traverse";
+
+function isBabelPolyfillSource(source) {
+  return source === "@babel/polyfill" || source === "babel-polyfill";
+}
+
+function isCoreJSSource(source) {
+  if (typeof source === "string") {
+    source = source
+      .replace(/\\/g, "/")
+      .replace(/(\/(index)?)?(\.js)?$/i, "")
+      .toLowerCase();
+  }
+  return has(corejsEntries, source) && corejsEntries[source];
+}
+
+const BABEL_POLYFILL_DEPRECATION = `
+  \`@babel/polyfill\` is deprecated. Please, use required parts of \`core-js\`
+  and \`regenerator-runtime/runtime\` separately`;
+
+export default function(
+  _: any,
+  { corejs, include, exclude, polyfillTargets, debug }: InternalPluginOptions,
+) {
+  const polyfills = filterItems(
+    corejs3Polyfills,
+    include,
+    exclude,
+    polyfillTargets,
+    null,
+  );
+
+  const available = new Set(getModulesListForTargetVersion(corejs.version));
+
+  const isPolyfillImport = {
+    ImportDeclaration(path: NodePath) {
+      const source = getImportSource(path);
+      if (!source) return;
+      if (isBabelPolyfillSource(source)) {
+        console.warn(BABEL_POLYFILL_DEPRECATION);
+      } else {
+        const modules = isCoreJSSource(source);
+        if (modules) {
+          this.replaceBySeparateModulesImport(path, modules);
+        }
+      }
+    },
+    Program(path: NodePath) {
+      path.get("body").forEach(bodyPath => {
+        const source = getRequireSource(bodyPath);
+        if (!source) return;
+        if (isBabelPolyfillSource(source)) {
+          console.warn(BABEL_POLYFILL_DEPRECATION);
+        } else {
+          const modules = isCoreJSSource(source);
+          if (modules) {
+            this.replaceBySeparateModulesImport(bodyPath, modules);
+          }
+        }
+      });
+    },
+  };
+
+  return {
+    name: "corejs3-entry",
+    visitor: isPolyfillImport,
+    pre() {
+      this.polyfillsSet = new Set();
+
+      this.replaceBySeparateModulesImport = function(path, modules) {
+        for (const module of modules) {
+          this.polyfillsSet.add(module);
+        }
+
+        path.remove();
+      };
+    },
+    post({ path }: { path: NodePath }) {
+      const filtered = intersection(polyfills, this.polyfillsSet, available);
+      const reversed = Array.from(filtered).reverse();
+
+      for (const module of reversed) {
+        createImport(path, module);
+      }
+
+      if (debug) {
+        logEntryPolyfills(
+          "core-js",
+          this.polyfillsSet.size > 0,
+          filtered,
+          this.file.opts.filename,
+          polyfillTargets,
+          corejs3Polyfills,
+        );
+      }
+    },
+  };
+}
diff --git a/packages/babel-preset-env/src/polyfills/corejs3/shipped-proposals.js b/packages/babel-preset-env/src/polyfills/corejs3/shipped-proposals.js
new file mode 100644
index 000000000000..c2d2ee875aa6
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs3/shipped-proposals.js
@@ -0,0 +1,3 @@
+// @flow
+
+export default (["esnext.global-this", "esnext.string.match-all"]: string[]);
diff --git a/packages/babel-preset-env/src/polyfills/corejs3/usage-plugin.js b/packages/babel-preset-env/src/polyfills/corejs3/usage-plugin.js
new file mode 100644
index 000000000000..ea1e06492134
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/corejs3/usage-plugin.js
@@ -0,0 +1,272 @@
+// @flow
+
+import corejs3Polyfills from "core-js-compat/data";
+import corejs3ShippedProposalsList from "./shipped-proposals";
+import getModulesListForTargetVersion from "core-js-compat/get-modules-list-for-target-version";
+import filterItems from "../../filter-items";
+import {
+  BuiltIns,
+  StaticProperties,
+  InstanceProperties,
+  CommonIterators,
+  CommonInstanceDependencies,
+  PromiseDependencies,
+  PossibleGlobalObjects,
+} from "./built-in-definitions";
+import {
+  createImport,
+  getType,
+  has,
+  intersection,
+  isPolyfillSource,
+  getImportSource,
+  getRequireSource,
+} from "../../utils";
+import { logUsagePolyfills } from "../../debug";
+
+import type { InternalPluginOptions } from "../../types";
+import type { NodePath } from "@babel/traverse";
+
+const NO_DIRECT_POLYFILL_IMPORT = `
+  When setting \`useBuiltIns: 'usage'\`, polyfills are automatically imported when needed.
+  Please remove the direct import of \`core-js\` or use \`useBuiltIns: 'entry'\` instead.`;
+
+const corejs3PolyfillsWithoutProposals = Object.keys(corejs3Polyfills)
+  .filter(name => !name.startsWith("esnext."))
+  .reduce((memo, key) => {
+    memo[key] = corejs3Polyfills[key];
+    return memo;
+  }, {});
+
+const corejs3PolyfillsWithShippedProposals = corejs3ShippedProposalsList.reduce(
+  (memo, key) => {
+    memo[key] = corejs3Polyfills[key];
+    return memo;
+  },
+  { ...corejs3PolyfillsWithoutProposals },
+);
+
+export default function(
+  _: any,
+  {
+    corejs,
+    include,
+    exclude,
+    polyfillTargets,
+    proposals,
+    shippedProposals,
+    debug,
+  }: InternalPluginOptions,
+) {
+  const polyfills = filterItems(
+    proposals
+      ? corejs3Polyfills
+      : shippedProposals
+      ? corejs3PolyfillsWithShippedProposals
+      : corejs3PolyfillsWithoutProposals,
+    include,
+    exclude,
+    polyfillTargets,
+    null,
+  );
+
+  const available = new Set(getModulesListForTargetVersion(corejs.version));
+
+  function resolveKey(path, computed) {
+    const { node, parent, scope } = path;
+    if (path.isStringLiteral()) return node.value;
+    const { name } = node;
+    const isIdentifier = path.isIdentifier();
+    if (isIdentifier && !(computed || parent.computed)) return name;
+    if (!isIdentifier || scope.getBindingIdentifier(name)) {
+      const { value } = path.evaluate();
+      if (typeof value === "string") return value;
+    }
+  }
+
+  function resolveSource(path) {
+    const { node, scope } = path;
+    let builtIn, instanceType;
+    if (node) {
+      builtIn = node.name;
+      if (!path.isIdentifier() || scope.getBindingIdentifier(builtIn)) {
+        const { deopt, value } = path.evaluate();
+        if (value !== undefined) {
+          instanceType = getType(value);
+        } else if (deopt && deopt.isIdentifier()) {
+          builtIn = deopt.node.name;
+        }
+      }
+    }
+    return { builtIn, instanceType };
+  }
+
+  const addAndRemovePolyfillImports = {
+    // import 'core-js'
+    ImportDeclaration(path: NodePath) {
+      if (isPolyfillSource(getImportSource(path))) {
+        console.warn(NO_DIRECT_POLYFILL_IMPORT);
+        path.remove();
+      }
+    },
+
+    // require('core-js')
+    Program(path: NodePath) {
+      path.get("body").forEach(bodyPath => {
+        if (isPolyfillSource(getRequireSource(bodyPath))) {
+          console.warn(NO_DIRECT_POLYFILL_IMPORT);
+          bodyPath.remove();
+        }
+      });
+    },
+
+    // import('something').then(...)
+    Import() {
+      this.addUnsupported(PromiseDependencies);
+    },
+
+    Function({ node }: NodePath) {
+      // (async function () { }).finally(...)
+      if (node.async) {
+        this.addUnsupported(PromiseDependencies);
+      }
+    },
+
+    // for-of, [a, b] = c
+    "ForOfStatement|ArrayPattern"() {
+      this.addUnsupported(CommonIterators);
+    },
+
+    // [...spread]
+    SpreadElement({ parentPath }: NodePath) {
+      if (!parentPath.isObjectExpression()) {
+        this.addUnsupported(CommonIterators);
+      }
+    },
+
+    // yield*
+    YieldExpression({ node }: NodePath) {
+      if (node.delegate) {
+        this.addUnsupported(CommonIterators);
+      }
+    },
+
+    // Symbol(), new Promise
+    ReferencedIdentifier({ node: { name }, scope }: NodePath) {
+      if (scope.getBindingIdentifier(name)) return;
+
+      this.addBuiltInDependencies(name);
+    },
+
+    MemberExpression(path: NodePath) {
+      const source = resolveSource(path.get("object"));
+      const key = resolveKey(path.get("property"));
+
+      // Object.entries
+      // [1, 2, 3].entries
+      this.addPropertyDependencies(source, key);
+    },
+
+    ObjectPattern(path: NodePath) {
+      const { parentPath, parent, key } = path;
+      let source;
+
+      // const { keys, values } = Object
+      if (parentPath.isVariableDeclarator()) {
+        source = resolveSource(parentPath.get("init"));
+        // ({ keys, values } = Object)
+      } else if (parentPath.isAssignmentExpression()) {
+        source = resolveSource(parentPath.get("right"));
+        // !function ({ keys, values }) {...} (Object)
+        // resolution does not work after properties transform :-(
+      } else if (parentPath.isFunctionExpression()) {
+        const grand = parentPath.parentPath;
+        if (grand.isCallExpression() || grand.isNewExpression()) {
+          if (grand.node.callee === parent) {
+            source = resolveSource(grand.get("arguments")[key]);
+          }
+        }
+      }
+
+      for (const property of path.get("properties")) {
+        if (property.isObjectProperty()) {
+          const key = resolveKey(property.get("key"));
+          // const { keys, values } = Object
+          // const { keys, values } = [1, 2, 3]
+          this.addPropertyDependencies(source, key);
+        }
+      }
+    },
+
+    BinaryExpression(path: NodePath) {
+      if (path.node.operator !== "in") return;
+
+      const source = resolveSource(path.get("right"));
+      const key = resolveKey(path.get("left"), true);
+
+      // 'entries' in Object
+      // 'entries' in [1, 2, 3]
+      this.addPropertyDependencies(source, key);
+    },
+  };
+
+  return {
+    name: "corejs3-usage",
+    pre() {
+      this.polyfillsSet = new Set();
+
+      this.addUnsupported = function(builtIn) {
+        const modules = Array.isArray(builtIn) ? builtIn : [builtIn];
+        for (const module of modules) {
+          this.polyfillsSet.add(module);
+        }
+      };
+
+      this.addBuiltInDependencies = function(builtIn) {
+        if (has(BuiltIns, builtIn)) {
+          const BuiltInDependencies = BuiltIns[builtIn];
+          this.addUnsupported(BuiltInDependencies);
+        }
+      };
+
+      this.addPropertyDependencies = function(source = {}, key) {
+        const { builtIn, instanceType } = source;
+        if (PossibleGlobalObjects.has(builtIn)) {
+          this.addBuiltInDependencies(key);
+        } else if (has(StaticProperties, builtIn)) {
+          const BuiltInProperties = StaticProperties[builtIn];
+          if (has(BuiltInProperties, key)) {
+            const StaticPropertyDependencies = BuiltInProperties[key];
+            return this.addUnsupported(StaticPropertyDependencies);
+          }
+        }
+        if (!has(InstanceProperties, key)) return;
+        let InstancePropertyDependencies = InstanceProperties[key];
+        if (instanceType) {
+          InstancePropertyDependencies = InstancePropertyDependencies.filter(
+            m => m.includes(instanceType) || CommonInstanceDependencies.has(m),
+          );
+        }
+        this.addUnsupported(InstancePropertyDependencies);
+      };
+    },
+    post({ path }: { path: NodePath }) {
+      const filtered = intersection(polyfills, this.polyfillsSet, available);
+      const reversed = Array.from(filtered).reverse();
+
+      for (const module of reversed) {
+        createImport(path, module);
+      }
+
+      if (debug) {
+        logUsagePolyfills(
+          filtered,
+          this.file.opts.filename,
+          polyfillTargets,
+          corejs3Polyfills,
+        );
+      }
+    },
+    visitor: addAndRemovePolyfillImports,
+  };
+}
diff --git a/packages/babel-preset-env/src/polyfills/regenerator/entry-plugin.js b/packages/babel-preset-env/src/polyfills/regenerator/entry-plugin.js
new file mode 100644
index 000000000000..a7872ac5429f
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/regenerator/entry-plugin.js
@@ -0,0 +1,44 @@
+// @flow
+
+import { getImportSource, getRequireSource } from "../../utils";
+import type { NodePath } from "@babel/traverse";
+
+function isRegeneratorSource(source) {
+  return source === "regenerator-runtime/runtime";
+}
+
+export default function() {
+  const visitor = {
+    ImportDeclaration(path: NodePath) {
+      if (isRegeneratorSource(getImportSource(path))) {
+        this.regeneratorImportExcluded = true;
+        path.remove();
+      }
+    },
+    Program(path: NodePath) {
+      path.get("body").forEach(bodyPath => {
+        if (isRegeneratorSource(getRequireSource(bodyPath))) {
+          this.regeneratorImportExcluded = true;
+          bodyPath.remove();
+        }
+      });
+    },
+  };
+
+  return {
+    name: "regenerator-entry",
+    visitor,
+    pre() {
+      this.regeneratorImportExcluded = false;
+    },
+    post() {
+      if (this.opts.debug && this.regeneratorImportExcluded) {
+        console.log(
+          `\n[${
+            this.file.opts.filename
+          }] Based on your targets, regenerator-runtime import excluded.`,
+        );
+      }
+    },
+  };
+}
diff --git a/packages/babel-preset-env/src/polyfills/regenerator/usage-plugin.js b/packages/babel-preset-env/src/polyfills/regenerator/usage-plugin.js
new file mode 100644
index 000000000000..36ac15502b18
--- /dev/null
+++ b/packages/babel-preset-env/src/polyfills/regenerator/usage-plugin.js
@@ -0,0 +1,32 @@
+// @flow
+
+import { createImport } from "../../utils";
+import type { NodePath } from "@babel/traverse";
+
+export default function() {
+  return {
+    name: "regenerator-usage",
+    pre() {
+      this.usesRegenerator = false;
+    },
+    visitor: {
+      Function(path: NodePath) {
+        const { node } = path;
+
+        if (!this.usesRegenerator && (node.generator || node.async)) {
+          this.usesRegenerator = true;
+          createImport(path, "regenerator-runtime");
+        }
+      },
+    },
+    post() {
+      if (this.opts.debug && this.usesRegenerator) {
+        console.log(
+          `\n[${
+            this.file.opts.filename
+          }] Based on your code and targets, added regenerator-runtime.`,
+        );
+      }
+    },
+  };
+}
diff --git a/packages/babel-preset-env/src/targets-parser.js b/packages/babel-preset-env/src/targets-parser.js
index c2a446d7ea84..4c006bf2f073 100644
--- a/packages/babel-preset-env/src/targets-parser.js
+++ b/packages/babel-preset-env/src/targets-parser.js
@@ -7,38 +7,56 @@ import {
   semverify,
   isUnreleasedVersion,
   getLowestUnreleased,
-  getValues,
   findSuggestion,
 } from "./utils";
-import { objectToBrowserslist } from "./normalize-options";
 import browserModulesData from "../data/built-in-modules.json";
 import { TargetNames } from "./options";
 import type { Targets } from "./types";
 
 const browserslistDefaults = browserslist.defaults;
 
-const validateTargetNames = (validTargets, targets) => {
+const validBrowserslistTargets = [
+  ...Object.keys(browserslist.data),
+  ...Object.keys(browserslist.aliases),
+];
+
+const objectToBrowserslist = (object: Targets): Array<string> => {
+  return Object.keys(object).reduce((list, targetName) => {
+    if (validBrowserslistTargets.indexOf(targetName) >= 0) {
+      const targetVersion = object[targetName];
+      return list.concat(`${targetName} ${targetVersion}`);
+    }
+    return list;
+  }, []);
+};
+
+const validateTargetNames = (targets: Targets): void => {
+  const validTargets = Object.keys(TargetNames);
   for (const target in targets) {
     if (!TargetNames[target]) {
-      const validOptions = getValues(TargetNames);
       throw new Error(
         `Invalid Option: '${target}' is not a valid target
-        Maybe you meant to use '${findSuggestion(validOptions, target)}'?`,
+        Maybe you meant to use '${findSuggestion(validTargets, target)}'?`,
       );
     }
   }
 };
 
 const browserNameMap = {
+  and_chr: "chrome",
+  and_ff: "firefox",
   android: "android",
   chrome: "chrome",
-  and_chr: "chrome",
   edge: "edge",
   firefox: "firefox",
   ie: "ie",
+  ie_mob: "ie",
   ios_saf: "ios",
-  safari: "safari",
   node: "node",
+  op_mob: "opera",
+  opera: "opera",
+  safari: "safari",
+  samsung: "samsung",
 };
 
 export const isBrowsersQueryValid = (
@@ -50,6 +68,7 @@ const validateBrowsers = browsers => {
     typeof browsers === "undefined" || isBrowsersQueryValid(browsers),
     `Invalid Option: '${browsers}' is not a valid browserslist query`,
   );
+
   return browsers;
 };
 
@@ -176,15 +195,27 @@ const getTargets = (targets: Object = {}, options: Object = {}): Targets => {
 
   // Parse browsers target via browserslist
   const browsersquery = validateBrowsers(targets.browsers);
+
+  const hasTargets = Object.keys(targets).length > 0;
   const shouldParseBrowsers = !!targets.browsers;
   const shouldSearchForConfig =
-    !options.ignoreBrowserslistConfig && !Object.keys(targets).length;
+    !options.ignoreBrowserslistConfig && !hasTargets;
 
   if (shouldParseBrowsers || shouldSearchForConfig) {
-    browserslist.defaults = objectToBrowserslist(targets);
+    // If no targets are passed, we need to overwrite browserslist's defaults
+    // so that we enable all transforms (acting like the now deprecated
+    // preset-latest).
+    //
+    // Note, if browserslist resolves the config (ex. package.json), then usage
+    // of `defaults` in queries will be different since we don't want to break
+    // the behavior of "no targets is the same as preset-latest".
+    if (!hasTargets) {
+      browserslist.defaults = objectToBrowserslist(targets);
+    }
 
     const browsers = browserslist(browsersquery, {
       path: options.configPath,
+      mobileToDesktop: true,
     });
 
     const queryBrowsers = getLowestVersions(browsers);
diff --git a/packages/babel-preset-env/src/types.js b/packages/babel-preset-env/src/types.js
index fe7428d20456..c1c3157eb27d 100644
--- a/packages/babel-preset-env/src/types.js
+++ b/packages/babel-preset-env/src/types.js
@@ -1,9 +1,22 @@
 //@flow
 
-import { TargetNames, ModulesOption, UseBuiltInsOption } from "./options";
+import { ModulesOption, UseBuiltInsOption } from "./options";
+import type { NormalizedCorejsOption } from "./normalize-options";
 
 // Targets
-export type Target = $Keys<typeof TargetNames>;
+export type Target =
+  | "node"
+  | "chrome"
+  | "opera"
+  | "edge"
+  | "firefox"
+  | "safari"
+  | "ie"
+  | "ios"
+  | "android"
+  | "electron"
+  | "samsung";
+
 export type Targets = {
   [target: Target]: string,
 };
@@ -13,13 +26,24 @@ export type Targets = {
 export type ModuleOption = $Values<typeof ModulesOption>;
 export type BuiltInsOption = $Values<typeof UseBuiltInsOption>;
 
+type CorejsVersion = 2 | 3 | string;
+
+export type CorejsOption =
+  | false
+  | CorejsVersion
+  | { version: CorejsVersion, proposals: boolean };
+
+export type PluginListItem = string | RegExp;
+export type PluginListOption = Array<PluginListItem>;
+
 export type Options = {
   configPath: string,
+  corejs: CorejsOption,
   debug: boolean,
-  exclude: Array<string | RegExp>,
+  exclude: PluginListOption,
   forceAllTransforms: boolean,
   ignoreBrowserslistConfig: boolean,
-  include: Array<string | RegExp>,
+  include: PluginListOption,
   loose: boolean,
   modules: ModuleOption,
   shippedProposals: boolean,
@@ -30,3 +54,14 @@ export type Options = {
 
 // Babel
 export type Plugin = [Object, Object];
+
+export type InternalPluginOptions = {
+  corejs: NormalizedCorejsOption,
+  include: Set<string>,
+  exclude: Set<string>,
+  polyfillTargets: Targets,
+  debug: boolean,
+  proposals: boolean,
+  shippedProposals: boolean,
+  regenerator: boolean,
+};
diff --git a/packages/babel-preset-env/src/use-built-ins-entry-plugin.js b/packages/babel-preset-env/src/use-built-ins-entry-plugin.js
deleted file mode 100644
index bb2680969c71..000000000000
--- a/packages/babel-preset-env/src/use-built-ins-entry-plugin.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// @flow
-import { logEntryPolyfills } from "./debug";
-import { createImport, isPolyfillSource, isRequire } from "./utils";
-
-type Plugin = {
-  visitor: Object,
-  pre: Function,
-  post: Function,
-  name: string,
-};
-
-export default function({ types: t }: { types: Object }): Plugin {
-  function replaceWithPolyfillImports(
-    path: Object,
-    polyfills: Array<string> | Set<string>,
-    regenerator: boolean,
-  ): void {
-    if (regenerator) {
-      createImport(path, "regenerator-runtime");
-    }
-
-    const items = Array.isArray(polyfills) ? new Set(polyfills) : polyfills;
-
-    for (const p of Array.from(items).reverse()) {
-      createImport(path, p);
-    }
-
-    path.remove();
-  }
-
-  const isPolyfillImport = {
-    ImportDeclaration(path, state) {
-      if (
-        path.node.specifiers.length === 0 &&
-        isPolyfillSource(path.node.source.value)
-      ) {
-        this.importPolyfillIncluded = true;
-
-        replaceWithPolyfillImports(
-          path,
-          state.opts.polyfills,
-          state.opts.regenerator,
-        );
-      }
-    },
-    Program(path, state) {
-      path.get("body").forEach(bodyPath => {
-        if (isRequire(t, bodyPath)) {
-          replaceWithPolyfillImports(
-            bodyPath,
-            state.opts.polyfills,
-            state.opts.regenerator,
-          );
-        }
-      });
-    },
-  };
-
-  return {
-    name: "transform-polyfill-require",
-    visitor: isPolyfillImport,
-    pre() {
-      this.numPolyfillImports = 0;
-      this.importPolyfillIncluded = false;
-    },
-    post() {
-      const { debug, onDebug, polyfills } = this.opts;
-
-      if (debug) {
-        logEntryPolyfills(
-          this.importPolyfillIncluded,
-          polyfills,
-          this.file.opts.filename,
-          onDebug,
-        );
-      }
-    },
-  };
-}
diff --git a/packages/babel-preset-env/src/use-built-ins-plugin.js b/packages/babel-preset-env/src/use-built-ins-plugin.js
deleted file mode 100644
index 6fcfe2dbf64a..000000000000
--- a/packages/babel-preset-env/src/use-built-ins-plugin.js
+++ /dev/null
@@ -1,267 +0,0 @@
-// @flow
-import { definitions } from "./built-in-definitions";
-import { logUsagePolyfills } from "./debug";
-import { createImport, isPolyfillSource, isRequire } from "./utils";
-
-type Plugin = {
-  visitor: Object,
-  pre: Function,
-  name: string,
-};
-
-// function warnOnInstanceMethod() {
-// state.opts.debug &&
-//   console.warn(
-//     `Adding a polyfill: An instance method may have been used: ${details}`,
-//   );
-// }
-
-function has(obj: Object, key: string): boolean {
-  return Object.prototype.hasOwnProperty.call(obj, key);
-}
-
-function getType(target: any): string {
-  if (Array.isArray(target)) return "array";
-  return typeof target;
-}
-
-// function getObjectString(node: Object): string {
-//   if (node.type === "Identifier") {
-//     return node.name;
-//   } else if (node.type === "MemberExpression") {
-//     return `${getObjectString(node.object)}.${getObjectString(node.property)}`;
-//   }
-//   return node.name;
-// }
-
-export default function({ types: t }: { types: Object }): Plugin {
-  function addImport(
-    path: Object,
-    builtIn: string,
-    builtIns: Set<string>,
-  ): void {
-    if (builtIn && !builtIns.has(builtIn)) {
-      builtIns.add(builtIn);
-      createImport(path, builtIn);
-    }
-  }
-
-  function addUnsupported(
-    path: Object,
-    polyfills: Set<string>,
-    builtIn: Array<string> | string,
-    builtIns: Set<string>,
-  ): void {
-    if (Array.isArray(builtIn)) {
-      for (const i of builtIn) {
-        if (polyfills.has(i)) {
-          addImport(path, i, builtIns);
-        }
-      }
-    } else {
-      if (polyfills.has(builtIn)) {
-        addImport(path, builtIn, builtIns);
-      }
-    }
-  }
-
-  const addAndRemovePolyfillImports = {
-    ImportDeclaration(path) {
-      if (
-        path.node.specifiers.length === 0 &&
-        isPolyfillSource(path.node.source.value)
-      ) {
-        console.warn(
-          `
-  When setting \`useBuiltIns: 'usage'\`, polyfills are automatically imported when needed.
-  Please remove the \`import '@babel/polyfill'\` call or use \`useBuiltIns: 'entry'\` instead.`,
-        );
-        path.remove();
-      }
-    },
-    Program: {
-      enter(path) {
-        path.get("body").forEach(bodyPath => {
-          if (isRequire(t, bodyPath)) {
-            console.warn(
-              `
-  When setting \`useBuiltIns: 'usage'\`, polyfills are automatically imported when needed.
-  Please remove the \`require('@babel/polyfill')\` call or use \`useBuiltIns: 'entry'\` instead.`,
-            );
-            bodyPath.remove();
-          }
-        });
-      },
-    },
-
-    // Symbol()
-    // new Promise
-    ReferencedIdentifier(path, state) {
-      const { node, parent, scope } = path;
-
-      if (t.isMemberExpression(parent)) return;
-      if (!has(definitions.builtins, node.name)) return;
-      if (scope.getBindingIdentifier(node.name)) return;
-
-      const builtIn = definitions.builtins[node.name];
-      addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
-    },
-
-    // arr[Symbol.iterator]()
-    CallExpression(path) {
-      // we can't compile this
-      if (path.node.arguments.length) return;
-
-      const callee = path.node.callee;
-      if (!t.isMemberExpression(callee)) return;
-      if (!callee.computed) return;
-      if (!path.get("callee.property").matchesPattern("Symbol.iterator")) {
-        return;
-      }
-
-      addImport(path, "web.dom.iterable", this.builtIns);
-    },
-
-    // Symbol.iterator in arr
-    BinaryExpression(path) {
-      if (path.node.operator !== "in") return;
-      if (!path.get("left").matchesPattern("Symbol.iterator")) return;
-
-      addImport(path, "web.dom.iterable", this.builtIns);
-    },
-
-    // yield*
-    YieldExpression(path) {
-      if (!path.node.delegate) return;
-
-      addImport(path, "web.dom.iterable", this.builtIns);
-    },
-
-    // Array.from
-    MemberExpression: {
-      enter(path, state) {
-        if (!path.isReferenced()) return;
-
-        const { node } = path;
-        const obj = node.object;
-        const prop = node.property;
-
-        if (!t.isReferenced(obj, node)) return;
-        let instanceType;
-        let evaluatedPropType = obj.name;
-        let propName = prop.name;
-        if (node.computed) {
-          if (t.isStringLiteral(prop)) {
-            propName = prop.value;
-          } else {
-            const res = path.get("property").evaluate();
-            if (res.confident && res.value) {
-              propName = res.value;
-            }
-          }
-        }
-        if (path.scope.getBindingIdentifier(obj.name)) {
-          const result = path.get("object").evaluate();
-          if (result.value) {
-            instanceType = getType(result.value);
-          } else if (result.deopt && result.deopt.isIdentifier()) {
-            evaluatedPropType = result.deopt.node.name;
-          }
-        }
-        if (has(definitions.staticMethods, evaluatedPropType)) {
-          const staticMethods = definitions.staticMethods[evaluatedPropType];
-          if (has(staticMethods, propName)) {
-            const builtIn = staticMethods[propName];
-            addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
-            // if (obj.name === "Array" && prop.name === "from") {
-            //   addImport(
-            //     path,
-            //     "@babel/polyfill/lib/core-js/modules/web.dom.iterable",
-            //     this.builtIns,
-            //   );
-            // }
-          }
-        }
-
-        if (has(definitions.instanceMethods, propName)) {
-          //warnOnInstanceMethod(state, getObjectString(node));
-          let builtIn = definitions.instanceMethods[propName];
-          if (instanceType) {
-            builtIn = builtIn.filter(item => item.includes(instanceType));
-          }
-          addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
-        }
-      },
-
-      // Symbol.match
-      exit(path, state) {
-        if (!path.isReferenced()) return;
-
-        const { node } = path;
-        const obj = node.object;
-
-        if (!has(definitions.builtins, obj.name)) return;
-        if (path.scope.getBindingIdentifier(obj.name)) return;
-
-        const builtIn = definitions.builtins[obj.name];
-        addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
-      },
-    },
-
-    // var { repeat, startsWith } = String
-    VariableDeclarator(path, state) {
-      if (!path.isReferenced()) return;
-
-      const { node } = path;
-      const obj = node.init;
-
-      if (!t.isObjectPattern(node.id)) return;
-      if (!t.isReferenced(obj, node)) return;
-
-      // doesn't reference the global
-      if (obj && path.scope.getBindingIdentifier(obj.name)) return;
-
-      for (let prop of node.id.properties) {
-        prop = prop.key;
-        if (
-          !node.computed &&
-          t.isIdentifier(prop) &&
-          has(definitions.instanceMethods, prop.name)
-        ) {
-          // warnOnInstanceMethod(
-          //   state,
-          //   `${path.parentPath.node.kind} { ${prop.name} } = ${obj.name}`,
-          // );
-
-          const builtIn = definitions.instanceMethods[prop.name];
-          addUnsupported(path, state.opts.polyfills, builtIn, this.builtIns);
-        }
-      }
-    },
-
-    Function(path, state) {
-      if (!this.usesRegenerator && (path.node.generator || path.node.async)) {
-        this.usesRegenerator = true;
-        if (state.opts.regenerator) {
-          addImport(path, "regenerator-runtime", this.builtIns);
-        }
-      }
-    },
-  };
-
-  return {
-    name: "use-built-ins",
-    pre() {
-      this.builtIns = new Set();
-      this.usesRegenerator = false;
-    },
-    post() {
-      const { debug, onDebug } = this.opts;
-
-      if (debug) {
-        logUsagePolyfills(this.builtIns, this.file.opts.filename, onDebug);
-      }
-    },
-    visitor: addAndRemovePolyfillImports,
-  };
-}
diff --git a/packages/babel-preset-env/src/utils.js b/packages/babel-preset-env/src/utils.js
index aa8677091249..81c1c3721c99 100644
--- a/packages/babel-preset-env/src/utils.js
+++ b/packages/babel-preset-env/src/utils.js
@@ -1,5 +1,7 @@
 // @flow
 
+import * as t from "@babel/types";
+import type { NodePath } from "@babel/traverse";
 import invariant from "invariant";
 import semver from "semver";
 import levenshtein from "js-levenshtein";
@@ -8,11 +10,20 @@ import unreleasedLabels from "../data/unreleased-labels";
 import { semverMin } from "./targets-parser";
 import type { Targets } from "./types";
 
+export const has = Object.hasOwnProperty.call.bind(Object.hasOwnProperty);
+
+export function getType(target: any): string {
+  return Object.prototype.toString
+    .call(target)
+    .slice(8, -1)
+    .toLowerCase();
+}
+
 const versionRegExp = /^(\d+|\d+.\d+)$/;
 
 // Convert version to a semver value.
 // 2.5 -> 2.5.0; 1 -> 1.0.0;
-export const semverify = (version: string | number): string => {
+export function semverify(version: number | string): string {
   if (typeof version === "string" && semver.valid(version)) {
     return version;
   }
@@ -28,12 +39,21 @@ export const semverify = (version: string | number): string => {
     split.push("0");
   }
   return split.join(".");
-};
-
-export const getValues = (object: Object): Array<any> =>
-  Object.keys(object).map(key => object[key]);
+}
+
+export function intersection<T>(
+  first: Set<T>,
+  second: Set<T>,
+  third: Set<T>,
+): Set<T> {
+  const result = new Set();
+  for (const el of first) {
+    if (second.has(el) && third.has(el)) result.add(el);
+  }
+  return result;
+}
 
-export const findSuggestion = (options: Array<string>, option: string) => {
+export function findSuggestion(options: string[], option: string): string {
   let levenshteinValue = Infinity;
   return options.reduce((suggestion, validOption) => {
     const value = levenshtein(validOption, option);
@@ -43,9 +63,9 @@ export const findSuggestion = (options: Array<string>, option: string) => {
     }
     return suggestion;
   }, undefined);
-};
+}
 
-export const prettifyVersion = (version: string): string => {
+export function prettifyVersion(version: string) {
   if (typeof version !== "string") {
     return version;
   }
@@ -63,9 +83,9 @@ export const prettifyVersion = (version: string): string => {
   }
 
   return parts.join(".");
-};
+}
 
-export const prettifyTargets = (targets: Targets): Object => {
+export function prettifyTargets(targets: Targets): Targets {
   return Object.keys(targets).reduce((results, target) => {
     let value = targets[target];
 
@@ -77,29 +97,31 @@ export const prettifyTargets = (targets: Targets): Object => {
     results[target] = value;
     return results;
   }, {});
-};
+}
 
-export const isUnreleasedVersion = (version: string, env: string): boolean => {
+export function isUnreleasedVersion(
+  version: string | number,
+  env: string,
+): boolean {
   const unreleasedLabel = unreleasedLabels[env];
   return (
     !!unreleasedLabel && unreleasedLabel === version.toString().toLowerCase()
   );
-};
+}
 
-export const getLowestUnreleased = (
-  a: string,
-  b: string,
-  env: string,
-): string => {
+export function getLowestUnreleased(a: string, b: string, env: string): string {
   const unreleasedLabel = unreleasedLabels[env];
   const hasUnreleased = [a, b].some(item => item === unreleasedLabel);
   if (hasUnreleased) {
     return a === hasUnreleased ? b : a || b;
   }
   return semverMin(a, b);
-};
+}
 
-export const filterStageFromList = (list: any, stageList: any) => {
+export function filterStageFromList(
+  list: { [feature: string]: Targets },
+  stageList: { [feature: string]: boolean },
+) {
   return Object.keys(list).reduce((result, item) => {
     if (!stageList[item]) {
       result[item] = list[item];
@@ -107,26 +129,36 @@ export const filterStageFromList = (list: any, stageList: any) => {
 
     return result;
   }, {});
-};
-
-export const isPolyfillSource = (source: string): boolean =>
-  source === "@babel/polyfill" || source === "core-js";
+}
+
+export function getImportSource({ node }: NodePath) {
+  if (node.specifiers.length === 0) return node.source.value;
+}
+
+export function getRequireSource({ node }: NodePath) {
+  if (!t.isExpressionStatement(node)) return;
+  const { expression } = node;
+  const isRequire =
+    t.isCallExpression(expression) &&
+    t.isIdentifier(expression.callee) &&
+    expression.callee.name === "require" &&
+    expression.arguments.length === 1 &&
+    t.isStringLiteral(expression.arguments[0]);
+  if (isRequire) return expression.arguments[0].value;
+}
+
+export function isPolyfillSource(source: ?string): boolean {
+  return source === "@babel/polyfill" || source === "core-js";
+}
 
 const modulePathMap = {
   "regenerator-runtime": "regenerator-runtime/runtime",
 };
 
-export const getModulePath = (mod: string) =>
-  modulePathMap[mod] || `core-js/modules/${mod}`;
-
-export const createImport = (path: Object, mod: string) =>
-  addSideEffect(path, getModulePath(mod));
+export function getModulePath(mod: string): string {
+  return modulePathMap[mod] || `core-js/modules/${mod}`;
+}
 
-export const isRequire = (t: Object, path: Object): boolean =>
-  t.isExpressionStatement(path.node) &&
-  t.isCallExpression(path.node.expression) &&
-  t.isIdentifier(path.node.expression.callee) &&
-  path.node.expression.callee.name === "require" &&
-  path.node.expression.arguments.length === 1 &&
-  t.isStringLiteral(path.node.expression.arguments[0]) &&
-  isPolyfillSource(path.node.expression.arguments[0].value);
+export function createImport(path: NodePath, mod: string) {
+  return addSideEffect(path, getModulePath(mod));
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/android/options.json b/packages/babel-preset-env/test/debug-fixtures/android/options.json
deleted file mode 100644
index caac961b5131..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/android/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "debug": true,
-      "targets": {
-        "browsers": [ "Android >= 4" ]
-      },
-      "useBuiltIns": "entry"
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/android/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/android/stdout.txt
deleted file mode 100644
index a9ce8a7dea8a..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/android/stdout.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "android": "4"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals { "android":"4" }
-  transform-literals { "android":"4" }
-  transform-function-name { "android":"4" }
-  transform-arrow-functions { "android":"4" }
-  transform-block-scoped-functions { "android":"4" }
-  transform-classes { "android":"4" }
-  transform-object-super { "android":"4" }
-  transform-shorthand-properties { "android":"4" }
-  transform-duplicate-keys { "android":"4" }
-  transform-computed-properties { "android":"4" }
-  transform-for-of { "android":"4" }
-  transform-sticky-regex { "android":"4" }
-  transform-dotall-regex { "android":"4" }
-  transform-unicode-regex { "android":"4" }
-  transform-spread { "android":"4" }
-  transform-parameters { "android":"4" }
-  transform-destructuring { "android":"4" }
-  transform-block-scoping { "android":"4" }
-  transform-typeof-symbol { "android":"4" }
-  transform-new-target { "android":"4" }
-  transform-regenerator { "android":"4" }
-  transform-exponentiation-operator { "android":"4" }
-  transform-async-to-generator { "android":"4" }
-  proposal-async-generator-functions { "android":"4" }
-  proposal-object-rest-spread { "android":"4" }
-  proposal-unicode-property-regex { "android":"4" }
-  proposal-json-strings { "android":"4" }
-  proposal-optional-catch-binding { "android":"4" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.copy-within { "android":"4" }
-  es6.array.fill { "android":"4" }
-  es6.array.find { "android":"4" }
-  es6.array.find-index { "android":"4" }
-  es6.array.from { "android":"4" }
-  es7.array.includes { "android":"4" }
-  es6.array.iterator { "android":"4" }
-  es6.array.of { "android":"4" }
-  es6.array.sort { "android":"4" }
-  es6.array.species { "android":"4" }
-  es6.date.to-primitive { "android":"4" }
-  es6.function.has-instance { "android":"4" }
-  es6.map { "android":"4" }
-  es6.math.acosh { "android":"4" }
-  es6.math.asinh { "android":"4" }
-  es6.math.atanh { "android":"4" }
-  es6.math.cbrt { "android":"4" }
-  es6.math.clz32 { "android":"4" }
-  es6.math.cosh { "android":"4" }
-  es6.math.expm1 { "android":"4" }
-  es6.math.fround { "android":"4" }
-  es6.math.hypot { "android":"4" }
-  es6.math.imul { "android":"4" }
-  es6.math.log1p { "android":"4" }
-  es6.math.log10 { "android":"4" }
-  es6.math.log2 { "android":"4" }
-  es6.math.sign { "android":"4" }
-  es6.math.sinh { "android":"4" }
-  es6.math.tanh { "android":"4" }
-  es6.math.trunc { "android":"4" }
-  es6.number.constructor { "android":"4" }
-  es6.number.epsilon { "android":"4" }
-  es6.number.is-finite { "android":"4" }
-  es6.number.is-integer { "android":"4" }
-  es6.number.is-nan { "android":"4" }
-  es6.number.is-safe-integer { "android":"4" }
-  es6.number.max-safe-integer { "android":"4" }
-  es6.number.min-safe-integer { "android":"4" }
-  es6.number.parse-float { "android":"4" }
-  es6.number.parse-int { "android":"4" }
-  es6.object.assign { "android":"4" }
-  es7.object.define-getter { "android":"4" }
-  es7.object.define-setter { "android":"4" }
-  es7.object.entries { "android":"4" }
-  es6.object.freeze { "android":"4" }
-  es6.object.get-own-property-descriptor { "android":"4" }
-  es7.object.get-own-property-descriptors { "android":"4" }
-  es6.object.get-own-property-names { "android":"4" }
-  es6.object.get-prototype-of { "android":"4" }
-  es7.object.lookup-getter { "android":"4" }
-  es7.object.lookup-setter { "android":"4" }
-  es6.object.prevent-extensions { "android":"4" }
-  es6.object.is { "android":"4" }
-  es6.object.is-frozen { "android":"4" }
-  es6.object.is-sealed { "android":"4" }
-  es6.object.is-extensible { "android":"4" }
-  es6.object.keys { "android":"4" }
-  es6.object.seal { "android":"4" }
-  es6.object.set-prototype-of { "android":"4" }
-  es7.object.values { "android":"4" }
-  es6.promise { "android":"4" }
-  es7.promise.finally { "android":"4" }
-  es6.reflect.apply { "android":"4" }
-  es6.reflect.construct { "android":"4" }
-  es6.reflect.define-property { "android":"4" }
-  es6.reflect.delete-property { "android":"4" }
-  es6.reflect.get { "android":"4" }
-  es6.reflect.get-own-property-descriptor { "android":"4" }
-  es6.reflect.get-prototype-of { "android":"4" }
-  es6.reflect.has { "android":"4" }
-  es6.reflect.is-extensible { "android":"4" }
-  es6.reflect.own-keys { "android":"4" }
-  es6.reflect.prevent-extensions { "android":"4" }
-  es6.reflect.set { "android":"4" }
-  es6.reflect.set-prototype-of { "android":"4" }
-  es6.regexp.constructor { "android":"4" }
-  es6.regexp.flags { "android":"4" }
-  es6.regexp.match { "android":"4" }
-  es6.regexp.replace { "android":"4" }
-  es6.regexp.split { "android":"4" }
-  es6.regexp.search { "android":"4" }
-  es6.regexp.to-string { "android":"4" }
-  es6.set { "android":"4" }
-  es6.symbol { "android":"4" }
-  es7.symbol.async-iterator { "android":"4" }
-  es6.string.code-point-at { "android":"4" }
-  es6.string.ends-with { "android":"4" }
-  es6.string.from-code-point { "android":"4" }
-  es6.string.includes { "android":"4" }
-  es6.string.iterator { "android":"4" }
-  es7.string.pad-start { "android":"4" }
-  es7.string.pad-end { "android":"4" }
-  es6.string.raw { "android":"4" }
-  es6.string.repeat { "android":"4" }
-  es6.string.starts-with { "android":"4" }
-  es6.typed.array-buffer { "android":"4" }
-  es6.typed.int8-array { "android":"4" }
-  es6.typed.uint8-array { "android":"4" }
-  es6.typed.uint8-clamped-array { "android":"4" }
-  es6.typed.int16-array { "android":"4" }
-  es6.typed.uint16-array { "android":"4" }
-  es6.typed.int32-array { "android":"4" }
-  es6.typed.uint32-array { "android":"4" }
-  es6.typed.float32-array { "android":"4" }
-  es6.typed.float64-array { "android":"4" }
-  es6.weak-map { "android":"4" }
-  es6.weak-set { "android":"4" }
-  web.timers { "android":"4" }
-  web.immediate { "android":"4" }
-  web.dom.iterable { "android":"4" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt
deleted file mode 100644
index 6f6c5128333e..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/builtins-no-import/stdout.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "node": "6"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-function-name { "node":"6" }
-  transform-for-of { "node":"6" }
-  transform-dotall-regex { "node":"6" }
-  transform-destructuring { "node":"6" }
-  transform-exponentiation-operator { "node":"6" }
-  transform-async-to-generator { "node":"6" }
-  proposal-async-generator-functions { "node":"6" }
-  proposal-object-rest-spread { "node":"6" }
-  proposal-unicode-property-regex { "node":"6" }
-  proposal-json-strings { "node":"6" }
-  proposal-optional-catch-binding { "node":"6" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] `import '@babel/polyfill'` was not found.
-Successfully compiled 1 file with Babel.
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt
deleted file mode 100644
index a56973565bc3..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/builtins-uglify/stdout.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-The uglify target has been deprecated. Set the top level
-option `forceAllTransforms: true` instead.
-
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "55"
-}
-
-Using modules transform: false
-
-Using plugins:
-  transform-template-literals {}
-  transform-literals {}
-  transform-function-name {}
-  transform-arrow-functions {}
-  transform-block-scoped-functions {}
-  transform-classes {}
-  transform-object-super {}
-  transform-shorthand-properties {}
-  transform-duplicate-keys {}
-  transform-computed-properties {}
-  transform-for-of {}
-  transform-sticky-regex {}
-  transform-dotall-regex { "chrome":"55" }
-  transform-unicode-regex {}
-  transform-spread {}
-  transform-parameters {}
-  transform-destructuring {}
-  transform-block-scoping {}
-  transform-typeof-symbol {}
-  transform-new-target {}
-  transform-regenerator {}
-  transform-exponentiation-operator {}
-  transform-async-to-generator {}
-  proposal-async-generator-functions { "chrome":"55" }
-  proposal-object-rest-spread { "chrome":"55" }
-  proposal-unicode-property-regex { "chrome":"55" }
-  proposal-json-strings { "chrome":"55" }
-  proposal-optional-catch-binding { "chrome":"55" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.sort { "chrome":"55" }
-  es7.object.define-getter { "chrome":"55" }
-  es7.object.define-setter { "chrome":"55" }
-  es7.object.lookup-getter { "chrome":"55" }
-  es7.object.lookup-setter { "chrome":"55" }
-  es7.promise.finally { "chrome":"55" }
-  es7.symbol.async-iterator { "chrome":"55" }
-  es7.string.pad-start { "chrome":"55" }
-  es7.string.pad-end { "chrome":"55" }
-  web.timers { "chrome":"55" }
-  web.immediate { "chrome":"55" }
-  web.dom.iterable { "chrome":"55" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/builtins/stdout.txt
deleted file mode 100644
index d3b723ee32be..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/builtins/stdout.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "54",
-  "ie": "10",
-  "node": "6"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals { "ie":"10" }
-  transform-literals { "ie":"10" }
-  transform-function-name { "ie":"10", "node":"6" }
-  transform-arrow-functions { "ie":"10" }
-  transform-block-scoped-functions { "ie":"10" }
-  transform-classes { "ie":"10" }
-  transform-object-super { "ie":"10" }
-  transform-shorthand-properties { "ie":"10" }
-  transform-duplicate-keys { "ie":"10" }
-  transform-computed-properties { "ie":"10" }
-  transform-for-of { "ie":"10", "node":"6" }
-  transform-sticky-regex { "ie":"10" }
-  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6" }
-  transform-unicode-regex { "ie":"10" }
-  transform-spread { "ie":"10" }
-  transform-parameters { "ie":"10" }
-  transform-destructuring { "ie":"10", "node":"6" }
-  transform-block-scoping { "ie":"10" }
-  transform-typeof-symbol { "ie":"10" }
-  transform-new-target { "ie":"10" }
-  transform-regenerator { "ie":"10" }
-  transform-exponentiation-operator { "ie":"10", "node":"6" }
-  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6" }
-  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6" }
-  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6" }
-  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6" }
-  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6" }
-  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.copy-within { "ie":"10" }
-  es6.array.fill { "ie":"10" }
-  es6.array.find { "ie":"10" }
-  es6.array.find-index { "ie":"10" }
-  es6.array.from { "ie":"10", "node":"6" }
-  es7.array.includes { "ie":"10" }
-  es6.array.iterator { "ie":"10" }
-  es6.array.of { "ie":"10" }
-  es6.array.sort { "chrome":"54", "node":"6" }
-  es6.array.species { "ie":"10", "node":"6" }
-  es6.date.to-primitive { "ie":"10" }
-  es6.function.has-instance { "ie":"10", "node":"6" }
-  es6.function.name { "ie":"10" }
-  es6.map { "ie":"10", "node":"6" }
-  es6.math.acosh { "ie":"10" }
-  es6.math.asinh { "ie":"10" }
-  es6.math.atanh { "ie":"10" }
-  es6.math.cbrt { "ie":"10" }
-  es6.math.clz32 { "ie":"10" }
-  es6.math.cosh { "ie":"10" }
-  es6.math.expm1 { "ie":"10" }
-  es6.math.fround { "ie":"10" }
-  es6.math.hypot { "ie":"10" }
-  es6.math.imul { "ie":"10" }
-  es6.math.log1p { "ie":"10" }
-  es6.math.log10 { "ie":"10" }
-  es6.math.log2 { "ie":"10" }
-  es6.math.sign { "ie":"10" }
-  es6.math.sinh { "ie":"10" }
-  es6.math.tanh { "ie":"10" }
-  es6.math.trunc { "ie":"10" }
-  es6.number.constructor { "ie":"10" }
-  es6.number.epsilon { "ie":"10" }
-  es6.number.is-finite { "ie":"10" }
-  es6.number.is-integer { "ie":"10" }
-  es6.number.is-nan { "ie":"10" }
-  es6.number.is-safe-integer { "ie":"10" }
-  es6.number.max-safe-integer { "ie":"10" }
-  es6.number.min-safe-integer { "ie":"10" }
-  es6.number.parse-float { "ie":"10" }
-  es6.number.parse-int { "ie":"10" }
-  es6.object.assign { "ie":"10" }
-  es7.object.define-getter { "chrome":"54", "ie":"10", "node":"6" }
-  es7.object.define-setter { "chrome":"54", "ie":"10", "node":"6" }
-  es7.object.entries { "ie":"10", "node":"6" }
-  es6.object.freeze { "ie":"10" }
-  es6.object.get-own-property-descriptor { "ie":"10" }
-  es7.object.get-own-property-descriptors { "ie":"10", "node":"6" }
-  es6.object.get-own-property-names { "ie":"10" }
-  es6.object.get-prototype-of { "ie":"10" }
-  es7.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6" }
-  es7.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6" }
-  es6.object.prevent-extensions { "ie":"10" }
-  es6.object.is { "ie":"10" }
-  es6.object.is-frozen { "ie":"10" }
-  es6.object.is-sealed { "ie":"10" }
-  es6.object.is-extensible { "ie":"10" }
-  es6.object.keys { "ie":"10" }
-  es6.object.seal { "ie":"10" }
-  es6.object.set-prototype-of { "ie":"10" }
-  es7.object.values { "ie":"10", "node":"6" }
-  es6.promise { "ie":"10", "node":"6" }
-  es7.promise.finally { "chrome":"54", "ie":"10", "node":"6" }
-  es6.reflect.apply { "ie":"10" }
-  es6.reflect.construct { "ie":"10" }
-  es6.reflect.define-property { "ie":"10" }
-  es6.reflect.delete-property { "ie":"10" }
-  es6.reflect.get { "ie":"10" }
-  es6.reflect.get-own-property-descriptor { "ie":"10" }
-  es6.reflect.get-prototype-of { "ie":"10" }
-  es6.reflect.has { "ie":"10" }
-  es6.reflect.is-extensible { "ie":"10" }
-  es6.reflect.own-keys { "ie":"10" }
-  es6.reflect.prevent-extensions { "ie":"10" }
-  es6.reflect.set { "ie":"10" }
-  es6.reflect.set-prototype-of { "ie":"10" }
-  es6.regexp.constructor { "ie":"10" }
-  es6.regexp.flags { "ie":"10" }
-  es6.regexp.match { "ie":"10" }
-  es6.regexp.replace { "ie":"10" }
-  es6.regexp.split { "ie":"10" }
-  es6.regexp.search { "ie":"10" }
-  es6.regexp.to-string { "ie":"10" }
-  es6.set { "ie":"10", "node":"6" }
-  es6.symbol { "ie":"10", "node":"6" }
-  es7.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6" }
-  es6.string.anchor { "ie":"10" }
-  es6.string.big { "ie":"10" }
-  es6.string.blink { "ie":"10" }
-  es6.string.bold { "ie":"10" }
-  es6.string.code-point-at { "ie":"10" }
-  es6.string.ends-with { "ie":"10" }
-  es6.string.fixed { "ie":"10" }
-  es6.string.fontcolor { "ie":"10" }
-  es6.string.fontsize { "ie":"10" }
-  es6.string.from-code-point { "ie":"10" }
-  es6.string.includes { "ie":"10" }
-  es6.string.italics { "ie":"10" }
-  es6.string.iterator { "ie":"10" }
-  es6.string.link { "ie":"10" }
-  es7.string.pad-start { "chrome":"54", "ie":"10", "node":"6" }
-  es7.string.pad-end { "chrome":"54", "ie":"10", "node":"6" }
-  es6.string.raw { "ie":"10" }
-  es6.string.repeat { "ie":"10" }
-  es6.string.small { "ie":"10" }
-  es6.string.starts-with { "ie":"10" }
-  es6.string.strike { "ie":"10" }
-  es6.string.sub { "ie":"10" }
-  es6.string.sup { "ie":"10" }
-  es6.typed.array-buffer { "ie":"10", "node":"6" }
-  es6.typed.int8-array { "ie":"10", "node":"6" }
-  es6.typed.uint8-array { "ie":"10", "node":"6" }
-  es6.typed.uint8-clamped-array { "ie":"10", "node":"6" }
-  es6.typed.int16-array { "ie":"10", "node":"6" }
-  es6.typed.uint16-array { "ie":"10", "node":"6" }
-  es6.typed.int32-array { "ie":"10", "node":"6" }
-  es6.typed.uint32-array { "ie":"10", "node":"6" }
-  es6.typed.float32-array { "ie":"10", "node":"6" }
-  es6.typed.float64-array { "ie":"10", "node":"6" }
-  es6.weak-map { "ie":"10", "node":"6" }
-  es6.weak-set { "ie":"10", "node":"6" }
-  web.timers { "chrome":"54", "ie":"10", "node":"6" }
-  web.immediate { "chrome":"54", "ie":"10", "node":"6" }
-  web.dom.iterable { "chrome":"54", "ie":"10", "node":"6" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/in/in.js b/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/in/in.js
new file mode 100644
index 000000000000..66bfb4d1516b
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/in/in.js
@@ -0,0 +1 @@
+import 'core-js';
diff --git a/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/options.json b/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/options.json
new file mode 100644
index 000000000000..5e051fe4e1b1
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/options.json
@@ -0,0 +1,8 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/stdout.txt
new file mode 100644
index 000000000000..1480ffe6bec5
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/corejs-without-usebuiltins/stdout.txt
@@ -0,0 +1,45 @@
+The `corejs` option only has an effect when the `useBuiltIns` option is not `false`
+
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/electron/options.json b/packages/babel-preset-env/test/debug-fixtures/electron/options.json
deleted file mode 100644
index b07199a0147f..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/electron/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "debug": true,
-      "targets": {
-        "electron": 0.36
-      },
-      "useBuiltIns": "entry"
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/electron/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/electron/stdout.txt
deleted file mode 100644
index 85f4e177155b..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/electron/stdout.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-Warning, the following targets are using a decimal version:
-
-  electron: 0.36
-
-We recommend using a string for minor/patch versions to avoid numbers like 6.10
-getting parsed as 6.1, which can lead to unexpected behavior.
-
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "electron": "0.36"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-function-name { "electron":"0.36" }
-  transform-for-of { "electron":"0.36" }
-  transform-sticky-regex { "electron":"0.36" }
-  transform-dotall-regex { "electron":"0.36" }
-  transform-unicode-regex { "electron":"0.36" }
-  transform-parameters { "electron":"0.36" }
-  transform-destructuring { "electron":"0.36" }
-  transform-block-scoping { "electron":"0.36" }
-  transform-regenerator { "electron":"0.36" }
-  transform-exponentiation-operator { "electron":"0.36" }
-  transform-async-to-generator { "electron":"0.36" }
-  proposal-async-generator-functions { "electron":"0.36" }
-  proposal-object-rest-spread { "electron":"0.36" }
-  proposal-unicode-property-regex { "electron":"0.36" }
-  proposal-json-strings { "electron":"0.36" }
-  proposal-optional-catch-binding { "electron":"0.36" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.every { "electron":"0.36" }
-  es6.array.filter { "electron":"0.36" }
-  es6.array.for-each { "electron":"0.36" }
-  es6.array.from { "electron":"0.36" }
-  es6.array.index-of { "electron":"0.36" }
-  es6.array.is-array { "electron":"0.36" }
-  es6.array.last-index-of { "electron":"0.36" }
-  es6.array.map { "electron":"0.36" }
-  es6.array.reduce { "electron":"0.36" }
-  es6.array.reduce-right { "electron":"0.36" }
-  es6.array.some { "electron":"0.36" }
-  es6.array.sort { "electron":"0.36" }
-  es6.array.species { "electron":"0.36" }
-  es6.date.now { "electron":"0.36" }
-  es6.date.to-iso-string { "electron":"0.36" }
-  es6.date.to-json { "electron":"0.36" }
-  es6.date.to-string { "electron":"0.36" }
-  es6.function.bind { "electron":"0.36" }
-  es6.function.has-instance { "electron":"0.36" }
-  es6.function.name { "electron":"0.36" }
-  es6.map { "electron":"0.36" }
-  es6.object.assign { "electron":"0.36" }
-  es6.object.create { "electron":"0.36" }
-  es7.object.define-getter { "electron":"0.36" }
-  es7.object.define-setter { "electron":"0.36" }
-  es6.object.define-property { "electron":"0.36" }
-  es6.object.define-properties { "electron":"0.36" }
-  es7.object.entries { "electron":"0.36" }
-  es7.object.get-own-property-descriptors { "electron":"0.36" }
-  es7.object.lookup-getter { "electron":"0.36" }
-  es7.object.lookup-setter { "electron":"0.36" }
-  es7.object.values { "electron":"0.36" }
-  es6.promise { "electron":"0.36" }
-  es7.promise.finally { "electron":"0.36" }
-  es6.reflect.apply { "electron":"0.36" }
-  es6.reflect.construct { "electron":"0.36" }
-  es6.reflect.define-property { "electron":"0.36" }
-  es6.reflect.delete-property { "electron":"0.36" }
-  es6.reflect.get { "electron":"0.36" }
-  es6.reflect.get-own-property-descriptor { "electron":"0.36" }
-  es6.reflect.get-prototype-of { "electron":"0.36" }
-  es6.reflect.has { "electron":"0.36" }
-  es6.reflect.is-extensible { "electron":"0.36" }
-  es6.reflect.own-keys { "electron":"0.36" }
-  es6.reflect.prevent-extensions { "electron":"0.36" }
-  es6.reflect.set { "electron":"0.36" }
-  es6.reflect.set-prototype-of { "electron":"0.36" }
-  es6.regexp.constructor { "electron":"0.36" }
-  es6.regexp.flags { "electron":"0.36" }
-  es6.regexp.match { "electron":"0.36" }
-  es6.regexp.replace { "electron":"0.36" }
-  es6.regexp.split { "electron":"0.36" }
-  es6.regexp.search { "electron":"0.36" }
-  es6.regexp.to-string { "electron":"0.36" }
-  es6.set { "electron":"0.36" }
-  es6.symbol { "electron":"0.36" }
-  es7.symbol.async-iterator { "electron":"0.36" }
-  es6.string.anchor { "electron":"0.36" }
-  es6.string.big { "electron":"0.36" }
-  es6.string.blink { "electron":"0.36" }
-  es6.string.bold { "electron":"0.36" }
-  es6.string.fixed { "electron":"0.36" }
-  es6.string.fontcolor { "electron":"0.36" }
-  es6.string.fontsize { "electron":"0.36" }
-  es6.string.italics { "electron":"0.36" }
-  es6.string.link { "electron":"0.36" }
-  es7.string.pad-start { "electron":"0.36" }
-  es7.string.pad-end { "electron":"0.36" }
-  es6.string.small { "electron":"0.36" }
-  es6.string.strike { "electron":"0.36" }
-  es6.string.sub { "electron":"0.36" }
-  es6.string.sup { "electron":"0.36" }
-  es6.string.trim { "electron":"0.36" }
-  es6.typed.array-buffer { "electron":"0.36" }
-  es6.typed.data-view { "electron":"0.36" }
-  es6.typed.int8-array { "electron":"0.36" }
-  es6.typed.uint8-array { "electron":"0.36" }
-  es6.typed.uint8-clamped-array { "electron":"0.36" }
-  es6.typed.int16-array { "electron":"0.36" }
-  es6.typed.uint16-array { "electron":"0.36" }
-  es6.typed.int32-array { "electron":"0.36" }
-  es6.typed.uint32-array { "electron":"0.36" }
-  es6.typed.float32-array { "electron":"0.36" }
-  es6.typed.float64-array { "electron":"0.36" }
-  es6.weak-map { "electron":"0.36" }
-  es6.weak-set { "electron":"0.36" }
-  web.timers { "electron":"0.36" }
-  web.immediate { "electron":"0.36" }
-  web.dom.iterable { "electron":"0.36" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/android/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/android/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/options.json
new file mode 100644
index 000000000000..4874a2298d1e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": [ "Android >= 4" ]
+      },
+      "useBuiltIns": "entry",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/stdout.txt
new file mode 100644
index 000000000000..f3d91c14ed87
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-android/stdout.txt
@@ -0,0 +1,159 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "android": "4"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "android":"4" }
+  transform-literals { "android":"4" }
+  transform-function-name { "android":"4" }
+  transform-arrow-functions { "android":"4" }
+  transform-block-scoped-functions { "android":"4" }
+  transform-classes { "android":"4" }
+  transform-object-super { "android":"4" }
+  transform-shorthand-properties { "android":"4" }
+  transform-duplicate-keys { "android":"4" }
+  transform-computed-properties { "android":"4" }
+  transform-for-of { "android":"4" }
+  transform-sticky-regex { "android":"4" }
+  transform-dotall-regex { "android":"4" }
+  transform-unicode-regex { "android":"4" }
+  transform-spread { "android":"4" }
+  transform-parameters { "android":"4" }
+  transform-destructuring { "android":"4" }
+  transform-block-scoping { "android":"4" }
+  transform-typeof-symbol { "android":"4" }
+  transform-new-target { "android":"4" }
+  transform-regenerator { "android":"4" }
+  transform-exponentiation-operator { "android":"4" }
+  transform-async-to-generator { "android":"4" }
+  proposal-async-generator-functions { "android":"4" }
+  proposal-object-rest-spread { "android":"4" }
+  proposal-unicode-property-regex { "android":"4" }
+  proposal-json-strings { "android":"4" }
+  proposal-optional-catch-binding { "android":"4" }
+  transform-named-capturing-groups-regex { "android":"4" }
+  transform-reserved-words { "android":"4" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within { "android":"4" }
+  es6.array.fill { "android":"4" }
+  es6.array.find { "android":"4" }
+  es6.array.find-index { "android":"4" }
+  es7.array.flat-map { "android":"4" }
+  es6.array.from { "android":"4" }
+  es7.array.includes { "android":"4" }
+  es6.array.iterator { "android":"4" }
+  es6.array.of { "android":"4" }
+  es6.array.sort { "android":"4" }
+  es6.array.species { "android":"4" }
+  es6.date.to-primitive { "android":"4" }
+  es6.function.has-instance { "android":"4" }
+  es6.map { "android":"4" }
+  es6.math.acosh { "android":"4" }
+  es6.math.asinh { "android":"4" }
+  es6.math.atanh { "android":"4" }
+  es6.math.cbrt { "android":"4" }
+  es6.math.clz32 { "android":"4" }
+  es6.math.cosh { "android":"4" }
+  es6.math.expm1 { "android":"4" }
+  es6.math.fround { "android":"4" }
+  es6.math.hypot { "android":"4" }
+  es6.math.imul { "android":"4" }
+  es6.math.log1p { "android":"4" }
+  es6.math.log10 { "android":"4" }
+  es6.math.log2 { "android":"4" }
+  es6.math.sign { "android":"4" }
+  es6.math.sinh { "android":"4" }
+  es6.math.tanh { "android":"4" }
+  es6.math.trunc { "android":"4" }
+  es6.number.constructor { "android":"4" }
+  es6.number.epsilon { "android":"4" }
+  es6.number.is-finite { "android":"4" }
+  es6.number.is-integer { "android":"4" }
+  es6.number.is-nan { "android":"4" }
+  es6.number.is-safe-integer { "android":"4" }
+  es6.number.max-safe-integer { "android":"4" }
+  es6.number.min-safe-integer { "android":"4" }
+  es6.number.parse-float { "android":"4" }
+  es6.number.parse-int { "android":"4" }
+  es6.object.assign { "android":"4" }
+  es7.object.define-getter { "android":"4" }
+  es7.object.define-setter { "android":"4" }
+  es7.object.entries { "android":"4" }
+  es6.object.freeze { "android":"4" }
+  es6.object.get-own-property-descriptor { "android":"4" }
+  es7.object.get-own-property-descriptors { "android":"4" }
+  es6.object.get-own-property-names { "android":"4" }
+  es6.object.get-prototype-of { "android":"4" }
+  es7.object.lookup-getter { "android":"4" }
+  es7.object.lookup-setter { "android":"4" }
+  es6.object.prevent-extensions { "android":"4" }
+  es6.object.to-string { "android":"4" }
+  es6.object.is { "android":"4" }
+  es6.object.is-frozen { "android":"4" }
+  es6.object.is-sealed { "android":"4" }
+  es6.object.is-extensible { "android":"4" }
+  es6.object.keys { "android":"4" }
+  es6.object.seal { "android":"4" }
+  es6.object.set-prototype-of { "android":"4" }
+  es7.object.values { "android":"4" }
+  es6.promise { "android":"4" }
+  es7.promise.finally { "android":"4" }
+  es6.reflect.apply { "android":"4" }
+  es6.reflect.construct { "android":"4" }
+  es6.reflect.define-property { "android":"4" }
+  es6.reflect.delete-property { "android":"4" }
+  es6.reflect.get { "android":"4" }
+  es6.reflect.get-own-property-descriptor { "android":"4" }
+  es6.reflect.get-prototype-of { "android":"4" }
+  es6.reflect.has { "android":"4" }
+  es6.reflect.is-extensible { "android":"4" }
+  es6.reflect.own-keys { "android":"4" }
+  es6.reflect.prevent-extensions { "android":"4" }
+  es6.reflect.set { "android":"4" }
+  es6.reflect.set-prototype-of { "android":"4" }
+  es6.regexp.constructor { "android":"4" }
+  es6.regexp.flags { "android":"4" }
+  es6.regexp.match { "android":"4" }
+  es6.regexp.replace { "android":"4" }
+  es6.regexp.split { "android":"4" }
+  es6.regexp.search { "android":"4" }
+  es6.regexp.to-string { "android":"4" }
+  es6.set { "android":"4" }
+  es6.symbol { "android":"4" }
+  es7.symbol.async-iterator { "android":"4" }
+  es6.string.code-point-at { "android":"4" }
+  es6.string.ends-with { "android":"4" }
+  es6.string.from-code-point { "android":"4" }
+  es6.string.includes { "android":"4" }
+  es6.string.iterator { "android":"4" }
+  es7.string.pad-start { "android":"4" }
+  es7.string.pad-end { "android":"4" }
+  es6.string.raw { "android":"4" }
+  es6.string.repeat { "android":"4" }
+  es6.string.starts-with { "android":"4" }
+  es7.string.trim-left { "android":"4" }
+  es7.string.trim-right { "android":"4" }
+  es6.typed.array-buffer { "android":"4" }
+  es6.typed.int8-array { "android":"4" }
+  es6.typed.uint8-array { "android":"4" }
+  es6.typed.uint8-clamped-array { "android":"4" }
+  es6.typed.int16-array { "android":"4" }
+  es6.typed.uint16-array { "android":"4" }
+  es6.typed.int32-array { "android":"4" }
+  es6.typed.uint32-array { "android":"4" }
+  es6.typed.float32-array { "android":"4" }
+  es6.typed.float64-array { "android":"4" }
+  es6.weak-map { "android":"4" }
+  es6.weak-set { "android":"4" }
+  web.timers { "android":"4" }
+  web.immediate { "android":"4" }
+  web.dom.iterable { "android":"4" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins-uglify/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/builtins-uglify/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/options.json
new file mode 100644
index 000000000000..7055c2d63318
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "electron": 0.36
+      },
+      "useBuiltIns": "entry",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/stdout.txt
new file mode 100644
index 000000000000..e0c6a95adc0d
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-electron/stdout.txt
@@ -0,0 +1,134 @@
+Warning, the following targets are using a decimal version:
+
+  electron: 0.36
+
+We recommend using a string for minor/patch versions to avoid numbers like 6.10
+getting parsed as 6.1, which can lead to unexpected behavior.
+
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "electron": "0.36"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-function-name { "electron":"0.36" }
+  transform-for-of { "electron":"0.36" }
+  transform-sticky-regex { "electron":"0.36" }
+  transform-dotall-regex { "electron":"0.36" }
+  transform-unicode-regex { "electron":"0.36" }
+  transform-parameters { "electron":"0.36" }
+  transform-destructuring { "electron":"0.36" }
+  transform-block-scoping { "electron":"0.36" }
+  transform-regenerator { "electron":"0.36" }
+  transform-exponentiation-operator { "electron":"0.36" }
+  transform-async-to-generator { "electron":"0.36" }
+  proposal-async-generator-functions { "electron":"0.36" }
+  proposal-object-rest-spread { "electron":"0.36" }
+  proposal-unicode-property-regex { "electron":"0.36" }
+  proposal-json-strings { "electron":"0.36" }
+  proposal-optional-catch-binding { "electron":"0.36" }
+  transform-named-capturing-groups-regex { "electron":"0.36" }
+  transform-member-expression-literals { "electron":"0.36" }
+  transform-property-literals { "electron":"0.36" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.every { "electron":"0.36" }
+  es6.array.filter { "electron":"0.36" }
+  es7.array.flat-map { "electron":"0.36" }
+  es6.array.for-each { "electron":"0.36" }
+  es6.array.from { "electron":"0.36" }
+  es6.array.index-of { "electron":"0.36" }
+  es6.array.is-array { "electron":"0.36" }
+  es6.array.last-index-of { "electron":"0.36" }
+  es6.array.map { "electron":"0.36" }
+  es6.array.reduce { "electron":"0.36" }
+  es6.array.reduce-right { "electron":"0.36" }
+  es6.array.some { "electron":"0.36" }
+  es6.array.sort { "electron":"0.36" }
+  es6.array.species { "electron":"0.36" }
+  es6.date.now { "electron":"0.36" }
+  es6.date.to-iso-string { "electron":"0.36" }
+  es6.date.to-json { "electron":"0.36" }
+  es6.date.to-string { "electron":"0.36" }
+  es6.function.bind { "electron":"0.36" }
+  es6.function.has-instance { "electron":"0.36" }
+  es6.function.name { "electron":"0.36" }
+  es6.map { "electron":"0.36" }
+  es6.object.assign { "electron":"0.36" }
+  es6.object.create { "electron":"0.36" }
+  es7.object.define-getter { "electron":"0.36" }
+  es7.object.define-setter { "electron":"0.36" }
+  es6.object.define-property { "electron":"0.36" }
+  es6.object.define-properties { "electron":"0.36" }
+  es7.object.entries { "electron":"0.36" }
+  es7.object.get-own-property-descriptors { "electron":"0.36" }
+  es7.object.lookup-getter { "electron":"0.36" }
+  es7.object.lookup-setter { "electron":"0.36" }
+  es6.object.to-string { "electron":"0.36" }
+  es7.object.values { "electron":"0.36" }
+  es6.promise { "electron":"0.36" }
+  es7.promise.finally { "electron":"0.36" }
+  es6.reflect.apply { "electron":"0.36" }
+  es6.reflect.construct { "electron":"0.36" }
+  es6.reflect.define-property { "electron":"0.36" }
+  es6.reflect.delete-property { "electron":"0.36" }
+  es6.reflect.get { "electron":"0.36" }
+  es6.reflect.get-own-property-descriptor { "electron":"0.36" }
+  es6.reflect.get-prototype-of { "electron":"0.36" }
+  es6.reflect.has { "electron":"0.36" }
+  es6.reflect.is-extensible { "electron":"0.36" }
+  es6.reflect.own-keys { "electron":"0.36" }
+  es6.reflect.prevent-extensions { "electron":"0.36" }
+  es6.reflect.set { "electron":"0.36" }
+  es6.reflect.set-prototype-of { "electron":"0.36" }
+  es6.regexp.constructor { "electron":"0.36" }
+  es6.regexp.flags { "electron":"0.36" }
+  es6.regexp.match { "electron":"0.36" }
+  es6.regexp.replace { "electron":"0.36" }
+  es6.regexp.split { "electron":"0.36" }
+  es6.regexp.search { "electron":"0.36" }
+  es6.regexp.to-string { "electron":"0.36" }
+  es6.set { "electron":"0.36" }
+  es6.symbol { "electron":"0.36" }
+  es7.symbol.async-iterator { "electron":"0.36" }
+  es6.string.anchor { "electron":"0.36" }
+  es6.string.big { "electron":"0.36" }
+  es6.string.blink { "electron":"0.36" }
+  es6.string.bold { "electron":"0.36" }
+  es6.string.fixed { "electron":"0.36" }
+  es6.string.fontcolor { "electron":"0.36" }
+  es6.string.fontsize { "electron":"0.36" }
+  es6.string.italics { "electron":"0.36" }
+  es6.string.link { "electron":"0.36" }
+  es7.string.pad-start { "electron":"0.36" }
+  es7.string.pad-end { "electron":"0.36" }
+  es6.string.small { "electron":"0.36" }
+  es6.string.strike { "electron":"0.36" }
+  es6.string.sub { "electron":"0.36" }
+  es6.string.sup { "electron":"0.36" }
+  es6.string.trim { "electron":"0.36" }
+  es7.string.trim-left { "electron":"0.36" }
+  es7.string.trim-right { "electron":"0.36" }
+  es6.typed.array-buffer { "electron":"0.36" }
+  es6.typed.data-view { "electron":"0.36" }
+  es6.typed.int8-array { "electron":"0.36" }
+  es6.typed.uint8-array { "electron":"0.36" }
+  es6.typed.uint8-clamped-array { "electron":"0.36" }
+  es6.typed.int16-array { "electron":"0.36" }
+  es6.typed.uint16-array { "electron":"0.36" }
+  es6.typed.int32-array { "electron":"0.36" }
+  es6.typed.uint32-array { "electron":"0.36" }
+  es6.typed.float32-array { "electron":"0.36" }
+  es6.typed.float64-array { "electron":"0.36" }
+  es6.weak-map { "electron":"0.36" }
+  es6.weak-set { "electron":"0.36" }
+  web.timers { "electron":"0.36" }
+  web.immediate { "electron":"0.36" }
+  web.dom.iterable { "electron":"0.36" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/builtins/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/options.json
new file mode 100644
index 000000000000..3615dbaff0f6
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "modules": false,
+      "targets": {
+        "chrome": 55
+      },
+      "useBuiltIns": "entry",
+      "corejs": 2,
+      "forceAllTransforms": true
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/stdout.txt
new file mode 100644
index 000000000000..988f64db332a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-force-all-transforms/stdout.txt
@@ -0,0 +1,63 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "55"
+}
+
+Using modules transform: false
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex { "chrome":"55" }
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions { "chrome":"55" }
+  proposal-object-rest-spread { "chrome":"55" }
+  proposal-unicode-property-regex { "chrome":"55" }
+  proposal-json-strings { "chrome":"55" }
+  proposal-optional-catch-binding { "chrome":"55" }
+  transform-named-capturing-groups-regex { "chrome":"55" }
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es7.array.flat-map { "chrome":"55" }
+  es6.array.sort { "chrome":"55" }
+  es7.object.define-getter { "chrome":"55" }
+  es7.object.define-setter { "chrome":"55" }
+  es7.object.lookup-getter { "chrome":"55" }
+  es7.object.lookup-setter { "chrome":"55" }
+  es6.object.to-string { "chrome":"55" }
+  es7.promise.finally { "chrome":"55" }
+  es7.symbol.async-iterator { "chrome":"55" }
+  es7.string.pad-start { "chrome":"55" }
+  es7.string.pad-end { "chrome":"55" }
+  es7.string.trim-left { "chrome":"55" }
+  es7.string.trim-right { "chrome":"55" }
+  web.timers { "chrome":"55" }
+  web.immediate { "chrome":"55" }
+  web.dom.iterable { "chrome":"55" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins-no-import/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/builtins-no-import/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/options.json
new file mode 100644
index 000000000000..b8acc7a56de8
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "node": 6
+      },
+      "useBuiltIns": "entry",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/stdout.txt
new file mode 100644
index 000000000000..ac37a584bfdf
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-no-import/stdout.txt
@@ -0,0 +1,27 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "node": "6"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-function-name { "node":"6" }
+  transform-for-of { "node":"6" }
+  transform-dotall-regex { "node":"6" }
+  transform-destructuring { "node":"6" }
+  transform-exponentiation-operator { "node":"6" }
+  transform-async-to-generator { "node":"6" }
+  proposal-async-generator-functions { "node":"6" }
+  proposal-object-rest-spread { "node":"6" }
+  proposal-unicode-property-regex { "node":"6" }
+  proposal-json-strings { "node":"6" }
+  proposal-optional-catch-binding { "node":"6" }
+  transform-named-capturing-groups-regex { "node":"6" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Import of @babel/polyfill was not found.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/electron/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/electron/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/options.json
new file mode 100644
index 000000000000..6873f884f7c8
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "useBuiltIns": "entry",
+      "corejs": { "version": 2, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/stdout.txt
new file mode 100644
index 000000000000..c5a336627064
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals-chrome-71/stdout.txt
@@ -0,0 +1,22 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  web.timers { "chrome":"71" }
+  web.immediate { "chrome":"71" }
+  web.dom.iterable { "chrome":"71" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/force-all-transforms/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/force-all-transforms/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/options.json
new file mode 100644
index 000000000000..e95eabddbf17
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/options.json
@@ -0,0 +1,9 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "useBuiltIns": "entry",
+      "corejs": { "version": 2, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/stdout.txt
new file mode 100644
index 000000000000..04e8ce0e5829
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-proposals/stdout.txt
@@ -0,0 +1,193 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within {}
+  es6.array.every {}
+  es6.array.fill {}
+  es6.array.filter {}
+  es6.array.find {}
+  es6.array.find-index {}
+  es7.array.flat-map {}
+  es6.array.for-each {}
+  es6.array.from {}
+  es7.array.includes {}
+  es6.array.index-of {}
+  es6.array.is-array {}
+  es6.array.iterator {}
+  es6.array.last-index-of {}
+  es6.array.map {}
+  es6.array.of {}
+  es6.array.reduce {}
+  es6.array.reduce-right {}
+  es6.array.some {}
+  es6.array.sort {}
+  es6.array.species {}
+  es6.date.now {}
+  es6.date.to-iso-string {}
+  es6.date.to-json {}
+  es6.date.to-primitive {}
+  es6.date.to-string {}
+  es6.function.bind {}
+  es6.function.has-instance {}
+  es6.function.name {}
+  es6.map {}
+  es6.math.acosh {}
+  es6.math.asinh {}
+  es6.math.atanh {}
+  es6.math.cbrt {}
+  es6.math.clz32 {}
+  es6.math.cosh {}
+  es6.math.expm1 {}
+  es6.math.fround {}
+  es6.math.hypot {}
+  es6.math.imul {}
+  es6.math.log1p {}
+  es6.math.log10 {}
+  es6.math.log2 {}
+  es6.math.sign {}
+  es6.math.sinh {}
+  es6.math.tanh {}
+  es6.math.trunc {}
+  es6.number.constructor {}
+  es6.number.epsilon {}
+  es6.number.is-finite {}
+  es6.number.is-integer {}
+  es6.number.is-nan {}
+  es6.number.is-safe-integer {}
+  es6.number.max-safe-integer {}
+  es6.number.min-safe-integer {}
+  es6.number.parse-float {}
+  es6.number.parse-int {}
+  es6.object.assign {}
+  es6.object.create {}
+  es7.object.define-getter {}
+  es7.object.define-setter {}
+  es6.object.define-property {}
+  es6.object.define-properties {}
+  es7.object.entries {}
+  es6.object.freeze {}
+  es6.object.get-own-property-descriptor {}
+  es7.object.get-own-property-descriptors {}
+  es6.object.get-own-property-names {}
+  es6.object.get-prototype-of {}
+  es7.object.lookup-getter {}
+  es7.object.lookup-setter {}
+  es6.object.prevent-extensions {}
+  es6.object.to-string {}
+  es6.object.is {}
+  es6.object.is-frozen {}
+  es6.object.is-sealed {}
+  es6.object.is-extensible {}
+  es6.object.keys {}
+  es6.object.seal {}
+  es6.object.set-prototype-of {}
+  es7.object.values {}
+  es6.promise {}
+  es7.promise.finally {}
+  es6.reflect.apply {}
+  es6.reflect.construct {}
+  es6.reflect.define-property {}
+  es6.reflect.delete-property {}
+  es6.reflect.get {}
+  es6.reflect.get-own-property-descriptor {}
+  es6.reflect.get-prototype-of {}
+  es6.reflect.has {}
+  es6.reflect.is-extensible {}
+  es6.reflect.own-keys {}
+  es6.reflect.prevent-extensions {}
+  es6.reflect.set {}
+  es6.reflect.set-prototype-of {}
+  es6.regexp.constructor {}
+  es6.regexp.flags {}
+  es6.regexp.match {}
+  es6.regexp.replace {}
+  es6.regexp.split {}
+  es6.regexp.search {}
+  es6.regexp.to-string {}
+  es6.set {}
+  es6.symbol {}
+  es7.symbol.async-iterator {}
+  es6.string.anchor {}
+  es6.string.big {}
+  es6.string.blink {}
+  es6.string.bold {}
+  es6.string.code-point-at {}
+  es6.string.ends-with {}
+  es6.string.fixed {}
+  es6.string.fontcolor {}
+  es6.string.fontsize {}
+  es6.string.from-code-point {}
+  es6.string.includes {}
+  es6.string.italics {}
+  es6.string.iterator {}
+  es6.string.link {}
+  es7.string.pad-start {}
+  es7.string.pad-end {}
+  es6.string.raw {}
+  es6.string.repeat {}
+  es6.string.small {}
+  es6.string.starts-with {}
+  es6.string.strike {}
+  es6.string.sub {}
+  es6.string.sup {}
+  es6.string.trim {}
+  es7.string.trim-left {}
+  es7.string.trim-right {}
+  es6.typed.array-buffer {}
+  es6.typed.data-view {}
+  es6.typed.int8-array {}
+  es6.typed.uint8-array {}
+  es6.typed.uint8-clamped-array {}
+  es6.typed.int16-array {}
+  es6.typed.uint16-array {}
+  es6.typed.int32-array {}
+  es6.typed.uint32-array {}
+  es6.typed.float32-array {}
+  es6.typed.float64-array {}
+  es6.weak-map {}
+  es6.weak-set {}
+  web.timers {}
+  web.immediate {}
+  web.dom.iterable {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/options.json
new file mode 100644
index 000000000000..2998e96d184b
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/stdout.txt
new file mode 100644
index 000000000000..c5a336627064
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals-chrome-71/stdout.txt
@@ -0,0 +1,22 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  web.timers { "chrome":"71" }
+  web.immediate { "chrome":"71" }
+  web.dom.iterable { "chrome":"71" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/shippedProposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/shippedProposals/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/options.json
new file mode 100644
index 000000000000..519fd0ad0e7b
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/stdout.txt
new file mode 100644
index 000000000000..04e8ce0e5829
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-shippedProposals/stdout.txt
@@ -0,0 +1,193 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within {}
+  es6.array.every {}
+  es6.array.fill {}
+  es6.array.filter {}
+  es6.array.find {}
+  es6.array.find-index {}
+  es7.array.flat-map {}
+  es6.array.for-each {}
+  es6.array.from {}
+  es7.array.includes {}
+  es6.array.index-of {}
+  es6.array.is-array {}
+  es6.array.iterator {}
+  es6.array.last-index-of {}
+  es6.array.map {}
+  es6.array.of {}
+  es6.array.reduce {}
+  es6.array.reduce-right {}
+  es6.array.some {}
+  es6.array.sort {}
+  es6.array.species {}
+  es6.date.now {}
+  es6.date.to-iso-string {}
+  es6.date.to-json {}
+  es6.date.to-primitive {}
+  es6.date.to-string {}
+  es6.function.bind {}
+  es6.function.has-instance {}
+  es6.function.name {}
+  es6.map {}
+  es6.math.acosh {}
+  es6.math.asinh {}
+  es6.math.atanh {}
+  es6.math.cbrt {}
+  es6.math.clz32 {}
+  es6.math.cosh {}
+  es6.math.expm1 {}
+  es6.math.fround {}
+  es6.math.hypot {}
+  es6.math.imul {}
+  es6.math.log1p {}
+  es6.math.log10 {}
+  es6.math.log2 {}
+  es6.math.sign {}
+  es6.math.sinh {}
+  es6.math.tanh {}
+  es6.math.trunc {}
+  es6.number.constructor {}
+  es6.number.epsilon {}
+  es6.number.is-finite {}
+  es6.number.is-integer {}
+  es6.number.is-nan {}
+  es6.number.is-safe-integer {}
+  es6.number.max-safe-integer {}
+  es6.number.min-safe-integer {}
+  es6.number.parse-float {}
+  es6.number.parse-int {}
+  es6.object.assign {}
+  es6.object.create {}
+  es7.object.define-getter {}
+  es7.object.define-setter {}
+  es6.object.define-property {}
+  es6.object.define-properties {}
+  es7.object.entries {}
+  es6.object.freeze {}
+  es6.object.get-own-property-descriptor {}
+  es7.object.get-own-property-descriptors {}
+  es6.object.get-own-property-names {}
+  es6.object.get-prototype-of {}
+  es7.object.lookup-getter {}
+  es7.object.lookup-setter {}
+  es6.object.prevent-extensions {}
+  es6.object.to-string {}
+  es6.object.is {}
+  es6.object.is-frozen {}
+  es6.object.is-sealed {}
+  es6.object.is-extensible {}
+  es6.object.keys {}
+  es6.object.seal {}
+  es6.object.set-prototype-of {}
+  es7.object.values {}
+  es6.promise {}
+  es7.promise.finally {}
+  es6.reflect.apply {}
+  es6.reflect.construct {}
+  es6.reflect.define-property {}
+  es6.reflect.delete-property {}
+  es6.reflect.get {}
+  es6.reflect.get-own-property-descriptor {}
+  es6.reflect.get-prototype-of {}
+  es6.reflect.has {}
+  es6.reflect.is-extensible {}
+  es6.reflect.own-keys {}
+  es6.reflect.prevent-extensions {}
+  es6.reflect.set {}
+  es6.reflect.set-prototype-of {}
+  es6.regexp.constructor {}
+  es6.regexp.flags {}
+  es6.regexp.match {}
+  es6.regexp.replace {}
+  es6.regexp.split {}
+  es6.regexp.search {}
+  es6.regexp.to-string {}
+  es6.set {}
+  es6.symbol {}
+  es7.symbol.async-iterator {}
+  es6.string.anchor {}
+  es6.string.big {}
+  es6.string.blink {}
+  es6.string.bold {}
+  es6.string.code-point-at {}
+  es6.string.ends-with {}
+  es6.string.fixed {}
+  es6.string.fontcolor {}
+  es6.string.fontsize {}
+  es6.string.from-code-point {}
+  es6.string.includes {}
+  es6.string.italics {}
+  es6.string.iterator {}
+  es6.string.link {}
+  es7.string.pad-start {}
+  es7.string.pad-end {}
+  es6.string.raw {}
+  es6.string.repeat {}
+  es6.string.small {}
+  es6.string.starts-with {}
+  es6.string.strike {}
+  es6.string.sub {}
+  es6.string.sup {}
+  es6.string.trim {}
+  es7.string.trim-left {}
+  es7.string.trim-right {}
+  es6.typed.array-buffer {}
+  es6.typed.data-view {}
+  es6.typed.int8-array {}
+  es6.typed.uint8-array {}
+  es6.typed.uint8-clamped-array {}
+  es6.typed.int16-array {}
+  es6.typed.uint16-array {}
+  es6.typed.int32-array {}
+  es6.typed.uint32-array {}
+  es6.typed.float32-array {}
+  es6.typed.float64-array {}
+  es6.weak-map {}
+  es6.weak-set {}
+  web.timers {}
+  web.immediate {}
+  web.dom.iterable {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/specific-targets/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/specific-targets/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/options.json
new file mode 100644
index 000000000000..dc30ad296d4b
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "ie 10, ios 9, safari 7, edge 13, chrome 54, firefox 49"
+      },
+      "useBuiltIns": "entry",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/stdout.txt
new file mode 100644
index 000000000000..a7c6a94b05aa
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-specific-targets/stdout.txt
@@ -0,0 +1,178 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "edge": "13",
+  "firefox": "49",
+  "ie": "10",
+  "ios": "9",
+  "safari": "7"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10", "ios":"9", "safari":"7" }
+  transform-literals { "firefox":"49", "ie":"10", "safari":"7" }
+  transform-function-name { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-arrow-functions { "ie":"10", "ios":"9", "safari":"7" }
+  transform-block-scoped-functions { "ie":"10", "ios":"9", "safari":"7" }
+  transform-classes { "ie":"10", "ios":"9", "safari":"7" }
+  transform-object-super { "ie":"10", "ios":"9", "safari":"7" }
+  transform-shorthand-properties { "ie":"10", "safari":"7" }
+  transform-duplicate-keys { "ie":"10", "safari":"7" }
+  transform-computed-properties { "ie":"10", "safari":"7" }
+  transform-for-of { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-sticky-regex { "ie":"10", "ios":"9", "safari":"7" }
+  transform-dotall-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-unicode-regex { "ie":"10", "ios":"9", "safari":"7" }
+  transform-spread { "ie":"10", "ios":"9", "safari":"7" }
+  transform-parameters { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-destructuring { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-block-scoping { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-typeof-symbol { "ie":"10", "safari":"7" }
+  transform-new-target { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  transform-regenerator { "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-exponentiation-operator { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-async-to-generator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-async-generator-functions { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-object-rest-spread { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-unicode-property-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-json-strings { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-optional-catch-binding { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-named-capturing-groups-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within { "ie":"10", "safari":"7" }
+  es6.array.fill { "ie":"10", "safari":"7" }
+  es6.array.find { "ie":"10", "safari":"7" }
+  es6.array.find-index { "ie":"10", "safari":"7" }
+  es7.array.flat-map { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.array.from { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es7.array.includes { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.array.iterator { "ie":"10", "safari":"7" }
+  es6.array.of { "ie":"10", "safari":"7" }
+  es6.array.sort { "chrome":"54", "ios":"9", "safari":"7" }
+  es6.array.species { "ie":"10", "ios":"9", "safari":"7" }
+  es6.date.to-json { "ios":"9", "safari":"7" }
+  es6.date.to-primitive { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.function.has-instance { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.function.name { "edge":"13", "ie":"10" }
+  es6.map { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.math.acosh { "ie":"10", "safari":"7" }
+  es6.math.asinh { "ie":"10", "safari":"7" }
+  es6.math.atanh { "ie":"10", "safari":"7" }
+  es6.math.cbrt { "ie":"10", "safari":"7" }
+  es6.math.clz32 { "ie":"10", "safari":"7" }
+  es6.math.cosh { "ie":"10", "safari":"7" }
+  es6.math.expm1 { "ie":"10", "safari":"7" }
+  es6.math.fround { "ie":"10", "safari":"7" }
+  es6.math.hypot { "ie":"10", "safari":"7" }
+  es6.math.imul { "ie":"10" }
+  es6.math.log1p { "ie":"10", "safari":"7" }
+  es6.math.log10 { "ie":"10", "safari":"7" }
+  es6.math.log2 { "ie":"10", "safari":"7" }
+  es6.math.sign { "ie":"10", "safari":"7" }
+  es6.math.sinh { "ie":"10", "safari":"7" }
+  es6.math.tanh { "ie":"10", "safari":"7" }
+  es6.math.trunc { "ie":"10", "safari":"7" }
+  es6.number.constructor { "ie":"10", "safari":"7" }
+  es6.number.epsilon { "ie":"10", "safari":"7" }
+  es6.number.is-finite { "ie":"10", "safari":"7" }
+  es6.number.is-integer { "ie":"10", "safari":"7" }
+  es6.number.is-nan { "ie":"10", "safari":"7" }
+  es6.number.is-safe-integer { "ie":"10", "safari":"7" }
+  es6.number.max-safe-integer { "ie":"10", "safari":"7" }
+  es6.number.min-safe-integer { "ie":"10", "safari":"7" }
+  es6.number.parse-float { "ie":"10", "safari":"7" }
+  es6.number.parse-int { "ie":"10", "safari":"7" }
+  es6.object.assign { "ie":"10", "ios":"9", "safari":"7" }
+  es7.object.define-getter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es7.object.define-setter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es7.object.entries { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.object.freeze { "ie":"10", "safari":"7" }
+  es6.object.get-own-property-descriptor { "ie":"10", "safari":"7" }
+  es7.object.get-own-property-descriptors { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.object.get-own-property-names { "ie":"10", "safari":"7" }
+  es6.object.get-prototype-of { "ie":"10", "safari":"7" }
+  es7.object.lookup-getter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es7.object.lookup-setter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es6.object.prevent-extensions { "ie":"10", "safari":"7" }
+  es6.object.to-string { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.object.is { "ie":"10", "safari":"7" }
+  es6.object.is-frozen { "ie":"10", "safari":"7" }
+  es6.object.is-sealed { "ie":"10", "safari":"7" }
+  es6.object.is-extensible { "ie":"10", "safari":"7" }
+  es6.object.keys { "ie":"10", "safari":"7" }
+  es6.object.seal { "ie":"10", "safari":"7" }
+  es6.object.set-prototype-of { "ie":"10", "safari":"7" }
+  es7.object.values { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.promise { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es7.promise.finally { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.apply { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.construct { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.define-property { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.delete-property { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.get { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.get-own-property-descriptor { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.get-prototype-of { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.has { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.is-extensible { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.own-keys { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.prevent-extensions { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.set { "ie":"10", "ios":"9", "safari":"7" }
+  es6.reflect.set-prototype-of { "ie":"10", "ios":"9", "safari":"7" }
+  es6.regexp.constructor { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.regexp.flags { "edge":"13", "ie":"10", "safari":"7" }
+  es6.regexp.match { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.regexp.replace { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.regexp.split { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.regexp.search { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.regexp.to-string { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.set { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.symbol { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es7.symbol.async-iterator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.string.anchor { "ie":"10" }
+  es6.string.big { "ie":"10" }
+  es6.string.blink { "ie":"10" }
+  es6.string.bold { "ie":"10" }
+  es6.string.code-point-at { "ie":"10", "safari":"7" }
+  es6.string.ends-with { "ie":"10", "safari":"7" }
+  es6.string.fixed { "ie":"10" }
+  es6.string.fontcolor { "ie":"10" }
+  es6.string.fontsize { "ie":"10" }
+  es6.string.from-code-point { "ie":"10", "safari":"7" }
+  es6.string.includes { "ie":"10", "safari":"7" }
+  es6.string.italics { "ie":"10" }
+  es6.string.iterator { "ie":"10", "safari":"7" }
+  es6.string.link { "ie":"10" }
+  es7.string.pad-start { "chrome":"54", "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es7.string.pad-end { "chrome":"54", "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es6.string.raw { "ie":"10", "safari":"7" }
+  es6.string.repeat { "ie":"10", "safari":"7" }
+  es6.string.small { "ie":"10" }
+  es6.string.starts-with { "ie":"10", "safari":"7" }
+  es6.string.strike { "ie":"10" }
+  es6.string.sub { "ie":"10" }
+  es6.string.sup { "ie":"10" }
+  es7.string.trim-left { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es7.string.trim-right { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.array-buffer { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.int8-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.uint8-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.uint8-clamped-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.int16-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.uint16-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.int32-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.uint32-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.float32-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.typed.float64-array { "ie":"10", "ios":"9", "safari":"7" }
+  es6.weak-map { "edge":"13", "firefox":"49", "ie":"10", "safari":"7" }
+  es6.weak-set { "edge":"13", "firefox":"49", "ie":"10", "safari":"7" }
+  web.timers { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.immediate { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.dom.iterable { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-with-import/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/usage-with-import/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/options.json
new file mode 100644
index 000000000000..abf19b511667
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    ["../../lib", {
+      "useBuiltIns": "entry",
+      "corejs": 2,
+      "debug": true,
+      "targets": {
+        "chrome": 54,
+        "electron": 0.36,
+        "node": 6.10,
+        "ie": 10
+      }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/stdout.txt
new file mode 100644
index 000000000000..3988359b77cf
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-decimals/stdout.txt
@@ -0,0 +1,205 @@
+Warning, the following targets are using a decimal version:
+
+  electron: 0.36
+  node: 6.1
+
+We recommend using a string for minor/patch versions to avoid numbers like 6.10
+getting parsed as 6.1, which can lead to unexpected behavior.
+
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "electron": "0.36",
+  "ie": "10",
+  "node": "6.1"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-sticky-regex { "electron":"0.36", "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-unicode-regex { "electron":"0.36", "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "electron":"0.36", "ie":"10" }
+  transform-destructuring { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-block-scoping { "electron":"0.36", "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "electron":"0.36", "ie":"10" }
+  transform-exponentiation-operator { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-async-to-generator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-async-generator-functions { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-object-rest-spread { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-unicode-property-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-json-strings { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-optional-catch-binding { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-named-capturing-groups-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-member-expression-literals { "electron":"0.36" }
+  transform-property-literals { "electron":"0.36" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within { "ie":"10" }
+  es6.array.every { "electron":"0.36" }
+  es6.array.fill { "ie":"10" }
+  es6.array.filter { "electron":"0.36" }
+  es6.array.find { "ie":"10" }
+  es6.array.find-index { "ie":"10" }
+  es7.array.flat-map { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.array.for-each { "electron":"0.36" }
+  es6.array.from { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es7.array.includes { "ie":"10" }
+  es6.array.index-of { "electron":"0.36" }
+  es6.array.is-array { "electron":"0.36" }
+  es6.array.iterator { "ie":"10" }
+  es6.array.last-index-of { "electron":"0.36" }
+  es6.array.map { "electron":"0.36" }
+  es6.array.of { "ie":"10" }
+  es6.array.reduce { "electron":"0.36" }
+  es6.array.reduce-right { "electron":"0.36" }
+  es6.array.some { "electron":"0.36" }
+  es6.array.sort { "chrome":"54", "electron":"0.36", "node":"6.1" }
+  es6.array.species { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.date.now { "electron":"0.36" }
+  es6.date.to-iso-string { "electron":"0.36" }
+  es6.date.to-json { "electron":"0.36" }
+  es6.date.to-primitive { "ie":"10" }
+  es6.date.to-string { "electron":"0.36" }
+  es6.function.bind { "electron":"0.36" }
+  es6.function.has-instance { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.function.name { "electron":"0.36", "ie":"10" }
+  es6.map { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.math.acosh { "ie":"10" }
+  es6.math.asinh { "ie":"10" }
+  es6.math.atanh { "ie":"10" }
+  es6.math.cbrt { "ie":"10" }
+  es6.math.clz32 { "ie":"10" }
+  es6.math.cosh { "ie":"10" }
+  es6.math.expm1 { "ie":"10" }
+  es6.math.fround { "ie":"10" }
+  es6.math.hypot { "ie":"10" }
+  es6.math.imul { "ie":"10" }
+  es6.math.log1p { "ie":"10" }
+  es6.math.log10 { "ie":"10" }
+  es6.math.log2 { "ie":"10" }
+  es6.math.sign { "ie":"10" }
+  es6.math.sinh { "ie":"10" }
+  es6.math.tanh { "ie":"10" }
+  es6.math.trunc { "ie":"10" }
+  es6.number.constructor { "ie":"10" }
+  es6.number.epsilon { "ie":"10" }
+  es6.number.is-finite { "ie":"10" }
+  es6.number.is-integer { "ie":"10" }
+  es6.number.is-nan { "ie":"10" }
+  es6.number.is-safe-integer { "ie":"10" }
+  es6.number.max-safe-integer { "ie":"10" }
+  es6.number.min-safe-integer { "ie":"10" }
+  es6.number.parse-float { "ie":"10" }
+  es6.number.parse-int { "ie":"10" }
+  es6.object.assign { "electron":"0.36", "ie":"10" }
+  es6.object.create { "electron":"0.36" }
+  es7.object.define-getter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es7.object.define-setter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.object.define-property { "electron":"0.36" }
+  es6.object.define-properties { "electron":"0.36" }
+  es7.object.entries { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.object.freeze { "ie":"10" }
+  es6.object.get-own-property-descriptor { "ie":"10" }
+  es7.object.get-own-property-descriptors { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.object.get-own-property-names { "ie":"10" }
+  es6.object.get-prototype-of { "ie":"10" }
+  es7.object.lookup-getter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es7.object.lookup-setter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.object.prevent-extensions { "ie":"10" }
+  es6.object.to-string { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.object.is { "ie":"10" }
+  es6.object.is-frozen { "ie":"10" }
+  es6.object.is-sealed { "ie":"10" }
+  es6.object.is-extensible { "ie":"10" }
+  es6.object.keys { "ie":"10" }
+  es6.object.seal { "ie":"10" }
+  es6.object.set-prototype-of { "ie":"10" }
+  es7.object.values { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.promise { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es7.promise.finally { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.reflect.apply { "electron":"0.36", "ie":"10" }
+  es6.reflect.construct { "electron":"0.36", "ie":"10" }
+  es6.reflect.define-property { "electron":"0.36", "ie":"10" }
+  es6.reflect.delete-property { "electron":"0.36", "ie":"10" }
+  es6.reflect.get { "electron":"0.36", "ie":"10" }
+  es6.reflect.get-own-property-descriptor { "electron":"0.36", "ie":"10" }
+  es6.reflect.get-prototype-of { "electron":"0.36", "ie":"10" }
+  es6.reflect.has { "electron":"0.36", "ie":"10" }
+  es6.reflect.is-extensible { "electron":"0.36", "ie":"10" }
+  es6.reflect.own-keys { "electron":"0.36", "ie":"10" }
+  es6.reflect.prevent-extensions { "electron":"0.36", "ie":"10" }
+  es6.reflect.set { "electron":"0.36", "ie":"10" }
+  es6.reflect.set-prototype-of { "electron":"0.36", "ie":"10" }
+  es6.regexp.constructor { "electron":"0.36", "ie":"10" }
+  es6.regexp.flags { "electron":"0.36", "ie":"10" }
+  es6.regexp.match { "electron":"0.36", "ie":"10" }
+  es6.regexp.replace { "electron":"0.36", "ie":"10" }
+  es6.regexp.split { "electron":"0.36", "ie":"10" }
+  es6.regexp.search { "electron":"0.36", "ie":"10" }
+  es6.regexp.to-string { "electron":"0.36", "ie":"10" }
+  es6.set { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.symbol { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es7.symbol.async-iterator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.string.anchor { "electron":"0.36", "ie":"10" }
+  es6.string.big { "electron":"0.36", "ie":"10" }
+  es6.string.blink { "electron":"0.36", "ie":"10" }
+  es6.string.bold { "electron":"0.36", "ie":"10" }
+  es6.string.code-point-at { "ie":"10" }
+  es6.string.ends-with { "ie":"10" }
+  es6.string.fixed { "electron":"0.36", "ie":"10" }
+  es6.string.fontcolor { "electron":"0.36", "ie":"10" }
+  es6.string.fontsize { "electron":"0.36", "ie":"10" }
+  es6.string.from-code-point { "ie":"10" }
+  es6.string.includes { "ie":"10" }
+  es6.string.italics { "electron":"0.36", "ie":"10" }
+  es6.string.iterator { "ie":"10" }
+  es6.string.link { "electron":"0.36", "ie":"10" }
+  es7.string.pad-start { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es7.string.pad-end { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.string.raw { "ie":"10" }
+  es6.string.repeat { "ie":"10" }
+  es6.string.small { "electron":"0.36", "ie":"10" }
+  es6.string.starts-with { "ie":"10" }
+  es6.string.strike { "electron":"0.36", "ie":"10" }
+  es6.string.sub { "electron":"0.36", "ie":"10" }
+  es6.string.sup { "electron":"0.36", "ie":"10" }
+  es6.string.trim { "electron":"0.36" }
+  es7.string.trim-left { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es7.string.trim-right { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.array-buffer { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.data-view { "electron":"0.36" }
+  es6.typed.int8-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.uint8-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.uint8-clamped-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.int16-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.uint16-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.int32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.uint32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.float32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.typed.float64-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.weak-map { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es6.weak-set { "electron":"0.36", "ie":"10", "node":"6.1" }
+  web.timers { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  web.immediate { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  web.dom.iterable { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/versions-decimals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/versions-decimals/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/options.json
new file mode 100644
index 000000000000..e586d8bb545e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "useBuiltIns": "entry",
+      "corejs": 2,
+      "debug": true,
+      "targets": {
+        "chrome": "54",
+        "node": "6.10",
+        "ie": "10"
+      }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/stdout.txt
new file mode 100644
index 000000000000..2599a836d290
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2-versions-strings/stdout.txt
@@ -0,0 +1,174 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "ie": "10",
+  "node": "6.10"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "ie":"10" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "ie":"10" }
+  transform-sticky-regex { "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-unicode-regex { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-destructuring { "ie":"10" }
+  transform-block-scoping { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "ie":"10" }
+  transform-exponentiation-operator { "ie":"10", "node":"6.10" }
+  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-named-capturing-groups-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within { "ie":"10" }
+  es6.array.fill { "ie":"10" }
+  es6.array.find { "ie":"10" }
+  es6.array.find-index { "ie":"10" }
+  es7.array.flat-map { "chrome":"54", "ie":"10", "node":"6.10" }
+  es6.array.from { "ie":"10" }
+  es7.array.includes { "ie":"10" }
+  es6.array.iterator { "ie":"10" }
+  es6.array.of { "ie":"10" }
+  es6.array.sort { "chrome":"54", "node":"6.10" }
+  es6.array.species { "ie":"10" }
+  es6.date.to-primitive { "ie":"10" }
+  es6.function.has-instance { "ie":"10" }
+  es6.function.name { "ie":"10" }
+  es6.map { "ie":"10" }
+  es6.math.acosh { "ie":"10" }
+  es6.math.asinh { "ie":"10" }
+  es6.math.atanh { "ie":"10" }
+  es6.math.cbrt { "ie":"10" }
+  es6.math.clz32 { "ie":"10" }
+  es6.math.cosh { "ie":"10" }
+  es6.math.expm1 { "ie":"10" }
+  es6.math.fround { "ie":"10" }
+  es6.math.hypot { "ie":"10" }
+  es6.math.imul { "ie":"10" }
+  es6.math.log1p { "ie":"10" }
+  es6.math.log10 { "ie":"10" }
+  es6.math.log2 { "ie":"10" }
+  es6.math.sign { "ie":"10" }
+  es6.math.sinh { "ie":"10" }
+  es6.math.tanh { "ie":"10" }
+  es6.math.trunc { "ie":"10" }
+  es6.number.constructor { "ie":"10" }
+  es6.number.epsilon { "ie":"10" }
+  es6.number.is-finite { "ie":"10" }
+  es6.number.is-integer { "ie":"10" }
+  es6.number.is-nan { "ie":"10" }
+  es6.number.is-safe-integer { "ie":"10" }
+  es6.number.max-safe-integer { "ie":"10" }
+  es6.number.min-safe-integer { "ie":"10" }
+  es6.number.parse-float { "ie":"10" }
+  es6.number.parse-int { "ie":"10" }
+  es6.object.assign { "ie":"10" }
+  es7.object.define-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es7.object.define-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es7.object.entries { "ie":"10", "node":"6.10" }
+  es6.object.freeze { "ie":"10" }
+  es6.object.get-own-property-descriptor { "ie":"10" }
+  es7.object.get-own-property-descriptors { "ie":"10", "node":"6.10" }
+  es6.object.get-own-property-names { "ie":"10" }
+  es6.object.get-prototype-of { "ie":"10" }
+  es7.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es7.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es6.object.prevent-extensions { "ie":"10" }
+  es6.object.to-string { "chrome":"54", "ie":"10", "node":"6.10" }
+  es6.object.is { "ie":"10" }
+  es6.object.is-frozen { "ie":"10" }
+  es6.object.is-sealed { "ie":"10" }
+  es6.object.is-extensible { "ie":"10" }
+  es6.object.keys { "ie":"10" }
+  es6.object.seal { "ie":"10" }
+  es6.object.set-prototype-of { "ie":"10" }
+  es7.object.values { "ie":"10", "node":"6.10" }
+  es6.promise { "ie":"10" }
+  es7.promise.finally { "chrome":"54", "ie":"10", "node":"6.10" }
+  es6.reflect.apply { "ie":"10" }
+  es6.reflect.construct { "ie":"10" }
+  es6.reflect.define-property { "ie":"10" }
+  es6.reflect.delete-property { "ie":"10" }
+  es6.reflect.get { "ie":"10" }
+  es6.reflect.get-own-property-descriptor { "ie":"10" }
+  es6.reflect.get-prototype-of { "ie":"10" }
+  es6.reflect.has { "ie":"10" }
+  es6.reflect.is-extensible { "ie":"10" }
+  es6.reflect.own-keys { "ie":"10" }
+  es6.reflect.prevent-extensions { "ie":"10" }
+  es6.reflect.set { "ie":"10" }
+  es6.reflect.set-prototype-of { "ie":"10" }
+  es6.regexp.constructor { "ie":"10" }
+  es6.regexp.flags { "ie":"10" }
+  es6.regexp.match { "ie":"10" }
+  es6.regexp.replace { "ie":"10" }
+  es6.regexp.split { "ie":"10" }
+  es6.regexp.search { "ie":"10" }
+  es6.regexp.to-string { "ie":"10" }
+  es6.set { "ie":"10" }
+  es6.symbol { "ie":"10" }
+  es7.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6.10" }
+  es6.string.anchor { "ie":"10" }
+  es6.string.big { "ie":"10" }
+  es6.string.blink { "ie":"10" }
+  es6.string.bold { "ie":"10" }
+  es6.string.code-point-at { "ie":"10" }
+  es6.string.ends-with { "ie":"10" }
+  es6.string.fixed { "ie":"10" }
+  es6.string.fontcolor { "ie":"10" }
+  es6.string.fontsize { "ie":"10" }
+  es6.string.from-code-point { "ie":"10" }
+  es6.string.includes { "ie":"10" }
+  es6.string.italics { "ie":"10" }
+  es6.string.iterator { "ie":"10" }
+  es6.string.link { "ie":"10" }
+  es7.string.pad-start { "chrome":"54", "ie":"10", "node":"6.10" }
+  es7.string.pad-end { "chrome":"54", "ie":"10", "node":"6.10" }
+  es6.string.raw { "ie":"10" }
+  es6.string.repeat { "ie":"10" }
+  es6.string.small { "ie":"10" }
+  es6.string.starts-with { "ie":"10" }
+  es6.string.strike { "ie":"10" }
+  es6.string.sub { "ie":"10" }
+  es6.string.sup { "ie":"10" }
+  es7.string.trim-left { "chrome":"54", "ie":"10", "node":"6.10" }
+  es7.string.trim-right { "chrome":"54", "ie":"10", "node":"6.10" }
+  es6.typed.array-buffer { "ie":"10" }
+  es6.typed.int8-array { "ie":"10" }
+  es6.typed.uint8-array { "ie":"10" }
+  es6.typed.uint8-clamped-array { "ie":"10" }
+  es6.typed.int16-array { "ie":"10" }
+  es6.typed.uint16-array { "ie":"10" }
+  es6.typed.int32-array { "ie":"10" }
+  es6.typed.uint32-array { "ie":"10" }
+  es6.typed.float32-array { "ie":"10" }
+  es6.typed.float64-array { "ie":"10" }
+  es6.weak-map { "ie":"10" }
+  es6.weak-set { "ie":"10" }
+  web.timers { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.immediate { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.dom.iterable { "chrome":"54", "ie":"10", "node":"6.10" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/versions-strings/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/versions-strings/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/entry-corejs2/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2/options.json
new file mode 100644
index 000000000000..de9fd3231ddf
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome >= 54, ie 10",
+        "node": 6
+      },
+      "useBuiltIns": "entry",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs2/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2/stdout.txt
new file mode 100644
index 000000000000..943bad68b9b1
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs2/stdout.txt
@@ -0,0 +1,174 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "ie": "10",
+  "node": "6"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "ie":"10", "node":"6" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "ie":"10", "node":"6" }
+  transform-sticky-regex { "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6" }
+  transform-unicode-regex { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-destructuring { "ie":"10", "node":"6" }
+  transform-block-scoping { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "ie":"10" }
+  transform-exponentiation-operator { "ie":"10", "node":"6" }
+  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6" }
+  transform-named-capturing-groups-regex { "chrome":"54", "ie":"10", "node":"6" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within { "ie":"10" }
+  es6.array.fill { "ie":"10" }
+  es6.array.find { "ie":"10" }
+  es6.array.find-index { "ie":"10" }
+  es7.array.flat-map { "chrome":"54", "ie":"10", "node":"6" }
+  es6.array.from { "ie":"10", "node":"6" }
+  es7.array.includes { "ie":"10" }
+  es6.array.iterator { "ie":"10" }
+  es6.array.of { "ie":"10" }
+  es6.array.sort { "chrome":"54", "node":"6" }
+  es6.array.species { "ie":"10", "node":"6" }
+  es6.date.to-primitive { "ie":"10" }
+  es6.function.has-instance { "ie":"10", "node":"6" }
+  es6.function.name { "ie":"10" }
+  es6.map { "ie":"10", "node":"6" }
+  es6.math.acosh { "ie":"10" }
+  es6.math.asinh { "ie":"10" }
+  es6.math.atanh { "ie":"10" }
+  es6.math.cbrt { "ie":"10" }
+  es6.math.clz32 { "ie":"10" }
+  es6.math.cosh { "ie":"10" }
+  es6.math.expm1 { "ie":"10" }
+  es6.math.fround { "ie":"10" }
+  es6.math.hypot { "ie":"10" }
+  es6.math.imul { "ie":"10" }
+  es6.math.log1p { "ie":"10" }
+  es6.math.log10 { "ie":"10" }
+  es6.math.log2 { "ie":"10" }
+  es6.math.sign { "ie":"10" }
+  es6.math.sinh { "ie":"10" }
+  es6.math.tanh { "ie":"10" }
+  es6.math.trunc { "ie":"10" }
+  es6.number.constructor { "ie":"10" }
+  es6.number.epsilon { "ie":"10" }
+  es6.number.is-finite { "ie":"10" }
+  es6.number.is-integer { "ie":"10" }
+  es6.number.is-nan { "ie":"10" }
+  es6.number.is-safe-integer { "ie":"10" }
+  es6.number.max-safe-integer { "ie":"10" }
+  es6.number.min-safe-integer { "ie":"10" }
+  es6.number.parse-float { "ie":"10" }
+  es6.number.parse-int { "ie":"10" }
+  es6.object.assign { "ie":"10" }
+  es7.object.define-getter { "chrome":"54", "ie":"10", "node":"6" }
+  es7.object.define-setter { "chrome":"54", "ie":"10", "node":"6" }
+  es7.object.entries { "ie":"10", "node":"6" }
+  es6.object.freeze { "ie":"10" }
+  es6.object.get-own-property-descriptor { "ie":"10" }
+  es7.object.get-own-property-descriptors { "ie":"10", "node":"6" }
+  es6.object.get-own-property-names { "ie":"10" }
+  es6.object.get-prototype-of { "ie":"10" }
+  es7.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6" }
+  es7.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6" }
+  es6.object.prevent-extensions { "ie":"10" }
+  es6.object.to-string { "chrome":"54", "ie":"10", "node":"6" }
+  es6.object.is { "ie":"10" }
+  es6.object.is-frozen { "ie":"10" }
+  es6.object.is-sealed { "ie":"10" }
+  es6.object.is-extensible { "ie":"10" }
+  es6.object.keys { "ie":"10" }
+  es6.object.seal { "ie":"10" }
+  es6.object.set-prototype-of { "ie":"10" }
+  es7.object.values { "ie":"10", "node":"6" }
+  es6.promise { "ie":"10", "node":"6" }
+  es7.promise.finally { "chrome":"54", "ie":"10", "node":"6" }
+  es6.reflect.apply { "ie":"10" }
+  es6.reflect.construct { "ie":"10" }
+  es6.reflect.define-property { "ie":"10" }
+  es6.reflect.delete-property { "ie":"10" }
+  es6.reflect.get { "ie":"10" }
+  es6.reflect.get-own-property-descriptor { "ie":"10" }
+  es6.reflect.get-prototype-of { "ie":"10" }
+  es6.reflect.has { "ie":"10" }
+  es6.reflect.is-extensible { "ie":"10" }
+  es6.reflect.own-keys { "ie":"10" }
+  es6.reflect.prevent-extensions { "ie":"10" }
+  es6.reflect.set { "ie":"10" }
+  es6.reflect.set-prototype-of { "ie":"10" }
+  es6.regexp.constructor { "ie":"10" }
+  es6.regexp.flags { "ie":"10" }
+  es6.regexp.match { "ie":"10" }
+  es6.regexp.replace { "ie":"10" }
+  es6.regexp.split { "ie":"10" }
+  es6.regexp.search { "ie":"10" }
+  es6.regexp.to-string { "ie":"10" }
+  es6.set { "ie":"10", "node":"6" }
+  es6.symbol { "ie":"10", "node":"6" }
+  es7.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6" }
+  es6.string.anchor { "ie":"10" }
+  es6.string.big { "ie":"10" }
+  es6.string.blink { "ie":"10" }
+  es6.string.bold { "ie":"10" }
+  es6.string.code-point-at { "ie":"10" }
+  es6.string.ends-with { "ie":"10" }
+  es6.string.fixed { "ie":"10" }
+  es6.string.fontcolor { "ie":"10" }
+  es6.string.fontsize { "ie":"10" }
+  es6.string.from-code-point { "ie":"10" }
+  es6.string.includes { "ie":"10" }
+  es6.string.italics { "ie":"10" }
+  es6.string.iterator { "ie":"10" }
+  es6.string.link { "ie":"10" }
+  es7.string.pad-start { "chrome":"54", "ie":"10", "node":"6" }
+  es7.string.pad-end { "chrome":"54", "ie":"10", "node":"6" }
+  es6.string.raw { "ie":"10" }
+  es6.string.repeat { "ie":"10" }
+  es6.string.small { "ie":"10" }
+  es6.string.starts-with { "ie":"10" }
+  es6.string.strike { "ie":"10" }
+  es6.string.sub { "ie":"10" }
+  es6.string.sup { "ie":"10" }
+  es7.string.trim-left { "chrome":"54", "ie":"10", "node":"6" }
+  es7.string.trim-right { "chrome":"54", "ie":"10", "node":"6" }
+  es6.typed.array-buffer { "ie":"10", "node":"6" }
+  es6.typed.int8-array { "ie":"10", "node":"6" }
+  es6.typed.uint8-array { "ie":"10", "node":"6" }
+  es6.typed.uint8-clamped-array { "ie":"10", "node":"6" }
+  es6.typed.int16-array { "ie":"10", "node":"6" }
+  es6.typed.uint16-array { "ie":"10", "node":"6" }
+  es6.typed.int32-array { "ie":"10", "node":"6" }
+  es6.typed.uint32-array { "ie":"10", "node":"6" }
+  es6.typed.float32-array { "ie":"10", "node":"6" }
+  es6.typed.float64-array { "ie":"10", "node":"6" }
+  es6.weak-map { "ie":"10", "node":"6" }
+  es6.weak-set { "ie":"10", "node":"6" }
+  web.timers { "chrome":"54", "ie":"10", "node":"6" }
+  web.immediate { "chrome":"54", "ie":"10", "node":"6" }
+  web.dom.iterable { "chrome":"54", "ie":"10", "node":"6" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/in/in.js
new file mode 100644
index 000000000000..c0ce4c954ebe
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/stdout.txt
new file mode 100644
index 000000000000..9bd35deedc21
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all-chrome-71/stdout.txt
@@ -0,0 +1,106 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.array.unscopables.flat { "chrome":"71" }
+  es.array.unscopables.flat-map { "chrome":"71" }
+  es.object.from-entries { "chrome":"71" }
+  esnext.aggregate-error { "chrome":"71" }
+  esnext.array.last-index { "chrome":"71" }
+  esnext.array.last-item { "chrome":"71" }
+  esnext.composite-key { "chrome":"71" }
+  esnext.composite-symbol { "chrome":"71" }
+  esnext.map.delete-all { "chrome":"71" }
+  esnext.map.every { "chrome":"71" }
+  esnext.map.filter { "chrome":"71" }
+  esnext.map.find { "chrome":"71" }
+  esnext.map.find-key { "chrome":"71" }
+  esnext.map.from { "chrome":"71" }
+  esnext.map.group-by { "chrome":"71" }
+  esnext.map.includes { "chrome":"71" }
+  esnext.map.key-by { "chrome":"71" }
+  esnext.map.key-of { "chrome":"71" }
+  esnext.map.map-keys { "chrome":"71" }
+  esnext.map.map-values { "chrome":"71" }
+  esnext.map.merge { "chrome":"71" }
+  esnext.map.of { "chrome":"71" }
+  esnext.map.reduce { "chrome":"71" }
+  esnext.map.some { "chrome":"71" }
+  esnext.map.update { "chrome":"71" }
+  esnext.math.clamp { "chrome":"71" }
+  esnext.math.deg-per-rad { "chrome":"71" }
+  esnext.math.degrees { "chrome":"71" }
+  esnext.math.fscale { "chrome":"71" }
+  esnext.math.iaddh { "chrome":"71" }
+  esnext.math.imulh { "chrome":"71" }
+  esnext.math.isubh { "chrome":"71" }
+  esnext.math.rad-per-deg { "chrome":"71" }
+  esnext.math.radians { "chrome":"71" }
+  esnext.math.scale { "chrome":"71" }
+  esnext.math.seeded-prng { "chrome":"71" }
+  esnext.math.signbit { "chrome":"71" }
+  esnext.math.umulh { "chrome":"71" }
+  esnext.number.from-string { "chrome":"71" }
+  esnext.observable { "chrome":"71" }
+  esnext.promise.all-settled { "chrome":"71" }
+  esnext.promise.any { "chrome":"71" }
+  esnext.promise.try { "chrome":"71" }
+  esnext.reflect.define-metadata { "chrome":"71" }
+  esnext.reflect.delete-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata-keys { "chrome":"71" }
+  esnext.reflect.get-own-metadata { "chrome":"71" }
+  esnext.reflect.get-own-metadata-keys { "chrome":"71" }
+  esnext.reflect.has-metadata { "chrome":"71" }
+  esnext.reflect.has-own-metadata { "chrome":"71" }
+  esnext.reflect.metadata { "chrome":"71" }
+  esnext.set.add-all { "chrome":"71" }
+  esnext.set.delete-all { "chrome":"71" }
+  esnext.set.difference { "chrome":"71" }
+  esnext.set.every { "chrome":"71" }
+  esnext.set.filter { "chrome":"71" }
+  esnext.set.find { "chrome":"71" }
+  esnext.set.from { "chrome":"71" }
+  esnext.set.intersection { "chrome":"71" }
+  esnext.set.is-disjoint-from { "chrome":"71" }
+  esnext.set.is-subset-of { "chrome":"71" }
+  esnext.set.is-superset-of { "chrome":"71" }
+  esnext.set.join { "chrome":"71" }
+  esnext.set.map { "chrome":"71" }
+  esnext.set.of { "chrome":"71" }
+  esnext.set.reduce { "chrome":"71" }
+  esnext.set.some { "chrome":"71" }
+  esnext.set.symmetric-difference { "chrome":"71" }
+  esnext.set.union { "chrome":"71" }
+  esnext.string.at { "chrome":"71" }
+  esnext.string.code-points { "chrome":"71" }
+  esnext.string.replace-all { "chrome":"71" }
+  esnext.symbol.dispose { "chrome":"71" }
+  esnext.symbol.observable { "chrome":"71" }
+  esnext.symbol.pattern-match { "chrome":"71" }
+  esnext.weak-map.delete-all { "chrome":"71" }
+  esnext.weak-map.from { "chrome":"71" }
+  esnext.weak-map.of { "chrome":"71" }
+  esnext.weak-set.add-all { "chrome":"71" }
+  esnext.weak-set.delete-all { "chrome":"71" }
+  esnext.weak-set.from { "chrome":"71" }
+  esnext.weak-set.of { "chrome":"71" }
+  web.immediate { "chrome":"71" }
+  esnext.string.match-all { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/in/in.js
new file mode 100644
index 000000000000..c0ce4c954ebe
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/stdout.txt
new file mode 100644
index 000000000000..cf2f612260b2
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-all/stdout.txt
@@ -0,0 +1,335 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol {}
+  es.symbol.description {}
+  es.symbol.async-iterator {}
+  es.symbol.has-instance {}
+  es.symbol.is-concat-spreadable {}
+  es.symbol.iterator {}
+  es.symbol.match {}
+  es.symbol.replace {}
+  es.symbol.search {}
+  es.symbol.species {}
+  es.symbol.split {}
+  es.symbol.to-primitive {}
+  es.symbol.to-string-tag {}
+  es.symbol.unscopables {}
+  es.array.concat {}
+  es.array.copy-within {}
+  es.array.every {}
+  es.array.fill {}
+  es.array.filter {}
+  es.array.find {}
+  es.array.find-index {}
+  es.array.flat {}
+  es.array.flat-map {}
+  es.array.for-each {}
+  es.array.from {}
+  es.array.includes {}
+  es.array.index-of {}
+  es.array.is-array {}
+  es.array.iterator {}
+  es.array.join {}
+  es.array.last-index-of {}
+  es.array.map {}
+  es.array.of {}
+  es.array.reduce {}
+  es.array.reduce-right {}
+  es.array.reverse {}
+  es.array.slice {}
+  es.array.some {}
+  es.array.sort {}
+  es.array.species {}
+  es.array.splice {}
+  es.array.unscopables.flat {}
+  es.array.unscopables.flat-map {}
+  es.array-buffer.constructor {}
+  es.array-buffer.is-view {}
+  es.array-buffer.slice {}
+  es.data-view {}
+  es.date.now {}
+  es.date.to-iso-string {}
+  es.date.to-json {}
+  es.date.to-primitive {}
+  es.date.to-string {}
+  es.function.bind {}
+  es.function.has-instance {}
+  es.function.name {}
+  es.json.to-string-tag {}
+  es.map {}
+  es.math.acosh {}
+  es.math.asinh {}
+  es.math.atanh {}
+  es.math.cbrt {}
+  es.math.clz32 {}
+  es.math.cosh {}
+  es.math.expm1 {}
+  es.math.fround {}
+  es.math.hypot {}
+  es.math.imul {}
+  es.math.log10 {}
+  es.math.log1p {}
+  es.math.log2 {}
+  es.math.sign {}
+  es.math.sinh {}
+  es.math.tanh {}
+  es.math.to-string-tag {}
+  es.math.trunc {}
+  es.number.constructor {}
+  es.number.epsilon {}
+  es.number.is-finite {}
+  es.number.is-integer {}
+  es.number.is-nan {}
+  es.number.is-safe-integer {}
+  es.number.max-safe-integer {}
+  es.number.min-safe-integer {}
+  es.number.parse-float {}
+  es.number.parse-int {}
+  es.number.to-fixed {}
+  es.number.to-precision {}
+  es.object.assign {}
+  es.object.create {}
+  es.object.define-getter {}
+  es.object.define-properties {}
+  es.object.define-property {}
+  es.object.define-setter {}
+  es.object.entries {}
+  es.object.freeze {}
+  es.object.from-entries {}
+  es.object.get-own-property-descriptor {}
+  es.object.get-own-property-descriptors {}
+  es.object.get-own-property-names {}
+  es.object.get-prototype-of {}
+  es.object.is {}
+  es.object.is-extensible {}
+  es.object.is-frozen {}
+  es.object.is-sealed {}
+  es.object.keys {}
+  es.object.lookup-getter {}
+  es.object.lookup-setter {}
+  es.object.prevent-extensions {}
+  es.object.seal {}
+  es.object.set-prototype-of {}
+  es.object.to-string {}
+  es.object.values {}
+  es.parse-float {}
+  es.parse-int {}
+  es.promise {}
+  es.promise.finally {}
+  es.reflect.apply {}
+  es.reflect.construct {}
+  es.reflect.define-property {}
+  es.reflect.delete-property {}
+  es.reflect.get {}
+  es.reflect.get-own-property-descriptor {}
+  es.reflect.get-prototype-of {}
+  es.reflect.has {}
+  es.reflect.is-extensible {}
+  es.reflect.own-keys {}
+  es.reflect.prevent-extensions {}
+  es.reflect.set {}
+  es.reflect.set-prototype-of {}
+  es.regexp.constructor {}
+  es.regexp.exec {}
+  es.regexp.flags {}
+  es.regexp.to-string {}
+  es.set {}
+  es.string.code-point-at {}
+  es.string.ends-with {}
+  es.string.from-code-point {}
+  es.string.includes {}
+  es.string.iterator {}
+  es.string.match {}
+  es.string.pad-end {}
+  es.string.pad-start {}
+  es.string.raw {}
+  es.string.repeat {}
+  es.string.replace {}
+  es.string.search {}
+  es.string.split {}
+  es.string.starts-with {}
+  es.string.trim {}
+  es.string.trim-end {}
+  es.string.trim-start {}
+  es.string.anchor {}
+  es.string.big {}
+  es.string.blink {}
+  es.string.bold {}
+  es.string.fixed {}
+  es.string.fontcolor {}
+  es.string.fontsize {}
+  es.string.italics {}
+  es.string.link {}
+  es.string.small {}
+  es.string.strike {}
+  es.string.sub {}
+  es.string.sup {}
+  es.typed-array.float32-array {}
+  es.typed-array.float64-array {}
+  es.typed-array.int8-array {}
+  es.typed-array.int16-array {}
+  es.typed-array.int32-array {}
+  es.typed-array.uint8-array {}
+  es.typed-array.uint8-clamped-array {}
+  es.typed-array.uint16-array {}
+  es.typed-array.uint32-array {}
+  es.typed-array.copy-within {}
+  es.typed-array.every {}
+  es.typed-array.fill {}
+  es.typed-array.filter {}
+  es.typed-array.find {}
+  es.typed-array.find-index {}
+  es.typed-array.for-each {}
+  es.typed-array.from {}
+  es.typed-array.includes {}
+  es.typed-array.index-of {}
+  es.typed-array.iterator {}
+  es.typed-array.join {}
+  es.typed-array.last-index-of {}
+  es.typed-array.map {}
+  es.typed-array.of {}
+  es.typed-array.reduce {}
+  es.typed-array.reduce-right {}
+  es.typed-array.reverse {}
+  es.typed-array.set {}
+  es.typed-array.slice {}
+  es.typed-array.some {}
+  es.typed-array.sort {}
+  es.typed-array.subarray {}
+  es.typed-array.to-locale-string {}
+  es.typed-array.to-string {}
+  es.weak-map {}
+  es.weak-set {}
+  esnext.aggregate-error {}
+  esnext.array.last-index {}
+  esnext.array.last-item {}
+  esnext.composite-key {}
+  esnext.composite-symbol {}
+  esnext.global-this {}
+  esnext.map.delete-all {}
+  esnext.map.every {}
+  esnext.map.filter {}
+  esnext.map.find {}
+  esnext.map.find-key {}
+  esnext.map.from {}
+  esnext.map.group-by {}
+  esnext.map.includes {}
+  esnext.map.key-by {}
+  esnext.map.key-of {}
+  esnext.map.map-keys {}
+  esnext.map.map-values {}
+  esnext.map.merge {}
+  esnext.map.of {}
+  esnext.map.reduce {}
+  esnext.map.some {}
+  esnext.map.update {}
+  esnext.math.clamp {}
+  esnext.math.deg-per-rad {}
+  esnext.math.degrees {}
+  esnext.math.fscale {}
+  esnext.math.iaddh {}
+  esnext.math.imulh {}
+  esnext.math.isubh {}
+  esnext.math.rad-per-deg {}
+  esnext.math.radians {}
+  esnext.math.scale {}
+  esnext.math.seeded-prng {}
+  esnext.math.signbit {}
+  esnext.math.umulh {}
+  esnext.number.from-string {}
+  esnext.observable {}
+  esnext.promise.all-settled {}
+  esnext.promise.any {}
+  esnext.promise.try {}
+  esnext.reflect.define-metadata {}
+  esnext.reflect.delete-metadata {}
+  esnext.reflect.get-metadata {}
+  esnext.reflect.get-metadata-keys {}
+  esnext.reflect.get-own-metadata {}
+  esnext.reflect.get-own-metadata-keys {}
+  esnext.reflect.has-metadata {}
+  esnext.reflect.has-own-metadata {}
+  esnext.reflect.metadata {}
+  esnext.set.add-all {}
+  esnext.set.delete-all {}
+  esnext.set.difference {}
+  esnext.set.every {}
+  esnext.set.filter {}
+  esnext.set.find {}
+  esnext.set.from {}
+  esnext.set.intersection {}
+  esnext.set.is-disjoint-from {}
+  esnext.set.is-subset-of {}
+  esnext.set.is-superset-of {}
+  esnext.set.join {}
+  esnext.set.map {}
+  esnext.set.of {}
+  esnext.set.reduce {}
+  esnext.set.some {}
+  esnext.set.symmetric-difference {}
+  esnext.set.union {}
+  esnext.string.at {}
+  esnext.string.code-points {}
+  esnext.string.replace-all {}
+  esnext.symbol.dispose {}
+  esnext.symbol.observable {}
+  esnext.symbol.pattern-match {}
+  esnext.weak-map.delete-all {}
+  esnext.weak-map.from {}
+  esnext.weak-map.of {}
+  esnext.weak-set.add-all {}
+  esnext.weak-set.delete-all {}
+  esnext.weak-set.from {}
+  esnext.weak-set.of {}
+  web.dom-collections.for-each {}
+  web.dom-collections.iterator {}
+  web.immediate {}
+  web.queue-microtask {}
+  web.timers {}
+  web.url {}
+  web.url.to-json {}
+  web.url-search-params {}
+  esnext.string.match-all {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/options.json
new file mode 100644
index 000000000000..e7f7ecdb7292
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": [ "Android >= 4" ]
+      },
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/stdout.txt
new file mode 100644
index 000000000000..b73850b76698
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-android/stdout.txt
@@ -0,0 +1,248 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "android": "4"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "android":"4" }
+  transform-literals { "android":"4" }
+  transform-function-name { "android":"4" }
+  transform-arrow-functions { "android":"4" }
+  transform-block-scoped-functions { "android":"4" }
+  transform-classes { "android":"4" }
+  transform-object-super { "android":"4" }
+  transform-shorthand-properties { "android":"4" }
+  transform-duplicate-keys { "android":"4" }
+  transform-computed-properties { "android":"4" }
+  transform-for-of { "android":"4" }
+  transform-sticky-regex { "android":"4" }
+  transform-dotall-regex { "android":"4" }
+  transform-unicode-regex { "android":"4" }
+  transform-spread { "android":"4" }
+  transform-parameters { "android":"4" }
+  transform-destructuring { "android":"4" }
+  transform-block-scoping { "android":"4" }
+  transform-typeof-symbol { "android":"4" }
+  transform-new-target { "android":"4" }
+  transform-regenerator { "android":"4" }
+  transform-exponentiation-operator { "android":"4" }
+  transform-async-to-generator { "android":"4" }
+  proposal-async-generator-functions { "android":"4" }
+  proposal-object-rest-spread { "android":"4" }
+  proposal-unicode-property-regex { "android":"4" }
+  proposal-json-strings { "android":"4" }
+  proposal-optional-catch-binding { "android":"4" }
+  transform-named-capturing-groups-regex { "android":"4" }
+  transform-reserved-words { "android":"4" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "android":"4" }
+  es.symbol.description { "android":"4" }
+  es.symbol.async-iterator { "android":"4" }
+  es.symbol.has-instance { "android":"4" }
+  es.symbol.is-concat-spreadable { "android":"4" }
+  es.symbol.iterator { "android":"4" }
+  es.symbol.match { "android":"4" }
+  es.symbol.replace { "android":"4" }
+  es.symbol.search { "android":"4" }
+  es.symbol.species { "android":"4" }
+  es.symbol.split { "android":"4" }
+  es.symbol.to-primitive { "android":"4" }
+  es.symbol.to-string-tag { "android":"4" }
+  es.symbol.unscopables { "android":"4" }
+  es.array.concat { "android":"4" }
+  es.array.copy-within { "android":"4" }
+  es.array.every { "android":"4" }
+  es.array.fill { "android":"4" }
+  es.array.filter { "android":"4" }
+  es.array.find { "android":"4" }
+  es.array.find-index { "android":"4" }
+  es.array.flat { "android":"4" }
+  es.array.flat-map { "android":"4" }
+  es.array.for-each { "android":"4" }
+  es.array.from { "android":"4" }
+  es.array.includes { "android":"4" }
+  es.array.index-of { "android":"4" }
+  es.array.iterator { "android":"4" }
+  es.array.join { "android":"4" }
+  es.array.last-index-of { "android":"4" }
+  es.array.map { "android":"4" }
+  es.array.of { "android":"4" }
+  es.array.reduce { "android":"4" }
+  es.array.reduce-right { "android":"4" }
+  es.array.reverse { "android":"4" }
+  es.array.slice { "android":"4" }
+  es.array.some { "android":"4" }
+  es.array.sort { "android":"4" }
+  es.array.species { "android":"4" }
+  es.array.splice { "android":"4" }
+  es.array.unscopables.flat { "android":"4" }
+  es.array.unscopables.flat-map { "android":"4" }
+  es.array-buffer.constructor { "android":"4" }
+  es.array-buffer.is-view { "android":"4" }
+  es.array-buffer.slice { "android":"4" }
+  es.data-view { "android":"4" }
+  es.date.to-iso-string { "android":"4" }
+  es.date.to-json { "android":"4" }
+  es.date.to-primitive { "android":"4" }
+  es.date.to-string { "android":"4" }
+  es.function.has-instance { "android":"4" }
+  es.function.name { "android":"4" }
+  es.json.to-string-tag { "android":"4" }
+  es.map { "android":"4" }
+  es.math.acosh { "android":"4" }
+  es.math.asinh { "android":"4" }
+  es.math.atanh { "android":"4" }
+  es.math.cbrt { "android":"4" }
+  es.math.clz32 { "android":"4" }
+  es.math.cosh { "android":"4" }
+  es.math.expm1 { "android":"4" }
+  es.math.fround { "android":"4" }
+  es.math.hypot { "android":"4" }
+  es.math.imul { "android":"4" }
+  es.math.log10 { "android":"4" }
+  es.math.log1p { "android":"4" }
+  es.math.log2 { "android":"4" }
+  es.math.sign { "android":"4" }
+  es.math.sinh { "android":"4" }
+  es.math.tanh { "android":"4" }
+  es.math.to-string-tag { "android":"4" }
+  es.math.trunc { "android":"4" }
+  es.number.constructor { "android":"4" }
+  es.number.epsilon { "android":"4" }
+  es.number.is-finite { "android":"4" }
+  es.number.is-integer { "android":"4" }
+  es.number.is-nan { "android":"4" }
+  es.number.is-safe-integer { "android":"4" }
+  es.number.max-safe-integer { "android":"4" }
+  es.number.min-safe-integer { "android":"4" }
+  es.number.parse-float { "android":"4" }
+  es.number.parse-int { "android":"4" }
+  es.number.to-fixed { "android":"4" }
+  es.number.to-precision { "android":"4" }
+  es.object.assign { "android":"4" }
+  es.object.define-getter { "android":"4" }
+  es.object.define-properties { "android":"4" }
+  es.object.define-property { "android":"4" }
+  es.object.define-setter { "android":"4" }
+  es.object.entries { "android":"4" }
+  es.object.freeze { "android":"4" }
+  es.object.from-entries { "android":"4" }
+  es.object.get-own-property-descriptor { "android":"4" }
+  es.object.get-own-property-descriptors { "android":"4" }
+  es.object.get-own-property-names { "android":"4" }
+  es.object.get-prototype-of { "android":"4" }
+  es.object.is { "android":"4" }
+  es.object.is-extensible { "android":"4" }
+  es.object.is-frozen { "android":"4" }
+  es.object.is-sealed { "android":"4" }
+  es.object.keys { "android":"4" }
+  es.object.lookup-getter { "android":"4" }
+  es.object.lookup-setter { "android":"4" }
+  es.object.prevent-extensions { "android":"4" }
+  es.object.seal { "android":"4" }
+  es.object.set-prototype-of { "android":"4" }
+  es.object.to-string { "android":"4" }
+  es.object.values { "android":"4" }
+  es.parse-float { "android":"4" }
+  es.parse-int { "android":"4" }
+  es.promise { "android":"4" }
+  es.promise.finally { "android":"4" }
+  es.reflect.apply { "android":"4" }
+  es.reflect.construct { "android":"4" }
+  es.reflect.define-property { "android":"4" }
+  es.reflect.delete-property { "android":"4" }
+  es.reflect.get { "android":"4" }
+  es.reflect.get-own-property-descriptor { "android":"4" }
+  es.reflect.get-prototype-of { "android":"4" }
+  es.reflect.has { "android":"4" }
+  es.reflect.is-extensible { "android":"4" }
+  es.reflect.own-keys { "android":"4" }
+  es.reflect.prevent-extensions { "android":"4" }
+  es.reflect.set { "android":"4" }
+  es.reflect.set-prototype-of { "android":"4" }
+  es.regexp.constructor { "android":"4" }
+  es.regexp.exec { "android":"4" }
+  es.regexp.flags { "android":"4" }
+  es.regexp.to-string { "android":"4" }
+  es.set { "android":"4" }
+  es.string.code-point-at { "android":"4" }
+  es.string.ends-with { "android":"4" }
+  es.string.from-code-point { "android":"4" }
+  es.string.includes { "android":"4" }
+  es.string.iterator { "android":"4" }
+  es.string.match { "android":"4" }
+  es.string.pad-end { "android":"4" }
+  es.string.pad-start { "android":"4" }
+  es.string.raw { "android":"4" }
+  es.string.repeat { "android":"4" }
+  es.string.replace { "android":"4" }
+  es.string.search { "android":"4" }
+  es.string.split { "android":"4" }
+  es.string.starts-with { "android":"4" }
+  es.string.trim { "android":"4" }
+  es.string.trim-end { "android":"4" }
+  es.string.trim-start { "android":"4" }
+  es.string.anchor { "android":"4" }
+  es.string.big { "android":"4" }
+  es.string.blink { "android":"4" }
+  es.string.bold { "android":"4" }
+  es.string.fixed { "android":"4" }
+  es.string.fontcolor { "android":"4" }
+  es.string.fontsize { "android":"4" }
+  es.string.italics { "android":"4" }
+  es.string.link { "android":"4" }
+  es.string.small { "android":"4" }
+  es.string.strike { "android":"4" }
+  es.string.sub { "android":"4" }
+  es.string.sup { "android":"4" }
+  es.typed-array.float32-array { "android":"4" }
+  es.typed-array.float64-array { "android":"4" }
+  es.typed-array.int8-array { "android":"4" }
+  es.typed-array.int16-array { "android":"4" }
+  es.typed-array.int32-array { "android":"4" }
+  es.typed-array.uint8-array { "android":"4" }
+  es.typed-array.uint8-clamped-array { "android":"4" }
+  es.typed-array.uint16-array { "android":"4" }
+  es.typed-array.uint32-array { "android":"4" }
+  es.typed-array.copy-within { "android":"4" }
+  es.typed-array.every { "android":"4" }
+  es.typed-array.fill { "android":"4" }
+  es.typed-array.filter { "android":"4" }
+  es.typed-array.find { "android":"4" }
+  es.typed-array.find-index { "android":"4" }
+  es.typed-array.for-each { "android":"4" }
+  es.typed-array.from { "android":"4" }
+  es.typed-array.includes { "android":"4" }
+  es.typed-array.index-of { "android":"4" }
+  es.typed-array.iterator { "android":"4" }
+  es.typed-array.join { "android":"4" }
+  es.typed-array.last-index-of { "android":"4" }
+  es.typed-array.map { "android":"4" }
+  es.typed-array.of { "android":"4" }
+  es.typed-array.reduce { "android":"4" }
+  es.typed-array.reduce-right { "android":"4" }
+  es.typed-array.reverse { "android":"4" }
+  es.typed-array.set { "android":"4" }
+  es.typed-array.slice { "android":"4" }
+  es.typed-array.some { "android":"4" }
+  es.typed-array.sort { "android":"4" }
+  es.typed-array.subarray { "android":"4" }
+  es.typed-array.to-locale-string { "android":"4" }
+  es.typed-array.to-string { "android":"4" }
+  es.weak-map { "android":"4" }
+  es.weak-set { "android":"4" }
+  web.dom-collections.for-each { "android":"4" }
+  web.dom-collections.iterator { "android":"4" }
+  web.immediate { "android":"4" }
+  web.queue-microtask { "android":"4" }
+  web.url { "android":"4" }
+  web.url.to-json { "android":"4" }
+  web.url-search-params { "android":"4" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/in/in.js
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/in/in.js
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/stderr.txt
new file mode 100644
index 000000000000..228f1a052848
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/stderr.txt
@@ -0,0 +1,2 @@
+`@babel/polyfill` is deprecated. Please, use required parts of `core-js`
+  and `regenerator-runtime/runtime` separately
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/stdout.txt
new file mode 100644
index 000000000000..22616b88ea89
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-babel-polyfill/stdout.txt
@@ -0,0 +1,45 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Import of core-js was not found.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/options.json
new file mode 100644
index 000000000000..acc203c75c8e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "electron": 0.36
+      },
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/stdout.txt
new file mode 100644
index 000000000000..f554ec16ce1f
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-electron/stdout.txt
@@ -0,0 +1,136 @@
+Warning, the following targets are using a decimal version:
+
+  electron: 0.36
+
+We recommend using a string for minor/patch versions to avoid numbers like 6.10
+getting parsed as 6.1, which can lead to unexpected behavior.
+
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "electron": "0.36"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-function-name { "electron":"0.36" }
+  transform-for-of { "electron":"0.36" }
+  transform-sticky-regex { "electron":"0.36" }
+  transform-dotall-regex { "electron":"0.36" }
+  transform-unicode-regex { "electron":"0.36" }
+  transform-parameters { "electron":"0.36" }
+  transform-destructuring { "electron":"0.36" }
+  transform-block-scoping { "electron":"0.36" }
+  transform-regenerator { "electron":"0.36" }
+  transform-exponentiation-operator { "electron":"0.36" }
+  transform-async-to-generator { "electron":"0.36" }
+  proposal-async-generator-functions { "electron":"0.36" }
+  proposal-object-rest-spread { "electron":"0.36" }
+  proposal-unicode-property-regex { "electron":"0.36" }
+  proposal-json-strings { "electron":"0.36" }
+  proposal-optional-catch-binding { "electron":"0.36" }
+  transform-named-capturing-groups-regex { "electron":"0.36" }
+  transform-member-expression-literals { "electron":"0.36" }
+  transform-property-literals { "electron":"0.36" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "electron":"0.36" }
+  es.symbol.description { "electron":"0.36" }
+  es.symbol.async-iterator { "electron":"0.36" }
+  es.symbol.has-instance { "electron":"0.36" }
+  es.symbol.is-concat-spreadable { "electron":"0.36" }
+  es.symbol.match { "electron":"0.36" }
+  es.symbol.replace { "electron":"0.36" }
+  es.symbol.search { "electron":"0.36" }
+  es.symbol.species { "electron":"0.36" }
+  es.symbol.split { "electron":"0.36" }
+  es.symbol.to-string-tag { "electron":"0.36" }
+  es.array.concat { "electron":"0.36" }
+  es.array.filter { "electron":"0.36" }
+  es.array.flat { "electron":"0.36" }
+  es.array.flat-map { "electron":"0.36" }
+  es.array.from { "electron":"0.36" }
+  es.array.includes { "electron":"0.36" }
+  es.array.index-of { "electron":"0.36" }
+  es.array.iterator { "electron":"0.36" }
+  es.array.last-index-of { "electron":"0.36" }
+  es.array.map { "electron":"0.36" }
+  es.array.slice { "electron":"0.36" }
+  es.array.sort { "electron":"0.36" }
+  es.array.species { "electron":"0.36" }
+  es.array.splice { "electron":"0.36" }
+  es.array.unscopables.flat { "electron":"0.36" }
+  es.array.unscopables.flat-map { "electron":"0.36" }
+  es.function.has-instance { "electron":"0.36" }
+  es.json.to-string-tag { "electron":"0.36" }
+  es.map { "electron":"0.36" }
+  es.math.acosh { "electron":"0.36" }
+  es.math.to-string-tag { "electron":"0.36" }
+  es.object.assign { "electron":"0.36" }
+  es.object.define-getter { "electron":"0.36" }
+  es.object.define-setter { "electron":"0.36" }
+  es.object.entries { "electron":"0.36" }
+  es.object.from-entries { "electron":"0.36" }
+  es.object.get-own-property-descriptors { "electron":"0.36" }
+  es.object.lookup-getter { "electron":"0.36" }
+  es.object.lookup-setter { "electron":"0.36" }
+  es.object.to-string { "electron":"0.36" }
+  es.object.values { "electron":"0.36" }
+  es.promise { "electron":"0.36" }
+  es.promise.finally { "electron":"0.36" }
+  es.reflect.apply { "electron":"0.36" }
+  es.reflect.construct { "electron":"0.36" }
+  es.reflect.define-property { "electron":"0.36" }
+  es.reflect.delete-property { "electron":"0.36" }
+  es.reflect.get { "electron":"0.36" }
+  es.reflect.get-own-property-descriptor { "electron":"0.36" }
+  es.reflect.get-prototype-of { "electron":"0.36" }
+  es.reflect.has { "electron":"0.36" }
+  es.reflect.is-extensible { "electron":"0.36" }
+  es.reflect.own-keys { "electron":"0.36" }
+  es.reflect.prevent-extensions { "electron":"0.36" }
+  es.reflect.set { "electron":"0.36" }
+  es.reflect.set-prototype-of { "electron":"0.36" }
+  es.regexp.constructor { "electron":"0.36" }
+  es.regexp.flags { "electron":"0.36" }
+  es.regexp.to-string { "electron":"0.36" }
+  es.set { "electron":"0.36" }
+  es.string.ends-with { "electron":"0.36" }
+  es.string.includes { "electron":"0.36" }
+  es.string.match { "electron":"0.36" }
+  es.string.pad-end { "electron":"0.36" }
+  es.string.pad-start { "electron":"0.36" }
+  es.string.replace { "electron":"0.36" }
+  es.string.search { "electron":"0.36" }
+  es.string.split { "electron":"0.36" }
+  es.string.starts-with { "electron":"0.36" }
+  es.string.trim { "electron":"0.36" }
+  es.string.trim-end { "electron":"0.36" }
+  es.string.trim-start { "electron":"0.36" }
+  es.typed-array.float32-array { "electron":"0.36" }
+  es.typed-array.float64-array { "electron":"0.36" }
+  es.typed-array.int8-array { "electron":"0.36" }
+  es.typed-array.int16-array { "electron":"0.36" }
+  es.typed-array.int32-array { "electron":"0.36" }
+  es.typed-array.uint8-array { "electron":"0.36" }
+  es.typed-array.uint8-clamped-array { "electron":"0.36" }
+  es.typed-array.uint16-array { "electron":"0.36" }
+  es.typed-array.uint32-array { "electron":"0.36" }
+  es.typed-array.from { "electron":"0.36" }
+  es.typed-array.includes { "electron":"0.36" }
+  es.typed-array.of { "electron":"0.36" }
+  es.typed-array.to-string { "electron":"0.36" }
+  es.weak-map { "electron":"0.36" }
+  es.weak-set { "electron":"0.36" }
+  web.dom-collections.for-each { "electron":"0.36" }
+  web.dom-collections.iterator { "electron":"0.36" }
+  web.immediate { "electron":"0.36" }
+  web.queue-microtask { "electron":"0.36" }
+  web.url { "electron":"0.36" }
+  web.url.to-json { "electron":"0.36" }
+  web.url-search-params { "electron":"0.36" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/in/in.js
new file mode 100644
index 000000000000..d830e7e10c5e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/es';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/stdout.txt
new file mode 100644
index 000000000000..1e83b69ce75f
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-chrome-71/stdout.txt
@@ -0,0 +1,24 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.array.unscopables.flat { "chrome":"71" }
+  es.array.unscopables.flat-map { "chrome":"71" }
+  es.object.from-entries { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/in/in.js
new file mode 100644
index 000000000000..3c012b22d846
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/in/in.js
@@ -0,0 +1,3 @@
+import 'core-js/es';
+import 'core-js/proposals';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/stdout.txt
new file mode 100644
index 000000000000..6d0687966b22
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals-chrome-71/stdout.txt
@@ -0,0 +1,105 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.array.unscopables.flat { "chrome":"71" }
+  es.array.unscopables.flat-map { "chrome":"71" }
+  es.object.from-entries { "chrome":"71" }
+  esnext.aggregate-error { "chrome":"71" }
+  esnext.array.last-index { "chrome":"71" }
+  esnext.array.last-item { "chrome":"71" }
+  esnext.composite-key { "chrome":"71" }
+  esnext.composite-symbol { "chrome":"71" }
+  esnext.map.delete-all { "chrome":"71" }
+  esnext.map.every { "chrome":"71" }
+  esnext.map.filter { "chrome":"71" }
+  esnext.map.find { "chrome":"71" }
+  esnext.map.find-key { "chrome":"71" }
+  esnext.map.from { "chrome":"71" }
+  esnext.map.group-by { "chrome":"71" }
+  esnext.map.includes { "chrome":"71" }
+  esnext.map.key-by { "chrome":"71" }
+  esnext.map.key-of { "chrome":"71" }
+  esnext.map.map-keys { "chrome":"71" }
+  esnext.map.map-values { "chrome":"71" }
+  esnext.map.merge { "chrome":"71" }
+  esnext.map.of { "chrome":"71" }
+  esnext.map.reduce { "chrome":"71" }
+  esnext.map.some { "chrome":"71" }
+  esnext.map.update { "chrome":"71" }
+  esnext.math.clamp { "chrome":"71" }
+  esnext.math.deg-per-rad { "chrome":"71" }
+  esnext.math.degrees { "chrome":"71" }
+  esnext.math.fscale { "chrome":"71" }
+  esnext.math.iaddh { "chrome":"71" }
+  esnext.math.imulh { "chrome":"71" }
+  esnext.math.isubh { "chrome":"71" }
+  esnext.math.rad-per-deg { "chrome":"71" }
+  esnext.math.radians { "chrome":"71" }
+  esnext.math.scale { "chrome":"71" }
+  esnext.math.seeded-prng { "chrome":"71" }
+  esnext.math.signbit { "chrome":"71" }
+  esnext.math.umulh { "chrome":"71" }
+  esnext.number.from-string { "chrome":"71" }
+  esnext.observable { "chrome":"71" }
+  esnext.promise.all-settled { "chrome":"71" }
+  esnext.promise.any { "chrome":"71" }
+  esnext.promise.try { "chrome":"71" }
+  esnext.reflect.define-metadata { "chrome":"71" }
+  esnext.reflect.delete-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata-keys { "chrome":"71" }
+  esnext.reflect.get-own-metadata { "chrome":"71" }
+  esnext.reflect.get-own-metadata-keys { "chrome":"71" }
+  esnext.reflect.has-metadata { "chrome":"71" }
+  esnext.reflect.has-own-metadata { "chrome":"71" }
+  esnext.reflect.metadata { "chrome":"71" }
+  esnext.set.add-all { "chrome":"71" }
+  esnext.set.delete-all { "chrome":"71" }
+  esnext.set.difference { "chrome":"71" }
+  esnext.set.every { "chrome":"71" }
+  esnext.set.filter { "chrome":"71" }
+  esnext.set.find { "chrome":"71" }
+  esnext.set.from { "chrome":"71" }
+  esnext.set.intersection { "chrome":"71" }
+  esnext.set.is-disjoint-from { "chrome":"71" }
+  esnext.set.is-subset-of { "chrome":"71" }
+  esnext.set.is-superset-of { "chrome":"71" }
+  esnext.set.join { "chrome":"71" }
+  esnext.set.map { "chrome":"71" }
+  esnext.set.of { "chrome":"71" }
+  esnext.set.reduce { "chrome":"71" }
+  esnext.set.some { "chrome":"71" }
+  esnext.set.symmetric-difference { "chrome":"71" }
+  esnext.set.union { "chrome":"71" }
+  esnext.string.at { "chrome":"71" }
+  esnext.string.code-points { "chrome":"71" }
+  esnext.string.replace-all { "chrome":"71" }
+  esnext.symbol.dispose { "chrome":"71" }
+  esnext.symbol.observable { "chrome":"71" }
+  esnext.symbol.pattern-match { "chrome":"71" }
+  esnext.weak-map.delete-all { "chrome":"71" }
+  esnext.weak-map.from { "chrome":"71" }
+  esnext.weak-map.of { "chrome":"71" }
+  esnext.weak-set.add-all { "chrome":"71" }
+  esnext.weak-set.delete-all { "chrome":"71" }
+  esnext.weak-set.from { "chrome":"71" }
+  esnext.weak-set.of { "chrome":"71" }
+  esnext.string.match-all { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/in/in.js
new file mode 100644
index 000000000000..3c012b22d846
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/in/in.js
@@ -0,0 +1,3 @@
+import 'core-js/es';
+import 'core-js/proposals';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/stdout.txt
new file mode 100644
index 000000000000..954fd4133665
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es-proposals/stdout.txt
@@ -0,0 +1,330 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol {}
+  es.symbol.description {}
+  es.symbol.async-iterator {}
+  es.symbol.has-instance {}
+  es.symbol.is-concat-spreadable {}
+  es.symbol.iterator {}
+  es.symbol.match {}
+  es.symbol.replace {}
+  es.symbol.search {}
+  es.symbol.species {}
+  es.symbol.split {}
+  es.symbol.to-primitive {}
+  es.symbol.to-string-tag {}
+  es.symbol.unscopables {}
+  es.array.concat {}
+  es.array.copy-within {}
+  es.array.every {}
+  es.array.fill {}
+  es.array.filter {}
+  es.array.find {}
+  es.array.find-index {}
+  es.array.flat {}
+  es.array.flat-map {}
+  es.array.for-each {}
+  es.array.from {}
+  es.array.includes {}
+  es.array.index-of {}
+  es.array.is-array {}
+  es.array.iterator {}
+  es.array.join {}
+  es.array.last-index-of {}
+  es.array.map {}
+  es.array.of {}
+  es.array.reduce {}
+  es.array.reduce-right {}
+  es.array.reverse {}
+  es.array.slice {}
+  es.array.some {}
+  es.array.sort {}
+  es.array.species {}
+  es.array.splice {}
+  es.array.unscopables.flat {}
+  es.array.unscopables.flat-map {}
+  es.array-buffer.constructor {}
+  es.array-buffer.is-view {}
+  es.array-buffer.slice {}
+  es.data-view {}
+  es.date.now {}
+  es.date.to-iso-string {}
+  es.date.to-json {}
+  es.date.to-primitive {}
+  es.date.to-string {}
+  es.function.bind {}
+  es.function.has-instance {}
+  es.function.name {}
+  es.json.to-string-tag {}
+  es.map {}
+  es.math.acosh {}
+  es.math.asinh {}
+  es.math.atanh {}
+  es.math.cbrt {}
+  es.math.clz32 {}
+  es.math.cosh {}
+  es.math.expm1 {}
+  es.math.fround {}
+  es.math.hypot {}
+  es.math.imul {}
+  es.math.log10 {}
+  es.math.log1p {}
+  es.math.log2 {}
+  es.math.sign {}
+  es.math.sinh {}
+  es.math.tanh {}
+  es.math.to-string-tag {}
+  es.math.trunc {}
+  es.number.constructor {}
+  es.number.epsilon {}
+  es.number.is-finite {}
+  es.number.is-integer {}
+  es.number.is-nan {}
+  es.number.is-safe-integer {}
+  es.number.max-safe-integer {}
+  es.number.min-safe-integer {}
+  es.number.parse-float {}
+  es.number.parse-int {}
+  es.number.to-fixed {}
+  es.number.to-precision {}
+  es.object.assign {}
+  es.object.create {}
+  es.object.define-getter {}
+  es.object.define-properties {}
+  es.object.define-property {}
+  es.object.define-setter {}
+  es.object.entries {}
+  es.object.freeze {}
+  es.object.from-entries {}
+  es.object.get-own-property-descriptor {}
+  es.object.get-own-property-descriptors {}
+  es.object.get-own-property-names {}
+  es.object.get-prototype-of {}
+  es.object.is {}
+  es.object.is-extensible {}
+  es.object.is-frozen {}
+  es.object.is-sealed {}
+  es.object.keys {}
+  es.object.lookup-getter {}
+  es.object.lookup-setter {}
+  es.object.prevent-extensions {}
+  es.object.seal {}
+  es.object.set-prototype-of {}
+  es.object.to-string {}
+  es.object.values {}
+  es.parse-float {}
+  es.parse-int {}
+  es.promise {}
+  es.promise.finally {}
+  es.reflect.apply {}
+  es.reflect.construct {}
+  es.reflect.define-property {}
+  es.reflect.delete-property {}
+  es.reflect.get {}
+  es.reflect.get-own-property-descriptor {}
+  es.reflect.get-prototype-of {}
+  es.reflect.has {}
+  es.reflect.is-extensible {}
+  es.reflect.own-keys {}
+  es.reflect.prevent-extensions {}
+  es.reflect.set {}
+  es.reflect.set-prototype-of {}
+  es.regexp.constructor {}
+  es.regexp.exec {}
+  es.regexp.flags {}
+  es.regexp.to-string {}
+  es.set {}
+  es.string.code-point-at {}
+  es.string.ends-with {}
+  es.string.from-code-point {}
+  es.string.includes {}
+  es.string.iterator {}
+  es.string.match {}
+  es.string.pad-end {}
+  es.string.pad-start {}
+  es.string.raw {}
+  es.string.repeat {}
+  es.string.replace {}
+  es.string.search {}
+  es.string.split {}
+  es.string.starts-with {}
+  es.string.trim {}
+  es.string.trim-end {}
+  es.string.trim-start {}
+  es.string.anchor {}
+  es.string.big {}
+  es.string.blink {}
+  es.string.bold {}
+  es.string.fixed {}
+  es.string.fontcolor {}
+  es.string.fontsize {}
+  es.string.italics {}
+  es.string.link {}
+  es.string.small {}
+  es.string.strike {}
+  es.string.sub {}
+  es.string.sup {}
+  es.typed-array.float32-array {}
+  es.typed-array.float64-array {}
+  es.typed-array.int8-array {}
+  es.typed-array.int16-array {}
+  es.typed-array.int32-array {}
+  es.typed-array.uint8-array {}
+  es.typed-array.uint8-clamped-array {}
+  es.typed-array.uint16-array {}
+  es.typed-array.uint32-array {}
+  es.typed-array.copy-within {}
+  es.typed-array.every {}
+  es.typed-array.fill {}
+  es.typed-array.filter {}
+  es.typed-array.find {}
+  es.typed-array.find-index {}
+  es.typed-array.for-each {}
+  es.typed-array.from {}
+  es.typed-array.includes {}
+  es.typed-array.index-of {}
+  es.typed-array.iterator {}
+  es.typed-array.join {}
+  es.typed-array.last-index-of {}
+  es.typed-array.map {}
+  es.typed-array.of {}
+  es.typed-array.reduce {}
+  es.typed-array.reduce-right {}
+  es.typed-array.reverse {}
+  es.typed-array.set {}
+  es.typed-array.slice {}
+  es.typed-array.some {}
+  es.typed-array.sort {}
+  es.typed-array.subarray {}
+  es.typed-array.to-locale-string {}
+  es.typed-array.to-string {}
+  es.weak-map {}
+  es.weak-set {}
+  esnext.aggregate-error {}
+  esnext.array.last-index {}
+  esnext.array.last-item {}
+  esnext.composite-key {}
+  esnext.composite-symbol {}
+  esnext.global-this {}
+  esnext.map.delete-all {}
+  esnext.map.every {}
+  esnext.map.filter {}
+  esnext.map.find {}
+  esnext.map.find-key {}
+  esnext.map.from {}
+  esnext.map.group-by {}
+  esnext.map.includes {}
+  esnext.map.key-by {}
+  esnext.map.key-of {}
+  esnext.map.map-keys {}
+  esnext.map.map-values {}
+  esnext.map.merge {}
+  esnext.map.of {}
+  esnext.map.reduce {}
+  esnext.map.some {}
+  esnext.map.update {}
+  esnext.math.clamp {}
+  esnext.math.deg-per-rad {}
+  esnext.math.degrees {}
+  esnext.math.fscale {}
+  esnext.math.iaddh {}
+  esnext.math.imulh {}
+  esnext.math.isubh {}
+  esnext.math.rad-per-deg {}
+  esnext.math.radians {}
+  esnext.math.scale {}
+  esnext.math.seeded-prng {}
+  esnext.math.signbit {}
+  esnext.math.umulh {}
+  esnext.number.from-string {}
+  esnext.observable {}
+  esnext.promise.all-settled {}
+  esnext.promise.any {}
+  esnext.promise.try {}
+  esnext.reflect.define-metadata {}
+  esnext.reflect.delete-metadata {}
+  esnext.reflect.get-metadata {}
+  esnext.reflect.get-metadata-keys {}
+  esnext.reflect.get-own-metadata {}
+  esnext.reflect.get-own-metadata-keys {}
+  esnext.reflect.has-metadata {}
+  esnext.reflect.has-own-metadata {}
+  esnext.reflect.metadata {}
+  esnext.set.add-all {}
+  esnext.set.delete-all {}
+  esnext.set.difference {}
+  esnext.set.every {}
+  esnext.set.filter {}
+  esnext.set.find {}
+  esnext.set.from {}
+  esnext.set.intersection {}
+  esnext.set.is-disjoint-from {}
+  esnext.set.is-subset-of {}
+  esnext.set.is-superset-of {}
+  esnext.set.join {}
+  esnext.set.map {}
+  esnext.set.of {}
+  esnext.set.reduce {}
+  esnext.set.some {}
+  esnext.set.symmetric-difference {}
+  esnext.set.union {}
+  esnext.string.at {}
+  esnext.string.code-points {}
+  esnext.string.replace-all {}
+  esnext.symbol.dispose {}
+  esnext.symbol.observable {}
+  esnext.symbol.pattern-match {}
+  esnext.weak-map.delete-all {}
+  esnext.weak-map.from {}
+  esnext.weak-map.of {}
+  esnext.weak-set.add-all {}
+  esnext.weak-set.delete-all {}
+  esnext.weak-set.from {}
+  esnext.weak-set.of {}
+  web.url {}
+  web.url.to-json {}
+  web.url-search-params {}
+  esnext.string.match-all {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/in/in.js
new file mode 100644
index 000000000000..d830e7e10c5e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/es';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/stdout.txt
new file mode 100644
index 000000000000..cf961ab95885
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-es/stdout.txt
@@ -0,0 +1,245 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol {}
+  es.symbol.description {}
+  es.symbol.async-iterator {}
+  es.symbol.has-instance {}
+  es.symbol.is-concat-spreadable {}
+  es.symbol.iterator {}
+  es.symbol.match {}
+  es.symbol.replace {}
+  es.symbol.search {}
+  es.symbol.species {}
+  es.symbol.split {}
+  es.symbol.to-primitive {}
+  es.symbol.to-string-tag {}
+  es.symbol.unscopables {}
+  es.array.concat {}
+  es.array.copy-within {}
+  es.array.every {}
+  es.array.fill {}
+  es.array.filter {}
+  es.array.find {}
+  es.array.find-index {}
+  es.array.flat {}
+  es.array.flat-map {}
+  es.array.for-each {}
+  es.array.from {}
+  es.array.includes {}
+  es.array.index-of {}
+  es.array.is-array {}
+  es.array.iterator {}
+  es.array.join {}
+  es.array.last-index-of {}
+  es.array.map {}
+  es.array.of {}
+  es.array.reduce {}
+  es.array.reduce-right {}
+  es.array.reverse {}
+  es.array.slice {}
+  es.array.some {}
+  es.array.sort {}
+  es.array.species {}
+  es.array.splice {}
+  es.array.unscopables.flat {}
+  es.array.unscopables.flat-map {}
+  es.array-buffer.constructor {}
+  es.array-buffer.is-view {}
+  es.array-buffer.slice {}
+  es.data-view {}
+  es.date.now {}
+  es.date.to-iso-string {}
+  es.date.to-json {}
+  es.date.to-primitive {}
+  es.date.to-string {}
+  es.function.bind {}
+  es.function.has-instance {}
+  es.function.name {}
+  es.json.to-string-tag {}
+  es.map {}
+  es.math.acosh {}
+  es.math.asinh {}
+  es.math.atanh {}
+  es.math.cbrt {}
+  es.math.clz32 {}
+  es.math.cosh {}
+  es.math.expm1 {}
+  es.math.fround {}
+  es.math.hypot {}
+  es.math.imul {}
+  es.math.log10 {}
+  es.math.log1p {}
+  es.math.log2 {}
+  es.math.sign {}
+  es.math.sinh {}
+  es.math.tanh {}
+  es.math.to-string-tag {}
+  es.math.trunc {}
+  es.number.constructor {}
+  es.number.epsilon {}
+  es.number.is-finite {}
+  es.number.is-integer {}
+  es.number.is-nan {}
+  es.number.is-safe-integer {}
+  es.number.max-safe-integer {}
+  es.number.min-safe-integer {}
+  es.number.parse-float {}
+  es.number.parse-int {}
+  es.number.to-fixed {}
+  es.number.to-precision {}
+  es.object.assign {}
+  es.object.create {}
+  es.object.define-getter {}
+  es.object.define-properties {}
+  es.object.define-property {}
+  es.object.define-setter {}
+  es.object.entries {}
+  es.object.freeze {}
+  es.object.from-entries {}
+  es.object.get-own-property-descriptor {}
+  es.object.get-own-property-descriptors {}
+  es.object.get-own-property-names {}
+  es.object.get-prototype-of {}
+  es.object.is {}
+  es.object.is-extensible {}
+  es.object.is-frozen {}
+  es.object.is-sealed {}
+  es.object.keys {}
+  es.object.lookup-getter {}
+  es.object.lookup-setter {}
+  es.object.prevent-extensions {}
+  es.object.seal {}
+  es.object.set-prototype-of {}
+  es.object.to-string {}
+  es.object.values {}
+  es.parse-float {}
+  es.parse-int {}
+  es.promise {}
+  es.promise.finally {}
+  es.reflect.apply {}
+  es.reflect.construct {}
+  es.reflect.define-property {}
+  es.reflect.delete-property {}
+  es.reflect.get {}
+  es.reflect.get-own-property-descriptor {}
+  es.reflect.get-prototype-of {}
+  es.reflect.has {}
+  es.reflect.is-extensible {}
+  es.reflect.own-keys {}
+  es.reflect.prevent-extensions {}
+  es.reflect.set {}
+  es.reflect.set-prototype-of {}
+  es.regexp.constructor {}
+  es.regexp.exec {}
+  es.regexp.flags {}
+  es.regexp.to-string {}
+  es.set {}
+  es.string.code-point-at {}
+  es.string.ends-with {}
+  es.string.from-code-point {}
+  es.string.includes {}
+  es.string.iterator {}
+  es.string.match {}
+  es.string.pad-end {}
+  es.string.pad-start {}
+  es.string.raw {}
+  es.string.repeat {}
+  es.string.replace {}
+  es.string.search {}
+  es.string.split {}
+  es.string.starts-with {}
+  es.string.trim {}
+  es.string.trim-end {}
+  es.string.trim-start {}
+  es.string.anchor {}
+  es.string.big {}
+  es.string.blink {}
+  es.string.bold {}
+  es.string.fixed {}
+  es.string.fontcolor {}
+  es.string.fontsize {}
+  es.string.italics {}
+  es.string.link {}
+  es.string.small {}
+  es.string.strike {}
+  es.string.sub {}
+  es.string.sup {}
+  es.typed-array.float32-array {}
+  es.typed-array.float64-array {}
+  es.typed-array.int8-array {}
+  es.typed-array.int16-array {}
+  es.typed-array.int32-array {}
+  es.typed-array.uint8-array {}
+  es.typed-array.uint8-clamped-array {}
+  es.typed-array.uint16-array {}
+  es.typed-array.uint32-array {}
+  es.typed-array.copy-within {}
+  es.typed-array.every {}
+  es.typed-array.fill {}
+  es.typed-array.filter {}
+  es.typed-array.find {}
+  es.typed-array.find-index {}
+  es.typed-array.for-each {}
+  es.typed-array.from {}
+  es.typed-array.includes {}
+  es.typed-array.index-of {}
+  es.typed-array.iterator {}
+  es.typed-array.join {}
+  es.typed-array.last-index-of {}
+  es.typed-array.map {}
+  es.typed-array.of {}
+  es.typed-array.reduce {}
+  es.typed-array.reduce-right {}
+  es.typed-array.reverse {}
+  es.typed-array.set {}
+  es.typed-array.slice {}
+  es.typed-array.some {}
+  es.typed-array.sort {}
+  es.typed-array.subarray {}
+  es.typed-array.to-locale-string {}
+  es.typed-array.to-string {}
+  es.weak-map {}
+  es.weak-set {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/options.json
new file mode 100644
index 000000000000..c1c4390e7125
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "modules": false,
+      "targets": {
+        "chrome": 55
+      },
+      "useBuiltIns": "entry",
+      "corejs": 3,
+      "forceAllTransforms": true
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/stdout.txt
new file mode 100644
index 000000000000..332da98e97bf
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-force-all-transforms/stdout.txt
@@ -0,0 +1,75 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "55"
+}
+
+Using modules transform: false
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex { "chrome":"55" }
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions { "chrome":"55" }
+  proposal-object-rest-spread { "chrome":"55" }
+  proposal-unicode-property-regex { "chrome":"55" }
+  proposal-json-strings { "chrome":"55" }
+  proposal-optional-catch-binding { "chrome":"55" }
+  transform-named-capturing-groups-regex { "chrome":"55" }
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol.description { "chrome":"55" }
+  es.symbol.async-iterator { "chrome":"55" }
+  es.array.flat { "chrome":"55" }
+  es.array.flat-map { "chrome":"55" }
+  es.array.iterator { "chrome":"55" }
+  es.array.sort { "chrome":"55" }
+  es.array.unscopables.flat { "chrome":"55" }
+  es.array.unscopables.flat-map { "chrome":"55" }
+  es.object.define-getter { "chrome":"55" }
+  es.object.define-setter { "chrome":"55" }
+  es.object.from-entries { "chrome":"55" }
+  es.object.lookup-getter { "chrome":"55" }
+  es.object.lookup-setter { "chrome":"55" }
+  es.promise { "chrome":"55" }
+  es.promise.finally { "chrome":"55" }
+  es.string.pad-end { "chrome":"55" }
+  es.string.pad-start { "chrome":"55" }
+  es.string.replace { "chrome":"55" }
+  es.string.trim { "chrome":"55" }
+  es.string.trim-end { "chrome":"55" }
+  es.string.trim-start { "chrome":"55" }
+  web.dom-collections.for-each { "chrome":"55" }
+  web.dom-collections.iterator { "chrome":"55" }
+  web.immediate { "chrome":"55" }
+  web.queue-microtask { "chrome":"55" }
+  web.url { "chrome":"55" }
+  web.url.to-json { "chrome":"55" }
+  web.url-search-params { "chrome":"55" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/in/in.js
new file mode 100644
index 000000000000..e31333abc597
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/in/in.js
@@ -0,0 +1 @@
+function hasAnyoneSeenImportBabelPolyfill() { return false };
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/options.json
new file mode 100644
index 000000000000..394e16ee1e55
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "node": 6
+      },
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/stdout.txt
new file mode 100644
index 000000000000..73ffcc5860ea
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-no-import/stdout.txt
@@ -0,0 +1,27 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "node": "6"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-function-name { "node":"6" }
+  transform-for-of { "node":"6" }
+  transform-dotall-regex { "node":"6" }
+  transform-destructuring { "node":"6" }
+  transform-exponentiation-operator { "node":"6" }
+  transform-async-to-generator { "node":"6" }
+  proposal-async-generator-functions { "node":"6" }
+  proposal-object-rest-spread { "node":"6" }
+  proposal-unicode-property-regex { "node":"6" }
+  proposal-json-strings { "node":"6" }
+  proposal-optional-catch-binding { "node":"6" }
+  transform-named-capturing-groups-regex { "node":"6" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Import of core-js was not found.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/in/in.js
new file mode 100644
index 000000000000..b721678e02bb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/proposals';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/options.json
new file mode 100644
index 000000000000..f08309ca7b73
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "useBuiltIns": "entry",
+      "corejs": { "version": 3, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/stdout.txt
new file mode 100644
index 000000000000..7b8630d1d45f
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals-chrome-71/stdout.txt
@@ -0,0 +1,102 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  esnext.aggregate-error { "chrome":"71" }
+  esnext.array.last-index { "chrome":"71" }
+  esnext.array.last-item { "chrome":"71" }
+  esnext.composite-key { "chrome":"71" }
+  esnext.composite-symbol { "chrome":"71" }
+  esnext.map.delete-all { "chrome":"71" }
+  esnext.map.every { "chrome":"71" }
+  esnext.map.filter { "chrome":"71" }
+  esnext.map.find { "chrome":"71" }
+  esnext.map.find-key { "chrome":"71" }
+  esnext.map.from { "chrome":"71" }
+  esnext.map.group-by { "chrome":"71" }
+  esnext.map.includes { "chrome":"71" }
+  esnext.map.key-by { "chrome":"71" }
+  esnext.map.key-of { "chrome":"71" }
+  esnext.map.map-keys { "chrome":"71" }
+  esnext.map.map-values { "chrome":"71" }
+  esnext.map.merge { "chrome":"71" }
+  esnext.map.of { "chrome":"71" }
+  esnext.map.reduce { "chrome":"71" }
+  esnext.map.some { "chrome":"71" }
+  esnext.map.update { "chrome":"71" }
+  esnext.math.clamp { "chrome":"71" }
+  esnext.math.deg-per-rad { "chrome":"71" }
+  esnext.math.degrees { "chrome":"71" }
+  esnext.math.fscale { "chrome":"71" }
+  esnext.math.iaddh { "chrome":"71" }
+  esnext.math.imulh { "chrome":"71" }
+  esnext.math.isubh { "chrome":"71" }
+  esnext.math.rad-per-deg { "chrome":"71" }
+  esnext.math.radians { "chrome":"71" }
+  esnext.math.scale { "chrome":"71" }
+  esnext.math.seeded-prng { "chrome":"71" }
+  esnext.math.signbit { "chrome":"71" }
+  esnext.math.umulh { "chrome":"71" }
+  esnext.number.from-string { "chrome":"71" }
+  esnext.observable { "chrome":"71" }
+  esnext.promise.all-settled { "chrome":"71" }
+  esnext.promise.any { "chrome":"71" }
+  esnext.promise.try { "chrome":"71" }
+  esnext.reflect.define-metadata { "chrome":"71" }
+  esnext.reflect.delete-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata-keys { "chrome":"71" }
+  esnext.reflect.get-own-metadata { "chrome":"71" }
+  esnext.reflect.get-own-metadata-keys { "chrome":"71" }
+  esnext.reflect.has-metadata { "chrome":"71" }
+  esnext.reflect.has-own-metadata { "chrome":"71" }
+  esnext.reflect.metadata { "chrome":"71" }
+  esnext.set.add-all { "chrome":"71" }
+  esnext.set.delete-all { "chrome":"71" }
+  esnext.set.difference { "chrome":"71" }
+  esnext.set.every { "chrome":"71" }
+  esnext.set.filter { "chrome":"71" }
+  esnext.set.find { "chrome":"71" }
+  esnext.set.from { "chrome":"71" }
+  esnext.set.intersection { "chrome":"71" }
+  esnext.set.is-disjoint-from { "chrome":"71" }
+  esnext.set.is-subset-of { "chrome":"71" }
+  esnext.set.is-superset-of { "chrome":"71" }
+  esnext.set.join { "chrome":"71" }
+  esnext.set.map { "chrome":"71" }
+  esnext.set.of { "chrome":"71" }
+  esnext.set.reduce { "chrome":"71" }
+  esnext.set.some { "chrome":"71" }
+  esnext.set.symmetric-difference { "chrome":"71" }
+  esnext.set.union { "chrome":"71" }
+  esnext.string.at { "chrome":"71" }
+  esnext.string.code-points { "chrome":"71" }
+  esnext.string.replace-all { "chrome":"71" }
+  esnext.symbol.dispose { "chrome":"71" }
+  esnext.symbol.observable { "chrome":"71" }
+  esnext.symbol.pattern-match { "chrome":"71" }
+  esnext.weak-map.delete-all { "chrome":"71" }
+  esnext.weak-map.from { "chrome":"71" }
+  esnext.weak-map.of { "chrome":"71" }
+  esnext.weak-set.add-all { "chrome":"71" }
+  esnext.weak-set.delete-all { "chrome":"71" }
+  esnext.weak-set.from { "chrome":"71" }
+  esnext.weak-set.of { "chrome":"71" }
+  esnext.string.match-all { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/in/in.js
new file mode 100644
index 000000000000..b721678e02bb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/proposals';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/options.json
new file mode 100644
index 000000000000..56005256589a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/options.json
@@ -0,0 +1,9 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "useBuiltIns": "entry",
+      "corejs": { "version": 3, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/stdout.txt
new file mode 100644
index 000000000000..34bf4094e273
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-proposals/stdout.txt
@@ -0,0 +1,130 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  esnext.aggregate-error {}
+  esnext.array.last-index {}
+  esnext.array.last-item {}
+  esnext.composite-key {}
+  esnext.composite-symbol {}
+  esnext.global-this {}
+  esnext.map.delete-all {}
+  esnext.map.every {}
+  esnext.map.filter {}
+  esnext.map.find {}
+  esnext.map.find-key {}
+  esnext.map.from {}
+  esnext.map.group-by {}
+  esnext.map.includes {}
+  esnext.map.key-by {}
+  esnext.map.key-of {}
+  esnext.map.map-keys {}
+  esnext.map.map-values {}
+  esnext.map.merge {}
+  esnext.map.of {}
+  esnext.map.reduce {}
+  esnext.map.some {}
+  esnext.map.update {}
+  esnext.math.clamp {}
+  esnext.math.deg-per-rad {}
+  esnext.math.degrees {}
+  esnext.math.fscale {}
+  esnext.math.iaddh {}
+  esnext.math.imulh {}
+  esnext.math.isubh {}
+  esnext.math.rad-per-deg {}
+  esnext.math.radians {}
+  esnext.math.scale {}
+  esnext.math.seeded-prng {}
+  esnext.math.signbit {}
+  esnext.math.umulh {}
+  esnext.number.from-string {}
+  esnext.observable {}
+  esnext.promise.all-settled {}
+  esnext.promise.any {}
+  esnext.promise.try {}
+  esnext.reflect.define-metadata {}
+  esnext.reflect.delete-metadata {}
+  esnext.reflect.get-metadata {}
+  esnext.reflect.get-metadata-keys {}
+  esnext.reflect.get-own-metadata {}
+  esnext.reflect.get-own-metadata-keys {}
+  esnext.reflect.has-metadata {}
+  esnext.reflect.has-own-metadata {}
+  esnext.reflect.metadata {}
+  esnext.set.add-all {}
+  esnext.set.delete-all {}
+  esnext.set.difference {}
+  esnext.set.every {}
+  esnext.set.filter {}
+  esnext.set.find {}
+  esnext.set.from {}
+  esnext.set.intersection {}
+  esnext.set.is-disjoint-from {}
+  esnext.set.is-subset-of {}
+  esnext.set.is-superset-of {}
+  esnext.set.join {}
+  esnext.set.map {}
+  esnext.set.of {}
+  esnext.set.reduce {}
+  esnext.set.some {}
+  esnext.set.symmetric-difference {}
+  esnext.set.union {}
+  esnext.string.at {}
+  esnext.string.code-points {}
+  esnext.string.replace-all {}
+  esnext.symbol.dispose {}
+  esnext.symbol.observable {}
+  esnext.symbol.pattern-match {}
+  esnext.weak-map.delete-all {}
+  esnext.weak-map.from {}
+  esnext.weak-map.of {}
+  esnext.weak-set.add-all {}
+  esnext.weak-set.delete-all {}
+  esnext.weak-set.from {}
+  esnext.weak-set.of {}
+  web.url {}
+  web.url.to-json {}
+  web.url-search-params {}
+  esnext.string.match-all {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/in/in.js
new file mode 100644
index 000000000000..b535f6a2cc34
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/in/in.js
@@ -0,0 +1 @@
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/stdout.txt
new file mode 100644
index 000000000000..2420ffb75e8e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only-chrome-71/stdout.txt
@@ -0,0 +1,21 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Import of core-js was not found.
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/in/in.js
new file mode 100644
index 000000000000..b535f6a2cc34
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/in/in.js
@@ -0,0 +1 @@
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/stdout.txt
new file mode 100644
index 000000000000..2420ffb75e8e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-runtime-only/stdout.txt
@@ -0,0 +1,21 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Import of core-js was not found.
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/in/in.js
new file mode 100644
index 000000000000..694e78444f7e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/in/in.js
@@ -0,0 +1,4 @@
+import 'core-js/es/object';
+import 'core-js/features/reflect';
+import 'core-js/something';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/stdout.txt
new file mode 100644
index 000000000000..e77af2686b72
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries-chrome-71/stdout.txt
@@ -0,0 +1,31 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.object.from-entries { "chrome":"71" }
+  esnext.reflect.define-metadata { "chrome":"71" }
+  esnext.reflect.delete-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata-keys { "chrome":"71" }
+  esnext.reflect.get-own-metadata { "chrome":"71" }
+  esnext.reflect.get-own-metadata-keys { "chrome":"71" }
+  esnext.reflect.has-metadata { "chrome":"71" }
+  esnext.reflect.has-own-metadata { "chrome":"71" }
+  esnext.reflect.metadata { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/in/in.js
new file mode 100644
index 000000000000..694e78444f7e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/in/in.js
@@ -0,0 +1,4 @@
+import 'core-js/es/object';
+import 'core-js/features/reflect';
+import 'core-js/something';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/stdout.txt
new file mode 100644
index 000000000000..d8ff0734f2d0
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-entries/stdout.txt
@@ -0,0 +1,95 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol {}
+  es.json.to-string-tag {}
+  es.math.to-string-tag {}
+  es.object.assign {}
+  es.object.create {}
+  es.object.define-getter {}
+  es.object.define-properties {}
+  es.object.define-property {}
+  es.object.define-setter {}
+  es.object.entries {}
+  es.object.freeze {}
+  es.object.from-entries {}
+  es.object.get-own-property-descriptor {}
+  es.object.get-own-property-descriptors {}
+  es.object.get-own-property-names {}
+  es.object.get-prototype-of {}
+  es.object.is {}
+  es.object.is-extensible {}
+  es.object.is-frozen {}
+  es.object.is-sealed {}
+  es.object.keys {}
+  es.object.lookup-getter {}
+  es.object.lookup-setter {}
+  es.object.prevent-extensions {}
+  es.object.seal {}
+  es.object.set-prototype-of {}
+  es.object.to-string {}
+  es.object.values {}
+  es.reflect.apply {}
+  es.reflect.construct {}
+  es.reflect.define-property {}
+  es.reflect.delete-property {}
+  es.reflect.get {}
+  es.reflect.get-own-property-descriptor {}
+  es.reflect.get-prototype-of {}
+  es.reflect.has {}
+  es.reflect.is-extensible {}
+  es.reflect.own-keys {}
+  es.reflect.prevent-extensions {}
+  es.reflect.set {}
+  es.reflect.set-prototype-of {}
+  esnext.reflect.define-metadata {}
+  esnext.reflect.delete-metadata {}
+  esnext.reflect.get-metadata {}
+  esnext.reflect.get-metadata-keys {}
+  esnext.reflect.get-own-metadata {}
+  esnext.reflect.get-own-metadata-keys {}
+  esnext.reflect.has-metadata {}
+  esnext.reflect.has-own-metadata {}
+  esnext.reflect.metadata {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/options.json
new file mode 100644
index 000000000000..b5693669350b
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "ie 10, ios 9, safari 7, edge 13, chrome 54, firefox 49"
+      },
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/stdout.txt
new file mode 100644
index 000000000000..0be270e41146
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-specific-targets/stdout.txt
@@ -0,0 +1,252 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "edge": "13",
+  "firefox": "49",
+  "ie": "10",
+  "ios": "9",
+  "safari": "7"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10", "ios":"9", "safari":"7" }
+  transform-literals { "firefox":"49", "ie":"10", "safari":"7" }
+  transform-function-name { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-arrow-functions { "ie":"10", "ios":"9", "safari":"7" }
+  transform-block-scoped-functions { "ie":"10", "ios":"9", "safari":"7" }
+  transform-classes { "ie":"10", "ios":"9", "safari":"7" }
+  transform-object-super { "ie":"10", "ios":"9", "safari":"7" }
+  transform-shorthand-properties { "ie":"10", "safari":"7" }
+  transform-duplicate-keys { "ie":"10", "safari":"7" }
+  transform-computed-properties { "ie":"10", "safari":"7" }
+  transform-for-of { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-sticky-regex { "ie":"10", "ios":"9", "safari":"7" }
+  transform-dotall-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-unicode-regex { "ie":"10", "ios":"9", "safari":"7" }
+  transform-spread { "ie":"10", "ios":"9", "safari":"7" }
+  transform-parameters { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-destructuring { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-block-scoping { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-typeof-symbol { "ie":"10", "safari":"7" }
+  transform-new-target { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  transform-regenerator { "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-exponentiation-operator { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-async-to-generator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-async-generator-functions { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-object-rest-spread { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-unicode-property-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-json-strings { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  proposal-optional-catch-binding { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  transform-named-capturing-groups-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.description { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.async-iterator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.has-instance { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.is-concat-spreadable { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.iterator { "ie":"10", "safari":"7" }
+  es.symbol.match { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.replace { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.search { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.species { "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.split { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.to-primitive { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.to-string-tag { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.symbol.unscopables { "ie":"10", "safari":"7" }
+  es.array.concat { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.array.copy-within { "ie":"10", "safari":"7" }
+  es.array.every { "safari":"7" }
+  es.array.fill { "ie":"10", "safari":"7" }
+  es.array.filter { "ie":"10", "ios":"9", "safari":"7" }
+  es.array.find { "ie":"10", "safari":"7" }
+  es.array.find-index { "ie":"10", "safari":"7" }
+  es.array.flat { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.array.flat-map { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.array.for-each { "safari":"7" }
+  es.array.from { "edge":"13", "firefox":"49", "ie":"10", "safari":"7" }
+  es.array.includes { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.array.index-of { "safari":"7" }
+  es.array.iterator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.array.join { "ie":"10", "safari":"7" }
+  es.array.last-index-of { "safari":"7" }
+  es.array.map { "ie":"10", "ios":"9", "safari":"7" }
+  es.array.of { "ie":"10", "safari":"7" }
+  es.array.reduce { "safari":"7" }
+  es.array.reduce-right { "safari":"7" }
+  es.array.reverse { "ios":"9", "safari":"7" }
+  es.array.slice { "ie":"10", "ios":"9", "safari":"7" }
+  es.array.some { "safari":"7" }
+  es.array.sort { "chrome":"54", "ios":"9", "safari":"7" }
+  es.array.species { "ie":"10", "ios":"9", "safari":"7" }
+  es.array.splice { "ie":"10", "ios":"9", "safari":"7" }
+  es.array.unscopables.flat { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.array.unscopables.flat-map { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.array-buffer.constructor { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.array-buffer.is-view { "ie":"10", "safari":"7" }
+  es.array-buffer.slice { "ie":"10", "ios":"9", "safari":"7" }
+  es.data-view { "safari":"7" }
+  es.date.to-iso-string { "safari":"7" }
+  es.date.to-json { "ios":"9", "safari":"7" }
+  es.date.to-primitive { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.date.to-string { "safari":"7" }
+  es.function.has-instance { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.function.name { "edge":"13", "ie":"10", "safari":"7" }
+  es.json.to-string-tag { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.map { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.math.acosh { "ie":"10", "safari":"7" }
+  es.math.asinh { "ie":"10", "safari":"7" }
+  es.math.atanh { "ie":"10", "safari":"7" }
+  es.math.cbrt { "ie":"10", "safari":"7" }
+  es.math.clz32 { "ie":"10", "safari":"7" }
+  es.math.cosh { "ie":"10", "safari":"7" }
+  es.math.expm1 { "ie":"10", "safari":"7" }
+  es.math.fround { "ie":"10", "safari":"7" }
+  es.math.hypot { "ie":"10", "safari":"7" }
+  es.math.imul { "ie":"10", "safari":"7" }
+  es.math.log10 { "ie":"10", "safari":"7" }
+  es.math.log1p { "ie":"10", "safari":"7" }
+  es.math.log2 { "ie":"10", "safari":"7" }
+  es.math.sign { "ie":"10", "safari":"7" }
+  es.math.sinh { "ie":"10", "safari":"7" }
+  es.math.tanh { "ie":"10", "safari":"7" }
+  es.math.to-string-tag { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.math.trunc { "ie":"10", "safari":"7" }
+  es.number.constructor { "ie":"10", "safari":"7" }
+  es.number.epsilon { "ie":"10", "safari":"7" }
+  es.number.is-finite { "ie":"10", "safari":"7" }
+  es.number.is-integer { "ie":"10", "safari":"7" }
+  es.number.is-nan { "ie":"10", "safari":"7" }
+  es.number.is-safe-integer { "ie":"10", "safari":"7" }
+  es.number.max-safe-integer { "ie":"10", "safari":"7" }
+  es.number.min-safe-integer { "ie":"10", "safari":"7" }
+  es.number.parse-float { "ie":"10", "ios":"9", "safari":"7" }
+  es.number.parse-int { "ie":"10", "safari":"7" }
+  es.number.to-fixed { "edge":"13", "ie":"10", "safari":"7" }
+  es.number.to-precision { "safari":"7" }
+  es.object.assign { "ie":"10", "safari":"7" }
+  es.object.define-getter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es.object.define-properties { "safari":"7" }
+  es.object.define-property { "safari":"7" }
+  es.object.define-setter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es.object.entries { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.object.freeze { "ie":"10", "safari":"7" }
+  es.object.from-entries { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.object.get-own-property-descriptor { "ie":"10", "safari":"7" }
+  es.object.get-own-property-descriptors { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.object.get-own-property-names { "ie":"10", "safari":"7" }
+  es.object.get-prototype-of { "ie":"10", "safari":"7" }
+  es.object.is { "ie":"10", "safari":"7" }
+  es.object.is-extensible { "ie":"10", "safari":"7" }
+  es.object.is-frozen { "ie":"10", "safari":"7" }
+  es.object.is-sealed { "ie":"10", "safari":"7" }
+  es.object.keys { "ie":"10", "safari":"7" }
+  es.object.lookup-getter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es.object.lookup-setter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
+  es.object.prevent-extensions { "ie":"10", "safari":"7" }
+  es.object.seal { "ie":"10", "safari":"7" }
+  es.object.set-prototype-of { "ie":"10", "safari":"7" }
+  es.object.to-string { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.object.values { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.parse-float { "safari":"7" }
+  es.parse-int { "safari":"7" }
+  es.promise { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.promise.finally { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.apply { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.construct { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.define-property { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.delete-property { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.get { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.get-own-property-descriptor { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.get-prototype-of { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.has { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.is-extensible { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.own-keys { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.prevent-extensions { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.set { "ie":"10", "ios":"9", "safari":"7" }
+  es.reflect.set-prototype-of { "ie":"10", "ios":"9", "safari":"7" }
+  es.regexp.constructor { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.regexp.exec { "safari":"7" }
+  es.regexp.flags { "edge":"13", "ie":"10", "safari":"7" }
+  es.regexp.to-string { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.set { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.code-point-at { "ie":"10", "safari":"7" }
+  es.string.ends-with { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.from-code-point { "ie":"10", "safari":"7" }
+  es.string.includes { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.iterator { "ie":"10", "safari":"7" }
+  es.string.match { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.pad-end { "chrome":"54", "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.pad-start { "chrome":"54", "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.raw { "ie":"10", "safari":"7" }
+  es.string.repeat { "ie":"10", "safari":"7" }
+  es.string.replace { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.search { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.split { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.starts-with { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.trim { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.trim-end { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.trim-start { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.string.anchor { "ie":"10", "safari":"7" }
+  es.string.big { "ie":"10", "safari":"7" }
+  es.string.blink { "ie":"10", "safari":"7" }
+  es.string.bold { "ie":"10", "safari":"7" }
+  es.string.fixed { "ie":"10", "safari":"7" }
+  es.string.fontcolor { "ie":"10", "safari":"7" }
+  es.string.fontsize { "ie":"10", "safari":"7" }
+  es.string.italics { "ie":"10", "safari":"7" }
+  es.string.link { "ie":"10", "safari":"7" }
+  es.string.small { "ie":"10", "safari":"7" }
+  es.string.strike { "ie":"10", "safari":"7" }
+  es.string.sub { "ie":"10", "safari":"7" }
+  es.string.sup { "ie":"10", "safari":"7" }
+  es.typed-array.float32-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.float64-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.int8-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.int16-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.int32-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.uint8-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.uint8-clamped-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.uint16-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.uint32-array { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.copy-within { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.every { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.fill { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.filter { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.find { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.find-index { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.for-each { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.from { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.includes { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.index-of { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.iterator { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.join { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.last-index-of { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.map { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.of { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.reduce { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.reduce-right { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.reverse { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.set { "ie":"10", "safari":"7" }
+  es.typed-array.slice { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.some { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.sort { "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.subarray { "ie":"10", "safari":"7" }
+  es.typed-array.to-locale-string { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.typed-array.to-string { "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.weak-map { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  es.weak-set { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.dom-collections.for-each { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.dom-collections.iterator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.immediate { "chrome":"54", "firefox":"49", "ios":"9", "safari":"7" }
+  web.queue-microtask { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.url { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.url.to-json { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+  web.url-search-params { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/stdout.txt
new file mode 100644
index 000000000000..781f32ad0974
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-chrome-71/stdout.txt
@@ -0,0 +1,25 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.array.unscopables.flat { "chrome":"71" }
+  es.array.unscopables.flat-map { "chrome":"71" }
+  es.object.from-entries { "chrome":"71" }
+  web.immediate { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/options.json
new file mode 100644
index 000000000000..381749958890
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "samsung 8.2"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/stdout.txt
new file mode 100644
index 000000000000..50f7b3e20e25
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable-samsung-8.2/stdout.txt
@@ -0,0 +1,39 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "samsung": "8.2"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "samsung":"8.2" }
+  syntax-object-rest-spread { "samsung":"8.2" }
+  proposal-unicode-property-regex { "samsung":"8.2" }
+  proposal-json-strings { "samsung":"8.2" }
+  proposal-optional-catch-binding { "samsung":"8.2" }
+  transform-named-capturing-groups-regex { "samsung":"8.2" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol.description { "samsung":"8.2" }
+  es.array.flat { "samsung":"8.2" }
+  es.array.flat-map { "samsung":"8.2" }
+  es.array.iterator { "samsung":"8.2" }
+  es.array.unscopables.flat { "samsung":"8.2" }
+  es.array.unscopables.flat-map { "samsung":"8.2" }
+  es.object.from-entries { "samsung":"8.2" }
+  es.promise { "samsung":"8.2" }
+  es.promise.finally { "samsung":"8.2" }
+  es.string.replace { "samsung":"8.2" }
+  es.string.trim-end { "samsung":"8.2" }
+  es.string.trim-start { "samsung":"8.2" }
+  web.dom-collections.iterator { "samsung":"8.2" }
+  web.immediate { "samsung":"8.2" }
+  web.queue-microtask { "samsung":"8.2" }
+  web.url.to-json { "samsung":"8.2" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/stdout.txt
new file mode 100644
index 000000000000..ac359171f3f1
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stable/stdout.txt
@@ -0,0 +1,253 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol {}
+  es.symbol.description {}
+  es.symbol.async-iterator {}
+  es.symbol.has-instance {}
+  es.symbol.is-concat-spreadable {}
+  es.symbol.iterator {}
+  es.symbol.match {}
+  es.symbol.replace {}
+  es.symbol.search {}
+  es.symbol.species {}
+  es.symbol.split {}
+  es.symbol.to-primitive {}
+  es.symbol.to-string-tag {}
+  es.symbol.unscopables {}
+  es.array.concat {}
+  es.array.copy-within {}
+  es.array.every {}
+  es.array.fill {}
+  es.array.filter {}
+  es.array.find {}
+  es.array.find-index {}
+  es.array.flat {}
+  es.array.flat-map {}
+  es.array.for-each {}
+  es.array.from {}
+  es.array.includes {}
+  es.array.index-of {}
+  es.array.is-array {}
+  es.array.iterator {}
+  es.array.join {}
+  es.array.last-index-of {}
+  es.array.map {}
+  es.array.of {}
+  es.array.reduce {}
+  es.array.reduce-right {}
+  es.array.reverse {}
+  es.array.slice {}
+  es.array.some {}
+  es.array.sort {}
+  es.array.species {}
+  es.array.splice {}
+  es.array.unscopables.flat {}
+  es.array.unscopables.flat-map {}
+  es.array-buffer.constructor {}
+  es.array-buffer.is-view {}
+  es.array-buffer.slice {}
+  es.data-view {}
+  es.date.now {}
+  es.date.to-iso-string {}
+  es.date.to-json {}
+  es.date.to-primitive {}
+  es.date.to-string {}
+  es.function.bind {}
+  es.function.has-instance {}
+  es.function.name {}
+  es.json.to-string-tag {}
+  es.map {}
+  es.math.acosh {}
+  es.math.asinh {}
+  es.math.atanh {}
+  es.math.cbrt {}
+  es.math.clz32 {}
+  es.math.cosh {}
+  es.math.expm1 {}
+  es.math.fround {}
+  es.math.hypot {}
+  es.math.imul {}
+  es.math.log10 {}
+  es.math.log1p {}
+  es.math.log2 {}
+  es.math.sign {}
+  es.math.sinh {}
+  es.math.tanh {}
+  es.math.to-string-tag {}
+  es.math.trunc {}
+  es.number.constructor {}
+  es.number.epsilon {}
+  es.number.is-finite {}
+  es.number.is-integer {}
+  es.number.is-nan {}
+  es.number.is-safe-integer {}
+  es.number.max-safe-integer {}
+  es.number.min-safe-integer {}
+  es.number.parse-float {}
+  es.number.parse-int {}
+  es.number.to-fixed {}
+  es.number.to-precision {}
+  es.object.assign {}
+  es.object.create {}
+  es.object.define-getter {}
+  es.object.define-properties {}
+  es.object.define-property {}
+  es.object.define-setter {}
+  es.object.entries {}
+  es.object.freeze {}
+  es.object.from-entries {}
+  es.object.get-own-property-descriptor {}
+  es.object.get-own-property-descriptors {}
+  es.object.get-own-property-names {}
+  es.object.get-prototype-of {}
+  es.object.is {}
+  es.object.is-extensible {}
+  es.object.is-frozen {}
+  es.object.is-sealed {}
+  es.object.keys {}
+  es.object.lookup-getter {}
+  es.object.lookup-setter {}
+  es.object.prevent-extensions {}
+  es.object.seal {}
+  es.object.set-prototype-of {}
+  es.object.to-string {}
+  es.object.values {}
+  es.parse-float {}
+  es.parse-int {}
+  es.promise {}
+  es.promise.finally {}
+  es.reflect.apply {}
+  es.reflect.construct {}
+  es.reflect.define-property {}
+  es.reflect.delete-property {}
+  es.reflect.get {}
+  es.reflect.get-own-property-descriptor {}
+  es.reflect.get-prototype-of {}
+  es.reflect.has {}
+  es.reflect.is-extensible {}
+  es.reflect.own-keys {}
+  es.reflect.prevent-extensions {}
+  es.reflect.set {}
+  es.reflect.set-prototype-of {}
+  es.regexp.constructor {}
+  es.regexp.exec {}
+  es.regexp.flags {}
+  es.regexp.to-string {}
+  es.set {}
+  es.string.code-point-at {}
+  es.string.ends-with {}
+  es.string.from-code-point {}
+  es.string.includes {}
+  es.string.iterator {}
+  es.string.match {}
+  es.string.pad-end {}
+  es.string.pad-start {}
+  es.string.raw {}
+  es.string.repeat {}
+  es.string.replace {}
+  es.string.search {}
+  es.string.split {}
+  es.string.starts-with {}
+  es.string.trim {}
+  es.string.trim-end {}
+  es.string.trim-start {}
+  es.string.anchor {}
+  es.string.big {}
+  es.string.blink {}
+  es.string.bold {}
+  es.string.fixed {}
+  es.string.fontcolor {}
+  es.string.fontsize {}
+  es.string.italics {}
+  es.string.link {}
+  es.string.small {}
+  es.string.strike {}
+  es.string.sub {}
+  es.string.sup {}
+  es.typed-array.float32-array {}
+  es.typed-array.float64-array {}
+  es.typed-array.int8-array {}
+  es.typed-array.int16-array {}
+  es.typed-array.int32-array {}
+  es.typed-array.uint8-array {}
+  es.typed-array.uint8-clamped-array {}
+  es.typed-array.uint16-array {}
+  es.typed-array.uint32-array {}
+  es.typed-array.copy-within {}
+  es.typed-array.every {}
+  es.typed-array.fill {}
+  es.typed-array.filter {}
+  es.typed-array.find {}
+  es.typed-array.find-index {}
+  es.typed-array.for-each {}
+  es.typed-array.from {}
+  es.typed-array.includes {}
+  es.typed-array.index-of {}
+  es.typed-array.iterator {}
+  es.typed-array.join {}
+  es.typed-array.last-index-of {}
+  es.typed-array.map {}
+  es.typed-array.of {}
+  es.typed-array.reduce {}
+  es.typed-array.reduce-right {}
+  es.typed-array.reverse {}
+  es.typed-array.set {}
+  es.typed-array.slice {}
+  es.typed-array.some {}
+  es.typed-array.sort {}
+  es.typed-array.subarray {}
+  es.typed-array.to-locale-string {}
+  es.typed-array.to-string {}
+  es.weak-map {}
+  es.weak-set {}
+  web.dom-collections.for-each {}
+  web.dom-collections.iterator {}
+  web.immediate {}
+  web.queue-microtask {}
+  web.timers {}
+  web.url {}
+  web.url.to-json {}
+  web.url-search-params {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/in/in.js
new file mode 100644
index 000000000000..d7e24c275a82
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stage';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/stdout.txt
new file mode 100644
index 000000000000..7b8630d1d45f
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage-chrome-71/stdout.txt
@@ -0,0 +1,102 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  esnext.aggregate-error { "chrome":"71" }
+  esnext.array.last-index { "chrome":"71" }
+  esnext.array.last-item { "chrome":"71" }
+  esnext.composite-key { "chrome":"71" }
+  esnext.composite-symbol { "chrome":"71" }
+  esnext.map.delete-all { "chrome":"71" }
+  esnext.map.every { "chrome":"71" }
+  esnext.map.filter { "chrome":"71" }
+  esnext.map.find { "chrome":"71" }
+  esnext.map.find-key { "chrome":"71" }
+  esnext.map.from { "chrome":"71" }
+  esnext.map.group-by { "chrome":"71" }
+  esnext.map.includes { "chrome":"71" }
+  esnext.map.key-by { "chrome":"71" }
+  esnext.map.key-of { "chrome":"71" }
+  esnext.map.map-keys { "chrome":"71" }
+  esnext.map.map-values { "chrome":"71" }
+  esnext.map.merge { "chrome":"71" }
+  esnext.map.of { "chrome":"71" }
+  esnext.map.reduce { "chrome":"71" }
+  esnext.map.some { "chrome":"71" }
+  esnext.map.update { "chrome":"71" }
+  esnext.math.clamp { "chrome":"71" }
+  esnext.math.deg-per-rad { "chrome":"71" }
+  esnext.math.degrees { "chrome":"71" }
+  esnext.math.fscale { "chrome":"71" }
+  esnext.math.iaddh { "chrome":"71" }
+  esnext.math.imulh { "chrome":"71" }
+  esnext.math.isubh { "chrome":"71" }
+  esnext.math.rad-per-deg { "chrome":"71" }
+  esnext.math.radians { "chrome":"71" }
+  esnext.math.scale { "chrome":"71" }
+  esnext.math.seeded-prng { "chrome":"71" }
+  esnext.math.signbit { "chrome":"71" }
+  esnext.math.umulh { "chrome":"71" }
+  esnext.number.from-string { "chrome":"71" }
+  esnext.observable { "chrome":"71" }
+  esnext.promise.all-settled { "chrome":"71" }
+  esnext.promise.any { "chrome":"71" }
+  esnext.promise.try { "chrome":"71" }
+  esnext.reflect.define-metadata { "chrome":"71" }
+  esnext.reflect.delete-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata { "chrome":"71" }
+  esnext.reflect.get-metadata-keys { "chrome":"71" }
+  esnext.reflect.get-own-metadata { "chrome":"71" }
+  esnext.reflect.get-own-metadata-keys { "chrome":"71" }
+  esnext.reflect.has-metadata { "chrome":"71" }
+  esnext.reflect.has-own-metadata { "chrome":"71" }
+  esnext.reflect.metadata { "chrome":"71" }
+  esnext.set.add-all { "chrome":"71" }
+  esnext.set.delete-all { "chrome":"71" }
+  esnext.set.difference { "chrome":"71" }
+  esnext.set.every { "chrome":"71" }
+  esnext.set.filter { "chrome":"71" }
+  esnext.set.find { "chrome":"71" }
+  esnext.set.from { "chrome":"71" }
+  esnext.set.intersection { "chrome":"71" }
+  esnext.set.is-disjoint-from { "chrome":"71" }
+  esnext.set.is-subset-of { "chrome":"71" }
+  esnext.set.is-superset-of { "chrome":"71" }
+  esnext.set.join { "chrome":"71" }
+  esnext.set.map { "chrome":"71" }
+  esnext.set.of { "chrome":"71" }
+  esnext.set.reduce { "chrome":"71" }
+  esnext.set.some { "chrome":"71" }
+  esnext.set.symmetric-difference { "chrome":"71" }
+  esnext.set.union { "chrome":"71" }
+  esnext.string.at { "chrome":"71" }
+  esnext.string.code-points { "chrome":"71" }
+  esnext.string.replace-all { "chrome":"71" }
+  esnext.symbol.dispose { "chrome":"71" }
+  esnext.symbol.observable { "chrome":"71" }
+  esnext.symbol.pattern-match { "chrome":"71" }
+  esnext.weak-map.delete-all { "chrome":"71" }
+  esnext.weak-map.from { "chrome":"71" }
+  esnext.weak-map.of { "chrome":"71" }
+  esnext.weak-set.add-all { "chrome":"71" }
+  esnext.weak-set.delete-all { "chrome":"71" }
+  esnext.weak-set.from { "chrome":"71" }
+  esnext.weak-set.of { "chrome":"71" }
+  esnext.string.match-all { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/in/in.js
new file mode 100644
index 000000000000..d7e24c275a82
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stage';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/stdout.txt
new file mode 100644
index 000000000000..34bf4094e273
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-stage/stdout.txt
@@ -0,0 +1,130 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  esnext.aggregate-error {}
+  esnext.array.last-index {}
+  esnext.array.last-item {}
+  esnext.composite-key {}
+  esnext.composite-symbol {}
+  esnext.global-this {}
+  esnext.map.delete-all {}
+  esnext.map.every {}
+  esnext.map.filter {}
+  esnext.map.find {}
+  esnext.map.find-key {}
+  esnext.map.from {}
+  esnext.map.group-by {}
+  esnext.map.includes {}
+  esnext.map.key-by {}
+  esnext.map.key-of {}
+  esnext.map.map-keys {}
+  esnext.map.map-values {}
+  esnext.map.merge {}
+  esnext.map.of {}
+  esnext.map.reduce {}
+  esnext.map.some {}
+  esnext.map.update {}
+  esnext.math.clamp {}
+  esnext.math.deg-per-rad {}
+  esnext.math.degrees {}
+  esnext.math.fscale {}
+  esnext.math.iaddh {}
+  esnext.math.imulh {}
+  esnext.math.isubh {}
+  esnext.math.rad-per-deg {}
+  esnext.math.radians {}
+  esnext.math.scale {}
+  esnext.math.seeded-prng {}
+  esnext.math.signbit {}
+  esnext.math.umulh {}
+  esnext.number.from-string {}
+  esnext.observable {}
+  esnext.promise.all-settled {}
+  esnext.promise.any {}
+  esnext.promise.try {}
+  esnext.reflect.define-metadata {}
+  esnext.reflect.delete-metadata {}
+  esnext.reflect.get-metadata {}
+  esnext.reflect.get-metadata-keys {}
+  esnext.reflect.get-own-metadata {}
+  esnext.reflect.get-own-metadata-keys {}
+  esnext.reflect.has-metadata {}
+  esnext.reflect.has-own-metadata {}
+  esnext.reflect.metadata {}
+  esnext.set.add-all {}
+  esnext.set.delete-all {}
+  esnext.set.difference {}
+  esnext.set.every {}
+  esnext.set.filter {}
+  esnext.set.find {}
+  esnext.set.from {}
+  esnext.set.intersection {}
+  esnext.set.is-disjoint-from {}
+  esnext.set.is-subset-of {}
+  esnext.set.is-superset-of {}
+  esnext.set.join {}
+  esnext.set.map {}
+  esnext.set.of {}
+  esnext.set.reduce {}
+  esnext.set.some {}
+  esnext.set.symmetric-difference {}
+  esnext.set.union {}
+  esnext.string.at {}
+  esnext.string.code-points {}
+  esnext.string.replace-all {}
+  esnext.symbol.dispose {}
+  esnext.symbol.observable {}
+  esnext.symbol.pattern-match {}
+  esnext.weak-map.delete-all {}
+  esnext.weak-map.from {}
+  esnext.weak-map.of {}
+  esnext.weak-set.add-all {}
+  esnext.weak-set.delete-all {}
+  esnext.weak-set.from {}
+  esnext.weak-set.of {}
+  web.url {}
+  web.url.to-json {}
+  web.url-search-params {}
+  esnext.string.match-all {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/options.json
new file mode 100644
index 000000000000..8eebdab425d8
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    ["../../lib", {
+      "useBuiltIns": "entry",
+      "corejs": 3,
+      "debug": true,
+      "targets": {
+        "chrome": 54,
+        "electron": 0.36,
+        "node": 6.10,
+        "ie": 10
+      }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/stdout.txt
new file mode 100644
index 000000000000..359bbdb07bdd
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-decimals/stdout.txt
@@ -0,0 +1,244 @@
+Warning, the following targets are using a decimal version:
+
+  electron: 0.36
+  node: 6.1
+
+We recommend using a string for minor/patch versions to avoid numbers like 6.10
+getting parsed as 6.1, which can lead to unexpected behavior.
+
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "electron": "0.36",
+  "ie": "10",
+  "node": "6.1"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-sticky-regex { "electron":"0.36", "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-unicode-regex { "electron":"0.36", "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "electron":"0.36", "ie":"10" }
+  transform-destructuring { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-block-scoping { "electron":"0.36", "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "electron":"0.36", "ie":"10" }
+  transform-exponentiation-operator { "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-async-to-generator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-async-generator-functions { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-object-rest-spread { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-unicode-property-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-json-strings { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  proposal-optional-catch-binding { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-named-capturing-groups-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  transform-member-expression-literals { "electron":"0.36" }
+  transform-property-literals { "electron":"0.36" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "electron":"0.36", "ie":"10" }
+  es.symbol.description { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.symbol.async-iterator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.symbol.has-instance { "electron":"0.36", "ie":"10" }
+  es.symbol.is-concat-spreadable { "electron":"0.36", "ie":"10" }
+  es.symbol.iterator { "ie":"10" }
+  es.symbol.match { "electron":"0.36", "ie":"10" }
+  es.symbol.replace { "electron":"0.36", "ie":"10" }
+  es.symbol.search { "electron":"0.36", "ie":"10" }
+  es.symbol.species { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.symbol.split { "electron":"0.36", "ie":"10" }
+  es.symbol.to-primitive { "ie":"10" }
+  es.symbol.to-string-tag { "electron":"0.36", "ie":"10" }
+  es.symbol.unscopables { "ie":"10" }
+  es.array.concat { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.copy-within { "ie":"10" }
+  es.array.fill { "ie":"10" }
+  es.array.filter { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.find { "ie":"10" }
+  es.array.find-index { "ie":"10" }
+  es.array.flat { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.flat-map { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.from { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.includes { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.index-of { "electron":"0.36", "node":"6.1" }
+  es.array.iterator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.join { "ie":"10" }
+  es.array.last-index-of { "electron":"0.36", "node":"6.1" }
+  es.array.map { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.of { "ie":"10" }
+  es.array.slice { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.sort { "chrome":"54", "electron":"0.36", "node":"6.1" }
+  es.array.species { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.splice { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.unscopables.flat { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array.unscopables.flat-map { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.array-buffer.constructor { "ie":"10" }
+  es.array-buffer.is-view { "ie":"10" }
+  es.array-buffer.slice { "ie":"10" }
+  es.date.to-primitive { "ie":"10" }
+  es.function.has-instance { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.function.name { "ie":"10" }
+  es.json.to-string-tag { "electron":"0.36", "ie":"10" }
+  es.map { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.math.acosh { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.math.asinh { "ie":"10" }
+  es.math.atanh { "ie":"10" }
+  es.math.cbrt { "ie":"10" }
+  es.math.clz32 { "ie":"10" }
+  es.math.cosh { "ie":"10" }
+  es.math.expm1 { "ie":"10" }
+  es.math.fround { "ie":"10" }
+  es.math.hypot { "ie":"10" }
+  es.math.imul { "ie":"10" }
+  es.math.log10 { "ie":"10" }
+  es.math.log1p { "ie":"10" }
+  es.math.log2 { "ie":"10" }
+  es.math.sign { "ie":"10" }
+  es.math.sinh { "ie":"10" }
+  es.math.tanh { "ie":"10" }
+  es.math.to-string-tag { "electron":"0.36", "ie":"10" }
+  es.math.trunc { "ie":"10" }
+  es.number.constructor { "ie":"10" }
+  es.number.epsilon { "ie":"10" }
+  es.number.is-finite { "ie":"10" }
+  es.number.is-integer { "ie":"10" }
+  es.number.is-nan { "ie":"10" }
+  es.number.is-safe-integer { "ie":"10" }
+  es.number.max-safe-integer { "ie":"10" }
+  es.number.min-safe-integer { "ie":"10" }
+  es.number.parse-float { "ie":"10" }
+  es.number.parse-int { "ie":"10" }
+  es.number.to-fixed { "ie":"10" }
+  es.object.assign { "electron":"0.36", "ie":"10" }
+  es.object.define-getter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.object.define-setter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.object.entries { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.object.freeze { "ie":"10" }
+  es.object.from-entries { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.object.get-own-property-descriptor { "ie":"10" }
+  es.object.get-own-property-descriptors { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.object.get-own-property-names { "ie":"10" }
+  es.object.get-prototype-of { "ie":"10" }
+  es.object.is { "ie":"10" }
+  es.object.is-extensible { "ie":"10" }
+  es.object.is-frozen { "ie":"10" }
+  es.object.is-sealed { "ie":"10" }
+  es.object.keys { "ie":"10" }
+  es.object.lookup-getter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.object.lookup-setter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.object.prevent-extensions { "ie":"10" }
+  es.object.seal { "ie":"10" }
+  es.object.set-prototype-of { "ie":"10" }
+  es.object.to-string { "electron":"0.36", "ie":"10" }
+  es.object.values { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.promise { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.promise.finally { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.reflect.apply { "electron":"0.36", "ie":"10" }
+  es.reflect.construct { "electron":"0.36", "ie":"10" }
+  es.reflect.define-property { "electron":"0.36", "ie":"10" }
+  es.reflect.delete-property { "electron":"0.36", "ie":"10" }
+  es.reflect.get { "electron":"0.36", "ie":"10" }
+  es.reflect.get-own-property-descriptor { "electron":"0.36", "ie":"10" }
+  es.reflect.get-prototype-of { "electron":"0.36", "ie":"10" }
+  es.reflect.has { "electron":"0.36", "ie":"10" }
+  es.reflect.is-extensible { "electron":"0.36", "ie":"10" }
+  es.reflect.own-keys { "electron":"0.36", "ie":"10" }
+  es.reflect.prevent-extensions { "electron":"0.36", "ie":"10" }
+  es.reflect.set { "electron":"0.36", "ie":"10" }
+  es.reflect.set-prototype-of { "electron":"0.36", "ie":"10" }
+  es.regexp.constructor { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.regexp.flags { "electron":"0.36", "ie":"10" }
+  es.regexp.to-string { "electron":"0.36", "ie":"10" }
+  es.set { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.code-point-at { "ie":"10" }
+  es.string.ends-with { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.from-code-point { "ie":"10" }
+  es.string.includes { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.iterator { "ie":"10" }
+  es.string.match { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.pad-end { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.pad-start { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.raw { "ie":"10" }
+  es.string.repeat { "ie":"10" }
+  es.string.replace { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.search { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.split { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.starts-with { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.trim { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.trim-end { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.trim-start { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.string.anchor { "ie":"10" }
+  es.string.big { "ie":"10" }
+  es.string.blink { "ie":"10" }
+  es.string.bold { "ie":"10" }
+  es.string.fixed { "ie":"10" }
+  es.string.fontcolor { "ie":"10" }
+  es.string.fontsize { "ie":"10" }
+  es.string.italics { "ie":"10" }
+  es.string.link { "ie":"10" }
+  es.string.small { "ie":"10" }
+  es.string.strike { "ie":"10" }
+  es.string.sub { "ie":"10" }
+  es.string.sup { "ie":"10" }
+  es.typed-array.float32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.float64-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.int8-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.int16-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.int32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.uint8-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.uint8-clamped-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.uint16-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.uint32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.copy-within { "ie":"10" }
+  es.typed-array.every { "ie":"10" }
+  es.typed-array.fill { "ie":"10" }
+  es.typed-array.filter { "ie":"10" }
+  es.typed-array.find { "ie":"10" }
+  es.typed-array.find-index { "ie":"10" }
+  es.typed-array.for-each { "ie":"10" }
+  es.typed-array.from { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.includes { "electron":"0.36", "ie":"10" }
+  es.typed-array.index-of { "ie":"10" }
+  es.typed-array.iterator { "ie":"10" }
+  es.typed-array.join { "ie":"10" }
+  es.typed-array.last-index-of { "ie":"10" }
+  es.typed-array.map { "ie":"10" }
+  es.typed-array.of { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.typed-array.reduce { "ie":"10" }
+  es.typed-array.reduce-right { "ie":"10" }
+  es.typed-array.reverse { "ie":"10" }
+  es.typed-array.set { "ie":"10" }
+  es.typed-array.slice { "ie":"10" }
+  es.typed-array.some { "ie":"10" }
+  es.typed-array.sort { "ie":"10" }
+  es.typed-array.subarray { "ie":"10" }
+  es.typed-array.to-locale-string { "ie":"10" }
+  es.typed-array.to-string { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.weak-map { "electron":"0.36", "ie":"10", "node":"6.1" }
+  es.weak-set { "electron":"0.36", "ie":"10", "node":"6.1" }
+  web.dom-collections.for-each { "chrome":"54", "electron":"0.36", "ie":"10" }
+  web.dom-collections.iterator { "chrome":"54", "electron":"0.36", "ie":"10" }
+  web.immediate { "chrome":"54", "electron":"0.36" }
+  web.queue-microtask { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  web.url { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  web.url.to-json { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+  web.url-search-params { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/options.json
new file mode 100644
index 000000000000..41cfee645021
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "useBuiltIns": "entry",
+      "corejs": "3.0",
+      "debug": true,
+      "targets": {
+        "chrome": "54",
+        "node": "6.10",
+        "ie": "10"
+      }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/stdout.txt
new file mode 100644
index 000000000000..d51520a95c36
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.0/stdout.txt
@@ -0,0 +1,231 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "ie": "10",
+  "node": "6.10"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "ie":"10" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "ie":"10" }
+  transform-sticky-regex { "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-unicode-regex { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-destructuring { "ie":"10" }
+  transform-block-scoping { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "ie":"10" }
+  transform-exponentiation-operator { "ie":"10", "node":"6.10" }
+  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-named-capturing-groups-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "ie":"10" }
+  es.symbol.description { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.symbol.has-instance { "ie":"10" }
+  es.symbol.is-concat-spreadable { "ie":"10" }
+  es.symbol.iterator { "ie":"10" }
+  es.symbol.match { "ie":"10" }
+  es.symbol.replace { "ie":"10" }
+  es.symbol.search { "ie":"10" }
+  es.symbol.species { "ie":"10" }
+  es.symbol.split { "ie":"10" }
+  es.symbol.to-primitive { "ie":"10" }
+  es.symbol.to-string-tag { "ie":"10" }
+  es.symbol.unscopables { "ie":"10" }
+  es.array.concat { "ie":"10" }
+  es.array.copy-within { "ie":"10" }
+  es.array.fill { "ie":"10" }
+  es.array.filter { "ie":"10" }
+  es.array.find { "ie":"10" }
+  es.array.find-index { "ie":"10" }
+  es.array.flat { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.flat-map { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.from { "ie":"10" }
+  es.array.includes { "ie":"10", "node":"6.10" }
+  es.array.iterator { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.join { "ie":"10" }
+  es.array.map { "ie":"10" }
+  es.array.of { "ie":"10" }
+  es.array.slice { "ie":"10" }
+  es.array.sort { "chrome":"54", "node":"6.10" }
+  es.array.species { "ie":"10" }
+  es.array.splice { "ie":"10" }
+  es.array.unscopables.flat { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.unscopables.flat-map { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array-buffer.constructor { "ie":"10" }
+  es.array-buffer.is-view { "ie":"10" }
+  es.array-buffer.slice { "ie":"10" }
+  es.date.to-primitive { "ie":"10" }
+  es.function.has-instance { "ie":"10" }
+  es.function.name { "ie":"10" }
+  es.json.to-string-tag { "ie":"10" }
+  es.map { "ie":"10" }
+  es.math.acosh { "ie":"10", "node":"6.10" }
+  es.math.asinh { "ie":"10" }
+  es.math.atanh { "ie":"10" }
+  es.math.cbrt { "ie":"10" }
+  es.math.clz32 { "ie":"10" }
+  es.math.cosh { "ie":"10" }
+  es.math.expm1 { "ie":"10" }
+  es.math.fround { "ie":"10" }
+  es.math.hypot { "ie":"10" }
+  es.math.imul { "ie":"10" }
+  es.math.log10 { "ie":"10" }
+  es.math.log1p { "ie":"10" }
+  es.math.log2 { "ie":"10" }
+  es.math.sign { "ie":"10" }
+  es.math.sinh { "ie":"10" }
+  es.math.tanh { "ie":"10" }
+  es.math.to-string-tag { "ie":"10" }
+  es.math.trunc { "ie":"10" }
+  es.number.constructor { "ie":"10" }
+  es.number.epsilon { "ie":"10" }
+  es.number.is-finite { "ie":"10" }
+  es.number.is-integer { "ie":"10" }
+  es.number.is-nan { "ie":"10" }
+  es.number.is-safe-integer { "ie":"10" }
+  es.number.max-safe-integer { "ie":"10" }
+  es.number.min-safe-integer { "ie":"10" }
+  es.number.parse-float { "ie":"10" }
+  es.number.parse-int { "ie":"10" }
+  es.number.to-fixed { "ie":"10" }
+  es.object.assign { "ie":"10" }
+  es.object.define-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.define-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.entries { "ie":"10", "node":"6.10" }
+  es.object.freeze { "ie":"10" }
+  es.object.from-entries { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.get-own-property-descriptor { "ie":"10" }
+  es.object.get-own-property-descriptors { "ie":"10", "node":"6.10" }
+  es.object.get-own-property-names { "ie":"10" }
+  es.object.get-prototype-of { "ie":"10" }
+  es.object.is { "ie":"10" }
+  es.object.is-extensible { "ie":"10" }
+  es.object.is-frozen { "ie":"10" }
+  es.object.is-sealed { "ie":"10" }
+  es.object.keys { "ie":"10" }
+  es.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.prevent-extensions { "ie":"10" }
+  es.object.seal { "ie":"10" }
+  es.object.set-prototype-of { "ie":"10" }
+  es.object.to-string { "ie":"10" }
+  es.object.values { "ie":"10", "node":"6.10" }
+  es.promise { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.promise.finally { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.reflect.apply { "ie":"10" }
+  es.reflect.construct { "ie":"10" }
+  es.reflect.define-property { "ie":"10" }
+  es.reflect.delete-property { "ie":"10" }
+  es.reflect.get { "ie":"10" }
+  es.reflect.get-own-property-descriptor { "ie":"10" }
+  es.reflect.get-prototype-of { "ie":"10" }
+  es.reflect.has { "ie":"10" }
+  es.reflect.is-extensible { "ie":"10" }
+  es.reflect.own-keys { "ie":"10" }
+  es.reflect.prevent-extensions { "ie":"10" }
+  es.reflect.set { "ie":"10" }
+  es.reflect.set-prototype-of { "ie":"10" }
+  es.regexp.constructor { "ie":"10" }
+  es.regexp.flags { "ie":"10" }
+  es.regexp.to-string { "ie":"10" }
+  es.set { "ie":"10" }
+  es.string.code-point-at { "ie":"10" }
+  es.string.ends-with { "ie":"10" }
+  es.string.from-code-point { "ie":"10" }
+  es.string.includes { "ie":"10" }
+  es.string.iterator { "ie":"10" }
+  es.string.match { "ie":"10" }
+  es.string.pad-end { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.pad-start { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.raw { "ie":"10" }
+  es.string.repeat { "ie":"10" }
+  es.string.replace { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.search { "ie":"10" }
+  es.string.split { "ie":"10", "node":"6.10" }
+  es.string.starts-with { "ie":"10" }
+  es.string.trim { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.trim-end { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.trim-start { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.anchor { "ie":"10" }
+  es.string.big { "ie":"10" }
+  es.string.blink { "ie":"10" }
+  es.string.bold { "ie":"10" }
+  es.string.fixed { "ie":"10" }
+  es.string.fontcolor { "ie":"10" }
+  es.string.fontsize { "ie":"10" }
+  es.string.italics { "ie":"10" }
+  es.string.link { "ie":"10" }
+  es.string.small { "ie":"10" }
+  es.string.strike { "ie":"10" }
+  es.string.sub { "ie":"10" }
+  es.string.sup { "ie":"10" }
+  es.typed-array.float32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.float64-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int8-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int16-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint8-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint8-clamped-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint16-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.copy-within { "ie":"10" }
+  es.typed-array.every { "ie":"10" }
+  es.typed-array.fill { "ie":"10" }
+  es.typed-array.filter { "ie":"10" }
+  es.typed-array.find { "ie":"10" }
+  es.typed-array.find-index { "ie":"10" }
+  es.typed-array.for-each { "ie":"10" }
+  es.typed-array.from { "ie":"10", "node":"6.10" }
+  es.typed-array.includes { "ie":"10" }
+  es.typed-array.index-of { "ie":"10" }
+  es.typed-array.iterator { "ie":"10" }
+  es.typed-array.join { "ie":"10" }
+  es.typed-array.last-index-of { "ie":"10" }
+  es.typed-array.map { "ie":"10" }
+  es.typed-array.of { "ie":"10", "node":"6.10" }
+  es.typed-array.reduce { "ie":"10" }
+  es.typed-array.reduce-right { "ie":"10" }
+  es.typed-array.reverse { "ie":"10" }
+  es.typed-array.set { "ie":"10" }
+  es.typed-array.slice { "ie":"10" }
+  es.typed-array.some { "ie":"10" }
+  es.typed-array.sort { "ie":"10" }
+  es.typed-array.subarray { "ie":"10" }
+  es.typed-array.to-locale-string { "ie":"10" }
+  es.typed-array.to-string { "ie":"10" }
+  es.weak-map { "ie":"10" }
+  es.weak-set { "ie":"10" }
+  web.dom-collections.for-each { "chrome":"54", "ie":"10" }
+  web.dom-collections.iterator { "chrome":"54", "ie":"10" }
+  web.immediate { "chrome":"54" }
+  web.queue-microtask { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url.to-json { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url-search-params { "chrome":"54", "ie":"10", "node":"6.10" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/options.json
new file mode 100644
index 000000000000..fd88d31055ef
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "useBuiltIns": "entry",
+      "corejs": "3.1",
+      "debug": true,
+      "targets": {
+        "chrome": "54",
+        "node": "6.10",
+        "ie": "10"
+      }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/stdout.txt
new file mode 100644
index 000000000000..9bdec21bb16c
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings-minor-3.1/stdout.txt
@@ -0,0 +1,233 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "ie": "10",
+  "node": "6.10"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "ie":"10" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "ie":"10" }
+  transform-sticky-regex { "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-unicode-regex { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-destructuring { "ie":"10" }
+  transform-block-scoping { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "ie":"10" }
+  transform-exponentiation-operator { "ie":"10", "node":"6.10" }
+  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-named-capturing-groups-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "ie":"10" }
+  es.symbol.description { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.symbol.has-instance { "ie":"10" }
+  es.symbol.is-concat-spreadable { "ie":"10" }
+  es.symbol.iterator { "ie":"10" }
+  es.symbol.match { "ie":"10" }
+  es.symbol.match-all { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.symbol.replace { "ie":"10" }
+  es.symbol.search { "ie":"10" }
+  es.symbol.species { "ie":"10" }
+  es.symbol.split { "ie":"10" }
+  es.symbol.to-primitive { "ie":"10" }
+  es.symbol.to-string-tag { "ie":"10" }
+  es.symbol.unscopables { "ie":"10" }
+  es.array.concat { "ie":"10" }
+  es.array.copy-within { "ie":"10" }
+  es.array.fill { "ie":"10" }
+  es.array.filter { "ie":"10" }
+  es.array.find { "ie":"10" }
+  es.array.find-index { "ie":"10" }
+  es.array.flat { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.flat-map { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.from { "ie":"10" }
+  es.array.includes { "ie":"10", "node":"6.10" }
+  es.array.iterator { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.join { "ie":"10" }
+  es.array.map { "ie":"10" }
+  es.array.of { "ie":"10" }
+  es.array.slice { "ie":"10" }
+  es.array.sort { "chrome":"54", "node":"6.10" }
+  es.array.species { "ie":"10" }
+  es.array.splice { "ie":"10" }
+  es.array.unscopables.flat { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.unscopables.flat-map { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array-buffer.constructor { "ie":"10" }
+  es.array-buffer.is-view { "ie":"10" }
+  es.array-buffer.slice { "ie":"10" }
+  es.date.to-primitive { "ie":"10" }
+  es.function.has-instance { "ie":"10" }
+  es.function.name { "ie":"10" }
+  es.json.to-string-tag { "ie":"10" }
+  es.map { "ie":"10" }
+  es.math.acosh { "ie":"10", "node":"6.10" }
+  es.math.asinh { "ie":"10" }
+  es.math.atanh { "ie":"10" }
+  es.math.cbrt { "ie":"10" }
+  es.math.clz32 { "ie":"10" }
+  es.math.cosh { "ie":"10" }
+  es.math.expm1 { "ie":"10" }
+  es.math.fround { "ie":"10" }
+  es.math.hypot { "ie":"10" }
+  es.math.imul { "ie":"10" }
+  es.math.log10 { "ie":"10" }
+  es.math.log1p { "ie":"10" }
+  es.math.log2 { "ie":"10" }
+  es.math.sign { "ie":"10" }
+  es.math.sinh { "ie":"10" }
+  es.math.tanh { "ie":"10" }
+  es.math.to-string-tag { "ie":"10" }
+  es.math.trunc { "ie":"10" }
+  es.number.constructor { "ie":"10" }
+  es.number.epsilon { "ie":"10" }
+  es.number.is-finite { "ie":"10" }
+  es.number.is-integer { "ie":"10" }
+  es.number.is-nan { "ie":"10" }
+  es.number.is-safe-integer { "ie":"10" }
+  es.number.max-safe-integer { "ie":"10" }
+  es.number.min-safe-integer { "ie":"10" }
+  es.number.parse-float { "ie":"10" }
+  es.number.parse-int { "ie":"10" }
+  es.number.to-fixed { "ie":"10" }
+  es.object.assign { "ie":"10" }
+  es.object.define-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.define-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.entries { "ie":"10", "node":"6.10" }
+  es.object.freeze { "ie":"10" }
+  es.object.from-entries { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.get-own-property-descriptor { "ie":"10" }
+  es.object.get-own-property-descriptors { "ie":"10", "node":"6.10" }
+  es.object.get-own-property-names { "ie":"10" }
+  es.object.get-prototype-of { "ie":"10" }
+  es.object.is { "ie":"10" }
+  es.object.is-extensible { "ie":"10" }
+  es.object.is-frozen { "ie":"10" }
+  es.object.is-sealed { "ie":"10" }
+  es.object.keys { "ie":"10" }
+  es.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.prevent-extensions { "ie":"10" }
+  es.object.seal { "ie":"10" }
+  es.object.set-prototype-of { "ie":"10" }
+  es.object.to-string { "ie":"10" }
+  es.object.values { "ie":"10", "node":"6.10" }
+  es.promise { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.promise.finally { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.reflect.apply { "ie":"10" }
+  es.reflect.construct { "ie":"10" }
+  es.reflect.define-property { "ie":"10" }
+  es.reflect.delete-property { "ie":"10" }
+  es.reflect.get { "ie":"10" }
+  es.reflect.get-own-property-descriptor { "ie":"10" }
+  es.reflect.get-prototype-of { "ie":"10" }
+  es.reflect.has { "ie":"10" }
+  es.reflect.is-extensible { "ie":"10" }
+  es.reflect.own-keys { "ie":"10" }
+  es.reflect.prevent-extensions { "ie":"10" }
+  es.reflect.set { "ie":"10" }
+  es.reflect.set-prototype-of { "ie":"10" }
+  es.regexp.constructor { "ie":"10" }
+  es.regexp.flags { "ie":"10" }
+  es.regexp.to-string { "ie":"10" }
+  es.set { "ie":"10" }
+  es.string.code-point-at { "ie":"10" }
+  es.string.ends-with { "ie":"10" }
+  es.string.from-code-point { "ie":"10" }
+  es.string.includes { "ie":"10" }
+  es.string.iterator { "ie":"10" }
+  es.string.match { "ie":"10" }
+  es.string.match-all { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.pad-end { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.pad-start { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.raw { "ie":"10" }
+  es.string.repeat { "ie":"10" }
+  es.string.replace { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.search { "ie":"10" }
+  es.string.split { "ie":"10", "node":"6.10" }
+  es.string.starts-with { "ie":"10" }
+  es.string.trim { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.trim-end { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.trim-start { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.anchor { "ie":"10" }
+  es.string.big { "ie":"10" }
+  es.string.blink { "ie":"10" }
+  es.string.bold { "ie":"10" }
+  es.string.fixed { "ie":"10" }
+  es.string.fontcolor { "ie":"10" }
+  es.string.fontsize { "ie":"10" }
+  es.string.italics { "ie":"10" }
+  es.string.link { "ie":"10" }
+  es.string.small { "ie":"10" }
+  es.string.strike { "ie":"10" }
+  es.string.sub { "ie":"10" }
+  es.string.sup { "ie":"10" }
+  es.typed-array.float32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.float64-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int8-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int16-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint8-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint8-clamped-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint16-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.copy-within { "ie":"10" }
+  es.typed-array.every { "ie":"10" }
+  es.typed-array.fill { "ie":"10" }
+  es.typed-array.filter { "ie":"10" }
+  es.typed-array.find { "ie":"10" }
+  es.typed-array.find-index { "ie":"10" }
+  es.typed-array.for-each { "ie":"10" }
+  es.typed-array.from { "ie":"10", "node":"6.10" }
+  es.typed-array.includes { "ie":"10" }
+  es.typed-array.index-of { "ie":"10" }
+  es.typed-array.iterator { "ie":"10" }
+  es.typed-array.join { "ie":"10" }
+  es.typed-array.last-index-of { "ie":"10" }
+  es.typed-array.map { "ie":"10" }
+  es.typed-array.of { "ie":"10", "node":"6.10" }
+  es.typed-array.reduce { "ie":"10" }
+  es.typed-array.reduce-right { "ie":"10" }
+  es.typed-array.reverse { "ie":"10" }
+  es.typed-array.set { "ie":"10" }
+  es.typed-array.slice { "ie":"10" }
+  es.typed-array.some { "ie":"10" }
+  es.typed-array.sort { "ie":"10" }
+  es.typed-array.subarray { "ie":"10" }
+  es.typed-array.to-locale-string { "ie":"10" }
+  es.typed-array.to-string { "ie":"10" }
+  es.weak-map { "ie":"10" }
+  es.weak-set { "ie":"10" }
+  web.dom-collections.for-each { "chrome":"54", "ie":"10" }
+  web.dom-collections.iterator { "chrome":"54", "ie":"10" }
+  web.immediate { "chrome":"54" }
+  web.queue-microtask { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url.to-json { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url-search-params { "chrome":"54", "ie":"10", "node":"6.10" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/options.json
new file mode 100644
index 000000000000..7cda7fb38c22
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "useBuiltIns": "entry",
+      "corejs": 3,
+      "debug": true,
+      "targets": {
+        "chrome": "54",
+        "node": "6.10",
+        "ie": "10"
+      }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/stdout.txt
new file mode 100644
index 000000000000..d51520a95c36
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-versions-strings/stdout.txt
@@ -0,0 +1,231 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "ie": "10",
+  "node": "6.10"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "ie":"10" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "ie":"10" }
+  transform-sticky-regex { "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-unicode-regex { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-destructuring { "ie":"10" }
+  transform-block-scoping { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "ie":"10" }
+  transform-exponentiation-operator { "ie":"10", "node":"6.10" }
+  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6.10" }
+  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6.10" }
+  transform-named-capturing-groups-regex { "chrome":"54", "ie":"10", "node":"6.10" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "ie":"10" }
+  es.symbol.description { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.symbol.has-instance { "ie":"10" }
+  es.symbol.is-concat-spreadable { "ie":"10" }
+  es.symbol.iterator { "ie":"10" }
+  es.symbol.match { "ie":"10" }
+  es.symbol.replace { "ie":"10" }
+  es.symbol.search { "ie":"10" }
+  es.symbol.species { "ie":"10" }
+  es.symbol.split { "ie":"10" }
+  es.symbol.to-primitive { "ie":"10" }
+  es.symbol.to-string-tag { "ie":"10" }
+  es.symbol.unscopables { "ie":"10" }
+  es.array.concat { "ie":"10" }
+  es.array.copy-within { "ie":"10" }
+  es.array.fill { "ie":"10" }
+  es.array.filter { "ie":"10" }
+  es.array.find { "ie":"10" }
+  es.array.find-index { "ie":"10" }
+  es.array.flat { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.flat-map { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.from { "ie":"10" }
+  es.array.includes { "ie":"10", "node":"6.10" }
+  es.array.iterator { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.join { "ie":"10" }
+  es.array.map { "ie":"10" }
+  es.array.of { "ie":"10" }
+  es.array.slice { "ie":"10" }
+  es.array.sort { "chrome":"54", "node":"6.10" }
+  es.array.species { "ie":"10" }
+  es.array.splice { "ie":"10" }
+  es.array.unscopables.flat { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array.unscopables.flat-map { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.array-buffer.constructor { "ie":"10" }
+  es.array-buffer.is-view { "ie":"10" }
+  es.array-buffer.slice { "ie":"10" }
+  es.date.to-primitive { "ie":"10" }
+  es.function.has-instance { "ie":"10" }
+  es.function.name { "ie":"10" }
+  es.json.to-string-tag { "ie":"10" }
+  es.map { "ie":"10" }
+  es.math.acosh { "ie":"10", "node":"6.10" }
+  es.math.asinh { "ie":"10" }
+  es.math.atanh { "ie":"10" }
+  es.math.cbrt { "ie":"10" }
+  es.math.clz32 { "ie":"10" }
+  es.math.cosh { "ie":"10" }
+  es.math.expm1 { "ie":"10" }
+  es.math.fround { "ie":"10" }
+  es.math.hypot { "ie":"10" }
+  es.math.imul { "ie":"10" }
+  es.math.log10 { "ie":"10" }
+  es.math.log1p { "ie":"10" }
+  es.math.log2 { "ie":"10" }
+  es.math.sign { "ie":"10" }
+  es.math.sinh { "ie":"10" }
+  es.math.tanh { "ie":"10" }
+  es.math.to-string-tag { "ie":"10" }
+  es.math.trunc { "ie":"10" }
+  es.number.constructor { "ie":"10" }
+  es.number.epsilon { "ie":"10" }
+  es.number.is-finite { "ie":"10" }
+  es.number.is-integer { "ie":"10" }
+  es.number.is-nan { "ie":"10" }
+  es.number.is-safe-integer { "ie":"10" }
+  es.number.max-safe-integer { "ie":"10" }
+  es.number.min-safe-integer { "ie":"10" }
+  es.number.parse-float { "ie":"10" }
+  es.number.parse-int { "ie":"10" }
+  es.number.to-fixed { "ie":"10" }
+  es.object.assign { "ie":"10" }
+  es.object.define-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.define-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.entries { "ie":"10", "node":"6.10" }
+  es.object.freeze { "ie":"10" }
+  es.object.from-entries { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.get-own-property-descriptor { "ie":"10" }
+  es.object.get-own-property-descriptors { "ie":"10", "node":"6.10" }
+  es.object.get-own-property-names { "ie":"10" }
+  es.object.get-prototype-of { "ie":"10" }
+  es.object.is { "ie":"10" }
+  es.object.is-extensible { "ie":"10" }
+  es.object.is-frozen { "ie":"10" }
+  es.object.is-sealed { "ie":"10" }
+  es.object.keys { "ie":"10" }
+  es.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.object.prevent-extensions { "ie":"10" }
+  es.object.seal { "ie":"10" }
+  es.object.set-prototype-of { "ie":"10" }
+  es.object.to-string { "ie":"10" }
+  es.object.values { "ie":"10", "node":"6.10" }
+  es.promise { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.promise.finally { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.reflect.apply { "ie":"10" }
+  es.reflect.construct { "ie":"10" }
+  es.reflect.define-property { "ie":"10" }
+  es.reflect.delete-property { "ie":"10" }
+  es.reflect.get { "ie":"10" }
+  es.reflect.get-own-property-descriptor { "ie":"10" }
+  es.reflect.get-prototype-of { "ie":"10" }
+  es.reflect.has { "ie":"10" }
+  es.reflect.is-extensible { "ie":"10" }
+  es.reflect.own-keys { "ie":"10" }
+  es.reflect.prevent-extensions { "ie":"10" }
+  es.reflect.set { "ie":"10" }
+  es.reflect.set-prototype-of { "ie":"10" }
+  es.regexp.constructor { "ie":"10" }
+  es.regexp.flags { "ie":"10" }
+  es.regexp.to-string { "ie":"10" }
+  es.set { "ie":"10" }
+  es.string.code-point-at { "ie":"10" }
+  es.string.ends-with { "ie":"10" }
+  es.string.from-code-point { "ie":"10" }
+  es.string.includes { "ie":"10" }
+  es.string.iterator { "ie":"10" }
+  es.string.match { "ie":"10" }
+  es.string.pad-end { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.pad-start { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.raw { "ie":"10" }
+  es.string.repeat { "ie":"10" }
+  es.string.replace { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.search { "ie":"10" }
+  es.string.split { "ie":"10", "node":"6.10" }
+  es.string.starts-with { "ie":"10" }
+  es.string.trim { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.trim-end { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.trim-start { "chrome":"54", "ie":"10", "node":"6.10" }
+  es.string.anchor { "ie":"10" }
+  es.string.big { "ie":"10" }
+  es.string.blink { "ie":"10" }
+  es.string.bold { "ie":"10" }
+  es.string.fixed { "ie":"10" }
+  es.string.fontcolor { "ie":"10" }
+  es.string.fontsize { "ie":"10" }
+  es.string.italics { "ie":"10" }
+  es.string.link { "ie":"10" }
+  es.string.small { "ie":"10" }
+  es.string.strike { "ie":"10" }
+  es.string.sub { "ie":"10" }
+  es.string.sup { "ie":"10" }
+  es.typed-array.float32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.float64-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int8-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int16-array { "ie":"10", "node":"6.10" }
+  es.typed-array.int32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint8-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint8-clamped-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint16-array { "ie":"10", "node":"6.10" }
+  es.typed-array.uint32-array { "ie":"10", "node":"6.10" }
+  es.typed-array.copy-within { "ie":"10" }
+  es.typed-array.every { "ie":"10" }
+  es.typed-array.fill { "ie":"10" }
+  es.typed-array.filter { "ie":"10" }
+  es.typed-array.find { "ie":"10" }
+  es.typed-array.find-index { "ie":"10" }
+  es.typed-array.for-each { "ie":"10" }
+  es.typed-array.from { "ie":"10", "node":"6.10" }
+  es.typed-array.includes { "ie":"10" }
+  es.typed-array.index-of { "ie":"10" }
+  es.typed-array.iterator { "ie":"10" }
+  es.typed-array.join { "ie":"10" }
+  es.typed-array.last-index-of { "ie":"10" }
+  es.typed-array.map { "ie":"10" }
+  es.typed-array.of { "ie":"10", "node":"6.10" }
+  es.typed-array.reduce { "ie":"10" }
+  es.typed-array.reduce-right { "ie":"10" }
+  es.typed-array.reverse { "ie":"10" }
+  es.typed-array.set { "ie":"10" }
+  es.typed-array.slice { "ie":"10" }
+  es.typed-array.some { "ie":"10" }
+  es.typed-array.sort { "ie":"10" }
+  es.typed-array.subarray { "ie":"10" }
+  es.typed-array.to-locale-string { "ie":"10" }
+  es.typed-array.to-string { "ie":"10" }
+  es.weak-map { "ie":"10" }
+  es.weak-set { "ie":"10" }
+  web.dom-collections.for-each { "chrome":"54", "ie":"10" }
+  web.dom-collections.iterator { "chrome":"54", "ie":"10" }
+  web.immediate { "chrome":"54" }
+  web.queue-microtask { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url.to-json { "chrome":"54", "ie":"10", "node":"6.10" }
+  web.url-search-params { "chrome":"54", "ie":"10", "node":"6.10" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/in/in.js
new file mode 100644
index 000000000000..807283757dae
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/web';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/options.json
new file mode 100644
index 000000000000..b9db1e21e401
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome 71"
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/stdout.txt
new file mode 100644
index 000000000000..47e1b712c226
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web-chrome-71/stdout.txt
@@ -0,0 +1,22 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfill:
+  web.immediate { "chrome":"71" }
+
+[<CWD>/src/in.js] Based on your targets, regenerator-runtime import excluded.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/in/in.js
new file mode 100644
index 000000000000..807283757dae
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/web';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/options.json
new file mode 100644
index 000000000000..1e5ef9ed0a56
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/options.json
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "shippedProposals": true,
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/stdout.txt
new file mode 100644
index 000000000000..10497d8551ab
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3-web/stdout.txt
@@ -0,0 +1,53 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  web.dom-collections.for-each {}
+  web.dom-collections.iterator {}
+  web.immediate {}
+  web.queue-microtask {}
+  web.timers {}
+  web.url {}
+  web.url.to-json {}
+  web.url-search-params {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/in/in.js
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/in/in.js
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/options.json
new file mode 100644
index 000000000000..d4af133772ff
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "browsers": "chrome >= 54, ie 10",
+        "node": 6
+      },
+      "useBuiltIns": "entry",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/stdout.txt
new file mode 100644
index 000000000000..be4132d6b1f0
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-corejs3/stdout.txt
@@ -0,0 +1,233 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "ie": "10",
+  "node": "6"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "ie":"10", "node":"6" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "ie":"10", "node":"6" }
+  transform-sticky-regex { "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6" }
+  transform-unicode-regex { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-destructuring { "ie":"10", "node":"6" }
+  transform-block-scoping { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "ie":"10" }
+  transform-exponentiation-operator { "ie":"10", "node":"6" }
+  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6" }
+  transform-named-capturing-groups-regex { "chrome":"54", "ie":"10", "node":"6" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced core-js entries with the following polyfills:
+  es.symbol { "ie":"10" }
+  es.symbol.description { "chrome":"54", "ie":"10", "node":"6" }
+  es.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6" }
+  es.symbol.has-instance { "ie":"10" }
+  es.symbol.is-concat-spreadable { "ie":"10" }
+  es.symbol.iterator { "ie":"10" }
+  es.symbol.match { "ie":"10" }
+  es.symbol.replace { "ie":"10" }
+  es.symbol.search { "ie":"10" }
+  es.symbol.species { "ie":"10", "node":"6" }
+  es.symbol.split { "ie":"10" }
+  es.symbol.to-primitive { "ie":"10" }
+  es.symbol.to-string-tag { "ie":"10" }
+  es.symbol.unscopables { "ie":"10" }
+  es.array.concat { "ie":"10", "node":"6" }
+  es.array.copy-within { "ie":"10" }
+  es.array.fill { "ie":"10" }
+  es.array.filter { "ie":"10", "node":"6" }
+  es.array.find { "ie":"10" }
+  es.array.find-index { "ie":"10" }
+  es.array.flat { "chrome":"54", "ie":"10", "node":"6" }
+  es.array.flat-map { "chrome":"54", "ie":"10", "node":"6" }
+  es.array.from { "ie":"10", "node":"6" }
+  es.array.includes { "ie":"10", "node":"6" }
+  es.array.index-of { "node":"6" }
+  es.array.iterator { "chrome":"54", "ie":"10", "node":"6" }
+  es.array.join { "ie":"10" }
+  es.array.last-index-of { "node":"6" }
+  es.array.map { "ie":"10", "node":"6" }
+  es.array.of { "ie":"10" }
+  es.array.slice { "ie":"10", "node":"6" }
+  es.array.sort { "chrome":"54", "node":"6" }
+  es.array.species { "ie":"10", "node":"6" }
+  es.array.splice { "ie":"10", "node":"6" }
+  es.array.unscopables.flat { "chrome":"54", "ie":"10", "node":"6" }
+  es.array.unscopables.flat-map { "chrome":"54", "ie":"10", "node":"6" }
+  es.array-buffer.constructor { "ie":"10" }
+  es.array-buffer.is-view { "ie":"10" }
+  es.array-buffer.slice { "ie":"10" }
+  es.date.to-primitive { "ie":"10" }
+  es.function.has-instance { "ie":"10", "node":"6" }
+  es.function.name { "ie":"10" }
+  es.json.to-string-tag { "ie":"10" }
+  es.map { "ie":"10", "node":"6" }
+  es.math.acosh { "ie":"10", "node":"6" }
+  es.math.asinh { "ie":"10" }
+  es.math.atanh { "ie":"10" }
+  es.math.cbrt { "ie":"10" }
+  es.math.clz32 { "ie":"10" }
+  es.math.cosh { "ie":"10" }
+  es.math.expm1 { "ie":"10" }
+  es.math.fround { "ie":"10" }
+  es.math.hypot { "ie":"10" }
+  es.math.imul { "ie":"10" }
+  es.math.log10 { "ie":"10" }
+  es.math.log1p { "ie":"10" }
+  es.math.log2 { "ie":"10" }
+  es.math.sign { "ie":"10" }
+  es.math.sinh { "ie":"10" }
+  es.math.tanh { "ie":"10" }
+  es.math.to-string-tag { "ie":"10" }
+  es.math.trunc { "ie":"10" }
+  es.number.constructor { "ie":"10" }
+  es.number.epsilon { "ie":"10" }
+  es.number.is-finite { "ie":"10" }
+  es.number.is-integer { "ie":"10" }
+  es.number.is-nan { "ie":"10" }
+  es.number.is-safe-integer { "ie":"10" }
+  es.number.max-safe-integer { "ie":"10" }
+  es.number.min-safe-integer { "ie":"10" }
+  es.number.parse-float { "ie":"10" }
+  es.number.parse-int { "ie":"10" }
+  es.number.to-fixed { "ie":"10" }
+  es.object.assign { "ie":"10" }
+  es.object.define-getter { "chrome":"54", "ie":"10", "node":"6" }
+  es.object.define-setter { "chrome":"54", "ie":"10", "node":"6" }
+  es.object.entries { "ie":"10", "node":"6" }
+  es.object.freeze { "ie":"10" }
+  es.object.from-entries { "chrome":"54", "ie":"10", "node":"6" }
+  es.object.get-own-property-descriptor { "ie":"10" }
+  es.object.get-own-property-descriptors { "ie":"10", "node":"6" }
+  es.object.get-own-property-names { "ie":"10" }
+  es.object.get-prototype-of { "ie":"10" }
+  es.object.is { "ie":"10" }
+  es.object.is-extensible { "ie":"10" }
+  es.object.is-frozen { "ie":"10" }
+  es.object.is-sealed { "ie":"10" }
+  es.object.keys { "ie":"10" }
+  es.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6" }
+  es.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6" }
+  es.object.prevent-extensions { "ie":"10" }
+  es.object.seal { "ie":"10" }
+  es.object.set-prototype-of { "ie":"10" }
+  es.object.to-string { "ie":"10" }
+  es.object.values { "ie":"10", "node":"6" }
+  es.promise { "chrome":"54", "ie":"10", "node":"6" }
+  es.promise.finally { "chrome":"54", "ie":"10", "node":"6" }
+  es.reflect.apply { "ie":"10" }
+  es.reflect.construct { "ie":"10" }
+  es.reflect.define-property { "ie":"10" }
+  es.reflect.delete-property { "ie":"10" }
+  es.reflect.get { "ie":"10" }
+  es.reflect.get-own-property-descriptor { "ie":"10" }
+  es.reflect.get-prototype-of { "ie":"10" }
+  es.reflect.has { "ie":"10" }
+  es.reflect.is-extensible { "ie":"10" }
+  es.reflect.own-keys { "ie":"10" }
+  es.reflect.prevent-extensions { "ie":"10" }
+  es.reflect.set { "ie":"10" }
+  es.reflect.set-prototype-of { "ie":"10" }
+  es.regexp.constructor { "ie":"10", "node":"6" }
+  es.regexp.flags { "ie":"10" }
+  es.regexp.to-string { "ie":"10" }
+  es.set { "ie":"10", "node":"6" }
+  es.string.code-point-at { "ie":"10" }
+  es.string.ends-with { "ie":"10", "node":"6" }
+  es.string.from-code-point { "ie":"10" }
+  es.string.includes { "ie":"10", "node":"6" }
+  es.string.iterator { "ie":"10" }
+  es.string.match { "ie":"10", "node":"6" }
+  es.string.pad-end { "chrome":"54", "ie":"10", "node":"6" }
+  es.string.pad-start { "chrome":"54", "ie":"10", "node":"6" }
+  es.string.raw { "ie":"10" }
+  es.string.repeat { "ie":"10" }
+  es.string.replace { "chrome":"54", "ie":"10", "node":"6" }
+  es.string.search { "ie":"10", "node":"6" }
+  es.string.split { "ie":"10", "node":"6" }
+  es.string.starts-with { "ie":"10", "node":"6" }
+  es.string.trim { "chrome":"54", "ie":"10", "node":"6" }
+  es.string.trim-end { "chrome":"54", "ie":"10", "node":"6" }
+  es.string.trim-start { "chrome":"54", "ie":"10", "node":"6" }
+  es.string.anchor { "ie":"10" }
+  es.string.big { "ie":"10" }
+  es.string.blink { "ie":"10" }
+  es.string.bold { "ie":"10" }
+  es.string.fixed { "ie":"10" }
+  es.string.fontcolor { "ie":"10" }
+  es.string.fontsize { "ie":"10" }
+  es.string.italics { "ie":"10" }
+  es.string.link { "ie":"10" }
+  es.string.small { "ie":"10" }
+  es.string.strike { "ie":"10" }
+  es.string.sub { "ie":"10" }
+  es.string.sup { "ie":"10" }
+  es.typed-array.float32-array { "ie":"10", "node":"6" }
+  es.typed-array.float64-array { "ie":"10", "node":"6" }
+  es.typed-array.int8-array { "ie":"10", "node":"6" }
+  es.typed-array.int16-array { "ie":"10", "node":"6" }
+  es.typed-array.int32-array { "ie":"10", "node":"6" }
+  es.typed-array.uint8-array { "ie":"10", "node":"6" }
+  es.typed-array.uint8-clamped-array { "ie":"10", "node":"6" }
+  es.typed-array.uint16-array { "ie":"10", "node":"6" }
+  es.typed-array.uint32-array { "ie":"10", "node":"6" }
+  es.typed-array.copy-within { "ie":"10" }
+  es.typed-array.every { "ie":"10" }
+  es.typed-array.fill { "ie":"10" }
+  es.typed-array.filter { "ie":"10" }
+  es.typed-array.find { "ie":"10" }
+  es.typed-array.find-index { "ie":"10" }
+  es.typed-array.for-each { "ie":"10" }
+  es.typed-array.from { "ie":"10", "node":"6" }
+  es.typed-array.includes { "ie":"10" }
+  es.typed-array.index-of { "ie":"10" }
+  es.typed-array.iterator { "ie":"10" }
+  es.typed-array.join { "ie":"10" }
+  es.typed-array.last-index-of { "ie":"10" }
+  es.typed-array.map { "ie":"10" }
+  es.typed-array.of { "ie":"10", "node":"6" }
+  es.typed-array.reduce { "ie":"10" }
+  es.typed-array.reduce-right { "ie":"10" }
+  es.typed-array.reverse { "ie":"10" }
+  es.typed-array.set { "ie":"10" }
+  es.typed-array.slice { "ie":"10" }
+  es.typed-array.some { "ie":"10" }
+  es.typed-array.sort { "ie":"10" }
+  es.typed-array.subarray { "ie":"10" }
+  es.typed-array.to-locale-string { "ie":"10" }
+  es.typed-array.to-string { "ie":"10", "node":"6" }
+  es.weak-map { "ie":"10", "node":"6" }
+  es.weak-set { "ie":"10", "node":"6" }
+  web.dom-collections.for-each { "chrome":"54", "ie":"10" }
+  web.dom-collections.iterator { "chrome":"54", "ie":"10" }
+  web.immediate { "chrome":"54" }
+  web.queue-microtask { "chrome":"54", "ie":"10", "node":"6" }
+  web.url { "chrome":"54", "ie":"10", "node":"6" }
+  web.url.to-json { "chrome":"54", "ie":"10", "node":"6" }
+  web.url-search-params { "chrome":"54", "ie":"10", "node":"6" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/in/in.js
new file mode 100644
index 000000000000..e31333abc597
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/in/in.js
@@ -0,0 +1 @@
+function hasAnyoneSeenImportBabelPolyfill() { return false };
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins-no-import/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/options.json
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/builtins-no-import/options.json
rename to packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/options.json
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/stderr.txt
new file mode 100644
index 000000000000..dbee5e8f3eb3
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/stderr.txt
@@ -0,0 +1,6 @@
+WARNING: We noticed you're using the `useBuiltIns` option without declaring a core-js version. Currently, we assume version 2.x when no version is passed. Since this default version will likely change in future versions of Babel, we recommend explicitly setting the core-js version you are using via the `corejs` option.
+
+You should also be sure that the version you pass to the `corejs` option matches the version specified in your `package.json`'s `dependencies` section. If it doesn't, you need to run one of the following commands:
+
+  npm install --save core-js@2    npm install --save core-js@3
+  yarn add core-js@2              yarn add core-js@3
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/stdout.txt
new file mode 100644
index 000000000000..ac37a584bfdf
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-no-import/stdout.txt
@@ -0,0 +1,27 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "node": "6"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-function-name { "node":"6" }
+  transform-for-of { "node":"6" }
+  transform-dotall-regex { "node":"6" }
+  transform-destructuring { "node":"6" }
+  transform-exponentiation-operator { "node":"6" }
+  transform-async-to-generator { "node":"6" }
+  proposal-async-generator-functions { "node":"6" }
+  proposal-object-rest-spread { "node":"6" }
+  proposal-unicode-property-regex { "node":"6" }
+  proposal-json-strings { "node":"6" }
+  proposal-optional-catch-binding { "node":"6" }
+  transform-named-capturing-groups-regex { "node":"6" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Import of @babel/polyfill was not found.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/in/in.js
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/in/in.js
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/debug-fixtures/shippedProposals/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/options.json
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/shippedProposals/options.json
rename to packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/options.json
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/stderr.txt
new file mode 100644
index 000000000000..dbee5e8f3eb3
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/stderr.txt
@@ -0,0 +1,6 @@
+WARNING: We noticed you're using the `useBuiltIns` option without declaring a core-js version. Currently, we assume version 2.x when no version is passed. Since this default version will likely change in future versions of Babel, we recommend explicitly setting the core-js version you are using via the `corejs` option.
+
+You should also be sure that the version you pass to the `corejs` option matches the version specified in your `package.json`'s `dependencies` section. If it doesn't, you need to run one of the following commands:
+
+  npm install --save core-js@2    npm install --save core-js@3
+  yarn add core-js@2              yarn add core-js@3
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/stdout.txt
new file mode 100644
index 000000000000..04e8ce0e5829
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-shippedProposals/stdout.txt
@@ -0,0 +1,193 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex {}
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions {}
+  proposal-object-rest-spread {}
+  proposal-unicode-property-regex {}
+  proposal-json-strings {}
+  proposal-optional-catch-binding {}
+  transform-named-capturing-groups-regex {}
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within {}
+  es6.array.every {}
+  es6.array.fill {}
+  es6.array.filter {}
+  es6.array.find {}
+  es6.array.find-index {}
+  es7.array.flat-map {}
+  es6.array.for-each {}
+  es6.array.from {}
+  es7.array.includes {}
+  es6.array.index-of {}
+  es6.array.is-array {}
+  es6.array.iterator {}
+  es6.array.last-index-of {}
+  es6.array.map {}
+  es6.array.of {}
+  es6.array.reduce {}
+  es6.array.reduce-right {}
+  es6.array.some {}
+  es6.array.sort {}
+  es6.array.species {}
+  es6.date.now {}
+  es6.date.to-iso-string {}
+  es6.date.to-json {}
+  es6.date.to-primitive {}
+  es6.date.to-string {}
+  es6.function.bind {}
+  es6.function.has-instance {}
+  es6.function.name {}
+  es6.map {}
+  es6.math.acosh {}
+  es6.math.asinh {}
+  es6.math.atanh {}
+  es6.math.cbrt {}
+  es6.math.clz32 {}
+  es6.math.cosh {}
+  es6.math.expm1 {}
+  es6.math.fround {}
+  es6.math.hypot {}
+  es6.math.imul {}
+  es6.math.log1p {}
+  es6.math.log10 {}
+  es6.math.log2 {}
+  es6.math.sign {}
+  es6.math.sinh {}
+  es6.math.tanh {}
+  es6.math.trunc {}
+  es6.number.constructor {}
+  es6.number.epsilon {}
+  es6.number.is-finite {}
+  es6.number.is-integer {}
+  es6.number.is-nan {}
+  es6.number.is-safe-integer {}
+  es6.number.max-safe-integer {}
+  es6.number.min-safe-integer {}
+  es6.number.parse-float {}
+  es6.number.parse-int {}
+  es6.object.assign {}
+  es6.object.create {}
+  es7.object.define-getter {}
+  es7.object.define-setter {}
+  es6.object.define-property {}
+  es6.object.define-properties {}
+  es7.object.entries {}
+  es6.object.freeze {}
+  es6.object.get-own-property-descriptor {}
+  es7.object.get-own-property-descriptors {}
+  es6.object.get-own-property-names {}
+  es6.object.get-prototype-of {}
+  es7.object.lookup-getter {}
+  es7.object.lookup-setter {}
+  es6.object.prevent-extensions {}
+  es6.object.to-string {}
+  es6.object.is {}
+  es6.object.is-frozen {}
+  es6.object.is-sealed {}
+  es6.object.is-extensible {}
+  es6.object.keys {}
+  es6.object.seal {}
+  es6.object.set-prototype-of {}
+  es7.object.values {}
+  es6.promise {}
+  es7.promise.finally {}
+  es6.reflect.apply {}
+  es6.reflect.construct {}
+  es6.reflect.define-property {}
+  es6.reflect.delete-property {}
+  es6.reflect.get {}
+  es6.reflect.get-own-property-descriptor {}
+  es6.reflect.get-prototype-of {}
+  es6.reflect.has {}
+  es6.reflect.is-extensible {}
+  es6.reflect.own-keys {}
+  es6.reflect.prevent-extensions {}
+  es6.reflect.set {}
+  es6.reflect.set-prototype-of {}
+  es6.regexp.constructor {}
+  es6.regexp.flags {}
+  es6.regexp.match {}
+  es6.regexp.replace {}
+  es6.regexp.split {}
+  es6.regexp.search {}
+  es6.regexp.to-string {}
+  es6.set {}
+  es6.symbol {}
+  es7.symbol.async-iterator {}
+  es6.string.anchor {}
+  es6.string.big {}
+  es6.string.blink {}
+  es6.string.bold {}
+  es6.string.code-point-at {}
+  es6.string.ends-with {}
+  es6.string.fixed {}
+  es6.string.fontcolor {}
+  es6.string.fontsize {}
+  es6.string.from-code-point {}
+  es6.string.includes {}
+  es6.string.italics {}
+  es6.string.iterator {}
+  es6.string.link {}
+  es7.string.pad-start {}
+  es7.string.pad-end {}
+  es6.string.raw {}
+  es6.string.repeat {}
+  es6.string.small {}
+  es6.string.starts-with {}
+  es6.string.strike {}
+  es6.string.sub {}
+  es6.string.sup {}
+  es6.string.trim {}
+  es7.string.trim-left {}
+  es7.string.trim-right {}
+  es6.typed.array-buffer {}
+  es6.typed.data-view {}
+  es6.typed.int8-array {}
+  es6.typed.uint8-array {}
+  es6.typed.uint8-clamped-array {}
+  es6.typed.int16-array {}
+  es6.typed.uint16-array {}
+  es6.typed.int32-array {}
+  es6.typed.uint32-array {}
+  es6.typed.float32-array {}
+  es6.typed.float64-array {}
+  es6.weak-map {}
+  es6.weak-set {}
+  web.timers {}
+  web.immediate {}
+  web.dom.iterable {}
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/in/in.js
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/in/in.js
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins-uglify/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/options.json
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/builtins-uglify/options.json
rename to packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/options.json
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/stderr.txt
new file mode 100644
index 000000000000..dbee5e8f3eb3
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/stderr.txt
@@ -0,0 +1,6 @@
+WARNING: We noticed you're using the `useBuiltIns` option without declaring a core-js version. Currently, we assume version 2.x when no version is passed. Since this default version will likely change in future versions of Babel, we recommend explicitly setting the core-js version you are using via the `corejs` option.
+
+You should also be sure that the version you pass to the `corejs` option matches the version specified in your `package.json`'s `dependencies` section. If it doesn't, you need to run one of the following commands:
+
+  npm install --save core-js@2    npm install --save core-js@3
+  yarn add core-js@2              yarn add core-js@3
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/stdout.txt
new file mode 100644
index 000000000000..2a97e7973107
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs-uglify/stdout.txt
@@ -0,0 +1,66 @@
+The uglify target has been deprecated. Set the top level
+option `forceAllTransforms: true` instead.
+
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "55"
+}
+
+Using modules transform: false
+
+Using plugins:
+  transform-template-literals {}
+  transform-literals {}
+  transform-function-name {}
+  transform-arrow-functions {}
+  transform-block-scoped-functions {}
+  transform-classes {}
+  transform-object-super {}
+  transform-shorthand-properties {}
+  transform-duplicate-keys {}
+  transform-computed-properties {}
+  transform-for-of {}
+  transform-sticky-regex {}
+  transform-dotall-regex { "chrome":"55" }
+  transform-unicode-regex {}
+  transform-spread {}
+  transform-parameters {}
+  transform-destructuring {}
+  transform-block-scoping {}
+  transform-typeof-symbol {}
+  transform-new-target {}
+  transform-regenerator {}
+  transform-exponentiation-operator {}
+  transform-async-to-generator {}
+  proposal-async-generator-functions { "chrome":"55" }
+  proposal-object-rest-spread { "chrome":"55" }
+  proposal-unicode-property-regex { "chrome":"55" }
+  proposal-json-strings { "chrome":"55" }
+  proposal-optional-catch-binding { "chrome":"55" }
+  transform-named-capturing-groups-regex { "chrome":"55" }
+  transform-member-expression-literals {}
+  transform-property-literals {}
+  transform-reserved-words {}
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es7.array.flat-map { "chrome":"55" }
+  es6.array.sort { "chrome":"55" }
+  es7.object.define-getter { "chrome":"55" }
+  es7.object.define-setter { "chrome":"55" }
+  es7.object.lookup-getter { "chrome":"55" }
+  es7.object.lookup-setter { "chrome":"55" }
+  es6.object.to-string { "chrome":"55" }
+  es7.promise.finally { "chrome":"55" }
+  es7.symbol.async-iterator { "chrome":"55" }
+  es7.string.pad-start { "chrome":"55" }
+  es7.string.pad-end { "chrome":"55" }
+  es7.string.trim-left { "chrome":"55" }
+  es7.string.trim-right { "chrome":"55" }
+  web.timers { "chrome":"55" }
+  web.immediate { "chrome":"55" }
+  web.dom.iterable { "chrome":"55" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/in/in.js b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/in/in.js
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/in/in.js
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/debug-fixtures/builtins/options.json b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/options.json
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/builtins/options.json
rename to packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/options.json
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/stderr.txt
new file mode 100644
index 000000000000..dbee5e8f3eb3
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/stderr.txt
@@ -0,0 +1,6 @@
+WARNING: We noticed you're using the `useBuiltIns` option without declaring a core-js version. Currently, we assume version 2.x when no version is passed. Since this default version will likely change in future versions of Babel, we recommend explicitly setting the core-js version you are using via the `corejs` option.
+
+You should also be sure that the version you pass to the `corejs` option matches the version specified in your `package.json`'s `dependencies` section. If it doesn't, you need to run one of the following commands:
+
+  npm install --save core-js@2    npm install --save core-js@3
+  yarn add core-js@2              yarn add core-js@3
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/stdout.txt
new file mode 100644
index 000000000000..943bad68b9b1
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/entry-no-corejs/stdout.txt
@@ -0,0 +1,174 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "54",
+  "ie": "10",
+  "node": "6"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"10" }
+  transform-literals { "ie":"10" }
+  transform-function-name { "ie":"10", "node":"6" }
+  transform-arrow-functions { "ie":"10" }
+  transform-block-scoped-functions { "ie":"10" }
+  transform-classes { "ie":"10" }
+  transform-object-super { "ie":"10" }
+  transform-shorthand-properties { "ie":"10" }
+  transform-duplicate-keys { "ie":"10" }
+  transform-computed-properties { "ie":"10" }
+  transform-for-of { "ie":"10", "node":"6" }
+  transform-sticky-regex { "ie":"10" }
+  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6" }
+  transform-unicode-regex { "ie":"10" }
+  transform-spread { "ie":"10" }
+  transform-parameters { "ie":"10" }
+  transform-destructuring { "ie":"10", "node":"6" }
+  transform-block-scoping { "ie":"10" }
+  transform-typeof-symbol { "ie":"10" }
+  transform-new-target { "ie":"10" }
+  transform-regenerator { "ie":"10" }
+  transform-exponentiation-operator { "ie":"10", "node":"6" }
+  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6" }
+  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6" }
+  transform-named-capturing-groups-regex { "chrome":"54", "ie":"10", "node":"6" }
+
+Using polyfills with `entry` option:
+
+[<CWD>/src/in.js] Replaced @babel/polyfill entries with the following polyfills:
+  es6.array.copy-within { "ie":"10" }
+  es6.array.fill { "ie":"10" }
+  es6.array.find { "ie":"10" }
+  es6.array.find-index { "ie":"10" }
+  es7.array.flat-map { "chrome":"54", "ie":"10", "node":"6" }
+  es6.array.from { "ie":"10", "node":"6" }
+  es7.array.includes { "ie":"10" }
+  es6.array.iterator { "ie":"10" }
+  es6.array.of { "ie":"10" }
+  es6.array.sort { "chrome":"54", "node":"6" }
+  es6.array.species { "ie":"10", "node":"6" }
+  es6.date.to-primitive { "ie":"10" }
+  es6.function.has-instance { "ie":"10", "node":"6" }
+  es6.function.name { "ie":"10" }
+  es6.map { "ie":"10", "node":"6" }
+  es6.math.acosh { "ie":"10" }
+  es6.math.asinh { "ie":"10" }
+  es6.math.atanh { "ie":"10" }
+  es6.math.cbrt { "ie":"10" }
+  es6.math.clz32 { "ie":"10" }
+  es6.math.cosh { "ie":"10" }
+  es6.math.expm1 { "ie":"10" }
+  es6.math.fround { "ie":"10" }
+  es6.math.hypot { "ie":"10" }
+  es6.math.imul { "ie":"10" }
+  es6.math.log1p { "ie":"10" }
+  es6.math.log10 { "ie":"10" }
+  es6.math.log2 { "ie":"10" }
+  es6.math.sign { "ie":"10" }
+  es6.math.sinh { "ie":"10" }
+  es6.math.tanh { "ie":"10" }
+  es6.math.trunc { "ie":"10" }
+  es6.number.constructor { "ie":"10" }
+  es6.number.epsilon { "ie":"10" }
+  es6.number.is-finite { "ie":"10" }
+  es6.number.is-integer { "ie":"10" }
+  es6.number.is-nan { "ie":"10" }
+  es6.number.is-safe-integer { "ie":"10" }
+  es6.number.max-safe-integer { "ie":"10" }
+  es6.number.min-safe-integer { "ie":"10" }
+  es6.number.parse-float { "ie":"10" }
+  es6.number.parse-int { "ie":"10" }
+  es6.object.assign { "ie":"10" }
+  es7.object.define-getter { "chrome":"54", "ie":"10", "node":"6" }
+  es7.object.define-setter { "chrome":"54", "ie":"10", "node":"6" }
+  es7.object.entries { "ie":"10", "node":"6" }
+  es6.object.freeze { "ie":"10" }
+  es6.object.get-own-property-descriptor { "ie":"10" }
+  es7.object.get-own-property-descriptors { "ie":"10", "node":"6" }
+  es6.object.get-own-property-names { "ie":"10" }
+  es6.object.get-prototype-of { "ie":"10" }
+  es7.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6" }
+  es7.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6" }
+  es6.object.prevent-extensions { "ie":"10" }
+  es6.object.to-string { "chrome":"54", "ie":"10", "node":"6" }
+  es6.object.is { "ie":"10" }
+  es6.object.is-frozen { "ie":"10" }
+  es6.object.is-sealed { "ie":"10" }
+  es6.object.is-extensible { "ie":"10" }
+  es6.object.keys { "ie":"10" }
+  es6.object.seal { "ie":"10" }
+  es6.object.set-prototype-of { "ie":"10" }
+  es7.object.values { "ie":"10", "node":"6" }
+  es6.promise { "ie":"10", "node":"6" }
+  es7.promise.finally { "chrome":"54", "ie":"10", "node":"6" }
+  es6.reflect.apply { "ie":"10" }
+  es6.reflect.construct { "ie":"10" }
+  es6.reflect.define-property { "ie":"10" }
+  es6.reflect.delete-property { "ie":"10" }
+  es6.reflect.get { "ie":"10" }
+  es6.reflect.get-own-property-descriptor { "ie":"10" }
+  es6.reflect.get-prototype-of { "ie":"10" }
+  es6.reflect.has { "ie":"10" }
+  es6.reflect.is-extensible { "ie":"10" }
+  es6.reflect.own-keys { "ie":"10" }
+  es6.reflect.prevent-extensions { "ie":"10" }
+  es6.reflect.set { "ie":"10" }
+  es6.reflect.set-prototype-of { "ie":"10" }
+  es6.regexp.constructor { "ie":"10" }
+  es6.regexp.flags { "ie":"10" }
+  es6.regexp.match { "ie":"10" }
+  es6.regexp.replace { "ie":"10" }
+  es6.regexp.split { "ie":"10" }
+  es6.regexp.search { "ie":"10" }
+  es6.regexp.to-string { "ie":"10" }
+  es6.set { "ie":"10", "node":"6" }
+  es6.symbol { "ie":"10", "node":"6" }
+  es7.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6" }
+  es6.string.anchor { "ie":"10" }
+  es6.string.big { "ie":"10" }
+  es6.string.blink { "ie":"10" }
+  es6.string.bold { "ie":"10" }
+  es6.string.code-point-at { "ie":"10" }
+  es6.string.ends-with { "ie":"10" }
+  es6.string.fixed { "ie":"10" }
+  es6.string.fontcolor { "ie":"10" }
+  es6.string.fontsize { "ie":"10" }
+  es6.string.from-code-point { "ie":"10" }
+  es6.string.includes { "ie":"10" }
+  es6.string.italics { "ie":"10" }
+  es6.string.iterator { "ie":"10" }
+  es6.string.link { "ie":"10" }
+  es7.string.pad-start { "chrome":"54", "ie":"10", "node":"6" }
+  es7.string.pad-end { "chrome":"54", "ie":"10", "node":"6" }
+  es6.string.raw { "ie":"10" }
+  es6.string.repeat { "ie":"10" }
+  es6.string.small { "ie":"10" }
+  es6.string.starts-with { "ie":"10" }
+  es6.string.strike { "ie":"10" }
+  es6.string.sub { "ie":"10" }
+  es6.string.sup { "ie":"10" }
+  es7.string.trim-left { "chrome":"54", "ie":"10", "node":"6" }
+  es7.string.trim-right { "chrome":"54", "ie":"10", "node":"6" }
+  es6.typed.array-buffer { "ie":"10", "node":"6" }
+  es6.typed.int8-array { "ie":"10", "node":"6" }
+  es6.typed.uint8-array { "ie":"10", "node":"6" }
+  es6.typed.uint8-clamped-array { "ie":"10", "node":"6" }
+  es6.typed.int16-array { "ie":"10", "node":"6" }
+  es6.typed.uint16-array { "ie":"10", "node":"6" }
+  es6.typed.int32-array { "ie":"10", "node":"6" }
+  es6.typed.uint32-array { "ie":"10", "node":"6" }
+  es6.typed.float32-array { "ie":"10", "node":"6" }
+  es6.typed.float64-array { "ie":"10", "node":"6" }
+  es6.weak-map { "ie":"10", "node":"6" }
+  es6.weak-set { "ie":"10", "node":"6" }
+  web.timers { "chrome":"54", "ie":"10", "node":"6" }
+  web.immediate { "chrome":"54", "ie":"10", "node":"6" }
+  web.dom.iterable { "chrome":"54", "ie":"10", "node":"6" }
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/force-all-transforms/options.json b/packages/babel-preset-env/test/debug-fixtures/force-all-transforms/options.json
deleted file mode 100644
index f598e9a28689..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/force-all-transforms/options.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "debug": true,
-      "modules": false,
-      "targets": {
-        "chrome": 55
-      },
-      "useBuiltIns": "entry",
-      "forceAllTransforms": true
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt
deleted file mode 100644
index ed62042f16cc..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/force-all-transforms/stdout.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "55"
-}
-
-Using modules transform: false
-
-Using plugins:
-  transform-template-literals {}
-  transform-literals {}
-  transform-function-name {}
-  transform-arrow-functions {}
-  transform-block-scoped-functions {}
-  transform-classes {}
-  transform-object-super {}
-  transform-shorthand-properties {}
-  transform-duplicate-keys {}
-  transform-computed-properties {}
-  transform-for-of {}
-  transform-sticky-regex {}
-  transform-dotall-regex { "chrome":"55" }
-  transform-unicode-regex {}
-  transform-spread {}
-  transform-parameters {}
-  transform-destructuring {}
-  transform-block-scoping {}
-  transform-typeof-symbol {}
-  transform-new-target {}
-  transform-regenerator {}
-  transform-exponentiation-operator {}
-  transform-async-to-generator {}
-  proposal-async-generator-functions { "chrome":"55" }
-  proposal-object-rest-spread { "chrome":"55" }
-  proposal-unicode-property-regex { "chrome":"55" }
-  proposal-json-strings { "chrome":"55" }
-  proposal-optional-catch-binding { "chrome":"55" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.sort { "chrome":"55" }
-  es7.object.define-getter { "chrome":"55" }
-  es7.object.define-setter { "chrome":"55" }
-  es7.object.lookup-getter { "chrome":"55" }
-  es7.object.lookup-setter { "chrome":"55" }
-  es7.promise.finally { "chrome":"55" }
-  es7.symbol.async-iterator { "chrome":"55" }
-  es7.string.pad-start { "chrome":"55" }
-  es7.string.pad-end { "chrome":"55" }
-  web.timers { "chrome":"55" }
-  web.immediate { "chrome":"55" }
-  web.dom.iterable { "chrome":"55" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/plugins-only/in/in.js b/packages/babel-preset-env/test/debug-fixtures/plugins-only/in/in.js
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/plugins-only/in/in.js
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt
index 460d1d4440e3..b9408aae4462 100644
--- a/packages/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt
+++ b/packages/babel-preset-env/test/debug-fixtures/plugins-only/stdout.txt
@@ -26,6 +26,7 @@ Using plugins:
   proposal-unicode-property-regex { "firefox":"52", "node":"7.4" }
   proposal-json-strings { "firefox":"52", "node":"7.4" }
   proposal-optional-catch-binding { "firefox":"52", "node":"7.4" }
+  transform-named-capturing-groups-regex { "firefox":"52", "node":"7.4" }
 
 Using polyfills: No polyfills were added, since the `useBuiltIns` option was not set.
-Successfully compiled 1 file with Babel.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/options.json b/packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/options.json
deleted file mode 100644
index a7fc993ff334..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/options.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "debug": true,
-      "targets": {
-        "browsers": "chrome 60"
-      },
-      "shippedProposals": true,
-      "useBuiltIns": "entry"
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/stdout.txt
deleted file mode 100644
index 951d93305d40..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/shippedProposals-chrome60/stdout.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "60"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-dotall-regex { "chrome":"60" }
-  proposal-async-generator-functions { "chrome":"60" }
-  syntax-object-rest-spread { "chrome":"60" }
-  proposal-unicode-property-regex { "chrome":"60" }
-  proposal-json-strings { "chrome":"60" }
-  proposal-optional-catch-binding { "chrome":"60" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.sort { "chrome":"60" }
-  es7.object.define-getter { "chrome":"60" }
-  es7.object.define-setter { "chrome":"60" }
-  es7.object.lookup-getter { "chrome":"60" }
-  es7.object.lookup-setter { "chrome":"60" }
-  es7.promise.finally { "chrome":"60" }
-  es7.symbol.async-iterator { "chrome":"60" }
-  es7.array.flat-map { "chrome":"60" }
-  web.timers { "chrome":"60" }
-  web.immediate { "chrome":"60" }
-  web.dom.iterable { "chrome":"60" }
-Successfully compiled 1 file with Babel.
diff --git a/packages/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt
deleted file mode 100644
index 7afc25b3b6cb..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/shippedProposals/stdout.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals {}
-  transform-literals {}
-  transform-function-name {}
-  transform-arrow-functions {}
-  transform-block-scoped-functions {}
-  transform-classes {}
-  transform-object-super {}
-  transform-shorthand-properties {}
-  transform-duplicate-keys {}
-  transform-computed-properties {}
-  transform-for-of {}
-  transform-sticky-regex {}
-  transform-dotall-regex {}
-  transform-unicode-regex {}
-  transform-spread {}
-  transform-parameters {}
-  transform-destructuring {}
-  transform-block-scoping {}
-  transform-typeof-symbol {}
-  transform-new-target {}
-  transform-regenerator {}
-  transform-exponentiation-operator {}
-  transform-async-to-generator {}
-  proposal-async-generator-functions {}
-  proposal-object-rest-spread {}
-  proposal-unicode-property-regex {}
-  proposal-json-strings {}
-  proposal-optional-catch-binding {}
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.copy-within {}
-  es6.array.every {}
-  es6.array.fill {}
-  es6.array.filter {}
-  es6.array.find {}
-  es6.array.find-index {}
-  es6.array.for-each {}
-  es6.array.from {}
-  es7.array.includes {}
-  es6.array.index-of {}
-  es6.array.is-array {}
-  es6.array.iterator {}
-  es6.array.last-index-of {}
-  es6.array.map {}
-  es6.array.of {}
-  es6.array.reduce {}
-  es6.array.reduce-right {}
-  es6.array.some {}
-  es6.array.sort {}
-  es6.array.species {}
-  es6.date.now {}
-  es6.date.to-iso-string {}
-  es6.date.to-json {}
-  es6.date.to-primitive {}
-  es6.date.to-string {}
-  es6.function.bind {}
-  es6.function.has-instance {}
-  es6.function.name {}
-  es6.map {}
-  es6.math.acosh {}
-  es6.math.asinh {}
-  es6.math.atanh {}
-  es6.math.cbrt {}
-  es6.math.clz32 {}
-  es6.math.cosh {}
-  es6.math.expm1 {}
-  es6.math.fround {}
-  es6.math.hypot {}
-  es6.math.imul {}
-  es6.math.log1p {}
-  es6.math.log10 {}
-  es6.math.log2 {}
-  es6.math.sign {}
-  es6.math.sinh {}
-  es6.math.tanh {}
-  es6.math.trunc {}
-  es6.number.constructor {}
-  es6.number.epsilon {}
-  es6.number.is-finite {}
-  es6.number.is-integer {}
-  es6.number.is-nan {}
-  es6.number.is-safe-integer {}
-  es6.number.max-safe-integer {}
-  es6.number.min-safe-integer {}
-  es6.number.parse-float {}
-  es6.number.parse-int {}
-  es6.object.assign {}
-  es6.object.create {}
-  es7.object.define-getter {}
-  es7.object.define-setter {}
-  es6.object.define-property {}
-  es6.object.define-properties {}
-  es7.object.entries {}
-  es6.object.freeze {}
-  es6.object.get-own-property-descriptor {}
-  es7.object.get-own-property-descriptors {}
-  es6.object.get-own-property-names {}
-  es6.object.get-prototype-of {}
-  es7.object.lookup-getter {}
-  es7.object.lookup-setter {}
-  es6.object.prevent-extensions {}
-  es6.object.is {}
-  es6.object.is-frozen {}
-  es6.object.is-sealed {}
-  es6.object.is-extensible {}
-  es6.object.keys {}
-  es6.object.seal {}
-  es6.object.set-prototype-of {}
-  es7.object.values {}
-  es6.promise {}
-  es7.promise.finally {}
-  es6.reflect.apply {}
-  es6.reflect.construct {}
-  es6.reflect.define-property {}
-  es6.reflect.delete-property {}
-  es6.reflect.get {}
-  es6.reflect.get-own-property-descriptor {}
-  es6.reflect.get-prototype-of {}
-  es6.reflect.has {}
-  es6.reflect.is-extensible {}
-  es6.reflect.own-keys {}
-  es6.reflect.prevent-extensions {}
-  es6.reflect.set {}
-  es6.reflect.set-prototype-of {}
-  es6.regexp.constructor {}
-  es6.regexp.flags {}
-  es6.regexp.match {}
-  es6.regexp.replace {}
-  es6.regexp.split {}
-  es6.regexp.search {}
-  es6.regexp.to-string {}
-  es6.set {}
-  es6.symbol {}
-  es7.symbol.async-iterator {}
-  es6.string.anchor {}
-  es6.string.big {}
-  es6.string.blink {}
-  es6.string.bold {}
-  es6.string.code-point-at {}
-  es6.string.ends-with {}
-  es6.string.fixed {}
-  es6.string.fontcolor {}
-  es6.string.fontsize {}
-  es6.string.from-code-point {}
-  es6.string.includes {}
-  es6.string.italics {}
-  es6.string.iterator {}
-  es6.string.link {}
-  es7.string.pad-start {}
-  es7.string.pad-end {}
-  es6.string.raw {}
-  es6.string.repeat {}
-  es6.string.small {}
-  es6.string.starts-with {}
-  es6.string.strike {}
-  es6.string.sub {}
-  es6.string.sup {}
-  es6.string.trim {}
-  es6.typed.array-buffer {}
-  es6.typed.data-view {}
-  es6.typed.int8-array {}
-  es6.typed.uint8-array {}
-  es6.typed.uint8-clamped-array {}
-  es6.typed.int16-array {}
-  es6.typed.uint16-array {}
-  es6.typed.int32-array {}
-  es6.typed.uint32-array {}
-  es6.typed.float32-array {}
-  es6.typed.float64-array {}
-  es6.weak-map {}
-  es6.weak-set {}
-  es7.array.flat-map {}
-  web.timers {}
-  web.immediate {}
-  web.dom.iterable {}
-Successfully compiled 1 file with Babel.
diff --git a/packages/babel-preset-env/test/debug-fixtures/specific-targets/options.json b/packages/babel-preset-env/test/debug-fixtures/specific-targets/options.json
deleted file mode 100644
index ae57604c0a77..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/specific-targets/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "debug": true,
-      "targets": {
-        "browsers": "ie 10, ios 9, safari 7, edge 13, chrome 54, firefox 49"
-      },
-      "useBuiltIns": "entry"
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt
deleted file mode 100644
index 8733b4c2341a..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/specific-targets/stdout.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "54",
-  "edge": "13",
-  "firefox": "49",
-  "ie": "10",
-  "ios": "9",
-  "safari": "7"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals { "ie":"10", "safari":"7" }
-  transform-literals { "firefox":"49", "ie":"10", "safari":"7" }
-  transform-function-name { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-arrow-functions { "ie":"10", "ios":"9", "safari":"7" }
-  transform-block-scoped-functions { "ie":"10", "ios":"9", "safari":"7" }
-  transform-classes { "ie":"10", "ios":"9", "safari":"7" }
-  transform-object-super { "ie":"10", "ios":"9", "safari":"7" }
-  transform-shorthand-properties { "ie":"10", "safari":"7" }
-  transform-duplicate-keys { "ie":"10", "safari":"7" }
-  transform-computed-properties { "ie":"10", "safari":"7" }
-  transform-for-of { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-sticky-regex { "ie":"10", "ios":"9", "safari":"7" }
-  transform-dotall-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-unicode-regex { "ie":"10", "ios":"9", "safari":"7" }
-  transform-spread { "ie":"10", "ios":"9", "safari":"7" }
-  transform-parameters { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-destructuring { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-block-scoping { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-typeof-symbol { "ie":"10", "safari":"7" }
-  transform-new-target { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  transform-regenerator { "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-exponentiation-operator { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  transform-async-to-generator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  proposal-async-generator-functions { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  proposal-object-rest-spread { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  proposal-unicode-property-regex { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  proposal-json-strings { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  proposal-optional-catch-binding { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.copy-within { "ie":"10", "safari":"7" }
-  es6.array.fill { "ie":"10", "safari":"7" }
-  es6.array.find { "ie":"10", "safari":"7" }
-  es6.array.find-index { "ie":"10", "safari":"7" }
-  es6.array.from { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es7.array.includes { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.array.iterator { "ie":"10", "safari":"7" }
-  es6.array.of { "ie":"10", "safari":"7" }
-  es6.array.sort { "chrome":"54", "ios":"9", "safari":"7" }
-  es6.array.species { "ie":"10", "ios":"9", "safari":"7" }
-  es6.date.to-json { "ios":"9", "safari":"7" }
-  es6.date.to-primitive { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.function.has-instance { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  es6.function.name { "ie":"10" }
-  es6.map { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  es6.math.acosh { "ie":"10", "safari":"7" }
-  es6.math.asinh { "ie":"10", "safari":"7" }
-  es6.math.atanh { "ie":"10", "safari":"7" }
-  es6.math.cbrt { "ie":"10", "safari":"7" }
-  es6.math.clz32 { "ie":"10", "safari":"7" }
-  es6.math.cosh { "ie":"10", "safari":"7" }
-  es6.math.expm1 { "ie":"10", "safari":"7" }
-  es6.math.fround { "ie":"10", "safari":"7" }
-  es6.math.hypot { "ie":"10", "safari":"7" }
-  es6.math.imul { "ie":"10" }
-  es6.math.log1p { "ie":"10", "safari":"7" }
-  es6.math.log10 { "ie":"10", "safari":"7" }
-  es6.math.log2 { "ie":"10", "safari":"7" }
-  es6.math.sign { "ie":"10", "safari":"7" }
-  es6.math.sinh { "ie":"10", "safari":"7" }
-  es6.math.tanh { "ie":"10", "safari":"7" }
-  es6.math.trunc { "ie":"10", "safari":"7" }
-  es6.number.constructor { "ie":"10", "safari":"7" }
-  es6.number.epsilon { "ie":"10", "safari":"7" }
-  es6.number.is-finite { "ie":"10", "safari":"7" }
-  es6.number.is-integer { "ie":"10", "safari":"7" }
-  es6.number.is-nan { "ie":"10", "safari":"7" }
-  es6.number.is-safe-integer { "ie":"10", "safari":"7" }
-  es6.number.max-safe-integer { "ie":"10", "safari":"7" }
-  es6.number.min-safe-integer { "ie":"10", "safari":"7" }
-  es6.number.parse-float { "ie":"10", "safari":"7" }
-  es6.number.parse-int { "ie":"10", "safari":"7" }
-  es6.object.assign { "ie":"10", "ios":"9", "safari":"7" }
-  es7.object.define-getter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
-  es7.object.define-setter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
-  es7.object.entries { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.object.freeze { "ie":"10", "safari":"7" }
-  es6.object.get-own-property-descriptor { "ie":"10", "safari":"7" }
-  es7.object.get-own-property-descriptors { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  es6.object.get-own-property-names { "ie":"10", "safari":"7" }
-  es6.object.get-prototype-of { "ie":"10", "safari":"7" }
-  es7.object.lookup-getter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
-  es7.object.lookup-setter { "chrome":"54", "edge":"13", "ie":"10", "safari":"7" }
-  es6.object.prevent-extensions { "ie":"10", "safari":"7" }
-  es6.object.is { "ie":"10", "safari":"7" }
-  es6.object.is-frozen { "ie":"10", "safari":"7" }
-  es6.object.is-sealed { "ie":"10", "safari":"7" }
-  es6.object.is-extensible { "ie":"10", "safari":"7" }
-  es6.object.keys { "ie":"10", "safari":"7" }
-  es6.object.seal { "ie":"10", "safari":"7" }
-  es6.object.set-prototype-of { "ie":"10", "safari":"7" }
-  es7.object.values { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.promise { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es7.promise.finally { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.apply { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.construct { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.define-property { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.delete-property { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.get { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.get-own-property-descriptor { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.get-prototype-of { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.has { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.is-extensible { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.own-keys { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.prevent-extensions { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.set { "ie":"10", "ios":"9", "safari":"7" }
-  es6.reflect.set-prototype-of { "ie":"10", "ios":"9", "safari":"7" }
-  es6.regexp.constructor { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.regexp.flags { "edge":"13", "ie":"10", "safari":"7" }
-  es6.regexp.match { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.regexp.replace { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.regexp.split { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.regexp.search { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.regexp.to-string { "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.set { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  es6.symbol { "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  es7.symbol.async-iterator { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  es6.string.anchor { "ie":"10" }
-  es6.string.big { "ie":"10" }
-  es6.string.blink { "ie":"10" }
-  es6.string.bold { "ie":"10" }
-  es6.string.code-point-at { "ie":"10", "safari":"7" }
-  es6.string.ends-with { "ie":"10", "safari":"7" }
-  es6.string.fixed { "ie":"10" }
-  es6.string.fontcolor { "ie":"10" }
-  es6.string.fontsize { "ie":"10" }
-  es6.string.from-code-point { "ie":"10", "safari":"7" }
-  es6.string.includes { "ie":"10", "safari":"7" }
-  es6.string.italics { "ie":"10" }
-  es6.string.iterator { "ie":"10", "safari":"7" }
-  es6.string.link { "ie":"10" }
-  es7.string.pad-start { "chrome":"54", "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es7.string.pad-end { "chrome":"54", "edge":"13", "ie":"10", "ios":"9", "safari":"7" }
-  es6.string.raw { "ie":"10", "safari":"7" }
-  es6.string.repeat { "ie":"10", "safari":"7" }
-  es6.string.small { "ie":"10" }
-  es6.string.starts-with { "ie":"10", "safari":"7" }
-  es6.string.strike { "ie":"10" }
-  es6.string.sub { "ie":"10" }
-  es6.string.sup { "ie":"10" }
-  es6.typed.array-buffer { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.int8-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.uint8-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.uint8-clamped-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.int16-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.uint16-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.int32-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.uint32-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.float32-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.typed.float64-array { "ie":"10", "ios":"9", "safari":"7" }
-  es6.weak-map { "edge":"13", "firefox":"49", "ie":"10", "safari":"7" }
-  es6.weak-set { "edge":"13", "firefox":"49", "ie":"10", "safari":"7" }
-  web.timers { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  web.immediate { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-  web.dom.iterable { "chrome":"54", "edge":"13", "firefox":"49", "ie":"10", "ios":"9", "safari":"7" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/in/in2.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/usage/in/in2.js
rename to packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/in/in2.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/options.json
new file mode 100644
index 000000000000..b2ed793a3530
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 71
+      },
+      "useBuiltIns": "usage",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/stdout.txt
new file mode 100644
index 000000000000..b3df5f0872ba
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-chrome-71/stdout.txt
@@ -0,0 +1,23 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"71" }
+
+[<CWD>/src/in2.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"71" }
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-none/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/in/in.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/usage-none/in/in.js
rename to packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/in/in.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-none/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/in/in2.js
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/usage-none/in/in2.js
rename to packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/in/in2.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/options.json
new file mode 100644
index 000000000000..087a0efc9f65
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/stdout.txt
new file mode 100644
index 000000000000..fafdcfca187c
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-none/stdout.txt
@@ -0,0 +1,47 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Based on your code and targets, core-js polyfills were not added.
+
+[<CWD>/src/in2.js] Based on your code and targets, core-js polyfills were not added.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-star/input.mjs b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/in/in2.js
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/yield-star/input.mjs
rename to packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/in/in2.js
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/options.json
new file mode 100644
index 000000000000..b2110d7ec87a
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 71
+      },
+      "useBuiltIns": "usage",
+      "corejs": { "version": 2, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/stdout.txt
new file mode 100644
index 000000000000..b3df5f0872ba
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals-chrome-71/stdout.txt
@@ -0,0 +1,23 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"71" }
+
+[<CWD>/src/in2.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"71" }
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/options.json
new file mode 100644
index 000000000000..04beb327c6ab
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": { "version": 2, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/stdout.txt
new file mode 100644
index 000000000000..8d1136d823bd
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-proposals/stdout.txt
@@ -0,0 +1,56 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es6.object.to-string { "chrome":"52", "firefox":"50", "ie":"11" }
+  es6.promise { "ie":"11" }
+  es6.map { "firefox":"50", "ie":"11" }
+  es6.string.iterator { "ie":"11" }
+  es6.array.iterator { "ie":"11" }
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/options.json
new file mode 100644
index 000000000000..448b3d6f1e8e
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "usage",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/stdout.txt
new file mode 100644
index 000000000000..8d1136d823bd
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-shippedProposals/stdout.txt
@@ -0,0 +1,56 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es6.object.to-string { "chrome":"52", "firefox":"50", "ie":"11" }
+  es6.promise { "ie":"11" }
+  es6.map { "firefox":"50", "ie":"11" }
+  es6.string.iterator { "ie":"11" }
+  es6.array.iterator { "ie":"11" }
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/in/in.js
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/in/in.js
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/options.json
new file mode 100644
index 000000000000..ab34fa8b5159
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 55
+      },
+      "useBuiltIns": "usage",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-with-import/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/stderr.txt
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/usage-with-import/stderr.txt
rename to packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/stderr.txt
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/stdout.txt
new file mode 100644
index 000000000000..e976e00c5f93
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2-with-import/stdout.txt
@@ -0,0 +1,22 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "55"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-dotall-regex { "chrome":"55" }
+  proposal-async-generator-functions { "chrome":"55" }
+  proposal-object-rest-spread { "chrome":"55" }
+  proposal-unicode-property-regex { "chrome":"55" }
+  proposal-json-strings { "chrome":"55" }
+  proposal-optional-catch-binding { "chrome":"55" }
+  transform-named-capturing-groups-regex { "chrome":"55" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Based on your code and targets, core-js polyfills were not added.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/options.json
new file mode 100644
index 000000000000..087a0efc9f65
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": 2
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/stdout.txt
new file mode 100644
index 000000000000..8d1136d823bd
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs2/stdout.txt
@@ -0,0 +1,56 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es6.object.to-string { "chrome":"52", "firefox":"50", "ie":"11" }
+  es6.promise { "ie":"11" }
+  es6.map { "firefox":"50", "ie":"11" }
+  es6.string.iterator { "ie":"11" }
+  es6.array.iterator { "ie":"11" }
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/options.json
new file mode 100644
index 000000000000..31c2a9c77a6f
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 71
+      },
+      "useBuiltIns": "usage",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/stdout.txt
new file mode 100644
index 000000000000..3b0d7b91373c
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-chrome-71/stdout.txt
@@ -0,0 +1,21 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Based on your code and targets, core-js polyfills were not added.
+
+[<CWD>/src/in2.js] Based on your code and targets, core-js polyfills were not added.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/in/in.js
new file mode 100644
index 000000000000..4ec1fa479e22
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/in/in.js
@@ -0,0 +1 @@
+var foo = "bar";
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/in/in2.js
new file mode 100644
index 000000000000..3fbea9d21153
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/in/in2.js
@@ -0,0 +1,5 @@
+var x = 0;
+
+for (var i = 0; i < 5; i++) {
+  x += i;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/options.json
new file mode 100644
index 000000000000..6c2922e8970d
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/stdout.txt
new file mode 100644
index 000000000000..fafdcfca187c
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-none/stdout.txt
@@ -0,0 +1,47 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Based on your code and targets, core-js polyfills were not added.
+
+[<CWD>/src/in2.js] Based on your code and targets, core-js polyfills were not added.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/options.json
new file mode 100644
index 000000000000..24bc77a0d5e0
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 71
+      },
+      "useBuiltIns": "usage",
+      "corejs": { "version": 3, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/stdout.txt
new file mode 100644
index 000000000000..e3546e022a16
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals-chrome-71/stdout.txt
@@ -0,0 +1,36 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "71"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  syntax-async-generators { "chrome":"71" }
+  syntax-object-rest-spread { "chrome":"71" }
+  syntax-json-strings { "chrome":"71" }
+  syntax-optional-catch-binding { "chrome":"71" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  esnext.map.delete-all { "chrome":"71" }
+  esnext.map.every { "chrome":"71" }
+  esnext.map.filter { "chrome":"71" }
+  esnext.map.find { "chrome":"71" }
+  esnext.map.find-key { "chrome":"71" }
+  esnext.map.includes { "chrome":"71" }
+  esnext.map.key-of { "chrome":"71" }
+  esnext.map.map-keys { "chrome":"71" }
+  esnext.map.map-values { "chrome":"71" }
+  esnext.map.merge { "chrome":"71" }
+  esnext.map.reduce { "chrome":"71" }
+  esnext.map.some { "chrome":"71" }
+  esnext.map.update { "chrome":"71" }
+  esnext.observable { "chrome":"71" }
+  esnext.symbol.observable { "chrome":"71" }
+
+[<CWD>/src/in2.js] Based on your code and targets, core-js polyfills were not added.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/options.json
new file mode 100644
index 000000000000..437b707652d3
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": { "version": 3, "proposals": true }
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/stdout.txt
new file mode 100644
index 000000000000..cec7b6803911
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-proposals/stdout.txt
@@ -0,0 +1,75 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.map { "firefox":"50", "ie":"11" }
+  es.object.to-string { "firefox":"50", "ie":"11" }
+  es.promise { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  esnext.global-this { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.delete-all { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.every { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.filter { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.find { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.find-key { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.includes { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.key-of { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.map-keys { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.map-values { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.merge { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.reduce { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.some { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.map.update { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.observable { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.symbol.observable { "chrome":"52", "firefox":"50", "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  web.queue-microtask { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/options.json
new file mode 100644
index 000000000000..0c80d936a7fb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "shippedProposals": true,
+      "useBuiltIns": "usage",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/stdout.txt
new file mode 100644
index 000000000000..c9d333c5820b
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-shippedProposals/stdout.txt
@@ -0,0 +1,60 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.map { "firefox":"50", "ie":"11" }
+  es.object.to-string { "firefox":"50", "ie":"11" }
+  es.promise { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  web.queue-microtask { "chrome":"52", "firefox":"50", "ie":"11" }
+  esnext.global-this { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/options.json
new file mode 100644
index 000000000000..b0adb5c0910f
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": "3.0"
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/stdout.txt
new file mode 100644
index 000000000000..5c7a63345026
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.0/stdout.txt
@@ -0,0 +1,59 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.map { "firefox":"50", "ie":"11" }
+  es.object.to-string { "firefox":"50", "ie":"11" }
+  es.promise { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  web.queue-microtask { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/options.json
new file mode 100644
index 000000000000..c2e64be32390
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": "3.1"
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/stdout.txt
new file mode 100644
index 000000000000..5c7a63345026
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-versions-strings-minor-3.1/stdout.txt
@@ -0,0 +1,59 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.map { "firefox":"50", "ie":"11" }
+  es.object.to-string { "firefox":"50", "ie":"11" }
+  es.promise { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  web.queue-microtask { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/in/in.js
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/in/in.js
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/options.json
new file mode 100644
index 000000000000..66118c78ad68
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 55
+      },
+      "useBuiltIns": "usage",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/stderr.txt
new file mode 100644
index 000000000000..e2d9ca85e887
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/stderr.txt
@@ -0,0 +1,2 @@
+When setting `useBuiltIns: 'usage'`, polyfills are automatically imported when needed.
+  Please remove the direct import of `core-js` or use `useBuiltIns: 'entry'` instead.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/stdout.txt
new file mode 100644
index 000000000000..e976e00c5f93
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3-with-import/stdout.txt
@@ -0,0 +1,22 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "55"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-dotall-regex { "chrome":"55" }
+  proposal-async-generator-functions { "chrome":"55" }
+  proposal-object-rest-spread { "chrome":"55" }
+  proposal-unicode-property-regex { "chrome":"55" }
+  proposal-json-strings { "chrome":"55" }
+  proposal-optional-catch-binding { "chrome":"55" }
+  transform-named-capturing-groups-regex { "chrome":"55" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Based on your code and targets, core-js polyfills were not added.
+Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/options.json
new file mode 100644
index 000000000000..6c2922e8970d
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    ["../../lib", {
+      "debug": true,
+      "targets": {
+        "chrome": 52,
+        "firefox": 50,
+        "ie": 11
+      },
+      "useBuiltIns": "usage",
+      "corejs": 3
+    }]
+  ]
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/stdout.txt
new file mode 100644
index 000000000000..5c7a63345026
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-corejs3/stdout.txt
@@ -0,0 +1,59 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.map { "firefox":"50", "ie":"11" }
+  es.object.to-string { "firefox":"50", "ie":"11" }
+  es.promise { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  web.queue-microtask { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfills:
+  es.array.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+  es.string.iterator { "ie":"11" }
+  web.dom-collections.iterator { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/in/in.js
new file mode 100644
index 000000000000..4ec1fa479e22
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/in/in.js
@@ -0,0 +1 @@
+var foo = "bar";
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/in/in2.js
new file mode 100644
index 000000000000..3fbea9d21153
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/in/in2.js
@@ -0,0 +1,5 @@
+var x = 0;
+
+for (var i = 0; i < 5; i++) {
+  x += i;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-none/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/options.json
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/usage-none/options.json
rename to packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/options.json
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/stderr.txt
new file mode 100644
index 000000000000..dbee5e8f3eb3
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/stderr.txt
@@ -0,0 +1,6 @@
+WARNING: We noticed you're using the `useBuiltIns` option without declaring a core-js version. Currently, we assume version 2.x when no version is passed. Since this default version will likely change in future versions of Babel, we recommend explicitly setting the core-js version you are using via the `corejs` option.
+
+You should also be sure that the version you pass to the `corejs` option matches the version specified in your `package.json`'s `dependencies` section. If it doesn't, you need to run one of the following commands:
+
+  npm install --save core-js@2    npm install --save core-js@3
+  yarn add core-js@2              yarn add core-js@3
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/stdout.txt
new file mode 100644
index 000000000000..fafdcfca187c
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs-none/stdout.txt
@@ -0,0 +1,47 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Based on your code and targets, core-js polyfills were not added.
+
+[<CWD>/src/in2.js] Based on your code and targets, core-js polyfills were not added.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/in/in.js
new file mode 100644
index 000000000000..6113c3b69b28
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/in/in.js
@@ -0,0 +1,7 @@
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/in/in2.js b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/in/in2.js
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/in/in2.js
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/options.json
similarity index 100%
rename from packages/babel-preset-env/test/debug-fixtures/usage/options.json
rename to packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/options.json
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/stderr.txt b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/stderr.txt
new file mode 100644
index 000000000000..dbee5e8f3eb3
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/stderr.txt
@@ -0,0 +1,6 @@
+WARNING: We noticed you're using the `useBuiltIns` option without declaring a core-js version. Currently, we assume version 2.x when no version is passed. Since this default version will likely change in future versions of Babel, we recommend explicitly setting the core-js version you are using via the `corejs` option.
+
+You should also be sure that the version you pass to the `corejs` option matches the version specified in your `package.json`'s `dependencies` section. If it doesn't, you need to run one of the following commands:
+
+  npm install --save core-js@2    npm install --save core-js@3
+  yarn add core-js@2              yarn add core-js@3
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/stdout.txt
new file mode 100644
index 000000000000..8d1136d823bd
--- /dev/null
+++ b/packages/babel-preset-env/test/debug-fixtures/usage-no-corejs/stdout.txt
@@ -0,0 +1,56 @@
+@babel/preset-env: `DEBUG` option
+
+Using targets:
+{
+  "chrome": "52",
+  "firefox": "50",
+  "ie": "11"
+}
+
+Using modules transform: auto
+
+Using plugins:
+  transform-template-literals { "ie":"11" }
+  transform-literals { "firefox":"50", "ie":"11" }
+  transform-function-name { "firefox":"50", "ie":"11" }
+  transform-arrow-functions { "ie":"11" }
+  transform-classes { "ie":"11" }
+  transform-object-super { "ie":"11" }
+  transform-shorthand-properties { "ie":"11" }
+  transform-duplicate-keys { "ie":"11" }
+  transform-computed-properties { "ie":"11" }
+  transform-for-of { "firefox":"50", "ie":"11" }
+  transform-sticky-regex { "ie":"11" }
+  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-unicode-regex { "ie":"11" }
+  transform-spread { "ie":"11" }
+  transform-parameters { "firefox":"50", "ie":"11" }
+  transform-destructuring { "firefox":"50", "ie":"11" }
+  transform-block-scoping { "firefox":"50", "ie":"11" }
+  transform-typeof-symbol { "ie":"11" }
+  transform-new-target { "ie":"11" }
+  transform-regenerator { "firefox":"50", "ie":"11" }
+  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
+  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
+  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
+  transform-named-capturing-groups-regex { "chrome":"52", "firefox":"50", "ie":"11" }
+
+Using polyfills with `usage` option:
+
+[<CWD>/src/in.js] Added following core-js polyfills:
+  es6.object.to-string { "chrome":"52", "firefox":"50", "ie":"11" }
+  es6.promise { "ie":"11" }
+  es6.map { "firefox":"50", "ie":"11" }
+  es6.string.iterator { "ie":"11" }
+  es6.array.iterator { "ie":"11" }
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Added following core-js polyfill:
+  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
+
+[<CWD>/src/in2.js] Based on your code and targets, added regenerator-runtime.
+Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt
deleted file mode 100644
index b53b349d9cac..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/usage-none/stdout.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "52",
-  "firefox": "50",
-  "ie": "11"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals { "ie":"11" }
-  transform-literals { "firefox":"50", "ie":"11" }
-  transform-function-name { "firefox":"50", "ie":"11" }
-  transform-arrow-functions { "ie":"11" }
-  transform-classes { "ie":"11" }
-  transform-object-super { "ie":"11" }
-  transform-shorthand-properties { "ie":"11" }
-  transform-duplicate-keys { "ie":"11" }
-  transform-computed-properties { "ie":"11" }
-  transform-for-of { "firefox":"50", "ie":"11" }
-  transform-sticky-regex { "ie":"11" }
-  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
-  transform-unicode-regex { "ie":"11" }
-  transform-spread { "ie":"11" }
-  transform-parameters { "firefox":"50", "ie":"11" }
-  transform-destructuring { "firefox":"50", "ie":"11" }
-  transform-block-scoping { "firefox":"50", "ie":"11" }
-  transform-typeof-symbol { "ie":"11" }
-  transform-new-target { "ie":"11" }
-  transform-regenerator { "firefox":"50", "ie":"11" }
-  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
-  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
-
-Using polyfills with `usage` option:
-
-[<CWD>/src/in.js] Based on your code and targets, none were added.
-
-[<CWD>/src/in2.js] Based on your code and targets, none were added.
-Successfully compiled 2 files with Babel.
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-with-import/options.json b/packages/babel-preset-env/test/debug-fixtures/usage-with-import/options.json
deleted file mode 100644
index bd129237f80e..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/usage-with-import/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "debug": true,
-      "targets": {
-        "chrome": 55
-      },
-      "useBuiltIns": "usage"
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt
deleted file mode 100644
index c898cba7907e..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/usage-with-import/stdout.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "55"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-dotall-regex { "chrome":"55" }
-  proposal-async-generator-functions { "chrome":"55" }
-  proposal-object-rest-spread { "chrome":"55" }
-  proposal-unicode-property-regex { "chrome":"55" }
-  proposal-json-strings { "chrome":"55" }
-  proposal-optional-catch-binding { "chrome":"55" }
-
-Using polyfills with `usage` option:
-
-[<CWD>/src/in.js] Based on your code and targets, none were added.
-Successfully compiled 1 file with Babel.
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage/in/in.js b/packages/babel-preset-env/test/debug-fixtures/usage/in/in.js
deleted file mode 100644
index b464d7f172af..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/usage/in/in.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const foo = new Promise((resolve) => {
-  resolve(new Map());
-});
diff --git a/packages/babel-preset-env/test/debug-fixtures/usage/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/usage/stdout.txt
deleted file mode 100644
index b3ecb28095c6..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/usage/stdout.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "52",
-  "firefox": "50",
-  "ie": "11"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals { "ie":"11" }
-  transform-literals { "firefox":"50", "ie":"11" }
-  transform-function-name { "firefox":"50", "ie":"11" }
-  transform-arrow-functions { "ie":"11" }
-  transform-classes { "ie":"11" }
-  transform-object-super { "ie":"11" }
-  transform-shorthand-properties { "ie":"11" }
-  transform-duplicate-keys { "ie":"11" }
-  transform-computed-properties { "ie":"11" }
-  transform-for-of { "firefox":"50", "ie":"11" }
-  transform-sticky-regex { "ie":"11" }
-  transform-dotall-regex { "chrome":"52", "firefox":"50", "ie":"11" }
-  transform-unicode-regex { "ie":"11" }
-  transform-spread { "ie":"11" }
-  transform-parameters { "firefox":"50", "ie":"11" }
-  transform-destructuring { "firefox":"50", "ie":"11" }
-  transform-block-scoping { "firefox":"50", "ie":"11" }
-  transform-typeof-symbol { "ie":"11" }
-  transform-new-target { "ie":"11" }
-  transform-regenerator { "firefox":"50", "ie":"11" }
-  transform-exponentiation-operator { "firefox":"50", "ie":"11" }
-  transform-async-to-generator { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-async-generator-functions { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-object-rest-spread { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-unicode-property-regex { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-json-strings { "chrome":"52", "firefox":"50", "ie":"11" }
-  proposal-optional-catch-binding { "chrome":"52", "firefox":"50", "ie":"11" }
-
-Using polyfills with `usage` option:
-
-[<CWD>/src/in.js] Added following polyfills:
-  es6.promise { "ie":"11" }
-  es6.map { "firefox":"50", "ie":"11" }
-  es6.string.iterator { "ie":"11" }
-  es6.array.iterator { "ie":"11" }
-  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
-
-[<CWD>/src/in2.js] Added following polyfills:
-  regenerator-runtime { "chrome":"52", "firefox":"50", "ie":"11" }
-  web.dom.iterable { "chrome":"52", "firefox":"50", "ie":"11" }
-Successfully compiled 2 files with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/versions-decimals/options.json b/packages/babel-preset-env/test/debug-fixtures/versions-decimals/options.json
deleted file mode 100644
index 5afbc32afcdb..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/versions-decimals/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "useBuiltIns": "entry",
-      "debug": true,
-      "targets": {
-        "chrome": 54,
-        "electron": 0.36,
-        "node": 6.10,
-        "ie": 10
-      }
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt
deleted file mode 100644
index 35cba07b44bc..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/versions-decimals/stdout.txt
+++ /dev/null
@@ -1,198 +0,0 @@
-Warning, the following targets are using a decimal version:
-
-  electron: 0.36
-  node: 6.1
-
-We recommend using a string for minor/patch versions to avoid numbers like 6.10
-getting parsed as 6.1, which can lead to unexpected behavior.
-
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "54",
-  "electron": "0.36",
-  "ie": "10",
-  "node": "6.1"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals { "ie":"10" }
-  transform-literals { "ie":"10" }
-  transform-function-name { "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-arrow-functions { "ie":"10" }
-  transform-block-scoped-functions { "ie":"10" }
-  transform-classes { "ie":"10" }
-  transform-object-super { "ie":"10" }
-  transform-shorthand-properties { "ie":"10" }
-  transform-duplicate-keys { "ie":"10" }
-  transform-computed-properties { "ie":"10" }
-  transform-for-of { "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-sticky-regex { "electron":"0.36", "ie":"10" }
-  transform-dotall-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-unicode-regex { "electron":"0.36", "ie":"10" }
-  transform-spread { "ie":"10" }
-  transform-parameters { "electron":"0.36", "ie":"10" }
-  transform-destructuring { "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-block-scoping { "electron":"0.36", "ie":"10" }
-  transform-typeof-symbol { "ie":"10" }
-  transform-new-target { "ie":"10" }
-  transform-regenerator { "electron":"0.36", "ie":"10" }
-  transform-exponentiation-operator { "electron":"0.36", "ie":"10", "node":"6.1" }
-  transform-async-to-generator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  proposal-async-generator-functions { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  proposal-object-rest-spread { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  proposal-unicode-property-regex { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  proposal-json-strings { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  proposal-optional-catch-binding { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.copy-within { "ie":"10" }
-  es6.array.every { "electron":"0.36" }
-  es6.array.fill { "ie":"10" }
-  es6.array.filter { "electron":"0.36" }
-  es6.array.find { "ie":"10" }
-  es6.array.find-index { "ie":"10" }
-  es6.array.for-each { "electron":"0.36" }
-  es6.array.from { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es7.array.includes { "ie":"10" }
-  es6.array.index-of { "electron":"0.36" }
-  es6.array.is-array { "electron":"0.36" }
-  es6.array.iterator { "ie":"10" }
-  es6.array.last-index-of { "electron":"0.36" }
-  es6.array.map { "electron":"0.36" }
-  es6.array.of { "ie":"10" }
-  es6.array.reduce { "electron":"0.36" }
-  es6.array.reduce-right { "electron":"0.36" }
-  es6.array.some { "electron":"0.36" }
-  es6.array.sort { "chrome":"54", "electron":"0.36", "node":"6.1" }
-  es6.array.species { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.date.now { "electron":"0.36" }
-  es6.date.to-iso-string { "electron":"0.36" }
-  es6.date.to-json { "electron":"0.36" }
-  es6.date.to-primitive { "ie":"10" }
-  es6.date.to-string { "electron":"0.36" }
-  es6.function.bind { "electron":"0.36" }
-  es6.function.has-instance { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.function.name { "electron":"0.36", "ie":"10" }
-  es6.map { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.math.acosh { "ie":"10" }
-  es6.math.asinh { "ie":"10" }
-  es6.math.atanh { "ie":"10" }
-  es6.math.cbrt { "ie":"10" }
-  es6.math.clz32 { "ie":"10" }
-  es6.math.cosh { "ie":"10" }
-  es6.math.expm1 { "ie":"10" }
-  es6.math.fround { "ie":"10" }
-  es6.math.hypot { "ie":"10" }
-  es6.math.imul { "ie":"10" }
-  es6.math.log1p { "ie":"10" }
-  es6.math.log10 { "ie":"10" }
-  es6.math.log2 { "ie":"10" }
-  es6.math.sign { "ie":"10" }
-  es6.math.sinh { "ie":"10" }
-  es6.math.tanh { "ie":"10" }
-  es6.math.trunc { "ie":"10" }
-  es6.number.constructor { "ie":"10" }
-  es6.number.epsilon { "ie":"10" }
-  es6.number.is-finite { "ie":"10" }
-  es6.number.is-integer { "ie":"10" }
-  es6.number.is-nan { "ie":"10" }
-  es6.number.is-safe-integer { "ie":"10" }
-  es6.number.max-safe-integer { "ie":"10" }
-  es6.number.min-safe-integer { "ie":"10" }
-  es6.number.parse-float { "ie":"10" }
-  es6.number.parse-int { "ie":"10" }
-  es6.object.assign { "electron":"0.36", "ie":"10" }
-  es6.object.create { "electron":"0.36" }
-  es7.object.define-getter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es7.object.define-setter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.object.define-property { "electron":"0.36" }
-  es6.object.define-properties { "electron":"0.36" }
-  es7.object.entries { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.object.freeze { "ie":"10" }
-  es6.object.get-own-property-descriptor { "ie":"10" }
-  es7.object.get-own-property-descriptors { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.object.get-own-property-names { "ie":"10" }
-  es6.object.get-prototype-of { "ie":"10" }
-  es7.object.lookup-getter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es7.object.lookup-setter { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.object.prevent-extensions { "ie":"10" }
-  es6.object.is { "ie":"10" }
-  es6.object.is-frozen { "ie":"10" }
-  es6.object.is-sealed { "ie":"10" }
-  es6.object.is-extensible { "ie":"10" }
-  es6.object.keys { "ie":"10" }
-  es6.object.seal { "ie":"10" }
-  es6.object.set-prototype-of { "ie":"10" }
-  es7.object.values { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.promise { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es7.promise.finally { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.reflect.apply { "electron":"0.36", "ie":"10" }
-  es6.reflect.construct { "electron":"0.36", "ie":"10" }
-  es6.reflect.define-property { "electron":"0.36", "ie":"10" }
-  es6.reflect.delete-property { "electron":"0.36", "ie":"10" }
-  es6.reflect.get { "electron":"0.36", "ie":"10" }
-  es6.reflect.get-own-property-descriptor { "electron":"0.36", "ie":"10" }
-  es6.reflect.get-prototype-of { "electron":"0.36", "ie":"10" }
-  es6.reflect.has { "electron":"0.36", "ie":"10" }
-  es6.reflect.is-extensible { "electron":"0.36", "ie":"10" }
-  es6.reflect.own-keys { "electron":"0.36", "ie":"10" }
-  es6.reflect.prevent-extensions { "electron":"0.36", "ie":"10" }
-  es6.reflect.set { "electron":"0.36", "ie":"10" }
-  es6.reflect.set-prototype-of { "electron":"0.36", "ie":"10" }
-  es6.regexp.constructor { "electron":"0.36", "ie":"10" }
-  es6.regexp.flags { "electron":"0.36", "ie":"10" }
-  es6.regexp.match { "electron":"0.36", "ie":"10" }
-  es6.regexp.replace { "electron":"0.36", "ie":"10" }
-  es6.regexp.split { "electron":"0.36", "ie":"10" }
-  es6.regexp.search { "electron":"0.36", "ie":"10" }
-  es6.regexp.to-string { "electron":"0.36", "ie":"10" }
-  es6.set { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.symbol { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es7.symbol.async-iterator { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.string.anchor { "electron":"0.36", "ie":"10" }
-  es6.string.big { "electron":"0.36", "ie":"10" }
-  es6.string.blink { "electron":"0.36", "ie":"10" }
-  es6.string.bold { "electron":"0.36", "ie":"10" }
-  es6.string.code-point-at { "ie":"10" }
-  es6.string.ends-with { "ie":"10" }
-  es6.string.fixed { "electron":"0.36", "ie":"10" }
-  es6.string.fontcolor { "electron":"0.36", "ie":"10" }
-  es6.string.fontsize { "electron":"0.36", "ie":"10" }
-  es6.string.from-code-point { "ie":"10" }
-  es6.string.includes { "ie":"10" }
-  es6.string.italics { "electron":"0.36", "ie":"10" }
-  es6.string.iterator { "ie":"10" }
-  es6.string.link { "electron":"0.36", "ie":"10" }
-  es7.string.pad-start { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es7.string.pad-end { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.string.raw { "ie":"10" }
-  es6.string.repeat { "ie":"10" }
-  es6.string.small { "electron":"0.36", "ie":"10" }
-  es6.string.starts-with { "ie":"10" }
-  es6.string.strike { "electron":"0.36", "ie":"10" }
-  es6.string.sub { "electron":"0.36", "ie":"10" }
-  es6.string.sup { "electron":"0.36", "ie":"10" }
-  es6.string.trim { "electron":"0.36" }
-  es6.typed.array-buffer { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.data-view { "electron":"0.36" }
-  es6.typed.int8-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.uint8-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.uint8-clamped-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.int16-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.uint16-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.int32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.uint32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.float32-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.typed.float64-array { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.weak-map { "electron":"0.36", "ie":"10", "node":"6.1" }
-  es6.weak-set { "electron":"0.36", "ie":"10", "node":"6.1" }
-  web.timers { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  web.immediate { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-  web.dom.iterable { "chrome":"54", "electron":"0.36", "ie":"10", "node":"6.1" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/debug-fixtures/versions-strings/options.json b/packages/babel-preset-env/test/debug-fixtures/versions-strings/options.json
deleted file mode 100644
index c0e334895029..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/versions-strings/options.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "presets": [
-    ["../../lib", {
-      "useBuiltIns": "entry",
-      "debug": true,
-      "targets": {
-        "chrome": "54",
-        "node": "6.10",
-        "ie": "10"
-      }
-    }]
-  ]
-}
diff --git a/packages/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt b/packages/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt
deleted file mode 100644
index fa70be96c6a2..000000000000
--- a/packages/babel-preset-env/test/debug-fixtures/versions-strings/stdout.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-@babel/preset-env: `DEBUG` option
-
-Using targets:
-{
-  "chrome": "54",
-  "ie": "10",
-  "node": "6.10"
-}
-
-Using modules transform: auto
-
-Using plugins:
-  transform-template-literals { "ie":"10" }
-  transform-literals { "ie":"10" }
-  transform-function-name { "ie":"10" }
-  transform-arrow-functions { "ie":"10" }
-  transform-block-scoped-functions { "ie":"10" }
-  transform-classes { "ie":"10" }
-  transform-object-super { "ie":"10" }
-  transform-shorthand-properties { "ie":"10" }
-  transform-duplicate-keys { "ie":"10" }
-  transform-computed-properties { "ie":"10" }
-  transform-for-of { "ie":"10" }
-  transform-sticky-regex { "ie":"10" }
-  transform-dotall-regex { "chrome":"54", "ie":"10", "node":"6.10" }
-  transform-unicode-regex { "ie":"10" }
-  transform-spread { "ie":"10" }
-  transform-parameters { "ie":"10" }
-  transform-destructuring { "ie":"10" }
-  transform-block-scoping { "ie":"10" }
-  transform-typeof-symbol { "ie":"10" }
-  transform-new-target { "ie":"10" }
-  transform-regenerator { "ie":"10" }
-  transform-exponentiation-operator { "ie":"10", "node":"6.10" }
-  transform-async-to-generator { "chrome":"54", "ie":"10", "node":"6.10" }
-  proposal-async-generator-functions { "chrome":"54", "ie":"10", "node":"6.10" }
-  proposal-object-rest-spread { "chrome":"54", "ie":"10", "node":"6.10" }
-  proposal-unicode-property-regex { "chrome":"54", "ie":"10", "node":"6.10" }
-  proposal-json-strings { "chrome":"54", "ie":"10", "node":"6.10" }
-  proposal-optional-catch-binding { "chrome":"54", "ie":"10", "node":"6.10" }
-
-Using polyfills with `entry` option:
-
-[<CWD>/src/in.js] Replaced `@babel/polyfill` with the following polyfills:
-  es6.array.copy-within { "ie":"10" }
-  es6.array.fill { "ie":"10" }
-  es6.array.find { "ie":"10" }
-  es6.array.find-index { "ie":"10" }
-  es6.array.from { "ie":"10" }
-  es7.array.includes { "ie":"10" }
-  es6.array.iterator { "ie":"10" }
-  es6.array.of { "ie":"10" }
-  es6.array.sort { "chrome":"54", "node":"6.10" }
-  es6.array.species { "ie":"10" }
-  es6.date.to-primitive { "ie":"10" }
-  es6.function.has-instance { "ie":"10" }
-  es6.function.name { "ie":"10" }
-  es6.map { "ie":"10" }
-  es6.math.acosh { "ie":"10" }
-  es6.math.asinh { "ie":"10" }
-  es6.math.atanh { "ie":"10" }
-  es6.math.cbrt { "ie":"10" }
-  es6.math.clz32 { "ie":"10" }
-  es6.math.cosh { "ie":"10" }
-  es6.math.expm1 { "ie":"10" }
-  es6.math.fround { "ie":"10" }
-  es6.math.hypot { "ie":"10" }
-  es6.math.imul { "ie":"10" }
-  es6.math.log1p { "ie":"10" }
-  es6.math.log10 { "ie":"10" }
-  es6.math.log2 { "ie":"10" }
-  es6.math.sign { "ie":"10" }
-  es6.math.sinh { "ie":"10" }
-  es6.math.tanh { "ie":"10" }
-  es6.math.trunc { "ie":"10" }
-  es6.number.constructor { "ie":"10" }
-  es6.number.epsilon { "ie":"10" }
-  es6.number.is-finite { "ie":"10" }
-  es6.number.is-integer { "ie":"10" }
-  es6.number.is-nan { "ie":"10" }
-  es6.number.is-safe-integer { "ie":"10" }
-  es6.number.max-safe-integer { "ie":"10" }
-  es6.number.min-safe-integer { "ie":"10" }
-  es6.number.parse-float { "ie":"10" }
-  es6.number.parse-int { "ie":"10" }
-  es6.object.assign { "ie":"10" }
-  es7.object.define-getter { "chrome":"54", "ie":"10", "node":"6.10" }
-  es7.object.define-setter { "chrome":"54", "ie":"10", "node":"6.10" }
-  es7.object.entries { "ie":"10", "node":"6.10" }
-  es6.object.freeze { "ie":"10" }
-  es6.object.get-own-property-descriptor { "ie":"10" }
-  es7.object.get-own-property-descriptors { "ie":"10", "node":"6.10" }
-  es6.object.get-own-property-names { "ie":"10" }
-  es6.object.get-prototype-of { "ie":"10" }
-  es7.object.lookup-getter { "chrome":"54", "ie":"10", "node":"6.10" }
-  es7.object.lookup-setter { "chrome":"54", "ie":"10", "node":"6.10" }
-  es6.object.prevent-extensions { "ie":"10" }
-  es6.object.is { "ie":"10" }
-  es6.object.is-frozen { "ie":"10" }
-  es6.object.is-sealed { "ie":"10" }
-  es6.object.is-extensible { "ie":"10" }
-  es6.object.keys { "ie":"10" }
-  es6.object.seal { "ie":"10" }
-  es6.object.set-prototype-of { "ie":"10" }
-  es7.object.values { "ie":"10", "node":"6.10" }
-  es6.promise { "ie":"10" }
-  es7.promise.finally { "chrome":"54", "ie":"10", "node":"6.10" }
-  es6.reflect.apply { "ie":"10" }
-  es6.reflect.construct { "ie":"10" }
-  es6.reflect.define-property { "ie":"10" }
-  es6.reflect.delete-property { "ie":"10" }
-  es6.reflect.get { "ie":"10" }
-  es6.reflect.get-own-property-descriptor { "ie":"10" }
-  es6.reflect.get-prototype-of { "ie":"10" }
-  es6.reflect.has { "ie":"10" }
-  es6.reflect.is-extensible { "ie":"10" }
-  es6.reflect.own-keys { "ie":"10" }
-  es6.reflect.prevent-extensions { "ie":"10" }
-  es6.reflect.set { "ie":"10" }
-  es6.reflect.set-prototype-of { "ie":"10" }
-  es6.regexp.constructor { "ie":"10" }
-  es6.regexp.flags { "ie":"10" }
-  es6.regexp.match { "ie":"10" }
-  es6.regexp.replace { "ie":"10" }
-  es6.regexp.split { "ie":"10" }
-  es6.regexp.search { "ie":"10" }
-  es6.regexp.to-string { "ie":"10" }
-  es6.set { "ie":"10" }
-  es6.symbol { "ie":"10" }
-  es7.symbol.async-iterator { "chrome":"54", "ie":"10", "node":"6.10" }
-  es6.string.anchor { "ie":"10" }
-  es6.string.big { "ie":"10" }
-  es6.string.blink { "ie":"10" }
-  es6.string.bold { "ie":"10" }
-  es6.string.code-point-at { "ie":"10" }
-  es6.string.ends-with { "ie":"10" }
-  es6.string.fixed { "ie":"10" }
-  es6.string.fontcolor { "ie":"10" }
-  es6.string.fontsize { "ie":"10" }
-  es6.string.from-code-point { "ie":"10" }
-  es6.string.includes { "ie":"10" }
-  es6.string.italics { "ie":"10" }
-  es6.string.iterator { "ie":"10" }
-  es6.string.link { "ie":"10" }
-  es7.string.pad-start { "chrome":"54", "ie":"10", "node":"6.10" }
-  es7.string.pad-end { "chrome":"54", "ie":"10", "node":"6.10" }
-  es6.string.raw { "ie":"10" }
-  es6.string.repeat { "ie":"10" }
-  es6.string.small { "ie":"10" }
-  es6.string.starts-with { "ie":"10" }
-  es6.string.strike { "ie":"10" }
-  es6.string.sub { "ie":"10" }
-  es6.string.sup { "ie":"10" }
-  es6.typed.array-buffer { "ie":"10" }
-  es6.typed.int8-array { "ie":"10" }
-  es6.typed.uint8-array { "ie":"10" }
-  es6.typed.uint8-clamped-array { "ie":"10" }
-  es6.typed.int16-array { "ie":"10" }
-  es6.typed.uint16-array { "ie":"10" }
-  es6.typed.int32-array { "ie":"10" }
-  es6.typed.uint32-array { "ie":"10" }
-  es6.typed.float32-array { "ie":"10" }
-  es6.typed.float64-array { "ie":"10" }
-  es6.weak-map { "ie":"10" }
-  es6.weak-set { "ie":"10" }
-  web.timers { "chrome":"54", "ie":"10", "node":"6.10" }
-  web.immediate { "chrome":"54", "ie":"10", "node":"6.10" }
-  web.dom.iterable { "chrome":"54", "ie":"10", "node":"6.10" }
-Successfully compiled 1 file with Babel.
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/defaults.js b/packages/babel-preset-env/test/defaults.js
deleted file mode 100644
index 376c93e1f5ac..000000000000
--- a/packages/babel-preset-env/test/defaults.js
+++ /dev/null
@@ -1,49 +0,0 @@
-"use strict";
-
-const defaults = require("../lib/defaults.js");
-
-const {
-  getPlatformSpecificDefaultFor,
-  getOptionSpecificExcludesFor,
-} = defaults;
-
-describe("defaults", () => {
-  describe("getPlatformSpecificDefaultFor", () => {
-    it("should return web polyfills for non-`node` platform", () => {
-      const defaultWebIncludesForChromeAndNode = getPlatformSpecificDefaultFor({
-        chrome: "63",
-        node: "8",
-      });
-      expect(defaultWebIncludesForChromeAndNode).toEqual([
-        "web.timers",
-        "web.immediate",
-        "web.dom.iterable",
-      ]);
-    });
-
-    it("shouldn't return web polyfills for node platform", () => {
-      const defaultWebIncludesForChromeAndNode = getPlatformSpecificDefaultFor({
-        node: "8",
-      });
-      expect(defaultWebIncludesForChromeAndNode).toBeNull();
-    });
-  });
-
-  describe("getOptionSpecificExcludesFor", () => {
-    it("should return correct excludes for `loose` mode", () => {
-      const defaultWebIncludesForChromeAndNode = getOptionSpecificExcludesFor({
-        loose: true,
-      });
-      expect(defaultWebIncludesForChromeAndNode).toEqual([
-        "transform-typeof-symbol",
-      ]);
-    });
-
-    it("shouldn't return excludes for non-`loose` mode", () => {
-      const defaultWebIncludesForChromeAndNode = getOptionSpecificExcludesFor({
-        loose: false,
-      });
-      expect(defaultWebIncludesForChromeAndNode).toBeNull();
-    });
-  });
-});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/.use-builtins-all-exec/exec.js b/packages/babel-preset-env/test/fixtures/corejs2/.entry-all-exec/exec.js
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/.use-builtins-all-exec/exec.js
rename to packages/babel-preset-env/test/fixtures/corejs2/.entry-all-exec/exec.js
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/options.json b/packages/babel-preset-env/test/fixtures/corejs2/.entry-all-exec/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/options.json
rename to packages/babel-preset-env/test/fixtures/corejs2/.entry-all-exec/options.json
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-all/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-all/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-all/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-all/options.json
new file mode 100644
index 000000000000..e5716ed34f4b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-all/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-all/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-all/output.mjs
new file mode 100644
index 000000000000..50550d4322d8
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-all/output.mjs
@@ -0,0 +1,149 @@
+import "core-js/modules/es6.array.copy-within";
+import "core-js/modules/es6.array.every";
+import "core-js/modules/es6.array.fill";
+import "core-js/modules/es6.array.filter";
+import "core-js/modules/es6.array.find";
+import "core-js/modules/es6.array.find-index";
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.for-each";
+import "core-js/modules/es6.array.from";
+import "core-js/modules/es7.array.includes";
+import "core-js/modules/es6.array.index-of";
+import "core-js/modules/es6.array.is-array";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.array.last-index-of";
+import "core-js/modules/es6.array.map";
+import "core-js/modules/es6.array.of";
+import "core-js/modules/es6.array.reduce";
+import "core-js/modules/es6.array.reduce-right";
+import "core-js/modules/es6.array.some";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es6.array.species";
+import "core-js/modules/es6.date.now";
+import "core-js/modules/es6.date.to-iso-string";
+import "core-js/modules/es6.date.to-json";
+import "core-js/modules/es6.date.to-primitive";
+import "core-js/modules/es6.date.to-string";
+import "core-js/modules/es6.function.bind";
+import "core-js/modules/es6.function.has-instance";
+import "core-js/modules/es6.function.name";
+import "core-js/modules/es6.map";
+import "core-js/modules/es6.math.acosh";
+import "core-js/modules/es6.math.asinh";
+import "core-js/modules/es6.math.atanh";
+import "core-js/modules/es6.math.cbrt";
+import "core-js/modules/es6.math.clz32";
+import "core-js/modules/es6.math.cosh";
+import "core-js/modules/es6.math.expm1";
+import "core-js/modules/es6.math.fround";
+import "core-js/modules/es6.math.hypot";
+import "core-js/modules/es6.math.imul";
+import "core-js/modules/es6.math.log1p";
+import "core-js/modules/es6.math.log10";
+import "core-js/modules/es6.math.log2";
+import "core-js/modules/es6.math.sign";
+import "core-js/modules/es6.math.sinh";
+import "core-js/modules/es6.math.tanh";
+import "core-js/modules/es6.math.trunc";
+import "core-js/modules/es6.number.constructor";
+import "core-js/modules/es6.number.epsilon";
+import "core-js/modules/es6.number.is-finite";
+import "core-js/modules/es6.number.is-integer";
+import "core-js/modules/es6.number.is-nan";
+import "core-js/modules/es6.number.is-safe-integer";
+import "core-js/modules/es6.number.max-safe-integer";
+import "core-js/modules/es6.number.min-safe-integer";
+import "core-js/modules/es6.number.parse-float";
+import "core-js/modules/es6.number.parse-int";
+import "core-js/modules/es6.object.assign";
+import "core-js/modules/es6.object.create";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es6.object.define-property";
+import "core-js/modules/es6.object.define-properties";
+import "core-js/modules/es7.object.entries";
+import "core-js/modules/es6.object.freeze";
+import "core-js/modules/es6.object.get-own-property-descriptor";
+import "core-js/modules/es7.object.get-own-property-descriptors";
+import "core-js/modules/es6.object.get-own-property-names";
+import "core-js/modules/es6.object.get-prototype-of";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.prevent-extensions";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es6.object.is";
+import "core-js/modules/es6.object.is-frozen";
+import "core-js/modules/es6.object.is-sealed";
+import "core-js/modules/es6.object.is-extensible";
+import "core-js/modules/es6.object.keys";
+import "core-js/modules/es6.object.seal";
+import "core-js/modules/es6.object.set-prototype-of";
+import "core-js/modules/es7.object.values";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.reflect.apply";
+import "core-js/modules/es6.reflect.construct";
+import "core-js/modules/es6.reflect.define-property";
+import "core-js/modules/es6.reflect.delete-property";
+import "core-js/modules/es6.reflect.get";
+import "core-js/modules/es6.reflect.get-own-property-descriptor";
+import "core-js/modules/es6.reflect.get-prototype-of";
+import "core-js/modules/es6.reflect.has";
+import "core-js/modules/es6.reflect.is-extensible";
+import "core-js/modules/es6.reflect.own-keys";
+import "core-js/modules/es6.reflect.prevent-extensions";
+import "core-js/modules/es6.reflect.set";
+import "core-js/modules/es6.reflect.set-prototype-of";
+import "core-js/modules/es6.regexp.constructor";
+import "core-js/modules/es6.regexp.flags";
+import "core-js/modules/es6.regexp.match";
+import "core-js/modules/es6.regexp.replace";
+import "core-js/modules/es6.regexp.split";
+import "core-js/modules/es6.regexp.search";
+import "core-js/modules/es6.regexp.to-string";
+import "core-js/modules/es6.set";
+import "core-js/modules/es6.symbol";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es6.string.anchor";
+import "core-js/modules/es6.string.big";
+import "core-js/modules/es6.string.blink";
+import "core-js/modules/es6.string.bold";
+import "core-js/modules/es6.string.code-point-at";
+import "core-js/modules/es6.string.ends-with";
+import "core-js/modules/es6.string.fixed";
+import "core-js/modules/es6.string.fontcolor";
+import "core-js/modules/es6.string.fontsize";
+import "core-js/modules/es6.string.from-code-point";
+import "core-js/modules/es6.string.includes";
+import "core-js/modules/es6.string.italics";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.string.link";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es6.string.raw";
+import "core-js/modules/es6.string.repeat";
+import "core-js/modules/es6.string.small";
+import "core-js/modules/es6.string.starts-with";
+import "core-js/modules/es6.string.strike";
+import "core-js/modules/es6.string.sub";
+import "core-js/modules/es6.string.sup";
+import "core-js/modules/es6.string.trim";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/es6.typed.array-buffer";
+import "core-js/modules/es6.typed.data-view";
+import "core-js/modules/es6.typed.int8-array";
+import "core-js/modules/es6.typed.uint8-array";
+import "core-js/modules/es6.typed.uint8-clamped-array";
+import "core-js/modules/es6.typed.int16-array";
+import "core-js/modules/es6.typed.uint16-array";
+import "core-js/modules/es6.typed.int32-array";
+import "core-js/modules/es6.typed.uint32-array";
+import "core-js/modules/es6.typed.float32-array";
+import "core-js/modules/es6.typed.float64-array";
+import "core-js/modules/es6.weak-map";
+import "core-js/modules/es6.weak-set";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/options.json
new file mode 100644
index 000000000000..e6be8cd4b1fd
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 48
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/output.mjs
new file mode 100644
index 000000000000..7f3479ae14b9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-48/output.mjs
@@ -0,0 +1,61 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.from";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es6.array.species";
+import "core-js/modules/es6.function.has-instance";
+import "core-js/modules/es6.map";
+import "core-js/modules/es6.object.assign";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.entries";
+import "core-js/modules/es7.object.get-own-property-descriptors";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.object.values";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.reflect.apply";
+import "core-js/modules/es6.reflect.construct";
+import "core-js/modules/es6.reflect.define-property";
+import "core-js/modules/es6.reflect.delete-property";
+import "core-js/modules/es6.reflect.get";
+import "core-js/modules/es6.reflect.get-own-property-descriptor";
+import "core-js/modules/es6.reflect.get-prototype-of";
+import "core-js/modules/es6.reflect.has";
+import "core-js/modules/es6.reflect.is-extensible";
+import "core-js/modules/es6.reflect.own-keys";
+import "core-js/modules/es6.reflect.prevent-extensions";
+import "core-js/modules/es6.reflect.set";
+import "core-js/modules/es6.reflect.set-prototype-of";
+import "core-js/modules/es6.regexp.constructor";
+import "core-js/modules/es6.regexp.flags";
+import "core-js/modules/es6.regexp.match";
+import "core-js/modules/es6.regexp.replace";
+import "core-js/modules/es6.regexp.split";
+import "core-js/modules/es6.regexp.search";
+import "core-js/modules/es6.regexp.to-string";
+import "core-js/modules/es6.set";
+import "core-js/modules/es6.symbol";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/es6.typed.array-buffer";
+import "core-js/modules/es6.typed.int8-array";
+import "core-js/modules/es6.typed.uint8-array";
+import "core-js/modules/es6.typed.uint8-clamped-array";
+import "core-js/modules/es6.typed.int16-array";
+import "core-js/modules/es6.typed.uint16-array";
+import "core-js/modules/es6.typed.int32-array";
+import "core-js/modules/es6.typed.uint32-array";
+import "core-js/modules/es6.typed.float32-array";
+import "core-js/modules/es6.typed.float64-array";
+import "core-js/modules/es6.weak-map";
+import "core-js/modules/es6.weak-set";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+import "regenerator-runtime/runtime";
+Math.pow(1, 2);
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/options.json
new file mode 100644
index 000000000000..29a64d797cf7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 49
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/output.mjs
new file mode 100644
index 000000000000..d424cb017c55
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-49/output.mjs
@@ -0,0 +1,46 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.from";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es6.array.species";
+import "core-js/modules/es6.function.has-instance";
+import "core-js/modules/es6.map";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.entries";
+import "core-js/modules/es7.object.get-own-property-descriptors";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.object.values";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.regexp.constructor";
+import "core-js/modules/es6.regexp.match";
+import "core-js/modules/es6.regexp.replace";
+import "core-js/modules/es6.regexp.split";
+import "core-js/modules/es6.regexp.search";
+import "core-js/modules/es6.regexp.to-string";
+import "core-js/modules/es6.set";
+import "core-js/modules/es6.symbol";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/es6.typed.array-buffer";
+import "core-js/modules/es6.typed.int8-array";
+import "core-js/modules/es6.typed.uint8-array";
+import "core-js/modules/es6.typed.uint8-clamped-array";
+import "core-js/modules/es6.typed.int16-array";
+import "core-js/modules/es6.typed.uint16-array";
+import "core-js/modules/es6.typed.int32-array";
+import "core-js/modules/es6.typed.uint32-array";
+import "core-js/modules/es6.typed.float32-array";
+import "core-js/modules/es6.typed.float64-array";
+import "core-js/modules/es6.weak-map";
+import "core-js/modules/es6.weak-set";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+import "regenerator-runtime/runtime";
+Math.pow(1, 2);
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-66/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-66/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/options.json
new file mode 100644
index 000000000000..5a0151ae5bf2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "66"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/output.mjs
new file mode 100644
index 000000000000..ce33befd1127
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-66/output.mjs
@@ -0,0 +1,16 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+const foo = {
+  a: true
+};
+const bar = { ...foo,
+  b: false
+};
+
+async function baz() {
+  for await (const x of someAsyncThing()) {
+    console.log(x);
+  }
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/input.mjs
new file mode 100644
index 000000000000..b475c7ae52a0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/input.mjs
@@ -0,0 +1,16 @@
+import "@babel/polyfill";
+
+const foo = {
+  a: true,
+};
+
+const bar = {
+  ...foo,
+  b: false,
+};
+
+async function baz() {
+  for await (const x of someAsyncThing()) {
+    console.log(x);
+  }
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/options.json
new file mode 100644
index 000000000000..344aa0ae6506
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-66/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-66/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-chrome-71/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/options.json
new file mode 100644
index 000000000000..167d33395b5b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": "chromeandroid 59"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/output.mjs
new file mode 100644
index 000000000000..50912e84ee5f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-chromeandroid/output.mjs
@@ -0,0 +1,14 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/input.mjs
new file mode 100644
index 000000000000..640bc11864fc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/input.mjs
@@ -0,0 +1 @@
+require("core-js");
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/options.json
new file mode 100644
index 000000000000..19b78ca4577d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/output.mjs
new file mode 100644
index 000000000000..0d844da81283
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main-require/output.mjs
@@ -0,0 +1,16 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/core-js/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/core-js/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/options.json
new file mode 100644
index 000000000000..19b78ca4577d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/output.mjs
new file mode 100644
index 000000000000..0d844da81283
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-core-js-main/output.mjs
@@ -0,0 +1,16 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/electron/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-electron/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/electron/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-electron/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-electron/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-electron/options.json
new file mode 100644
index 000000000000..fe07d418a7f9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-electron/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "electron": "1.4"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-electron/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-electron/output.mjs
new file mode 100644
index 000000000000..c71a6a9b4044
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-electron/output.mjs
@@ -0,0 +1,21 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es6.function.bind";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.entries";
+import "core-js/modules/es7.object.get-own-property-descriptors";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.object.values";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+a ** b;
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-false/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/plugin-options/regenerator-false/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/options.json
new file mode 100644
index 000000000000..280e9827e693
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "ie": 11
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/output.mjs
new file mode 100644
index 000000000000..220ad965edab
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-11/output.mjs
@@ -0,0 +1,127 @@
+import "core-js/modules/es6.array.copy-within";
+import "core-js/modules/es6.array.fill";
+import "core-js/modules/es6.array.find";
+import "core-js/modules/es6.array.find-index";
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.from";
+import "core-js/modules/es7.array.includes";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.array.of";
+import "core-js/modules/es6.array.species";
+import "core-js/modules/es6.date.to-primitive";
+import "core-js/modules/es6.function.has-instance";
+import "core-js/modules/es6.function.name";
+import "core-js/modules/es6.map";
+import "core-js/modules/es6.math.acosh";
+import "core-js/modules/es6.math.asinh";
+import "core-js/modules/es6.math.atanh";
+import "core-js/modules/es6.math.cbrt";
+import "core-js/modules/es6.math.clz32";
+import "core-js/modules/es6.math.cosh";
+import "core-js/modules/es6.math.expm1";
+import "core-js/modules/es6.math.fround";
+import "core-js/modules/es6.math.hypot";
+import "core-js/modules/es6.math.imul";
+import "core-js/modules/es6.math.log1p";
+import "core-js/modules/es6.math.log10";
+import "core-js/modules/es6.math.log2";
+import "core-js/modules/es6.math.sign";
+import "core-js/modules/es6.math.sinh";
+import "core-js/modules/es6.math.tanh";
+import "core-js/modules/es6.math.trunc";
+import "core-js/modules/es6.number.constructor";
+import "core-js/modules/es6.number.epsilon";
+import "core-js/modules/es6.number.is-finite";
+import "core-js/modules/es6.number.is-integer";
+import "core-js/modules/es6.number.is-nan";
+import "core-js/modules/es6.number.is-safe-integer";
+import "core-js/modules/es6.number.max-safe-integer";
+import "core-js/modules/es6.number.min-safe-integer";
+import "core-js/modules/es6.number.parse-float";
+import "core-js/modules/es6.number.parse-int";
+import "core-js/modules/es6.object.assign";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.entries";
+import "core-js/modules/es6.object.freeze";
+import "core-js/modules/es6.object.get-own-property-descriptor";
+import "core-js/modules/es7.object.get-own-property-descriptors";
+import "core-js/modules/es6.object.get-own-property-names";
+import "core-js/modules/es6.object.get-prototype-of";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.prevent-extensions";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es6.object.is";
+import "core-js/modules/es6.object.is-frozen";
+import "core-js/modules/es6.object.is-sealed";
+import "core-js/modules/es6.object.is-extensible";
+import "core-js/modules/es6.object.keys";
+import "core-js/modules/es6.object.seal";
+import "core-js/modules/es7.object.values";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.reflect.apply";
+import "core-js/modules/es6.reflect.construct";
+import "core-js/modules/es6.reflect.define-property";
+import "core-js/modules/es6.reflect.delete-property";
+import "core-js/modules/es6.reflect.get";
+import "core-js/modules/es6.reflect.get-own-property-descriptor";
+import "core-js/modules/es6.reflect.get-prototype-of";
+import "core-js/modules/es6.reflect.has";
+import "core-js/modules/es6.reflect.is-extensible";
+import "core-js/modules/es6.reflect.own-keys";
+import "core-js/modules/es6.reflect.prevent-extensions";
+import "core-js/modules/es6.reflect.set";
+import "core-js/modules/es6.reflect.set-prototype-of";
+import "core-js/modules/es6.regexp.constructor";
+import "core-js/modules/es6.regexp.flags";
+import "core-js/modules/es6.regexp.match";
+import "core-js/modules/es6.regexp.replace";
+import "core-js/modules/es6.regexp.split";
+import "core-js/modules/es6.regexp.search";
+import "core-js/modules/es6.regexp.to-string";
+import "core-js/modules/es6.set";
+import "core-js/modules/es6.symbol";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es6.string.anchor";
+import "core-js/modules/es6.string.big";
+import "core-js/modules/es6.string.blink";
+import "core-js/modules/es6.string.bold";
+import "core-js/modules/es6.string.code-point-at";
+import "core-js/modules/es6.string.ends-with";
+import "core-js/modules/es6.string.fixed";
+import "core-js/modules/es6.string.fontcolor";
+import "core-js/modules/es6.string.fontsize";
+import "core-js/modules/es6.string.from-code-point";
+import "core-js/modules/es6.string.includes";
+import "core-js/modules/es6.string.italics";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.string.link";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es6.string.raw";
+import "core-js/modules/es6.string.repeat";
+import "core-js/modules/es6.string.small";
+import "core-js/modules/es6.string.starts-with";
+import "core-js/modules/es6.string.strike";
+import "core-js/modules/es6.string.sub";
+import "core-js/modules/es6.string.sup";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/es6.typed.array-buffer";
+import "core-js/modules/es6.typed.int8-array";
+import "core-js/modules/es6.typed.uint8-array";
+import "core-js/modules/es6.typed.uint8-clamped-array";
+import "core-js/modules/es6.typed.int16-array";
+import "core-js/modules/es6.typed.uint16-array";
+import "core-js/modules/es6.typed.int32-array";
+import "core-js/modules/es6.typed.uint32-array";
+import "core-js/modules/es6.typed.float32-array";
+import "core-js/modules/es6.typed.float64-array";
+import "core-js/modules/es6.weak-map";
+import "core-js/modules/es6.weak-set";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/options.json
new file mode 100644
index 000000000000..a955fd914bb2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "ie": 9
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/output.mjs
new file mode 100644
index 000000000000..9012ed720c20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-ie-9/output.mjs
@@ -0,0 +1,130 @@
+import "core-js/modules/es6.array.copy-within";
+import "core-js/modules/es6.array.fill";
+import "core-js/modules/es6.array.find";
+import "core-js/modules/es6.array.find-index";
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.from";
+import "core-js/modules/es7.array.includes";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.array.of";
+import "core-js/modules/es6.array.species";
+import "core-js/modules/es6.date.to-primitive";
+import "core-js/modules/es6.date.to-string";
+import "core-js/modules/es6.function.has-instance";
+import "core-js/modules/es6.function.name";
+import "core-js/modules/es6.map";
+import "core-js/modules/es6.math.acosh";
+import "core-js/modules/es6.math.asinh";
+import "core-js/modules/es6.math.atanh";
+import "core-js/modules/es6.math.cbrt";
+import "core-js/modules/es6.math.clz32";
+import "core-js/modules/es6.math.cosh";
+import "core-js/modules/es6.math.expm1";
+import "core-js/modules/es6.math.fround";
+import "core-js/modules/es6.math.hypot";
+import "core-js/modules/es6.math.imul";
+import "core-js/modules/es6.math.log1p";
+import "core-js/modules/es6.math.log10";
+import "core-js/modules/es6.math.log2";
+import "core-js/modules/es6.math.sign";
+import "core-js/modules/es6.math.sinh";
+import "core-js/modules/es6.math.tanh";
+import "core-js/modules/es6.math.trunc";
+import "core-js/modules/es6.number.constructor";
+import "core-js/modules/es6.number.epsilon";
+import "core-js/modules/es6.number.is-finite";
+import "core-js/modules/es6.number.is-integer";
+import "core-js/modules/es6.number.is-nan";
+import "core-js/modules/es6.number.is-safe-integer";
+import "core-js/modules/es6.number.max-safe-integer";
+import "core-js/modules/es6.number.min-safe-integer";
+import "core-js/modules/es6.number.parse-float";
+import "core-js/modules/es6.number.parse-int";
+import "core-js/modules/es6.object.assign";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.entries";
+import "core-js/modules/es6.object.freeze";
+import "core-js/modules/es6.object.get-own-property-descriptor";
+import "core-js/modules/es7.object.get-own-property-descriptors";
+import "core-js/modules/es6.object.get-own-property-names";
+import "core-js/modules/es6.object.get-prototype-of";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.prevent-extensions";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es6.object.is";
+import "core-js/modules/es6.object.is-frozen";
+import "core-js/modules/es6.object.is-sealed";
+import "core-js/modules/es6.object.is-extensible";
+import "core-js/modules/es6.object.keys";
+import "core-js/modules/es6.object.seal";
+import "core-js/modules/es6.object.set-prototype-of";
+import "core-js/modules/es7.object.values";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.reflect.apply";
+import "core-js/modules/es6.reflect.construct";
+import "core-js/modules/es6.reflect.define-property";
+import "core-js/modules/es6.reflect.delete-property";
+import "core-js/modules/es6.reflect.get";
+import "core-js/modules/es6.reflect.get-own-property-descriptor";
+import "core-js/modules/es6.reflect.get-prototype-of";
+import "core-js/modules/es6.reflect.has";
+import "core-js/modules/es6.reflect.is-extensible";
+import "core-js/modules/es6.reflect.own-keys";
+import "core-js/modules/es6.reflect.prevent-extensions";
+import "core-js/modules/es6.reflect.set";
+import "core-js/modules/es6.reflect.set-prototype-of";
+import "core-js/modules/es6.regexp.constructor";
+import "core-js/modules/es6.regexp.flags";
+import "core-js/modules/es6.regexp.match";
+import "core-js/modules/es6.regexp.replace";
+import "core-js/modules/es6.regexp.split";
+import "core-js/modules/es6.regexp.search";
+import "core-js/modules/es6.regexp.to-string";
+import "core-js/modules/es6.set";
+import "core-js/modules/es6.symbol";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es6.string.anchor";
+import "core-js/modules/es6.string.big";
+import "core-js/modules/es6.string.blink";
+import "core-js/modules/es6.string.bold";
+import "core-js/modules/es6.string.code-point-at";
+import "core-js/modules/es6.string.ends-with";
+import "core-js/modules/es6.string.fixed";
+import "core-js/modules/es6.string.fontcolor";
+import "core-js/modules/es6.string.fontsize";
+import "core-js/modules/es6.string.from-code-point";
+import "core-js/modules/es6.string.includes";
+import "core-js/modules/es6.string.italics";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.string.link";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es6.string.raw";
+import "core-js/modules/es6.string.repeat";
+import "core-js/modules/es6.string.small";
+import "core-js/modules/es6.string.starts-with";
+import "core-js/modules/es6.string.strike";
+import "core-js/modules/es6.string.sub";
+import "core-js/modules/es6.string.sup";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/es6.typed.array-buffer";
+import "core-js/modules/es6.typed.data-view";
+import "core-js/modules/es6.typed.int8-array";
+import "core-js/modules/es6.typed.uint8-array";
+import "core-js/modules/es6.typed.uint8-clamped-array";
+import "core-js/modules/es6.typed.int16-array";
+import "core-js/modules/es6.typed.uint16-array";
+import "core-js/modules/es6.typed.int32-array";
+import "core-js/modules/es6.typed.uint32-array";
+import "core-js/modules/es6.typed.float32-array";
+import "core-js/modules/es6.typed.float64-array";
+import "core-js/modules/es6.weak-map";
+import "core-js/modules/es6.weak-set";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-import/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-import/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-import/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-import/options.json
new file mode 100644
index 000000000000..19b78ca4577d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-import/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-import/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-import/output.mjs
new file mode 100644
index 000000000000..68e37cc3ea2e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-import/output.mjs
@@ -0,0 +1,17 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/input.mjs
new file mode 100644
index 000000000000..cce2c112e09f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/input.mjs
@@ -0,0 +1,2 @@
+import "@babel/polyfill";
+
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/options.json
new file mode 100644
index 000000000000..0bc0d53b8459
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "10.13"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/output.mjs
new file mode 100644
index 000000000000..0518d02b9cc2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-10.13/output.mjs
@@ -0,0 +1 @@
+import "core-js/modules/es7.array.flat-map";
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/input.mjs
new file mode 100644
index 000000000000..cce2c112e09f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/input.mjs
@@ -0,0 +1,2 @@
+import "@babel/polyfill";
+
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/options.json
new file mode 100644
index 000000000000..c8b34662cfef
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "11"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/output.mjs
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-11/output.mjs
@@ -0,0 +1 @@
+
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/options.json
new file mode 100644
index 000000000000..56fd28fa3d68
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/options.json
@@ -0,0 +1,17 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55",
+          "node": "7.6"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "forceAllTransforms": true,
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/output.mjs
new file mode 100644
index 000000000000..a9f27a4dced7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node-web/output.mjs
@@ -0,0 +1,17 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-node/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-node/options.json
new file mode 100644
index 000000000000..fc9b166ab908
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "7.6"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "forceAllTransforms": true,
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-node/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/entry-node/output.mjs
new file mode 100644
index 000000000000..2afa855ac7eb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-node/output.mjs
@@ -0,0 +1,14 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/input.js b/packages/babel-preset-env/test/fixtures/corejs2/entry-require/input.js
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/input.js
rename to packages/babel-preset-env/test/fixtures/corejs2/entry-require/input.js
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-require/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-require/options.json
new file mode 100644
index 000000000000..b1dae07978c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-require/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-require/output.js b/packages/babel-preset-env/test/fixtures/corejs2/entry-require/output.js
new file mode 100644
index 000000000000..70393b8eae04
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-require/output.js
@@ -0,0 +1,33 @@
+require("core-js/modules/es7.array.flat-map");
+
+require("core-js/modules/es6.array.sort");
+
+require("core-js/modules/es7.object.define-getter");
+
+require("core-js/modules/es7.object.define-setter");
+
+require("core-js/modules/es7.object.lookup-getter");
+
+require("core-js/modules/es7.object.lookup-setter");
+
+require("core-js/modules/es6.object.to-string");
+
+require("core-js/modules/es7.promise.finally");
+
+require("core-js/modules/es7.symbol.async-iterator");
+
+require("core-js/modules/es7.string.pad-start");
+
+require("core-js/modules/es7.string.pad-end");
+
+require("core-js/modules/es7.string.trim-left");
+
+require("core-js/modules/es7.string.trim-right");
+
+require("core-js/modules/web.timers");
+
+require("core-js/modules/web.immediate");
+
+require("core-js/modules/web.dom.iterable");
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/input.js b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/input.js
new file mode 100644
index 000000000000..139b7c19f808
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/input.js
@@ -0,0 +1,8 @@
+require("@babel/polyfill");
+
+let { x, y, ...z } = { x: 1, y: 2, a: 3, b: 4 };
+let n = { x, y, ...z };
+async function* agf() {
+  await 1;
+  yield 2;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/options.json
new file mode 100644
index 000000000000..10e3737d2b65
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "shippedProposals": true,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/output.js b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/output.js
new file mode 100644
index 000000000000..6618653a758e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/output.js
@@ -0,0 +1,367 @@
+require("core-js/modules/es6.array.copy-within");
+
+require("core-js/modules/es6.array.every");
+
+require("core-js/modules/es6.array.fill");
+
+require("core-js/modules/es6.array.filter");
+
+require("core-js/modules/es6.array.find");
+
+require("core-js/modules/es6.array.find-index");
+
+require("core-js/modules/es7.array.flat-map");
+
+require("core-js/modules/es6.array.for-each");
+
+require("core-js/modules/es6.array.from");
+
+require("core-js/modules/es7.array.includes");
+
+require("core-js/modules/es6.array.index-of");
+
+require("core-js/modules/es6.array.is-array");
+
+require("core-js/modules/es6.array.iterator");
+
+require("core-js/modules/es6.array.last-index-of");
+
+require("core-js/modules/es6.array.map");
+
+require("core-js/modules/es6.array.of");
+
+require("core-js/modules/es6.array.reduce");
+
+require("core-js/modules/es6.array.reduce-right");
+
+require("core-js/modules/es6.array.some");
+
+require("core-js/modules/es6.array.sort");
+
+require("core-js/modules/es6.array.species");
+
+require("core-js/modules/es6.date.now");
+
+require("core-js/modules/es6.date.to-iso-string");
+
+require("core-js/modules/es6.date.to-json");
+
+require("core-js/modules/es6.date.to-primitive");
+
+require("core-js/modules/es6.date.to-string");
+
+require("core-js/modules/es6.function.bind");
+
+require("core-js/modules/es6.function.has-instance");
+
+require("core-js/modules/es6.function.name");
+
+require("core-js/modules/es6.map");
+
+require("core-js/modules/es6.math.acosh");
+
+require("core-js/modules/es6.math.asinh");
+
+require("core-js/modules/es6.math.atanh");
+
+require("core-js/modules/es6.math.cbrt");
+
+require("core-js/modules/es6.math.clz32");
+
+require("core-js/modules/es6.math.cosh");
+
+require("core-js/modules/es6.math.expm1");
+
+require("core-js/modules/es6.math.fround");
+
+require("core-js/modules/es6.math.hypot");
+
+require("core-js/modules/es6.math.imul");
+
+require("core-js/modules/es6.math.log1p");
+
+require("core-js/modules/es6.math.log10");
+
+require("core-js/modules/es6.math.log2");
+
+require("core-js/modules/es6.math.sign");
+
+require("core-js/modules/es6.math.sinh");
+
+require("core-js/modules/es6.math.tanh");
+
+require("core-js/modules/es6.math.trunc");
+
+require("core-js/modules/es6.number.constructor");
+
+require("core-js/modules/es6.number.epsilon");
+
+require("core-js/modules/es6.number.is-finite");
+
+require("core-js/modules/es6.number.is-integer");
+
+require("core-js/modules/es6.number.is-nan");
+
+require("core-js/modules/es6.number.is-safe-integer");
+
+require("core-js/modules/es6.number.max-safe-integer");
+
+require("core-js/modules/es6.number.min-safe-integer");
+
+require("core-js/modules/es6.number.parse-float");
+
+require("core-js/modules/es6.number.parse-int");
+
+require("core-js/modules/es6.object.assign");
+
+require("core-js/modules/es6.object.create");
+
+require("core-js/modules/es7.object.define-getter");
+
+require("core-js/modules/es7.object.define-setter");
+
+require("core-js/modules/es6.object.define-property");
+
+require("core-js/modules/es6.object.define-properties");
+
+require("core-js/modules/es7.object.entries");
+
+require("core-js/modules/es6.object.freeze");
+
+require("core-js/modules/es6.object.get-own-property-descriptor");
+
+require("core-js/modules/es7.object.get-own-property-descriptors");
+
+require("core-js/modules/es6.object.get-own-property-names");
+
+require("core-js/modules/es6.object.get-prototype-of");
+
+require("core-js/modules/es7.object.lookup-getter");
+
+require("core-js/modules/es7.object.lookup-setter");
+
+require("core-js/modules/es6.object.prevent-extensions");
+
+require("core-js/modules/es6.object.to-string");
+
+require("core-js/modules/es6.object.is");
+
+require("core-js/modules/es6.object.is-frozen");
+
+require("core-js/modules/es6.object.is-sealed");
+
+require("core-js/modules/es6.object.is-extensible");
+
+require("core-js/modules/es6.object.keys");
+
+require("core-js/modules/es6.object.seal");
+
+require("core-js/modules/es6.object.set-prototype-of");
+
+require("core-js/modules/es7.object.values");
+
+require("core-js/modules/es6.promise");
+
+require("core-js/modules/es7.promise.finally");
+
+require("core-js/modules/es6.reflect.apply");
+
+require("core-js/modules/es6.reflect.construct");
+
+require("core-js/modules/es6.reflect.define-property");
+
+require("core-js/modules/es6.reflect.delete-property");
+
+require("core-js/modules/es6.reflect.get");
+
+require("core-js/modules/es6.reflect.get-own-property-descriptor");
+
+require("core-js/modules/es6.reflect.get-prototype-of");
+
+require("core-js/modules/es6.reflect.has");
+
+require("core-js/modules/es6.reflect.is-extensible");
+
+require("core-js/modules/es6.reflect.own-keys");
+
+require("core-js/modules/es6.reflect.prevent-extensions");
+
+require("core-js/modules/es6.reflect.set");
+
+require("core-js/modules/es6.reflect.set-prototype-of");
+
+require("core-js/modules/es6.regexp.constructor");
+
+require("core-js/modules/es6.regexp.flags");
+
+require("core-js/modules/es6.regexp.match");
+
+require("core-js/modules/es6.regexp.replace");
+
+require("core-js/modules/es6.regexp.split");
+
+require("core-js/modules/es6.regexp.search");
+
+require("core-js/modules/es6.regexp.to-string");
+
+require("core-js/modules/es6.set");
+
+require("core-js/modules/es6.symbol");
+
+require("core-js/modules/es7.symbol.async-iterator");
+
+require("core-js/modules/es6.string.anchor");
+
+require("core-js/modules/es6.string.big");
+
+require("core-js/modules/es6.string.blink");
+
+require("core-js/modules/es6.string.bold");
+
+require("core-js/modules/es6.string.code-point-at");
+
+require("core-js/modules/es6.string.ends-with");
+
+require("core-js/modules/es6.string.fixed");
+
+require("core-js/modules/es6.string.fontcolor");
+
+require("core-js/modules/es6.string.fontsize");
+
+require("core-js/modules/es6.string.from-code-point");
+
+require("core-js/modules/es6.string.includes");
+
+require("core-js/modules/es6.string.italics");
+
+require("core-js/modules/es6.string.iterator");
+
+require("core-js/modules/es6.string.link");
+
+require("core-js/modules/es7.string.pad-start");
+
+require("core-js/modules/es7.string.pad-end");
+
+require("core-js/modules/es6.string.raw");
+
+require("core-js/modules/es6.string.repeat");
+
+require("core-js/modules/es6.string.small");
+
+require("core-js/modules/es6.string.starts-with");
+
+require("core-js/modules/es6.string.strike");
+
+require("core-js/modules/es6.string.sub");
+
+require("core-js/modules/es6.string.sup");
+
+require("core-js/modules/es6.string.trim");
+
+require("core-js/modules/es7.string.trim-left");
+
+require("core-js/modules/es7.string.trim-right");
+
+require("core-js/modules/es6.typed.array-buffer");
+
+require("core-js/modules/es6.typed.data-view");
+
+require("core-js/modules/es6.typed.int8-array");
+
+require("core-js/modules/es6.typed.uint8-array");
+
+require("core-js/modules/es6.typed.uint8-clamped-array");
+
+require("core-js/modules/es6.typed.int16-array");
+
+require("core-js/modules/es6.typed.uint16-array");
+
+require("core-js/modules/es6.typed.int32-array");
+
+require("core-js/modules/es6.typed.uint32-array");
+
+require("core-js/modules/es6.typed.float32-array");
+
+require("core-js/modules/es6.typed.float64-array");
+
+require("core-js/modules/es6.weak-map");
+
+require("core-js/modules/es6.weak-set");
+
+require("core-js/modules/web.timers");
+
+require("core-js/modules/web.immediate");
+
+require("core-js/modules/web.dom.iterable");
+
+require("regenerator-runtime/runtime");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
+
+function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
+
+function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen["return"] !== "function") { this["return"] = undefined; } }
+
+if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
+
+_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
+
+_AsyncGenerator.prototype["throw"] = function (arg) { return this._invoke("throw", arg); };
+
+_AsyncGenerator.prototype["return"] = function (arg) { return this._invoke("return", arg); };
+
+function _AwaitValue(value) { this.wrapped = value; }
+
+var _x$y$a$b = {
+  x: 1,
+  y: 2,
+  a: 3,
+  b: 4
+},
+    x = _x$y$a$b.x,
+    y = _x$y$a$b.y,
+    z = _objectWithoutProperties(_x$y$a$b, ["x", "y"]);
+
+var n = _objectSpread({
+  x: x,
+  y: y
+}, z);
+
+function agf() {
+  return _agf.apply(this, arguments);
+}
+
+function _agf() {
+  _agf = _wrapAsyncGenerator(
+  /*#__PURE__*/
+  regeneratorRuntime.mark(function _callee() {
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _awaitAsyncGenerator(1);
+
+          case 2:
+            _context.next = 4;
+            return 2;
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _agf.apply(this, arguments);
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/options.json b/packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/options.json
new file mode 100644
index 000000000000..f3f1b4733a05
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/options.json
@@ -0,0 +1,21 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 63
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2,
+        "exclude": [
+          "es7.array.flat-map",
+          "web.timers",
+          "web.immediate",
+          "web.dom.iterable"
+        ]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/output.mjs
new file mode 100644
index 000000000000..71b8fdb1d834
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/exclude-built-ins/output.mjs
@@ -0,0 +1,2 @@
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-include/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude-include/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/exclude-include/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/exclude-include/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/exclude-include/options.json b/packages/babel-preset-env/test/fixtures/corejs2/exclude-include/options.json
new file mode 100644
index 000000000000..73ac20486207
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/exclude-include/options.json
@@ -0,0 +1,21 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2,
+        "exclude": [
+          "transform-async-to-generator",
+          "transform-regenerator",
+          "es6.string.repeat"
+        ],
+        "include": ["transform-arrow-functions", "es6.map"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/exclude-include/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude-include/output.mjs
new file mode 100644
index 000000000000..265ac0ac0365
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/exclude-include/output.mjs
@@ -0,0 +1,23 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es6.map";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+
+async function a() {
+  await 1;
+}
+
+(function () {});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/options.json b/packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/options.json
new file mode 100644
index 000000000000..376e03903748
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2,
+        "exclude": ["transform-regenerator"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/output.mjs
new file mode 100644
index 000000000000..e8994bd76301
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/exclude-regenerator/output.mjs
@@ -0,0 +1,148 @@
+import "core-js/modules/es6.array.copy-within";
+import "core-js/modules/es6.array.every";
+import "core-js/modules/es6.array.fill";
+import "core-js/modules/es6.array.filter";
+import "core-js/modules/es6.array.find";
+import "core-js/modules/es6.array.find-index";
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.for-each";
+import "core-js/modules/es6.array.from";
+import "core-js/modules/es7.array.includes";
+import "core-js/modules/es6.array.index-of";
+import "core-js/modules/es6.array.is-array";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.array.last-index-of";
+import "core-js/modules/es6.array.map";
+import "core-js/modules/es6.array.of";
+import "core-js/modules/es6.array.reduce";
+import "core-js/modules/es6.array.reduce-right";
+import "core-js/modules/es6.array.some";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es6.array.species";
+import "core-js/modules/es6.date.now";
+import "core-js/modules/es6.date.to-iso-string";
+import "core-js/modules/es6.date.to-json";
+import "core-js/modules/es6.date.to-primitive";
+import "core-js/modules/es6.date.to-string";
+import "core-js/modules/es6.function.bind";
+import "core-js/modules/es6.function.has-instance";
+import "core-js/modules/es6.function.name";
+import "core-js/modules/es6.map";
+import "core-js/modules/es6.math.acosh";
+import "core-js/modules/es6.math.asinh";
+import "core-js/modules/es6.math.atanh";
+import "core-js/modules/es6.math.cbrt";
+import "core-js/modules/es6.math.clz32";
+import "core-js/modules/es6.math.cosh";
+import "core-js/modules/es6.math.expm1";
+import "core-js/modules/es6.math.fround";
+import "core-js/modules/es6.math.hypot";
+import "core-js/modules/es6.math.imul";
+import "core-js/modules/es6.math.log1p";
+import "core-js/modules/es6.math.log10";
+import "core-js/modules/es6.math.log2";
+import "core-js/modules/es6.math.sign";
+import "core-js/modules/es6.math.sinh";
+import "core-js/modules/es6.math.tanh";
+import "core-js/modules/es6.math.trunc";
+import "core-js/modules/es6.number.constructor";
+import "core-js/modules/es6.number.epsilon";
+import "core-js/modules/es6.number.is-finite";
+import "core-js/modules/es6.number.is-integer";
+import "core-js/modules/es6.number.is-nan";
+import "core-js/modules/es6.number.is-safe-integer";
+import "core-js/modules/es6.number.max-safe-integer";
+import "core-js/modules/es6.number.min-safe-integer";
+import "core-js/modules/es6.number.parse-float";
+import "core-js/modules/es6.number.parse-int";
+import "core-js/modules/es6.object.assign";
+import "core-js/modules/es6.object.create";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es6.object.define-property";
+import "core-js/modules/es6.object.define-properties";
+import "core-js/modules/es7.object.entries";
+import "core-js/modules/es6.object.freeze";
+import "core-js/modules/es6.object.get-own-property-descriptor";
+import "core-js/modules/es7.object.get-own-property-descriptors";
+import "core-js/modules/es6.object.get-own-property-names";
+import "core-js/modules/es6.object.get-prototype-of";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.prevent-extensions";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es6.object.is";
+import "core-js/modules/es6.object.is-frozen";
+import "core-js/modules/es6.object.is-sealed";
+import "core-js/modules/es6.object.is-extensible";
+import "core-js/modules/es6.object.keys";
+import "core-js/modules/es6.object.seal";
+import "core-js/modules/es6.object.set-prototype-of";
+import "core-js/modules/es7.object.values";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.reflect.apply";
+import "core-js/modules/es6.reflect.construct";
+import "core-js/modules/es6.reflect.define-property";
+import "core-js/modules/es6.reflect.delete-property";
+import "core-js/modules/es6.reflect.get";
+import "core-js/modules/es6.reflect.get-own-property-descriptor";
+import "core-js/modules/es6.reflect.get-prototype-of";
+import "core-js/modules/es6.reflect.has";
+import "core-js/modules/es6.reflect.is-extensible";
+import "core-js/modules/es6.reflect.own-keys";
+import "core-js/modules/es6.reflect.prevent-extensions";
+import "core-js/modules/es6.reflect.set";
+import "core-js/modules/es6.reflect.set-prototype-of";
+import "core-js/modules/es6.regexp.constructor";
+import "core-js/modules/es6.regexp.flags";
+import "core-js/modules/es6.regexp.match";
+import "core-js/modules/es6.regexp.replace";
+import "core-js/modules/es6.regexp.split";
+import "core-js/modules/es6.regexp.search";
+import "core-js/modules/es6.regexp.to-string";
+import "core-js/modules/es6.set";
+import "core-js/modules/es6.symbol";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es6.string.anchor";
+import "core-js/modules/es6.string.big";
+import "core-js/modules/es6.string.blink";
+import "core-js/modules/es6.string.bold";
+import "core-js/modules/es6.string.code-point-at";
+import "core-js/modules/es6.string.ends-with";
+import "core-js/modules/es6.string.fixed";
+import "core-js/modules/es6.string.fontcolor";
+import "core-js/modules/es6.string.fontsize";
+import "core-js/modules/es6.string.from-code-point";
+import "core-js/modules/es6.string.includes";
+import "core-js/modules/es6.string.italics";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.string.link";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es6.string.raw";
+import "core-js/modules/es6.string.repeat";
+import "core-js/modules/es6.string.small";
+import "core-js/modules/es6.string.starts-with";
+import "core-js/modules/es6.string.strike";
+import "core-js/modules/es6.string.sub";
+import "core-js/modules/es6.string.sup";
+import "core-js/modules/es6.string.trim";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/es6.typed.array-buffer";
+import "core-js/modules/es6.typed.data-view";
+import "core-js/modules/es6.typed.int8-array";
+import "core-js/modules/es6.typed.uint8-array";
+import "core-js/modules/es6.typed.uint8-clamped-array";
+import "core-js/modules/es6.typed.int16-array";
+import "core-js/modules/es6.typed.uint16-array";
+import "core-js/modules/es6.typed.int32-array";
+import "core-js/modules/es6.typed.uint32-array";
+import "core-js/modules/es6.typed.float32-array";
+import "core-js/modules/es6.typed.float64-array";
+import "core-js/modules/es6.weak-map";
+import "core-js/modules/es6.weak-set";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/exclude/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/exclude/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/exclude/options.json b/packages/babel-preset-env/test/fixtures/corejs2/exclude/options.json
new file mode 100644
index 000000000000..0dd423720230
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/exclude/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "exclude": ["transform-async-to-generator", "transform-regenerator"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/exclude/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/exclude/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/exclude/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/options.json b/packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/options.json
new file mode 100644
index 000000000000..a16df6bc3e50
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2,
+        "forceAllTransforms": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/output.mjs
new file mode 100644
index 000000000000..3cb3bf4ca5aa
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/force-all-transforms/output.mjs
@@ -0,0 +1,18 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
+import "regenerator-runtime/runtime";
+var a = 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/options.json b/packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/options.json
new file mode 100644
index 000000000000..c6fc181232c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "include": ["es6.map", "es6.set"],
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/output.mjs
new file mode 100644
index 000000000000..cdc603eea1d3
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/include-built-ins/output.mjs
@@ -0,0 +1,18 @@
+import "core-js/modules/es7.array.flat-map";
+import "core-js/modules/es6.array.sort";
+import "core-js/modules/es6.map";
+import "core-js/modules/es7.object.define-getter";
+import "core-js/modules/es7.object.define-setter";
+import "core-js/modules/es7.object.lookup-getter";
+import "core-js/modules/es7.object.lookup-setter";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.set";
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.trim-left";
+import "core-js/modules/es7.string.trim-right";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.dom.iterable";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-all/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-all/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-all/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-all/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-all/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-all/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-all/output.mjs
new file mode 100644
index 000000000000..ccc11ee5c78d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-all/output.mjs
@@ -0,0 +1,38 @@
+import "core-js/modules/es7.symbol.async-iterator";
+import "core-js/modules/es6.symbol";
+import "core-js/modules/es6.regexp.match";
+import "core-js/modules/es6.promise";
+import "core-js/modules/web.dom.iterable";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es6.map";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.array.from";
+Array.from; // static method
+
+Map; // built-in
+
+new Promise(); // new builtin
+
+Symbol.match; // as member expression
+
+_arr[Symbol.iterator](); // Symbol.iterator
+// no import
+
+
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+
+_arr9[Symbol2.iterator]();
+
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/browserslist b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/browserslist
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/browserslist
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/browserslist
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/options.json
new file mode 100644
index 000000000000..f0e1e2cba61d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "configPath": "../fixtures/preset-options-add-used-built-ins/browserslist-config-ignore",
+        "modules": false,
+        "targets": { "esmodules": true },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "debug": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/output.mjs
new file mode 100644
index 000000000000..71719adea2ca
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-browserslist-config-ignore/output.mjs
@@ -0,0 +1,2 @@
+import "core-js/modules/web.dom.iterable";
+var a = new Map();
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/input.mjs
new file mode 100644
index 000000000000..bf62d9f7518e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/input.mjs
@@ -0,0 +1 @@
+[a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/options.json
new file mode 100644
index 000000000000..e58bc7432b89
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/output.mjs
new file mode 100644
index 000000000000..bf62d9f7518e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-assignment/output.mjs
@@ -0,0 +1 @@
+[a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/input.mjs
new file mode 100644
index 000000000000..cb50832b47e8
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/input.mjs
@@ -0,0 +1,3 @@
+try {
+  a();
+} catch([b, c]) { }
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/options.json
new file mode 100644
index 000000000000..e58bc7432b89
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/output.mjs
new file mode 100644
index 000000000000..830d37b8507d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-catch/output.mjs
@@ -0,0 +1,3 @@
+try {
+  a();
+} catch ([b, c]) {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/input.mjs
new file mode 100644
index 000000000000..027d407b5e83
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/input.mjs
@@ -0,0 +1 @@
+for (let [a, b] in c);
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/options.json
new file mode 100644
index 000000000000..e58bc7432b89
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/output.mjs
new file mode 100644
index 000000000000..ca32ae08c5e2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-for-x/output.mjs
@@ -0,0 +1,3 @@
+for (var [a, b] in c) {
+  ;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/input.mjs
new file mode 100644
index 000000000000..0b8c72fe4c58
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/input.mjs
@@ -0,0 +1 @@
+function a([b, c]) {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/options.json
new file mode 100644
index 000000000000..e58bc7432b89
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/output.mjs
new file mode 100644
index 000000000000..db332778ee99
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-params/output.mjs
@@ -0,0 +1,3 @@
+function a(_ref) {
+  var [b, c] = _ref;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/input.mjs
new file mode 100644
index 000000000000..e68aeb23a87b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/input.mjs
@@ -0,0 +1 @@
+const [a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/options.json
new file mode 100644
index 000000000000..e58bc7432b89
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/output.mjs
new file mode 100644
index 000000000000..6f950af748b7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-destructuring-variable-declaration/output.mjs
@@ -0,0 +1 @@
+var [a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/output.mjs
new file mode 100644
index 000000000000..113f840cdd16
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-class-methods/output.mjs
@@ -0,0 +1,17 @@
+import "core-js/modules/es6.object.assign";
+import "core-js/modules/web.dom.iterable";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.object.to-string";
+var objectClass = Object;
+var arrayInstance = [];
+var assignStr = "assign";
+var entriesStr = "entries";
+var valuesStr = "values";
+var inclidesStr = "includes";
+var findStr = "find"; // Allow static methods be assigned to variables only directly in the module.
+
+externalVar[valuesStr]; // don't include
+
+objectClass[assignStr]({}); // include
+
+arrayInstance[entriesStr]({}); // don't include
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-instance-methods/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-instance-methods/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-instance-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-instance-methods/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-instance-methods/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-instance-methods/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-evaluated-instance-methods/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-with/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-with/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-with/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-with/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-with/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-with/options.json
new file mode 100644
index 000000000000..53c96ff4219d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-with/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "7"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-with/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-with/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-with/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-with/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/options.json
new file mode 100644
index 000000000000..ec23cad4bdce
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "11"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/output.mjs
new file mode 100644
index 000000000000..9b8c02b13b8d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of-destructure-without/output.mjs
@@ -0,0 +1,5 @@
+for (const {
+  a
+} of foo) {
+  console.log(a);
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/input.mjs
new file mode 100644
index 000000000000..9f6660a25f8a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/input.mjs
@@ -0,0 +1 @@
+for (let a of b);
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/options.json
new file mode 100644
index 000000000000..ef3d4db9f278
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "exclude": ["transform-for-of"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/output.mjs
new file mode 100644
index 000000000000..0399fdab41a1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-for-of/output.mjs
@@ -0,0 +1,3 @@
+for (var a of b) {
+  ;
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods-native-support/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods-native-support/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods-native-support/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods-native-support/options.json
new file mode 100644
index 000000000000..de79358da292
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "targets": {
+          "chrome": 71
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods-native-support/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods-native-support/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods-native-support/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/output.mjs
new file mode 100644
index 000000000000..e0f8fc879b64
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-instance-methods/output.mjs
@@ -0,0 +1,55 @@
+import "core-js/modules/es6.regexp.split";
+import "core-js/modules/es6.regexp.replace";
+import "core-js/modules/es6.regexp.search";
+import "core-js/modules/es6.array.copy-within";
+import "core-js/modules/es6.string.ends-with";
+import "core-js/modules/es6.string.code-point-at";
+import "core-js/modules/es6.string.starts-with";
+import "core-js/modules/es7.string.pad-end";
+import "core-js/modules/es7.string.pad-start";
+import "core-js/modules/es6.array.fill";
+import "core-js/modules/es6.function.bind";
+import "core-js/modules/es6.array.find-index";
+import "core-js/modules/es6.array.find";
+import "core-js/modules/es7.array.includes";
+import "core-js/modules/es6.string.includes";
+import "core-js/modules/web.dom.iterable";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.object.to-string";
+import "core-js/modules/es6.map";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.array.from";
+Array.from; // static function
+
+Map; // top level built-in
+// instance methods may have false positives (which is ok)
+
+a.includes(); // method call
+
+b['find']; // computed string?
+
+c.prototype.findIndex(); // .prototype
+
+d.fill.bind(); //.bind
+
+e.padStart.apply(); // .apply
+
+f.padEnd.call(); // .call
+
+String.prototype.startsWith.call; // prototype.call
+
+var _k = k,
+    codePointAt = _k.codePointAt,
+    endsWith = _k.endsWith; // destructuring
+
+var asdf = "copyWithin";
+var asdf2 = "split";
+var asdf3 = "re" + "place";
+i[asdf]; // computed with identifier
+
+j["search"]; // computed with template
+
+k[asdf3]; // computed with concat strings
+
+var _k2 = k,
+    _a = _k2[asdf2]; // computed
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/options.json
new file mode 100644
index 000000000000..32ed21fb6f92
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/options.json
@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/output.js b/packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/output.js
new file mode 100644
index 000000000000..4a62ea9e8164
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-modules-transform/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+require("core-js/modules/es6.promise");
+
+require("core-js/modules/es6.object.to-string");
+
+Promise;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/options.json
new file mode 100644
index 000000000000..de79358da292
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "targets": {
+          "chrome": 71
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/output.mjs
new file mode 100644
index 000000000000..845aac57c5c0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-native-support/output.mjs
@@ -0,0 +1,37 @@
+import "core-js/modules/web.dom.iterable";
+Array.from; // static method
+
+Map; // built-in
+
+new Promise(); // new builtin
+
+Symbol.match; // as member expression
+// no import
+
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+
+_arr9[Symbol2.iterator]();
+
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
+// not covered by this plugin
+
+
+var asdf = 'copyWithin';
+i[asdf]; // computed with identifier
+
+j[`copyWithin`]; // computed with template
+
+var {
+  [asdf]: _a
+} = k; // computed
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/no-builtins-used/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-builtins/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/no-builtins-used/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-no-builtins/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-no-builtins/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-builtins/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-builtins/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/no-builtins-used/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-builtins/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/no-builtins-used/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-no-builtins/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/no-transform/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-transform/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/no-transform/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-no-transform/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-no-transform/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-transform/options.json
new file mode 100644
index 000000000000..ff036632375c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-transform/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55"
+        },
+        "modules": false,
+        "useBuiltIns": "usage",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/no-transform/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-no-transform/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/no-transform/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-no-transform/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/number-ie11/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-number-ie-11/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/number-ie11/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-number-ie-11/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-number-ie-11/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-number-ie-11/options.json
new file mode 100644
index 000000000000..e793b91733df
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-number-ie-11/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "ie": "11"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/number-ie11/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-number-ie-11/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/number-ie11/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-number-ie-11/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/options.json
new file mode 100644
index 000000000000..133e1e9298dc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie > 10"]
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/output.mjs
new file mode 100644
index 000000000000..199377053c8a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-all/output.mjs
@@ -0,0 +1,9 @@
+import "core-js/modules/web.dom.iterable";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es6.object.to-string";
+var p = Promise.resolve(0);
+Promise.all([p]).then(function (outcome) {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/options.json
new file mode 100644
index 000000000000..133e1e9298dc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie > 10"]
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/output.mjs
new file mode 100644
index 000000000000..a2103a5120a2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-finally/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es7.promise.finally";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es6.object.to-string";
+var p = Promise.resolve(0);
+p.finally(function () {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/options.json
new file mode 100644
index 000000000000..133e1e9298dc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie > 10"]
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/output.mjs
new file mode 100644
index 000000000000..b4a03612d049
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-promise-race/output.mjs
@@ -0,0 +1,9 @@
+import "core-js/modules/web.dom.iterable";
+import "core-js/modules/es6.array.iterator";
+import "core-js/modules/es6.string.iterator";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es6.object.to-string";
+var p = Promise.resolve(0);
+Promise.race([p]).then(function (outcome) {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-and-promise-native-support/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async-native-support/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-and-promise-native-support/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-and-promise-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-and-promise-native-support/options.json
new file mode 100644
index 000000000000..a1b9ada1e85c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-and-promise-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "targets": {
+          "chrome": 70
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-and-promise-native-support/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async-native-support/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-and-promise-native-support/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/options.json
new file mode 100644
index 000000000000..d5fc31f1549d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "targets": {
+          "chrome": 55
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/output.mjs
new file mode 100644
index 000000000000..5d965c6200a9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async-native-support/output.mjs
@@ -0,0 +1 @@
+async function a() {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/input.mjs
new file mode 100644
index 000000000000..8f6724b27f04
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/input.mjs
@@ -0,0 +1 @@
+async function a(){}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/output.mjs
new file mode 100644
index 000000000000..db18b8bfe116
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-async/output.mjs
@@ -0,0 +1,28 @@
+import "regenerator-runtime/runtime";
+import "core-js/modules/es6.promise";
+import "core-js/modules/es6.object.to-string";
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function a() {
+  return _a.apply(this, arguments);
+}
+
+function _a() {
+  _a = _asyncToGenerator(
+  /*#__PURE__*/
+  regeneratorRuntime.mark(function _callee() {
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _a.apply(this, arguments);
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator-native-support/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator-native-support/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator-native-support/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator-native-support/options.json
new file mode 100644
index 000000000000..2386a9041077
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "targets": {
+          "node": 6
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator-native-support/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator-native-support/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator-native-support/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/output.mjs
new file mode 100644
index 000000000000..ce5acd262e9f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-regenerator-used-generator/output.mjs
@@ -0,0 +1,17 @@
+import "regenerator-runtime/runtime";
+
+var _marked =
+/*#__PURE__*/
+regeneratorRuntime.mark(a);
+
+function a() {
+  return regeneratorRuntime.wrap(function a$(_context) {
+    while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked);
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-remove-babel-polyfill-import/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-remove-babel-polyfill-import/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-remove-babel-polyfill-import/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-remove-babel-polyfill-import/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-remove-babel-polyfill-import/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/input.js b/packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/input.js
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/input.js
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/input.js
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/options.json
new file mode 100644
index 000000000000..1ff3addd4982
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/options.json
@@ -0,0 +1,13 @@
+{
+  "sourceType": "module",
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "shippedProposals": true,
+        "useBuiltIns": "usage",
+        "corejs": 2
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/output.js b/packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/output.js
new file mode 100644
index 000000000000..341d5845145e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-shippedProposals/output.js
@@ -0,0 +1,99 @@
+"use strict";
+
+require("core-js/modules/es6.object.define-properties");
+
+require("core-js/modules/es7.object.get-own-property-descriptors");
+
+require("core-js/modules/es6.array.for-each");
+
+require("core-js/modules/es6.array.filter");
+
+require("core-js/modules/es6.object.define-property");
+
+require("core-js/modules/es6.array.index-of");
+
+require("core-js/modules/web.dom.iterable");
+
+require("core-js/modules/es6.array.iterator");
+
+require("core-js/modules/es6.object.keys");
+
+require("regenerator-runtime/runtime");
+
+require("core-js/modules/es7.symbol.async-iterator");
+
+require("core-js/modules/es6.symbol");
+
+require("core-js/modules/es6.promise");
+
+require("core-js/modules/es6.object.to-string");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
+
+function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
+
+function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen["return"] !== "function") { this["return"] = undefined; } }
+
+if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
+
+_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
+
+_AsyncGenerator.prototype["throw"] = function (arg) { return this._invoke("throw", arg); };
+
+_AsyncGenerator.prototype["return"] = function (arg) { return this._invoke("return", arg); };
+
+function _AwaitValue(value) { this.wrapped = value; }
+
+var _x$y$a$b = {
+  x: 1,
+  y: 2,
+  a: 3,
+  b: 4
+},
+    x = _x$y$a$b.x,
+    y = _x$y$a$b.y,
+    z = _objectWithoutProperties(_x$y$a$b, ["x", "y"]);
+
+var n = _objectSpread({
+  x: x,
+  y: y
+}, z);
+
+function agf() {
+  return _agf.apply(this, arguments);
+}
+
+function _agf() {
+  _agf = _wrapAsyncGenerator(
+  /*#__PURE__*/
+  regeneratorRuntime.mark(function _callee() {
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return _awaitAsyncGenerator(1);
+
+          case 2:
+            _context.next = 4;
+            return 2;
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _agf.apply(this, arguments);
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/input.js b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/input.js
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/input.js
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/input.js
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/options.json
new file mode 100644
index 000000000000..5bf97a806ec8
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "targets": {
+          "node": "4.0.0"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "shippedProposals": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/output.js b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/output.js
new file mode 100644
index 000000000000..6f953a53d427
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script-query/output.js
@@ -0,0 +1,13 @@
+require("core-js/modules/es7.array.includes");
+
+require("core-js/modules/es6.promise");
+
+require("core-js/modules/es6.object.to-string");
+
+require("foo");
+
+var x = new Promise(function (resolve) {
+  var p = [];
+
+  if (p.includes("a")) {}
+});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/input.js b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/input.js
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/input.js
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/input.js
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/options.json
new file mode 100644
index 000000000000..5bf97a806ec8
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "targets": {
+          "node": "4.0.0"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "shippedProposals": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/output.js b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/output.js
new file mode 100644
index 000000000000..6f953a53d427
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-source-type-script/output.js
@@ -0,0 +1,13 @@
+require("core-js/modules/es7.array.includes");
+
+require("core-js/modules/es6.promise");
+
+require("core-js/modules/es6.object.to-string");
+
+require("foo");
+
+var x = new Promise(function (resolve) {
+  var p = [];
+
+  if (p.includes("a")) {}
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/input.mjs
new file mode 100644
index 000000000000..457ddbbd55fe
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/input.mjs
@@ -0,0 +1 @@
+a = [b, ...c];
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/options.json
new file mode 100644
index 000000000000..fe86765f3810
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false,
+        "exclude": ["transform-spread"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/output.mjs
new file mode 100644
index 000000000000..457ddbbd55fe
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-spread/output.mjs
@@ -0,0 +1 @@
+a = [b, ...c];
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator-in/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator-in/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator-in/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator-in/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator-in/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator-in/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator-in/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-symbol-iterator/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/input.mjs
new file mode 100644
index 000000000000..0f5be0d2da0e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/input.mjs
@@ -0,0 +1,5 @@
+Promise.resolve().then(it => {
+  setTimeout(foo, 1, 2);
+  setInterval(foo, 1, 2);
+  setImmediate(foo, 1, 2);
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/output.mjs
new file mode 100644
index 000000000000..9f0806068bfb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-timers/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es6.promise";
+import "core-js/modules/es6.object.to-string";
+Promise.resolve().then(function (it) {
+  setTimeout(foo, 1, 2);
+  setInterval(foo, 1, 2);
+  setImmediate(foo, 1, 2);
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/input.mjs
new file mode 100644
index 000000000000..b0bc068aa063
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/input.mjs
@@ -0,0 +1 @@
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/options.json
new file mode 100644
index 000000000000..057e2ed59be0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "targets": {
+          "edge": "13"
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/output.mjs
new file mode 100644
index 000000000000..b0bc068aa063
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-edge-13/output.mjs
@@ -0,0 +1 @@
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/input.mjs
new file mode 100644
index 000000000000..2394d067f859
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/input.mjs
@@ -0,0 +1 @@
+Int8Array.of();
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/output.mjs
new file mode 100644
index 000000000000..995d901c5ced
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array-static/output.mjs
@@ -0,0 +1,2 @@
+import "core-js/modules/es6.typed.int8-array";
+Int8Array.of();
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/input.mjs
new file mode 100644
index 000000000000..b0bc068aa063
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/input.mjs
@@ -0,0 +1 @@
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/options.json
new file mode 100644
index 000000000000..fe3e4d6cf9c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/output.mjs
new file mode 100644
index 000000000000..5f5982426d2b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-typed-array/output.mjs
@@ -0,0 +1,2 @@
+import "core-js/modules/es6.typed.int8-array";
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-non-star/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-non-star/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/yield-non-star/input.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-yield-non-star/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-non-star/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-non-star/options.json
new file mode 100644
index 000000000000..dae54735f2d9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-non-star/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-non-star/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-non-star/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/yield-non-star/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-yield-non-star/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/input.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/input.mjs
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/input.mjs
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/options.json b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/options.json
new file mode 100644
index 000000000000..dae54735f2d9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 2,
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-star/output.mjs b/packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/dom-iterable/yield-star/output.mjs
rename to packages/babel-preset-env/test/fixtures/corejs2/usage-yield-star/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/.entry-all-exec/exec.js b/packages/babel-preset-env/test/fixtures/corejs3/.entry-all-exec/exec.js
new file mode 100644
index 000000000000..dc2f5fc562b5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/.entry-all-exec/exec.js
@@ -0,0 +1,3 @@
+if (parseInt(process.version.slice(1)) > 5) {
+  require('core-js');
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/.use-builtins-all-exec/options.json b/packages/babel-preset-env/test/fixtures/corejs3/.entry-all-exec/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/.use-builtins-all-exec/options.json
rename to packages/babel-preset-env/test/fixtures/corejs3/.entry-all-exec/options.json
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/input.mjs
new file mode 100644
index 000000000000..c0ce4c954ebe
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/output.mjs
new file mode 100644
index 000000000000..b0bfda361f5d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-all-chrome-71/output.mjs
@@ -0,0 +1,85 @@
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/web.immediate";
+import "core-js/modules/esnext.string.match-all";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-all/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-all/input.mjs
new file mode 100644
index 000000000000..c0ce4c954ebe
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-all/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-all/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-all/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-all/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-all/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-all/output.mjs
new file mode 100644
index 000000000000..d1fd6163046e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-all/output.mjs
@@ -0,0 +1,291 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.is-concat-spreadable";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.symbol.to-primitive";
+import "core-js/modules/es.symbol.to-string-tag";
+import "core-js/modules/es.symbol.unscopables";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.copy-within";
+import "core-js/modules/es.array.every";
+import "core-js/modules/es.array.fill";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.find-index";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.for-each";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.index-of";
+import "core-js/modules/es.array.is-array";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.join";
+import "core-js/modules/es.array.last-index-of";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.of";
+import "core-js/modules/es.array.reduce";
+import "core-js/modules/es.array.reduce-right";
+import "core-js/modules/es.array.reverse";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.some";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.array-buffer.constructor";
+import "core-js/modules/es.array-buffer.is-view";
+import "core-js/modules/es.array-buffer.slice";
+import "core-js/modules/es.data-view";
+import "core-js/modules/es.date.now";
+import "core-js/modules/es.date.to-iso-string";
+import "core-js/modules/es.date.to-json";
+import "core-js/modules/es.date.to-primitive";
+import "core-js/modules/es.date.to-string";
+import "core-js/modules/es.function.bind";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.function.name";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.asinh";
+import "core-js/modules/es.math.atanh";
+import "core-js/modules/es.math.cbrt";
+import "core-js/modules/es.math.clz32";
+import "core-js/modules/es.math.cosh";
+import "core-js/modules/es.math.expm1";
+import "core-js/modules/es.math.fround";
+import "core-js/modules/es.math.hypot";
+import "core-js/modules/es.math.imul";
+import "core-js/modules/es.math.log10";
+import "core-js/modules/es.math.log1p";
+import "core-js/modules/es.math.log2";
+import "core-js/modules/es.math.sign";
+import "core-js/modules/es.math.sinh";
+import "core-js/modules/es.math.tanh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.math.trunc";
+import "core-js/modules/es.number.constructor";
+import "core-js/modules/es.number.epsilon";
+import "core-js/modules/es.number.is-finite";
+import "core-js/modules/es.number.is-integer";
+import "core-js/modules/es.number.is-nan";
+import "core-js/modules/es.number.is-safe-integer";
+import "core-js/modules/es.number.max-safe-integer";
+import "core-js/modules/es.number.min-safe-integer";
+import "core-js/modules/es.number.parse-float";
+import "core-js/modules/es.number.parse-int";
+import "core-js/modules/es.number.to-fixed";
+import "core-js/modules/es.number.to-precision";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.create";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-properties";
+import "core-js/modules/es.object.define-property";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.freeze";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptor";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.get-own-property-names";
+import "core-js/modules/es.object.get-prototype-of";
+import "core-js/modules/es.object.is";
+import "core-js/modules/es.object.is-extensible";
+import "core-js/modules/es.object.is-frozen";
+import "core-js/modules/es.object.is-sealed";
+import "core-js/modules/es.object.keys";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.prevent-extensions";
+import "core-js/modules/es.object.seal";
+import "core-js/modules/es.object.set-prototype-of";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.parse-float";
+import "core-js/modules/es.parse-int";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.code-point-at";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.from-code-point";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.raw";
+import "core-js/modules/es.string.repeat";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.string.anchor";
+import "core-js/modules/es.string.big";
+import "core-js/modules/es.string.blink";
+import "core-js/modules/es.string.bold";
+import "core-js/modules/es.string.fixed";
+import "core-js/modules/es.string.fontcolor";
+import "core-js/modules/es.string.fontsize";
+import "core-js/modules/es.string.italics";
+import "core-js/modules/es.string.link";
+import "core-js/modules/es.string.small";
+import "core-js/modules/es.string.strike";
+import "core-js/modules/es.string.sub";
+import "core-js/modules/es.string.sup";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.global-this";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import "core-js/modules/esnext.string.match-all";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/input.mjs
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/input.mjs
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/output.mjs
new file mode 100644
index 000000000000..c3030bdd6280
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-babel-polyfill/output.mjs
@@ -0,0 +1 @@
+import '@babel/polyfill';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/input.mjs
new file mode 100644
index 000000000000..4709961aee5f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/options.json
new file mode 100644
index 000000000000..8d81267b6799
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 48
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/output.mjs
new file mode 100644
index 000000000000..4714da27c5b2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-48/output.mjs
@@ -0,0 +1,96 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.symbol.to-string-tag";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.index-of";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.last-index-of";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
+Math.pow(1, 2);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/input.mjs
new file mode 100644
index 000000000000..4709961aee5f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/options.json
new file mode 100644
index 000000000000..20c5a15f216f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 49
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/output.mjs
new file mode 100644
index 000000000000..d38ec2742978
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-49/output.mjs
@@ -0,0 +1,77 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.index-of";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.last-index-of";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
+Math.pow(1, 2);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/input.mjs
new file mode 100644
index 000000000000..dc9866842e7b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/input.mjs
@@ -0,0 +1,17 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+
+const foo = {
+  a: true,
+};
+
+const bar = {
+  ...foo,
+  b: false,
+};
+
+async function baz() {
+  for await (const x of someAsyncThing()) {
+    console.log(x);
+  }
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/options.json
new file mode 100644
index 000000000000..68c70de63a84
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "66"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/output.mjs
new file mode 100644
index 000000000000..f367b9447dc2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-66/output.mjs
@@ -0,0 +1,23 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url.to-json";
+const foo = {
+  a: true
+};
+const bar = { ...foo,
+  b: false
+};
+
+async function baz() {
+  for await (const x of someAsyncThing()) {
+    console.log(x);
+  }
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/input.mjs
new file mode 100644
index 000000000000..dc9866842e7b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/input.mjs
@@ -0,0 +1,17 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+
+const foo = {
+  a: true,
+};
+
+const bar = {
+  ...foo,
+  b: false,
+};
+
+async function baz() {
+  for await (const x of someAsyncThing()) {
+    console.log(x);
+  }
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/output.mjs
new file mode 100644
index 000000000000..e7e57e8ebb0d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chrome-71/output.mjs
@@ -0,0 +1,16 @@
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/web.immediate";
+const foo = {
+  a: true
+};
+const bar = { ...foo,
+  b: false
+};
+
+async function baz() {
+  for await (const x of someAsyncThing()) {
+    console.log(x);
+  }
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/input.mjs
new file mode 100644
index 000000000000..4709961aee5f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/options.json
new file mode 100644
index 000000000000..64487f4c5f72
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": "chromeandroid 59"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/output.mjs
new file mode 100644
index 000000000000..e3be757cb2a9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-chromeandroid/output.mjs
@@ -0,0 +1,25 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/input.mjs
new file mode 100644
index 000000000000..6d00700f4266
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+
+a ** b;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/options.json
new file mode 100644
index 000000000000..de3541c8af37
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "electron": "1.4"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/output.mjs
new file mode 100644
index 000000000000..daf15be68f3a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-electron/output.mjs
@@ -0,0 +1,29 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+a ** b;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/input.mjs
new file mode 100644
index 000000000000..cda864f1014e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/es';
+import 'core-js/proposals';
+import 'core-js/stage';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/output.mjs
new file mode 100644
index 000000000000..a6c680fa982e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage-chrome-71/output.mjs
@@ -0,0 +1,84 @@
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/esnext.string.match-all";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/input.mjs
new file mode 100644
index 000000000000..cda864f1014e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/es';
+import 'core-js/proposals';
+import 'core-js/stage';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/output.mjs
new file mode 100644
index 000000000000..c90f59ea1482
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-es-proposals-stage/output.mjs
@@ -0,0 +1,286 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.is-concat-spreadable";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.symbol.to-primitive";
+import "core-js/modules/es.symbol.to-string-tag";
+import "core-js/modules/es.symbol.unscopables";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.copy-within";
+import "core-js/modules/es.array.every";
+import "core-js/modules/es.array.fill";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.find-index";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.for-each";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.index-of";
+import "core-js/modules/es.array.is-array";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.join";
+import "core-js/modules/es.array.last-index-of";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.of";
+import "core-js/modules/es.array.reduce";
+import "core-js/modules/es.array.reduce-right";
+import "core-js/modules/es.array.reverse";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.some";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.array-buffer.constructor";
+import "core-js/modules/es.array-buffer.is-view";
+import "core-js/modules/es.array-buffer.slice";
+import "core-js/modules/es.data-view";
+import "core-js/modules/es.date.now";
+import "core-js/modules/es.date.to-iso-string";
+import "core-js/modules/es.date.to-json";
+import "core-js/modules/es.date.to-primitive";
+import "core-js/modules/es.date.to-string";
+import "core-js/modules/es.function.bind";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.function.name";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.asinh";
+import "core-js/modules/es.math.atanh";
+import "core-js/modules/es.math.cbrt";
+import "core-js/modules/es.math.clz32";
+import "core-js/modules/es.math.cosh";
+import "core-js/modules/es.math.expm1";
+import "core-js/modules/es.math.fround";
+import "core-js/modules/es.math.hypot";
+import "core-js/modules/es.math.imul";
+import "core-js/modules/es.math.log10";
+import "core-js/modules/es.math.log1p";
+import "core-js/modules/es.math.log2";
+import "core-js/modules/es.math.sign";
+import "core-js/modules/es.math.sinh";
+import "core-js/modules/es.math.tanh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.math.trunc";
+import "core-js/modules/es.number.constructor";
+import "core-js/modules/es.number.epsilon";
+import "core-js/modules/es.number.is-finite";
+import "core-js/modules/es.number.is-integer";
+import "core-js/modules/es.number.is-nan";
+import "core-js/modules/es.number.is-safe-integer";
+import "core-js/modules/es.number.max-safe-integer";
+import "core-js/modules/es.number.min-safe-integer";
+import "core-js/modules/es.number.parse-float";
+import "core-js/modules/es.number.parse-int";
+import "core-js/modules/es.number.to-fixed";
+import "core-js/modules/es.number.to-precision";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.create";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-properties";
+import "core-js/modules/es.object.define-property";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.freeze";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptor";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.get-own-property-names";
+import "core-js/modules/es.object.get-prototype-of";
+import "core-js/modules/es.object.is";
+import "core-js/modules/es.object.is-extensible";
+import "core-js/modules/es.object.is-frozen";
+import "core-js/modules/es.object.is-sealed";
+import "core-js/modules/es.object.keys";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.prevent-extensions";
+import "core-js/modules/es.object.seal";
+import "core-js/modules/es.object.set-prototype-of";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.parse-float";
+import "core-js/modules/es.parse-int";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.code-point-at";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.from-code-point";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.raw";
+import "core-js/modules/es.string.repeat";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.string.anchor";
+import "core-js/modules/es.string.big";
+import "core-js/modules/es.string.blink";
+import "core-js/modules/es.string.bold";
+import "core-js/modules/es.string.fixed";
+import "core-js/modules/es.string.fontcolor";
+import "core-js/modules/es.string.fontsize";
+import "core-js/modules/es.string.italics";
+import "core-js/modules/es.string.link";
+import "core-js/modules/es.string.small";
+import "core-js/modules/es.string.strike";
+import "core-js/modules/es.string.sub";
+import "core-js/modules/es.string.sup";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.global-this";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import "core-js/modules/esnext.string.match-all";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/input.mjs
new file mode 100644
index 000000000000..1dfe5978ede0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/features/set';
+import 'core-js/features/array/from';
+import 'core-js/features/object/from-entries';
+import 'core-js/features/string/replace-all';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/output.mjs
new file mode 100644
index 000000000000..709c4c46f314
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features-chrome-71/output.mjs
@@ -0,0 +1,20 @@
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.replace-all";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/input.mjs
new file mode 100644
index 000000000000..1dfe5978ede0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/features/set';
+import 'core-js/features/array/from';
+import 'core-js/features/object/from-entries';
+import 'core-js/features/string/replace-all';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/output.mjs
new file mode 100644
index 000000000000..bd40e3a515d5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-features/output.mjs
@@ -0,0 +1,26 @@
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/web.dom-collections.iterator";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/input.mjs
new file mode 100644
index 000000000000..98845292d4f3
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/features/set';
+import 'core-js/features/something.new';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/output.mjs
new file mode 100644
index 000000000000..db5f1173b2fc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-missed/output.mjs
@@ -0,0 +1,19 @@
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import 'core-js/features/something.new';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/input.mjs
new file mode 100644
index 000000000000..461f89abcc96
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/es/object';
+import 'core-js/features/reflect';
+import 'core-js/something';
+import 'regenerator-runtime/runtime';
\ No newline at end of file
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/output.mjs
new file mode 100644
index 000000000000..ef5c31db184c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed-chrome-71/output.mjs
@@ -0,0 +1,11 @@
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import 'core-js/something';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/input.mjs
new file mode 100644
index 000000000000..694e78444f7e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/es/object';
+import 'core-js/features/reflect';
+import 'core-js/something';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/output.mjs
new file mode 100644
index 000000000000..24251fba896e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-mixed/output.mjs
@@ -0,0 +1,52 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.create";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-properties";
+import "core-js/modules/es.object.define-property";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.freeze";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptor";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.get-own-property-names";
+import "core-js/modules/es.object.get-prototype-of";
+import "core-js/modules/es.object.is";
+import "core-js/modules/es.object.is-extensible";
+import "core-js/modules/es.object.is-frozen";
+import "core-js/modules/es.object.is-sealed";
+import "core-js/modules/es.object.keys";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.prevent-extensions";
+import "core-js/modules/es.object.seal";
+import "core-js/modules/es.object.set-prototype-of";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import 'core-js/something';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/input.mjs
new file mode 100644
index 000000000000..e761a4ac12c5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/modules/es.symbol';
+import 'core-js/modules/es.object.from-entries';
+import 'core-js/modules/esnext.string.replace-all';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/output.mjs
new file mode 100644
index 000000000000..44a025d6a453
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules-chrome-71/output.mjs
@@ -0,0 +1,2 @@
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/esnext.string.replace-all";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/input.mjs
new file mode 100644
index 000000000000..e761a4ac12c5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/modules/es.symbol';
+import 'core-js/modules/es.object.from-entries';
+import 'core-js/modules/esnext.string.replace-all';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/output.mjs
new file mode 100644
index 000000000000..16b33e2fd0b9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-modules/output.mjs
@@ -0,0 +1,3 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/esnext.string.replace-all";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/input.mjs
new file mode 100644
index 000000000000..b721678e02bb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/proposals';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/output.mjs
new file mode 100644
index 000000000000..56b2198265f2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals-chrome-71/output.mjs
@@ -0,0 +1,81 @@
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/esnext.string.match-all";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/input.mjs
new file mode 100644
index 000000000000..b721678e02bb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/proposals';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/output.mjs
new file mode 100644
index 000000000000..65c37496e056
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-proposals/output.mjs
@@ -0,0 +1,86 @@
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.global-this";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import "core-js/modules/esnext.string.match-all";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/input.mjs
new file mode 100644
index 000000000000..063b45ea1155
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/stable/set';
+import 'core-js/stable/array/from';
+import 'core-js/stable/object/from-entries';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/output.mjs
new file mode 100644
index 000000000000..770311665f95
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable-chrome-71/output.mjs
@@ -0,0 +1 @@
+import "core-js/modules/es.object.from-entries";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/input.mjs
new file mode 100644
index 000000000000..063b45ea1155
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/stable/set';
+import 'core-js/stable/array/from';
+import 'core-js/stable/object/from-entries';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/output.mjs
new file mode 100644
index 000000000000..896c1ad687dd
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stable/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/input.mjs
new file mode 100644
index 000000000000..d7e24c275a82
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stage';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/output.mjs
new file mode 100644
index 000000000000..56b2198265f2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage-chrome-71/output.mjs
@@ -0,0 +1,81 @@
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/esnext.string.match-all";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/input.mjs
new file mode 100644
index 000000000000..d7e24c275a82
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stage';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/output.mjs
new file mode 100644
index 000000000000..65c37496e056
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-stage/output.mjs
@@ -0,0 +1,86 @@
+import "core-js/modules/esnext.aggregate-error";
+import "core-js/modules/esnext.array.last-index";
+import "core-js/modules/esnext.array.last-item";
+import "core-js/modules/esnext.composite-key";
+import "core-js/modules/esnext.composite-symbol";
+import "core-js/modules/esnext.global-this";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.from";
+import "core-js/modules/esnext.map.group-by";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-by";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.of";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.math.clamp";
+import "core-js/modules/esnext.math.deg-per-rad";
+import "core-js/modules/esnext.math.degrees";
+import "core-js/modules/esnext.math.fscale";
+import "core-js/modules/esnext.math.iaddh";
+import "core-js/modules/esnext.math.imulh";
+import "core-js/modules/esnext.math.isubh";
+import "core-js/modules/esnext.math.rad-per-deg";
+import "core-js/modules/esnext.math.radians";
+import "core-js/modules/esnext.math.scale";
+import "core-js/modules/esnext.math.seeded-prng";
+import "core-js/modules/esnext.math.signbit";
+import "core-js/modules/esnext.math.umulh";
+import "core-js/modules/esnext.number.from-string";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.promise.all-settled";
+import "core-js/modules/esnext.promise.any";
+import "core-js/modules/esnext.promise.try";
+import "core-js/modules/esnext.reflect.define-metadata";
+import "core-js/modules/esnext.reflect.delete-metadata";
+import "core-js/modules/esnext.reflect.get-metadata";
+import "core-js/modules/esnext.reflect.get-metadata-keys";
+import "core-js/modules/esnext.reflect.get-own-metadata";
+import "core-js/modules/esnext.reflect.get-own-metadata-keys";
+import "core-js/modules/esnext.reflect.has-metadata";
+import "core-js/modules/esnext.reflect.has-own-metadata";
+import "core-js/modules/esnext.reflect.metadata";
+import "core-js/modules/esnext.set.add-all";
+import "core-js/modules/esnext.set.delete-all";
+import "core-js/modules/esnext.set.difference";
+import "core-js/modules/esnext.set.every";
+import "core-js/modules/esnext.set.filter";
+import "core-js/modules/esnext.set.find";
+import "core-js/modules/esnext.set.from";
+import "core-js/modules/esnext.set.intersection";
+import "core-js/modules/esnext.set.is-disjoint-from";
+import "core-js/modules/esnext.set.is-subset-of";
+import "core-js/modules/esnext.set.is-superset-of";
+import "core-js/modules/esnext.set.join";
+import "core-js/modules/esnext.set.map";
+import "core-js/modules/esnext.set.of";
+import "core-js/modules/esnext.set.reduce";
+import "core-js/modules/esnext.set.some";
+import "core-js/modules/esnext.set.symmetric-difference";
+import "core-js/modules/esnext.set.union";
+import "core-js/modules/esnext.string.at";
+import "core-js/modules/esnext.string.code-points";
+import "core-js/modules/esnext.string.replace-all";
+import "core-js/modules/esnext.symbol.dispose";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/esnext.symbol.pattern-match";
+import "core-js/modules/esnext.weak-map.delete-all";
+import "core-js/modules/esnext.weak-map.from";
+import "core-js/modules/esnext.weak-map.of";
+import "core-js/modules/esnext.weak-set.add-all";
+import "core-js/modules/esnext.weak-set.delete-all";
+import "core-js/modules/esnext.weak-set.from";
+import "core-js/modules/esnext.weak-set.of";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import "core-js/modules/esnext.string.match-all";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/input.mjs
new file mode 100644
index 000000000000..807283757dae
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/web';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/output.mjs
new file mode 100644
index 000000000000..6dbf8852bca6
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web-chrome-71/output.mjs
@@ -0,0 +1 @@
+import "core-js/modules/web.immediate";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/input.mjs
new file mode 100644
index 000000000000..807283757dae
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/web';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/output.mjs
new file mode 100644
index 000000000000..37348c29d894
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-entries-web/output.mjs
@@ -0,0 +1,9 @@
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/options.json
new file mode 100644
index 000000000000..f55b8ee60849
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "ie": 11
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/output.mjs
new file mode 100644
index 000000000000..f6b2431273cf
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-11/output.mjs
@@ -0,0 +1,181 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.is-concat-spreadable";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.symbol.to-primitive";
+import "core-js/modules/es.symbol.to-string-tag";
+import "core-js/modules/es.symbol.unscopables";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.copy-within";
+import "core-js/modules/es.array.fill";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.find-index";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.join";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.of";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.array-buffer.constructor";
+import "core-js/modules/es.date.to-primitive";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.function.name";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.asinh";
+import "core-js/modules/es.math.atanh";
+import "core-js/modules/es.math.cbrt";
+import "core-js/modules/es.math.clz32";
+import "core-js/modules/es.math.cosh";
+import "core-js/modules/es.math.expm1";
+import "core-js/modules/es.math.fround";
+import "core-js/modules/es.math.hypot";
+import "core-js/modules/es.math.imul";
+import "core-js/modules/es.math.log10";
+import "core-js/modules/es.math.log1p";
+import "core-js/modules/es.math.log2";
+import "core-js/modules/es.math.sign";
+import "core-js/modules/es.math.sinh";
+import "core-js/modules/es.math.tanh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.math.trunc";
+import "core-js/modules/es.number.constructor";
+import "core-js/modules/es.number.epsilon";
+import "core-js/modules/es.number.is-finite";
+import "core-js/modules/es.number.is-integer";
+import "core-js/modules/es.number.is-nan";
+import "core-js/modules/es.number.is-safe-integer";
+import "core-js/modules/es.number.max-safe-integer";
+import "core-js/modules/es.number.min-safe-integer";
+import "core-js/modules/es.number.parse-float";
+import "core-js/modules/es.number.parse-int";
+import "core-js/modules/es.number.to-fixed";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.freeze";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptor";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.get-own-property-names";
+import "core-js/modules/es.object.get-prototype-of";
+import "core-js/modules/es.object.is";
+import "core-js/modules/es.object.is-extensible";
+import "core-js/modules/es.object.is-frozen";
+import "core-js/modules/es.object.is-sealed";
+import "core-js/modules/es.object.keys";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.prevent-extensions";
+import "core-js/modules/es.object.seal";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.code-point-at";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.from-code-point";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.raw";
+import "core-js/modules/es.string.repeat";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.string.anchor";
+import "core-js/modules/es.string.big";
+import "core-js/modules/es.string.blink";
+import "core-js/modules/es.string.bold";
+import "core-js/modules/es.string.fixed";
+import "core-js/modules/es.string.fontcolor";
+import "core-js/modules/es.string.fontsize";
+import "core-js/modules/es.string.italics";
+import "core-js/modules/es.string.link";
+import "core-js/modules/es.string.small";
+import "core-js/modules/es.string.strike";
+import "core-js/modules/es.string.sub";
+import "core-js/modules/es.string.sup";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/options.json
new file mode 100644
index 000000000000..22cf5bdb9c22
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "ie": 9
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/output.mjs
new file mode 100644
index 000000000000..80f642659b89
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-ie-9/output.mjs
@@ -0,0 +1,187 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.is-concat-spreadable";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.symbol.to-primitive";
+import "core-js/modules/es.symbol.to-string-tag";
+import "core-js/modules/es.symbol.unscopables";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.copy-within";
+import "core-js/modules/es.array.fill";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.find-index";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.join";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.of";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.array-buffer.constructor";
+import "core-js/modules/es.array-buffer.is-view";
+import "core-js/modules/es.array-buffer.slice";
+import "core-js/modules/es.data-view";
+import "core-js/modules/es.date.to-primitive";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.function.name";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.asinh";
+import "core-js/modules/es.math.atanh";
+import "core-js/modules/es.math.cbrt";
+import "core-js/modules/es.math.clz32";
+import "core-js/modules/es.math.cosh";
+import "core-js/modules/es.math.expm1";
+import "core-js/modules/es.math.fround";
+import "core-js/modules/es.math.hypot";
+import "core-js/modules/es.math.imul";
+import "core-js/modules/es.math.log10";
+import "core-js/modules/es.math.log1p";
+import "core-js/modules/es.math.log2";
+import "core-js/modules/es.math.sign";
+import "core-js/modules/es.math.sinh";
+import "core-js/modules/es.math.tanh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.math.trunc";
+import "core-js/modules/es.number.constructor";
+import "core-js/modules/es.number.epsilon";
+import "core-js/modules/es.number.is-finite";
+import "core-js/modules/es.number.is-integer";
+import "core-js/modules/es.number.is-nan";
+import "core-js/modules/es.number.is-safe-integer";
+import "core-js/modules/es.number.max-safe-integer";
+import "core-js/modules/es.number.min-safe-integer";
+import "core-js/modules/es.number.parse-float";
+import "core-js/modules/es.number.parse-int";
+import "core-js/modules/es.number.to-fixed";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.freeze";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptor";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.get-own-property-names";
+import "core-js/modules/es.object.get-prototype-of";
+import "core-js/modules/es.object.is";
+import "core-js/modules/es.object.is-extensible";
+import "core-js/modules/es.object.is-frozen";
+import "core-js/modules/es.object.is-sealed";
+import "core-js/modules/es.object.keys";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.prevent-extensions";
+import "core-js/modules/es.object.seal";
+import "core-js/modules/es.object.set-prototype-of";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.code-point-at";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.from-code-point";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.raw";
+import "core-js/modules/es.string.repeat";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.string.anchor";
+import "core-js/modules/es.string.big";
+import "core-js/modules/es.string.blink";
+import "core-js/modules/es.string.bold";
+import "core-js/modules/es.string.fixed";
+import "core-js/modules/es.string.fontcolor";
+import "core-js/modules/es.string.fontsize";
+import "core-js/modules/es.string.italics";
+import "core-js/modules/es.string.link";
+import "core-js/modules/es.string.small";
+import "core-js/modules/es.string.strike";
+import "core-js/modules/es.string.sub";
+import "core-js/modules/es.string.sup";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-import/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-import/input.mjs
new file mode 100644
index 000000000000..4709961aee5f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-import/input.mjs
@@ -0,0 +1,3 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-import/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-import/options.json
new file mode 100644
index 000000000000..2ffd25a686a6
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-import/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-import/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-import/output.mjs
new file mode 100644
index 000000000000..f891a16256c3
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-import/output.mjs
@@ -0,0 +1,29 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/options.json
new file mode 100644
index 000000000000..cbdaa5e7c577
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "10.13"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/output.mjs
new file mode 100644
index 000000000000..ff125b389f5e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-10.13/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/web.queue-microtask";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/options.json
new file mode 100644
index 000000000000..3ca66ba0eadf
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "11"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/output.mjs
new file mode 100644
index 000000000000..d8b2d0eb8b78
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-11/output.mjs
@@ -0,0 +1,4 @@
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/web.queue-microtask";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/options.json
new file mode 100644
index 000000000000..96cbf1f26dd6
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/options.json
@@ -0,0 +1,17 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55",
+          "node": "7.6"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "forceAllTransforms": true,
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/output.mjs
new file mode 100644
index 000000000000..d5e59efa8f02
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node-web/output.mjs
@@ -0,0 +1,29 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-node/options.json
new file mode 100644
index 000000000000..14e8b3671f8e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "7.6"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "forceAllTransforms": true,
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-node/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-node/output.mjs
new file mode 100644
index 000000000000..87a92e7348c0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-node/output.mjs
@@ -0,0 +1,26 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/input.mjs
new file mode 100644
index 000000000000..5617711cfa60
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/input.mjs
@@ -0,0 +1,7 @@
+import 'core-js/es/map/index.js';
+import 'core-js/es/set/index';
+import 'core-js/es/array/from.js';
+import 'core-js/es/promise/';
+import 'cOrE-jS/eS/SymBOL/iTERator';
+import 'core-js\\es\\symbol\\async-iterator';
+import 'foo/index.js';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/output.mjs
new file mode 100644
index 000000000000..479672b52e8e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-normalization/output.mjs
@@ -0,0 +1,11 @@
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.map";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+import 'foo/index.js';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/input.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/input.js
new file mode 100644
index 000000000000..3872c3ce0ad2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/input.js
@@ -0,0 +1,4 @@
+require('core-js');
+require('regenerator-runtime/runtime');
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/options.json
new file mode 100644
index 000000000000..bc7cfa8eb23e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/output.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/output.js
new file mode 100644
index 000000000000..ac1379a63561
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-all/output.js
@@ -0,0 +1,221 @@
+require("core-js/modules/es.symbol.description");
+
+require("core-js/modules/es.symbol.async-iterator");
+
+require("core-js/modules/es.array.flat");
+
+require("core-js/modules/es.array.flat-map");
+
+require("core-js/modules/es.array.iterator");
+
+require("core-js/modules/es.array.sort");
+
+require("core-js/modules/es.array.unscopables.flat");
+
+require("core-js/modules/es.array.unscopables.flat-map");
+
+require("core-js/modules/es.object.define-getter");
+
+require("core-js/modules/es.object.define-setter");
+
+require("core-js/modules/es.object.from-entries");
+
+require("core-js/modules/es.object.lookup-getter");
+
+require("core-js/modules/es.object.lookup-setter");
+
+require("core-js/modules/es.promise");
+
+require("core-js/modules/es.promise.finally");
+
+require("core-js/modules/es.string.pad-end");
+
+require("core-js/modules/es.string.pad-start");
+
+require("core-js/modules/es.string.replace");
+
+require("core-js/modules/es.string.trim");
+
+require("core-js/modules/es.string.trim-end");
+
+require("core-js/modules/es.string.trim-start");
+
+require("core-js/modules/esnext.aggregate-error");
+
+require("core-js/modules/esnext.array.last-index");
+
+require("core-js/modules/esnext.array.last-item");
+
+require("core-js/modules/esnext.composite-key");
+
+require("core-js/modules/esnext.composite-symbol");
+
+require("core-js/modules/esnext.global-this");
+
+require("core-js/modules/esnext.map.delete-all");
+
+require("core-js/modules/esnext.map.every");
+
+require("core-js/modules/esnext.map.filter");
+
+require("core-js/modules/esnext.map.find");
+
+require("core-js/modules/esnext.map.find-key");
+
+require("core-js/modules/esnext.map.from");
+
+require("core-js/modules/esnext.map.group-by");
+
+require("core-js/modules/esnext.map.includes");
+
+require("core-js/modules/esnext.map.key-by");
+
+require("core-js/modules/esnext.map.key-of");
+
+require("core-js/modules/esnext.map.map-keys");
+
+require("core-js/modules/esnext.map.map-values");
+
+require("core-js/modules/esnext.map.merge");
+
+require("core-js/modules/esnext.map.of");
+
+require("core-js/modules/esnext.map.reduce");
+
+require("core-js/modules/esnext.map.some");
+
+require("core-js/modules/esnext.map.update");
+
+require("core-js/modules/esnext.math.clamp");
+
+require("core-js/modules/esnext.math.deg-per-rad");
+
+require("core-js/modules/esnext.math.degrees");
+
+require("core-js/modules/esnext.math.fscale");
+
+require("core-js/modules/esnext.math.iaddh");
+
+require("core-js/modules/esnext.math.imulh");
+
+require("core-js/modules/esnext.math.isubh");
+
+require("core-js/modules/esnext.math.rad-per-deg");
+
+require("core-js/modules/esnext.math.radians");
+
+require("core-js/modules/esnext.math.scale");
+
+require("core-js/modules/esnext.math.seeded-prng");
+
+require("core-js/modules/esnext.math.signbit");
+
+require("core-js/modules/esnext.math.umulh");
+
+require("core-js/modules/esnext.number.from-string");
+
+require("core-js/modules/esnext.observable");
+
+require("core-js/modules/esnext.promise.all-settled");
+
+require("core-js/modules/esnext.promise.any");
+
+require("core-js/modules/esnext.promise.try");
+
+require("core-js/modules/esnext.reflect.define-metadata");
+
+require("core-js/modules/esnext.reflect.delete-metadata");
+
+require("core-js/modules/esnext.reflect.get-metadata");
+
+require("core-js/modules/esnext.reflect.get-metadata-keys");
+
+require("core-js/modules/esnext.reflect.get-own-metadata");
+
+require("core-js/modules/esnext.reflect.get-own-metadata-keys");
+
+require("core-js/modules/esnext.reflect.has-metadata");
+
+require("core-js/modules/esnext.reflect.has-own-metadata");
+
+require("core-js/modules/esnext.reflect.metadata");
+
+require("core-js/modules/esnext.set.add-all");
+
+require("core-js/modules/esnext.set.delete-all");
+
+require("core-js/modules/esnext.set.difference");
+
+require("core-js/modules/esnext.set.every");
+
+require("core-js/modules/esnext.set.filter");
+
+require("core-js/modules/esnext.set.find");
+
+require("core-js/modules/esnext.set.from");
+
+require("core-js/modules/esnext.set.intersection");
+
+require("core-js/modules/esnext.set.is-disjoint-from");
+
+require("core-js/modules/esnext.set.is-subset-of");
+
+require("core-js/modules/esnext.set.is-superset-of");
+
+require("core-js/modules/esnext.set.join");
+
+require("core-js/modules/esnext.set.map");
+
+require("core-js/modules/esnext.set.of");
+
+require("core-js/modules/esnext.set.reduce");
+
+require("core-js/modules/esnext.set.some");
+
+require("core-js/modules/esnext.set.symmetric-difference");
+
+require("core-js/modules/esnext.set.union");
+
+require("core-js/modules/esnext.string.at");
+
+require("core-js/modules/esnext.string.code-points");
+
+require("core-js/modules/esnext.string.replace-all");
+
+require("core-js/modules/esnext.symbol.dispose");
+
+require("core-js/modules/esnext.symbol.observable");
+
+require("core-js/modules/esnext.symbol.pattern-match");
+
+require("core-js/modules/esnext.weak-map.delete-all");
+
+require("core-js/modules/esnext.weak-map.from");
+
+require("core-js/modules/esnext.weak-map.of");
+
+require("core-js/modules/esnext.weak-set.add-all");
+
+require("core-js/modules/esnext.weak-set.delete-all");
+
+require("core-js/modules/esnext.weak-set.from");
+
+require("core-js/modules/esnext.weak-set.of");
+
+require("core-js/modules/web.dom-collections.for-each");
+
+require("core-js/modules/web.dom-collections.iterator");
+
+require("core-js/modules/web.immediate");
+
+require("core-js/modules/web.queue-microtask");
+
+require("core-js/modules/web.url");
+
+require("core-js/modules/web.url.to-json");
+
+require("core-js/modules/web.url-search-params");
+
+require("core-js/modules/esnext.string.match-all");
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/input.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/input.js
new file mode 100644
index 000000000000..389c27a6caa9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/input.js
@@ -0,0 +1,3 @@
+require('@babel/polyfill');
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/options.json
new file mode 100644
index 000000000000..bc7cfa8eb23e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/output.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/output.js
new file mode 100644
index 000000000000..389c27a6caa9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-babel-polyfill/output.js
@@ -0,0 +1,3 @@
+require('@babel/polyfill');
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/input.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/input.js
new file mode 100644
index 000000000000..521d4777d4f7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/input.js
@@ -0,0 +1,4 @@
+require('core-js/es');
+require('regenerator-runtime/runtime');
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/output.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/output.js
new file mode 100644
index 000000000000..af7ecd4cda07
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-chrome-71/output.js
@@ -0,0 +1,7 @@
+require("core-js/modules/es.array.unscopables.flat");
+
+require("core-js/modules/es.array.unscopables.flat-map");
+
+require("core-js/modules/es.object.from-entries");
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/input.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/input.js
new file mode 100644
index 000000000000..4b7ac12b6a09
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/input.js
@@ -0,0 +1,5 @@
+require('core-js/es');
+require('core-js/proposals');
+require('regenerator-runtime/runtime');
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/options.json
new file mode 100644
index 000000000000..bc7cfa8eb23e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/output.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/output.js
new file mode 100644
index 000000000000..31ec22fc83ba
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require-es-proposals/output.js
@@ -0,0 +1,213 @@
+require("core-js/modules/es.symbol.description");
+
+require("core-js/modules/es.symbol.async-iterator");
+
+require("core-js/modules/es.array.flat");
+
+require("core-js/modules/es.array.flat-map");
+
+require("core-js/modules/es.array.iterator");
+
+require("core-js/modules/es.array.sort");
+
+require("core-js/modules/es.array.unscopables.flat");
+
+require("core-js/modules/es.array.unscopables.flat-map");
+
+require("core-js/modules/es.object.define-getter");
+
+require("core-js/modules/es.object.define-setter");
+
+require("core-js/modules/es.object.from-entries");
+
+require("core-js/modules/es.object.lookup-getter");
+
+require("core-js/modules/es.object.lookup-setter");
+
+require("core-js/modules/es.promise");
+
+require("core-js/modules/es.promise.finally");
+
+require("core-js/modules/es.string.pad-end");
+
+require("core-js/modules/es.string.pad-start");
+
+require("core-js/modules/es.string.replace");
+
+require("core-js/modules/es.string.trim");
+
+require("core-js/modules/es.string.trim-end");
+
+require("core-js/modules/es.string.trim-start");
+
+require("core-js/modules/esnext.aggregate-error");
+
+require("core-js/modules/esnext.array.last-index");
+
+require("core-js/modules/esnext.array.last-item");
+
+require("core-js/modules/esnext.composite-key");
+
+require("core-js/modules/esnext.composite-symbol");
+
+require("core-js/modules/esnext.global-this");
+
+require("core-js/modules/esnext.map.delete-all");
+
+require("core-js/modules/esnext.map.every");
+
+require("core-js/modules/esnext.map.filter");
+
+require("core-js/modules/esnext.map.find");
+
+require("core-js/modules/esnext.map.find-key");
+
+require("core-js/modules/esnext.map.from");
+
+require("core-js/modules/esnext.map.group-by");
+
+require("core-js/modules/esnext.map.includes");
+
+require("core-js/modules/esnext.map.key-by");
+
+require("core-js/modules/esnext.map.key-of");
+
+require("core-js/modules/esnext.map.map-keys");
+
+require("core-js/modules/esnext.map.map-values");
+
+require("core-js/modules/esnext.map.merge");
+
+require("core-js/modules/esnext.map.of");
+
+require("core-js/modules/esnext.map.reduce");
+
+require("core-js/modules/esnext.map.some");
+
+require("core-js/modules/esnext.map.update");
+
+require("core-js/modules/esnext.math.clamp");
+
+require("core-js/modules/esnext.math.deg-per-rad");
+
+require("core-js/modules/esnext.math.degrees");
+
+require("core-js/modules/esnext.math.fscale");
+
+require("core-js/modules/esnext.math.iaddh");
+
+require("core-js/modules/esnext.math.imulh");
+
+require("core-js/modules/esnext.math.isubh");
+
+require("core-js/modules/esnext.math.rad-per-deg");
+
+require("core-js/modules/esnext.math.radians");
+
+require("core-js/modules/esnext.math.scale");
+
+require("core-js/modules/esnext.math.seeded-prng");
+
+require("core-js/modules/esnext.math.signbit");
+
+require("core-js/modules/esnext.math.umulh");
+
+require("core-js/modules/esnext.number.from-string");
+
+require("core-js/modules/esnext.observable");
+
+require("core-js/modules/esnext.promise.all-settled");
+
+require("core-js/modules/esnext.promise.any");
+
+require("core-js/modules/esnext.promise.try");
+
+require("core-js/modules/esnext.reflect.define-metadata");
+
+require("core-js/modules/esnext.reflect.delete-metadata");
+
+require("core-js/modules/esnext.reflect.get-metadata");
+
+require("core-js/modules/esnext.reflect.get-metadata-keys");
+
+require("core-js/modules/esnext.reflect.get-own-metadata");
+
+require("core-js/modules/esnext.reflect.get-own-metadata-keys");
+
+require("core-js/modules/esnext.reflect.has-metadata");
+
+require("core-js/modules/esnext.reflect.has-own-metadata");
+
+require("core-js/modules/esnext.reflect.metadata");
+
+require("core-js/modules/esnext.set.add-all");
+
+require("core-js/modules/esnext.set.delete-all");
+
+require("core-js/modules/esnext.set.difference");
+
+require("core-js/modules/esnext.set.every");
+
+require("core-js/modules/esnext.set.filter");
+
+require("core-js/modules/esnext.set.find");
+
+require("core-js/modules/esnext.set.from");
+
+require("core-js/modules/esnext.set.intersection");
+
+require("core-js/modules/esnext.set.is-disjoint-from");
+
+require("core-js/modules/esnext.set.is-subset-of");
+
+require("core-js/modules/esnext.set.is-superset-of");
+
+require("core-js/modules/esnext.set.join");
+
+require("core-js/modules/esnext.set.map");
+
+require("core-js/modules/esnext.set.of");
+
+require("core-js/modules/esnext.set.reduce");
+
+require("core-js/modules/esnext.set.some");
+
+require("core-js/modules/esnext.set.symmetric-difference");
+
+require("core-js/modules/esnext.set.union");
+
+require("core-js/modules/esnext.string.at");
+
+require("core-js/modules/esnext.string.code-points");
+
+require("core-js/modules/esnext.string.replace-all");
+
+require("core-js/modules/esnext.symbol.dispose");
+
+require("core-js/modules/esnext.symbol.observable");
+
+require("core-js/modules/esnext.symbol.pattern-match");
+
+require("core-js/modules/esnext.weak-map.delete-all");
+
+require("core-js/modules/esnext.weak-map.from");
+
+require("core-js/modules/esnext.weak-map.of");
+
+require("core-js/modules/esnext.weak-set.add-all");
+
+require("core-js/modules/esnext.weak-set.delete-all");
+
+require("core-js/modules/esnext.weak-set.from");
+
+require("core-js/modules/esnext.weak-set.of");
+
+require("core-js/modules/web.url");
+
+require("core-js/modules/web.url.to-json");
+
+require("core-js/modules/web.url-search-params");
+
+require("core-js/modules/esnext.string.match-all");
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require/input.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require/input.js
new file mode 100644
index 000000000000..476fb940dd45
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require/input.js
@@ -0,0 +1,4 @@
+require('core-js/stable');
+require('regenerator-runtime/runtime');
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-require/options.json
new file mode 100644
index 000000000000..bc7cfa8eb23e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-require/output.js b/packages/babel-preset-env/test/fixtures/corejs3/entry-require/output.js
new file mode 100644
index 000000000000..49aa2d8f4ca3
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-require/output.js
@@ -0,0 +1,57 @@
+require("core-js/modules/es.symbol.description");
+
+require("core-js/modules/es.symbol.async-iterator");
+
+require("core-js/modules/es.array.flat");
+
+require("core-js/modules/es.array.flat-map");
+
+require("core-js/modules/es.array.iterator");
+
+require("core-js/modules/es.array.sort");
+
+require("core-js/modules/es.array.unscopables.flat");
+
+require("core-js/modules/es.array.unscopables.flat-map");
+
+require("core-js/modules/es.object.define-getter");
+
+require("core-js/modules/es.object.define-setter");
+
+require("core-js/modules/es.object.from-entries");
+
+require("core-js/modules/es.object.lookup-getter");
+
+require("core-js/modules/es.object.lookup-setter");
+
+require("core-js/modules/es.promise");
+
+require("core-js/modules/es.promise.finally");
+
+require("core-js/modules/es.string.pad-end");
+
+require("core-js/modules/es.string.pad-start");
+
+require("core-js/modules/es.string.replace");
+
+require("core-js/modules/es.string.trim");
+
+require("core-js/modules/es.string.trim-end");
+
+require("core-js/modules/es.string.trim-start");
+
+require("core-js/modules/web.dom-collections.for-each");
+
+require("core-js/modules/web.dom-collections.iterator");
+
+require("core-js/modules/web.immediate");
+
+require("core-js/modules/web.queue-microtask");
+
+require("core-js/modules/web.url");
+
+require("core-js/modules/web.url.to-json");
+
+require("core-js/modules/web.url-search-params");
+
+1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/input.mjs
new file mode 100644
index 000000000000..eb1b8b061a8e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/input.mjs
@@ -0,0 +1,2 @@
+import { fromEntries } from 'core-js/es/object';
+const reflect = require('core-js/features/reflect');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/output.mjs
new file mode 100644
index 000000000000..0119f0da2e73
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-specified-imports/output.mjs
@@ -0,0 +1,3 @@
+import { fromEntries } from 'core-js/es/object';
+
+var reflect = require('core-js/features/reflect');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/options.json
new file mode 100644
index 000000000000..b8ee30edfe08
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "71"
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/output.mjs
new file mode 100644
index 000000000000..de648a923f2b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-chrome-71/output.mjs
@@ -0,0 +1,4 @@
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/web.immediate";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/options.json
new file mode 100644
index 000000000000..7d03dc896bfc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "targets": {
+          "samsung": "8.2"
+        },
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/output.mjs
new file mode 100644
index 000000000000..b55987d82a9f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable-samsung-8.2/output.mjs
@@ -0,0 +1,16 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url.to-json";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/options.json b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/options.json
new file mode 100644
index 000000000000..fe930890ee20
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/output.mjs
new file mode 100644
index 000000000000..212123a9631a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/entry-stable/output.mjs
@@ -0,0 +1,209 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.is-concat-spreadable";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.symbol.to-primitive";
+import "core-js/modules/es.symbol.to-string-tag";
+import "core-js/modules/es.symbol.unscopables";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.copy-within";
+import "core-js/modules/es.array.every";
+import "core-js/modules/es.array.fill";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.find-index";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.for-each";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.index-of";
+import "core-js/modules/es.array.is-array";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.join";
+import "core-js/modules/es.array.last-index-of";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.of";
+import "core-js/modules/es.array.reduce";
+import "core-js/modules/es.array.reduce-right";
+import "core-js/modules/es.array.reverse";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.some";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.array-buffer.constructor";
+import "core-js/modules/es.array-buffer.is-view";
+import "core-js/modules/es.array-buffer.slice";
+import "core-js/modules/es.data-view";
+import "core-js/modules/es.date.now";
+import "core-js/modules/es.date.to-iso-string";
+import "core-js/modules/es.date.to-json";
+import "core-js/modules/es.date.to-primitive";
+import "core-js/modules/es.date.to-string";
+import "core-js/modules/es.function.bind";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.function.name";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.asinh";
+import "core-js/modules/es.math.atanh";
+import "core-js/modules/es.math.cbrt";
+import "core-js/modules/es.math.clz32";
+import "core-js/modules/es.math.cosh";
+import "core-js/modules/es.math.expm1";
+import "core-js/modules/es.math.fround";
+import "core-js/modules/es.math.hypot";
+import "core-js/modules/es.math.imul";
+import "core-js/modules/es.math.log10";
+import "core-js/modules/es.math.log1p";
+import "core-js/modules/es.math.log2";
+import "core-js/modules/es.math.sign";
+import "core-js/modules/es.math.sinh";
+import "core-js/modules/es.math.tanh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.math.trunc";
+import "core-js/modules/es.number.constructor";
+import "core-js/modules/es.number.epsilon";
+import "core-js/modules/es.number.is-finite";
+import "core-js/modules/es.number.is-integer";
+import "core-js/modules/es.number.is-nan";
+import "core-js/modules/es.number.is-safe-integer";
+import "core-js/modules/es.number.max-safe-integer";
+import "core-js/modules/es.number.min-safe-integer";
+import "core-js/modules/es.number.parse-float";
+import "core-js/modules/es.number.parse-int";
+import "core-js/modules/es.number.to-fixed";
+import "core-js/modules/es.number.to-precision";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.create";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-properties";
+import "core-js/modules/es.object.define-property";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.freeze";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptor";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.get-own-property-names";
+import "core-js/modules/es.object.get-prototype-of";
+import "core-js/modules/es.object.is";
+import "core-js/modules/es.object.is-extensible";
+import "core-js/modules/es.object.is-frozen";
+import "core-js/modules/es.object.is-sealed";
+import "core-js/modules/es.object.keys";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.prevent-extensions";
+import "core-js/modules/es.object.seal";
+import "core-js/modules/es.object.set-prototype-of";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.parse-float";
+import "core-js/modules/es.parse-int";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.code-point-at";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.from-code-point";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.raw";
+import "core-js/modules/es.string.repeat";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.string.anchor";
+import "core-js/modules/es.string.big";
+import "core-js/modules/es.string.blink";
+import "core-js/modules/es.string.bold";
+import "core-js/modules/es.string.fixed";
+import "core-js/modules/es.string.fontcolor";
+import "core-js/modules/es.string.fontsize";
+import "core-js/modules/es.string.italics";
+import "core-js/modules/es.string.link";
+import "core-js/modules/es.string.small";
+import "core-js/modules/es.string.strike";
+import "core-js/modules/es.string.sub";
+import "core-js/modules/es.string.sup";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/options.json b/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/options.json
new file mode 100644
index 000000000000..c762d11f090e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/options.json
@@ -0,0 +1,22 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 63
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3,
+        "exclude": [
+          "es.string.pad-start",
+          "es.string.pad-end",
+          "web.timers",
+          "web.immediate",
+          "web.dom-collections.iterator"
+        ]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/output.mjs
new file mode 100644
index 000000000000..8dc8ff014a4c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-built-ins/output.mjs
@@ -0,0 +1,14 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url.to-json";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/input.mjs
new file mode 100644
index 000000000000..efe0d2ee2c63
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/input.mjs
@@ -0,0 +1,8 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+
+async function a() {
+  await 1;
+}
+
+(() => {})
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/options.json b/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/options.json
new file mode 100644
index 000000000000..d41e694ad4cb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/options.json
@@ -0,0 +1,21 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3,
+        "exclude": [
+          "transform-async-to-generator",
+          "transform-regenerator",
+          "es.string.pad-start"
+        ],
+        "include": ["transform-arrow-functions", "es.map"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/output.mjs
new file mode 100644
index 000000000000..e116abf02cf1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-include/output.mjs
@@ -0,0 +1,34 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+
+async function a() {
+  await 1;
+}
+
+(function () {});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/options.json b/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/options.json
new file mode 100644
index 000000000000..f45281fbee56
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3,
+        "exclude": ["transform-regenerator"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/output.mjs
new file mode 100644
index 000000000000..93f856aa51c3
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude-regenerator/output.mjs
@@ -0,0 +1,208 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.symbol.has-instance";
+import "core-js/modules/es.symbol.is-concat-spreadable";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.symbol.replace";
+import "core-js/modules/es.symbol.search";
+import "core-js/modules/es.symbol.species";
+import "core-js/modules/es.symbol.split";
+import "core-js/modules/es.symbol.to-primitive";
+import "core-js/modules/es.symbol.to-string-tag";
+import "core-js/modules/es.symbol.unscopables";
+import "core-js/modules/es.array.concat";
+import "core-js/modules/es.array.copy-within";
+import "core-js/modules/es.array.every";
+import "core-js/modules/es.array.fill";
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.find-index";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.for-each";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.index-of";
+import "core-js/modules/es.array.is-array";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.join";
+import "core-js/modules/es.array.last-index-of";
+import "core-js/modules/es.array.map";
+import "core-js/modules/es.array.of";
+import "core-js/modules/es.array.reduce";
+import "core-js/modules/es.array.reduce-right";
+import "core-js/modules/es.array.reverse";
+import "core-js/modules/es.array.slice";
+import "core-js/modules/es.array.some";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.species";
+import "core-js/modules/es.array.splice";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.array-buffer.constructor";
+import "core-js/modules/es.array-buffer.is-view";
+import "core-js/modules/es.array-buffer.slice";
+import "core-js/modules/es.data-view";
+import "core-js/modules/es.date.now";
+import "core-js/modules/es.date.to-iso-string";
+import "core-js/modules/es.date.to-json";
+import "core-js/modules/es.date.to-primitive";
+import "core-js/modules/es.date.to-string";
+import "core-js/modules/es.function.bind";
+import "core-js/modules/es.function.has-instance";
+import "core-js/modules/es.function.name";
+import "core-js/modules/es.json.to-string-tag";
+import "core-js/modules/es.map";
+import "core-js/modules/es.math.acosh";
+import "core-js/modules/es.math.asinh";
+import "core-js/modules/es.math.atanh";
+import "core-js/modules/es.math.cbrt";
+import "core-js/modules/es.math.clz32";
+import "core-js/modules/es.math.cosh";
+import "core-js/modules/es.math.expm1";
+import "core-js/modules/es.math.fround";
+import "core-js/modules/es.math.hypot";
+import "core-js/modules/es.math.imul";
+import "core-js/modules/es.math.log10";
+import "core-js/modules/es.math.log1p";
+import "core-js/modules/es.math.log2";
+import "core-js/modules/es.math.sign";
+import "core-js/modules/es.math.sinh";
+import "core-js/modules/es.math.tanh";
+import "core-js/modules/es.math.to-string-tag";
+import "core-js/modules/es.math.trunc";
+import "core-js/modules/es.number.constructor";
+import "core-js/modules/es.number.epsilon";
+import "core-js/modules/es.number.is-finite";
+import "core-js/modules/es.number.is-integer";
+import "core-js/modules/es.number.is-nan";
+import "core-js/modules/es.number.is-safe-integer";
+import "core-js/modules/es.number.max-safe-integer";
+import "core-js/modules/es.number.min-safe-integer";
+import "core-js/modules/es.number.parse-float";
+import "core-js/modules/es.number.parse-int";
+import "core-js/modules/es.number.to-fixed";
+import "core-js/modules/es.number.to-precision";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.create";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-properties";
+import "core-js/modules/es.object.define-property";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.freeze";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.get-own-property-descriptor";
+import "core-js/modules/es.object.get-own-property-descriptors";
+import "core-js/modules/es.object.get-own-property-names";
+import "core-js/modules/es.object.get-prototype-of";
+import "core-js/modules/es.object.is";
+import "core-js/modules/es.object.is-extensible";
+import "core-js/modules/es.object.is-frozen";
+import "core-js/modules/es.object.is-sealed";
+import "core-js/modules/es.object.keys";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.object.prevent-extensions";
+import "core-js/modules/es.object.seal";
+import "core-js/modules/es.object.set-prototype-of";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.object.values";
+import "core-js/modules/es.parse-float";
+import "core-js/modules/es.parse-int";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.reflect.apply";
+import "core-js/modules/es.reflect.construct";
+import "core-js/modules/es.reflect.define-property";
+import "core-js/modules/es.reflect.delete-property";
+import "core-js/modules/es.reflect.get";
+import "core-js/modules/es.reflect.get-own-property-descriptor";
+import "core-js/modules/es.reflect.get-prototype-of";
+import "core-js/modules/es.reflect.has";
+import "core-js/modules/es.reflect.is-extensible";
+import "core-js/modules/es.reflect.own-keys";
+import "core-js/modules/es.reflect.prevent-extensions";
+import "core-js/modules/es.reflect.set";
+import "core-js/modules/es.reflect.set-prototype-of";
+import "core-js/modules/es.regexp.constructor";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.code-point-at";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.from-code-point";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.raw";
+import "core-js/modules/es.string.repeat";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/es.string.anchor";
+import "core-js/modules/es.string.big";
+import "core-js/modules/es.string.blink";
+import "core-js/modules/es.string.bold";
+import "core-js/modules/es.string.fixed";
+import "core-js/modules/es.string.fontcolor";
+import "core-js/modules/es.string.fontsize";
+import "core-js/modules/es.string.italics";
+import "core-js/modules/es.string.link";
+import "core-js/modules/es.string.small";
+import "core-js/modules/es.string.strike";
+import "core-js/modules/es.string.sub";
+import "core-js/modules/es.string.sup";
+import "core-js/modules/es.typed-array.float32-array";
+import "core-js/modules/es.typed-array.float64-array";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.int16-array";
+import "core-js/modules/es.typed-array.int32-array";
+import "core-js/modules/es.typed-array.uint8-array";
+import "core-js/modules/es.typed-array.uint8-clamped-array";
+import "core-js/modules/es.typed-array.uint16-array";
+import "core-js/modules/es.typed-array.uint32-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.from";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+import "core-js/modules/es.weak-map";
+import "core-js/modules/es.weak-set";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.timers";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude/input.mjs
new file mode 100644
index 000000000000..c70b44b5a432
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude/input.mjs
@@ -0,0 +1,3 @@
+async function a() {
+  await 1;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude/options.json b/packages/babel-preset-env/test/fixtures/corejs3/exclude/options.json
new file mode 100644
index 000000000000..f6c98a7a3312
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "exclude": ["transform-async-to-generator", "transform-regenerator"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/exclude/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/exclude/output.mjs
new file mode 100644
index 000000000000..8f37a64f243e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/exclude/output.mjs
@@ -0,0 +1,6 @@
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+
+async function a() {
+  await 1;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/input.mjs
new file mode 100644
index 000000000000..aaf258d9cfe5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/input.mjs
@@ -0,0 +1,4 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
+
+const a = 1;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/options.json b/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/options.json
new file mode 100644
index 000000000000..4dcf6b59d766
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3,
+        "forceAllTransforms": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/output.mjs
new file mode 100644
index 000000000000..698280d4465c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/force-all-transforms/output.mjs
@@ -0,0 +1,30 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
+import 'regenerator-runtime/runtime';
+var a = 1;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/input.mjs
new file mode 100644
index 000000000000..34bd72ce1c2a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/input.mjs
@@ -0,0 +1,2 @@
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/options.json b/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/options.json
new file mode 100644
index 000000000000..b36c01481735
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 55
+        },
+        "include": ["es.map", "es.set"],
+        "modules": false,
+        "useBuiltIns": "entry",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/output.mjs
new file mode 100644
index 000000000000..504b23702786
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/include-built-ins/output.mjs
@@ -0,0 +1,30 @@
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.async-iterator";
+import "core-js/modules/es.array.flat";
+import "core-js/modules/es.array.flat-map";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.sort";
+import "core-js/modules/es.array.unscopables.flat";
+import "core-js/modules/es.array.unscopables.flat-map";
+import "core-js/modules/es.map";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.define-setter";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.lookup-getter";
+import "core-js/modules/es.object.lookup-setter";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/es.string.trim-end";
+import "core-js/modules/es.string.trim-start";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.queue-microtask";
+import "core-js/modules/web.url";
+import "core-js/modules/web.url.to-json";
+import "core-js/modules/web.url-search-params";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/input.mjs
new file mode 100644
index 000000000000..39641419b1cb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/input.mjs
@@ -0,0 +1,26 @@
+Array.from; // static method
+Map; // built-in
+new Promise(); // new builtin
+Symbol.match; // as member expression
+_arr[Symbol.iterator](); // Symbol.iterator
+
+// no import
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+_arr9[Symbol2.iterator]();
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+function H(WeakMap) { var blah = new WeakMap(); } // shadowed
+
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/options.json
new file mode 100644
index 000000000000..09d412d0011d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "targets": {
+          "chrome": "71"
+        },
+        "corejs": { "version": 3, "proposals": true },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/output.mjs
new file mode 100644
index 000000000000..bf51809e7297
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals-chrome-71/output.mjs
@@ -0,0 +1,50 @@
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.symbol.observable";
+Array.from; // static method
+
+Map; // built-in
+
+new Promise(); // new builtin
+
+Symbol.match; // as member expression
+
+_arr[Symbol.iterator](); // Symbol.iterator
+// no import
+
+
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+
+_arr9[Symbol2.iterator]();
+
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
+
+
+const foo = new Promise(resolve => {
+  resolve(new Map());
+});
+queueMicrotask(() => globalThis);
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/input.mjs
new file mode 100644
index 000000000000..39641419b1cb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/input.mjs
@@ -0,0 +1,26 @@
+Array.from; // static method
+Map; // built-in
+new Promise(); // new builtin
+Symbol.match; // as member expression
+_arr[Symbol.iterator](); // Symbol.iterator
+
+// no import
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+_arr9[Symbol2.iterator]();
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+function H(WeakMap) { var blah = new WeakMap(); } // shadowed
+
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/options.json
new file mode 100644
index 000000000000..5a0b22a7dd82
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": { "version": 3, "proposals": true },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/output.mjs
new file mode 100644
index 000000000000..699c00e7ae82
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all-proposals/output.mjs
@@ -0,0 +1,67 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.map";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/esnext.global-this";
+import "core-js/modules/esnext.map.delete-all";
+import "core-js/modules/esnext.map.every";
+import "core-js/modules/esnext.map.filter";
+import "core-js/modules/esnext.map.find";
+import "core-js/modules/esnext.map.find-key";
+import "core-js/modules/esnext.map.includes";
+import "core-js/modules/esnext.map.key-of";
+import "core-js/modules/esnext.map.map-keys";
+import "core-js/modules/esnext.map.map-values";
+import "core-js/modules/esnext.map.merge";
+import "core-js/modules/esnext.map.reduce";
+import "core-js/modules/esnext.map.some";
+import "core-js/modules/esnext.map.update";
+import "core-js/modules/esnext.observable";
+import "core-js/modules/esnext.symbol.observable";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.queue-microtask";
+Array.from; // static method
+
+Map; // built-in
+
+new Promise(); // new builtin
+
+Symbol.match; // as member expression
+
+_arr[Symbol.iterator](); // Symbol.iterator
+// no import
+
+
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+
+_arr9[Symbol2.iterator]();
+
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
+
+
+var foo = new Promise(function (resolve) {
+  resolve(new Map());
+});
+queueMicrotask(function () {
+  return globalThis;
+});
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-all/input.mjs
new file mode 100644
index 000000000000..39641419b1cb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all/input.mjs
@@ -0,0 +1,26 @@
+Array.from; // static method
+Map; // built-in
+new Promise(); // new builtin
+Symbol.match; // as member expression
+_arr[Symbol.iterator](); // Symbol.iterator
+
+// no import
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+_arr9[Symbol2.iterator]();
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+function H(WeakMap) { var blah = new WeakMap(); } // shadowed
+
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-all/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-all/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-all/output.mjs
new file mode 100644
index 000000000000..320fcf8662c5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-all/output.mjs
@@ -0,0 +1,51 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.symbol.match";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.map";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.match";
+import "core-js/modules/web.dom-collections.iterator";
+import "core-js/modules/web.queue-microtask";
+Array.from; // static method
+
+Map; // built-in
+
+new Promise(); // new builtin
+
+Symbol.match; // as member expression
+
+_arr[Symbol.iterator](); // Symbol.iterator
+// no import
+
+
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+
+_arr9[Symbol2.iterator]();
+
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
+
+
+var foo = new Promise(function (resolve) {
+  resolve(new Map());
+});
+queueMicrotask(function () {
+  return globalThis;
+});
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/browserslist b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/browserslist
new file mode 100644
index 000000000000..d0ae78fe6a24
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/browserslist
@@ -0,0 +1 @@
+chrome 55
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/input.mjs
new file mode 100644
index 000000000000..f9e8d5a95638
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/input.mjs
@@ -0,0 +1 @@
+const a = new Map();
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/options.json
new file mode 100644
index 000000000000..95a82bb5ec7a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "configPath": "../fixtures/preset-options-add-used-built-ins/browserslist-config-ignore",
+        "modules": false,
+        "targets": { "esmodules": true },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "debug": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/output.mjs
new file mode 100644
index 000000000000..e73421da0ea4
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-browserslist-config-ignore/output.mjs
@@ -0,0 +1,3 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+var a = new Map();
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/input.mjs
new file mode 100644
index 000000000000..725315824b3b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/input.mjs
@@ -0,0 +1,2 @@
+const Set = window.Set;
+const Map = something.Map;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/output.mjs
new file mode 100644
index 000000000000..008dade84785
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-built-in-from-global-object/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.set";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+var Set = window.Set;
+var Map = something.Map;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/input.mjs
new file mode 100644
index 000000000000..bf62d9f7518e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/input.mjs
@@ -0,0 +1 @@
+[a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/options.json
new file mode 100644
index 000000000000..66007aa56ae9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/output.mjs
new file mode 100644
index 000000000000..19ec5a3bda5b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-assignment/output.mjs
@@ -0,0 +1,4 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+[a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/input.mjs
new file mode 100644
index 000000000000..cb50832b47e8
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/input.mjs
@@ -0,0 +1,3 @@
+try {
+  a();
+} catch([b, c]) { }
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/options.json
new file mode 100644
index 000000000000..66007aa56ae9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/output.mjs
new file mode 100644
index 000000000000..07b47aee452a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-catch/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+
+try {
+  a();
+} catch ([b, c]) {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/input.mjs
new file mode 100644
index 000000000000..027d407b5e83
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/input.mjs
@@ -0,0 +1 @@
+for (let [a, b] in c);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/options.json
new file mode 100644
index 000000000000..66007aa56ae9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/output.mjs
new file mode 100644
index 000000000000..13575cf7d08e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-for-x/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+
+for (var [a, b] in c) {
+  ;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/input.mjs
new file mode 100644
index 000000000000..6cb372d8a2e9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/input.mjs
@@ -0,0 +1,5 @@
+!function (foo, { entries }) {} ({}, Object);
+
+new function (foo, { from }) {} ({}, Array);
+
+(({ includes }) => { })('42');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/options.json
new file mode 100644
index 000000000000..70fc29a6de63
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring", "transform-parameters"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/output.mjs
new file mode 100644
index 000000000000..096af6abc7d1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-iife/output.mjs
@@ -0,0 +1,14 @@
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+!function (foo, {
+  entries: entries
+}) {}({}, Object);
+new function (foo, {
+  from: from
+}) {}({}, Array);
+
+(function ({
+  includes: includes
+}) {})('42');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/input.mjs
new file mode 100644
index 000000000000..0b8c72fe4c58
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/input.mjs
@@ -0,0 +1 @@
+function a([b, c]) {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/options.json
new file mode 100644
index 000000000000..66007aa56ae9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/output.mjs
new file mode 100644
index 000000000000..e2100787e008
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-params/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+
+function a(_ref) {
+  var [b, c] = _ref;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/input.mjs
new file mode 100644
index 000000000000..e68aeb23a87b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/input.mjs
@@ -0,0 +1 @@
+const [a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/options.json
new file mode 100644
index 000000000000..66007aa56ae9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/output.mjs
new file mode 100644
index 000000000000..c995f912ab42
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-destructuring-variable-declaration/output.mjs
@@ -0,0 +1,4 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+var [a, b] = c;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/input.mjs
new file mode 100644
index 000000000000..5c8f80cf47a7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/input.mjs
@@ -0,0 +1,17 @@
+var a = [];
+
+a.values();
+
+''.replace()
+
+''.includes();
+
+/./gi.flags;
+
+''.indexOf();
+
+a.__defineGetter__('foo', () => 42);
+
+a.trim;
+
+Function.bind;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/output.mjs
new file mode 100644
index 000000000000..a748b6c1d722
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-determanated-instance-methods/output.mjs
@@ -0,0 +1,21 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.function.bind";
+import "core-js/modules/es.object.define-getter";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.regexp.flags";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.replace";
+var a = [];
+a.values();
+''.replace();
+''.includes();
+/./gi.flags;
+''.indexOf();
+
+a.__defineGetter__('foo', function () {
+  return 42;
+});
+
+a.trim;
+Function.bind;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/input.mjs
new file mode 100644
index 000000000000..7ebcdb5d1730
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/input.mjs
@@ -0,0 +1 @@
+const foo = import('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/options.json
new file mode 100644
index 000000000000..26b5f87194db
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/options.json
@@ -0,0 +1,16 @@
+{
+  "plugins": ["syntax-dynamic-import"],
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "targets": {
+          "chrome": "71"
+        },
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/output.mjs
new file mode 100644
index 000000000000..7ebcdb5d1730
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import-chrome-71/output.mjs
@@ -0,0 +1 @@
+const foo = import('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/input.mjs
new file mode 100644
index 000000000000..7ebcdb5d1730
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/input.mjs
@@ -0,0 +1 @@
+const foo = import('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/options.json
new file mode 100644
index 000000000000..563713faab57
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/options.json
@@ -0,0 +1,13 @@
+{
+  "plugins": ["syntax-dynamic-import"],
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/output.mjs
new file mode 100644
index 000000000000..03c0a1be1e86
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-dynamic-import/output.mjs
@@ -0,0 +1,3 @@
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+var foo = import('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/input.mjs
new file mode 100644
index 000000000000..c12f5e3a8adb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/input.mjs
@@ -0,0 +1,12 @@
+var objectClass = Object;
+var arrayInstance = [];
+var assignStr = "assign";
+var entriesStr = "entries";
+var valuesStr = "values";
+var inclidesStr = "includes";
+var findStr = "find";
+
+// Allow static methods be assigned to variables only directly in the module.
+externalVar[valuesStr]; // don't include
+objectClass[assignStr]({}); // include
+arrayInstance[entriesStr]({}); // don't include
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/output.mjs
new file mode 100644
index 000000000000..0237af3f76ea
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-class-methods/output.mjs
@@ -0,0 +1,17 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/web.dom-collections.iterator";
+var objectClass = Object;
+var arrayInstance = [];
+var assignStr = "assign";
+var entriesStr = "entries";
+var valuesStr = "values";
+var inclidesStr = "includes";
+var findStr = "find"; // Allow static methods be assigned to variables only directly in the module.
+
+externalVar[valuesStr]; // don't include
+
+objectClass[assignStr]({}); // include
+
+arrayInstance[entriesStr]({}); // don't include
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/input.mjs
new file mode 100644
index 000000000000..369046bb1597
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/input.mjs
@@ -0,0 +1,8 @@
+var arrayInstance = [];
+var inclidesStr = "includes";
+var findStr = "find";
+
+// Allow instance methods be assigned to variables.
+arrayInstance[inclidesStr](); // include
+externalVar[findStr]; // include
+
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/output.mjs
new file mode 100644
index 000000000000..854101328ea4
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-evaluated-instance-methods/output.mjs
@@ -0,0 +1,9 @@
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.includes";
+var arrayInstance = [];
+var inclidesStr = "includes";
+var findStr = "find"; // Allow instance methods be assigned to variables.
+
+arrayInstance[inclidesStr](); // include
+
+externalVar[findStr]; // include
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/input.mjs
new file mode 100644
index 000000000000..4f8bca34cbf5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/input.mjs
@@ -0,0 +1 @@
+const foo = fetch('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/options.json
new file mode 100644
index 000000000000..eb821662bc64
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "targets": {
+          "chrome": "71"
+        },
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/output.mjs
new file mode 100644
index 000000000000..4f8bca34cbf5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch-chrome-71/output.mjs
@@ -0,0 +1 @@
+const foo = fetch('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/input.mjs
new file mode 100644
index 000000000000..4f8bca34cbf5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/input.mjs
@@ -0,0 +1 @@
+const foo = fetch('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/output.mjs
new file mode 100644
index 000000000000..6637fedce2be
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-fetch/output.mjs
@@ -0,0 +1,3 @@
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+var foo = fetch('foo');
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/input.mjs
new file mode 100644
index 000000000000..c9f54a8e47d2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/input.mjs
@@ -0,0 +1,3 @@
+for (const { padStart } of foo) {
+  console.log('b'.padEnd(5));
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/options.json
new file mode 100644
index 000000000000..28ad6bb35e93
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "7"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/output.mjs
new file mode 100644
index 000000000000..5237617a6e67
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-with/output.mjs
@@ -0,0 +1,10 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+
+for (const _ref of foo) {
+  const {
+    padStart
+  } = _ref;
+  console.log('b'.padEnd(5));
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/input.mjs
new file mode 100644
index 000000000000..4228bde23c50
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/input.mjs
@@ -0,0 +1,3 @@
+for (const { a } of foo) {
+  console.log(a);
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/options.json
new file mode 100644
index 000000000000..e31b22a885ed
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "11"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/output.mjs
new file mode 100644
index 000000000000..9b8c02b13b8d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of-destructure-without/output.mjs
@@ -0,0 +1,5 @@
+for (const {
+  a
+} of foo) {
+  console.log(a);
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/input.mjs
new file mode 100644
index 000000000000..9f6660a25f8a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/input.mjs
@@ -0,0 +1 @@
+for (let a of b);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/options.json
new file mode 100644
index 000000000000..97f8881a338c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-for-of"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/output.mjs
new file mode 100644
index 000000000000..b8da08e913ef
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-for-of/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+
+for (var a of b) {
+  ;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-in/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-in/input.mjs
new file mode 100644
index 000000000000..1f6eeef40d76
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-in/input.mjs
@@ -0,0 +1,7 @@
+'entries' in Object;
+'includes' in [1, 2, 3];
+
+('va' + 'lues') in Object;
+
+var keys = 'fromEntries';
+keys in Object;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-in/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-in/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-in/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-in/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-in/output.mjs
new file mode 100644
index 000000000000..6c58b94f862a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-in/output.mjs
@@ -0,0 +1,10 @@
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.from-entries";
+import "core-js/modules/es.object.values";
+'entries' in Object;
+'includes' in [1, 2, 3];
+'va' + 'lues' in Object;
+var keys = 'fromEntries';
+keys in Object;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/input.mjs
new file mode 100644
index 000000000000..35cd0f9960af
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/input.mjs
@@ -0,0 +1,12 @@
+Array.from; // static function
+Map; // top level built-in
+
+// instance methods may have false positives (which is ok)
+a.includes(); // method call
+b['find'] // computed string?
+c.prototype.findIndex(); // .prototype
+d.fill.bind(); //.bind
+e.padStart.apply(); // .apply
+f.padEnd.call(); // .call
+String.prototype.startsWith.call; // prototype.call
+var { codePointAt, endsWith } = k; // destructuring
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/options.json
new file mode 100644
index 000000000000..d868cc145bcd
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "targets": {
+          "chrome": 71
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/output.mjs
new file mode 100644
index 000000000000..9ee8bd8b5ac1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods-native-support/output.mjs
@@ -0,0 +1,23 @@
+Array.from; // static function
+
+Map; // top level built-in
+// instance methods may have false positives (which is ok)
+
+a.includes(); // method call
+
+b['find']; // computed string?
+
+c.prototype.findIndex(); // .prototype
+
+d.fill.bind(); //.bind
+
+e.padStart.apply(); // .apply
+
+f.padEnd.call(); // .call
+
+String.prototype.startsWith.call; // prototype.call
+
+var {
+  codePointAt,
+  endsWith
+} = k; // destructuring
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/input.mjs
new file mode 100644
index 000000000000..4528eff880c4
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/input.mjs
@@ -0,0 +1,20 @@
+Array.from; // static function
+Map; // top level built-in
+
+// instance methods may have false positives (which is ok)
+a.includes(); // method call
+b['find'] // computed string?
+c.prototype.findIndex(); // .prototype
+d.fill.bind(); //.bind
+e.padStart.apply(); // .apply
+f.padEnd.call(); // .call
+String.prototype.startsWith.call; // prototype.call
+var { codePointAt, endsWith } = k; // destructuring
+
+var asdf = "copyWithin";
+var asdf2 = "split";
+var asdf3 = "re" + "place";
+i[asdf]; // computed with identifier
+j[`search`]; // computed with template
+k[asdf3] // computed with concat strings
+var { [asdf2]: _a } = k; // computed
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/output.mjs
new file mode 100644
index 000000000000..be008261d43e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-instance-methods/output.mjs
@@ -0,0 +1,56 @@
+import "core-js/modules/es.array.copy-within";
+import "core-js/modules/es.array.fill";
+import "core-js/modules/es.array.find";
+import "core-js/modules/es.array.find-index";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.includes";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.function.bind";
+import "core-js/modules/es.map";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.string.code-point-at";
+import "core-js/modules/es.string.ends-with";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.pad-end";
+import "core-js/modules/es.string.pad-start";
+import "core-js/modules/es.string.replace";
+import "core-js/modules/es.string.search";
+import "core-js/modules/es.string.split";
+import "core-js/modules/es.string.starts-with";
+import "core-js/modules/web.dom-collections.iterator";
+Array.from; // static function
+
+Map; // top level built-in
+// instance methods may have false positives (which is ok)
+
+a.includes(); // method call
+
+b['find']; // computed string?
+
+c.prototype.findIndex(); // .prototype
+
+d.fill.bind(); //.bind
+
+e.padStart.apply(); // .apply
+
+f.padEnd.call(); // .call
+
+String.prototype.startsWith.call; // prototype.call
+
+var _k = k,
+    codePointAt = _k.codePointAt,
+    endsWith = _k.endsWith; // destructuring
+
+var asdf = "copyWithin";
+var asdf2 = "split";
+var asdf3 = "re" + "place";
+i[asdf]; // computed with identifier
+
+j["search"]; // computed with template
+
+k[asdf3]; // computed with concat strings
+
+var _k2 = k,
+    _a = _k2[asdf2]; // computed
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/input.mjs
new file mode 100644
index 000000000000..a2b81d72e3d5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/input.mjs
@@ -0,0 +1 @@
+Promise;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/options.json
new file mode 100644
index 000000000000..949ccc15e215
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/options.json
@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/output.js b/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/output.js
new file mode 100644
index 000000000000..b86b98172305
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-modules-transform/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+require("core-js/modules/es.object.to-string");
+
+require("core-js/modules/es.promise");
+
+Promise;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/input.mjs
new file mode 100644
index 000000000000..4d789721e6b6
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/input.mjs
@@ -0,0 +1,33 @@
+Array.from; // static method
+Map; // built-in
+new Promise(); // new builtin
+Symbol.match; // as member expression
+
+// no import
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+_arr9[Symbol2.iterator]();
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
+
+// not covered by this plugin
+var asdf = 'copyWithin';
+i[asdf]; // computed with identifier
+j[`copyWithin`]; // computed with template
+var { [asdf]: _a } = k; // computed
+
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/options.json
new file mode 100644
index 000000000000..d868cc145bcd
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "targets": {
+          "chrome": 71
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/output.mjs
new file mode 100644
index 000000000000..271ffd332001
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-native-support/output.mjs
@@ -0,0 +1,42 @@
+Array.from; // static method
+
+Map; // built-in
+
+new Promise(); // new builtin
+
+Symbol.match; // as member expression
+// no import
+
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+
+_arr9[Symbol2.iterator]();
+
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
+// not covered by this plugin
+
+
+var asdf = 'copyWithin';
+i[asdf]; // computed with identifier
+
+j[`copyWithin`]; // computed with template
+
+var {
+  [asdf]: _a
+} = k; // computed
+
+const foo = new Promise(resolve => {
+  resolve(new Map());
+});
+queueMicrotask(() => globalThis);
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/input.mjs
new file mode 100644
index 000000000000..f688910ec093
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/input.mjs
@@ -0,0 +1 @@
+var a = 1;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/output.mjs
new file mode 100644
index 000000000000..f688910ec093
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-builtins/output.mjs
@@ -0,0 +1 @@
+var a = 1;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/input.mjs
new file mode 100644
index 000000000000..31f2d79f9abb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/input.mjs
@@ -0,0 +1,2 @@
+import "not-core-js";
+import "not-babel-polyfill";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/options.json
new file mode 100644
index 000000000000..e5c382aadcd2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": "55"
+        },
+        "modules": false,
+        "useBuiltIns": "usage",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/output.mjs
new file mode 100644
index 000000000000..31f2d79f9abb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-no-transform/output.mjs
@@ -0,0 +1,2 @@
+import "not-core-js";
+import "not-babel-polyfill";
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/input.mjs
new file mode 100644
index 000000000000..f71c85f35e63
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/input.mjs
@@ -0,0 +1,2 @@
+Number.parseFloat("3.14");
+Number.parseInt("10");
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/options.json
new file mode 100644
index 000000000000..a8516537b3f0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "ie": "11"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/output.mjs
new file mode 100644
index 000000000000..e43b0499157a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-number-ie-11/output.mjs
@@ -0,0 +1,5 @@
+import "core-js/modules/es.number.constructor";
+import "core-js/modules/es.number.parse-float";
+import "core-js/modules/es.number.parse-int";
+Number.parseFloat("3.14");
+Number.parseInt("10");
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/input.mjs
new file mode 100644
index 000000000000..f7bfa876749f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/input.mjs
@@ -0,0 +1 @@
+function test({ ...others }) {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/options.json
new file mode 100644
index 000000000000..3e006cec63b4
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "targets": { "node": "8.10.0" }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/output.js b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/output.js
new file mode 100644
index 000000000000..dccc8f3dbd6d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring-with-rest/output.js
@@ -0,0 +1,4 @@
+"use strict";
+
+function test({ ...others
+}) {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/input.mjs
new file mode 100644
index 000000000000..33e982c47577
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/input.mjs
@@ -0,0 +1,23 @@
+var bind, toString;
+
+var { bind } = Function;
+
+var { entries } = Object;
+
+({ toString } = Math);
+
+const [{ exec }] = something;
+
+const { 'trim': foo } = '1';
+
+const { foo: { filter } } = { foo: [] }
+
+const { includes } = '';
+
+var bar = Array;
+const { from } = bar; 
+
+const { ['o' + 'f']: fuz } = Array; 
+
+let forEach = 'sort';
+({ forEach } = zzz);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/options.json
new file mode 100644
index 000000000000..66007aa56ae9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/output.mjs
new file mode 100644
index 000000000000..d220e642b57a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-destructuring/output.mjs
@@ -0,0 +1,53 @@
+import "core-js/modules/es.array.filter";
+import "core-js/modules/es.array.for-each";
+import "core-js/modules/es.array.from";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array.of";
+import "core-js/modules/es.date.to-string";
+import "core-js/modules/es.function.bind";
+import "core-js/modules/es.object.entries";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.regexp.exec";
+import "core-js/modules/es.regexp.to-string";
+import "core-js/modules/es.string.includes";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/es.string.trim";
+import "core-js/modules/web.dom-collections.for-each";
+import "core-js/modules/web.dom-collections.iterator";
+var bind, toString;
+var {
+  bind: bind
+} = Function;
+var {
+  entries: entries
+} = Object;
+({
+  toString: toString
+} = Math);
+var [{
+  exec: exec
+}] = something;
+var {
+  'trim': foo
+} = '1';
+var {
+  foo: {
+    filter: filter
+  }
+} = {
+  foo: []
+};
+var {
+  includes: includes
+} = '';
+var bar = Array;
+var {
+  from: from
+} = bar;
+var {
+  ['o' + 'f']: fuz
+} = Array;
+var forEach = 'sort';
+({
+  forEach: forEach
+} = zzz);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/input.mjs
new file mode 100644
index 000000000000..2c63640feb14
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/input.mjs
@@ -0,0 +1 @@
+a = { b, ...c };
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/options.json
new file mode 100644
index 000000000000..723c1039a39d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["proposal-object-rest-spread"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/output.mjs
new file mode 100644
index 000000000000..a1e4b08b0d34
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-object-spread/output.mjs
@@ -0,0 +1,4 @@
+a = {
+  b: b,
+  ...c
+};
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/input.mjs
new file mode 100644
index 000000000000..0fef928e163d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/input.mjs
@@ -0,0 +1,4 @@
+var p = Promise.resolve(0);
+Promise.all([p]).then(outcome => {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/options.json
new file mode 100644
index 000000000000..0975cd86bf3c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie > 10"]
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/output.mjs
new file mode 100644
index 000000000000..a645ea5c4549
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-all/output.mjs
@@ -0,0 +1,9 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+var p = Promise.resolve(0);
+Promise.all([p]).then(function (outcome) {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/input.mjs
new file mode 100644
index 000000000000..bb634febe9b9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/input.mjs
@@ -0,0 +1,4 @@
+var p = Promise.resolve(0);
+p.finally(() => {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/options.json
new file mode 100644
index 000000000000..0975cd86bf3c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie > 10"]
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/output.mjs
new file mode 100644
index 000000000000..d0d487d3454d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-finally/output.mjs
@@ -0,0 +1,7 @@
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.promise.finally";
+var p = Promise.resolve(0);
+p.finally(function () {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/input.mjs
new file mode 100644
index 000000000000..334252838bc0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/input.mjs
@@ -0,0 +1,4 @@
+var p = Promise.resolve(0);
+Promise.race([p]).then(outcome => {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/options.json
new file mode 100644
index 000000000000..0975cd86bf3c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie > 10"]
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/output.mjs
new file mode 100644
index 000000000000..f818ab24bbfc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-promise-race/output.mjs
@@ -0,0 +1,9 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+var p = Promise.resolve(0);
+Promise.race([p]).then(function (outcome) {
+  alert("OK");
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/input.mjs
new file mode 100644
index 000000000000..8f6724b27f04
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/input.mjs
@@ -0,0 +1 @@
+async function a(){}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/options.json
new file mode 100644
index 000000000000..abaa6f0c2212
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "targets": {
+          "chrome": 70
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/output.mjs
new file mode 100644
index 000000000000..5d965c6200a9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-and-promise-native-support/output.mjs
@@ -0,0 +1 @@
+async function a() {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/input.mjs
new file mode 100644
index 000000000000..8f6724b27f04
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/input.mjs
@@ -0,0 +1 @@
+async function a(){}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/options.json
new file mode 100644
index 000000000000..793f43d96f89
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "targets": {
+          "chrome": 55
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/output.mjs
new file mode 100644
index 000000000000..9e343bd1dfaf
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async-native-support/output.mjs
@@ -0,0 +1,3 @@
+import "core-js/modules/es.promise";
+
+async function a() {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/input.mjs
new file mode 100644
index 000000000000..8f6724b27f04
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/input.mjs
@@ -0,0 +1 @@
+async function a(){}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/output.mjs
new file mode 100644
index 000000000000..5663fd906a75
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-async/output.mjs
@@ -0,0 +1,28 @@
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "regenerator-runtime/runtime";
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function a() {
+  return _a.apply(this, arguments);
+}
+
+function _a() {
+  _a = _asyncToGenerator(
+  /*#__PURE__*/
+  regeneratorRuntime.mark(function _callee() {
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _a.apply(this, arguments);
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/input.mjs
new file mode 100644
index 000000000000..4df46943d261
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/input.mjs
@@ -0,0 +1 @@
+function* a() {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/options.json
new file mode 100644
index 000000000000..6814f1539e44
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "targets": {
+          "node": 6
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/output.mjs
new file mode 100644
index 000000000000..4df46943d261
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator-native-support/output.mjs
@@ -0,0 +1 @@
+function* a() {}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/input.mjs
new file mode 100644
index 000000000000..74604e9198f6
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/input.mjs
@@ -0,0 +1 @@
+function* a(){}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/output.mjs
new file mode 100644
index 000000000000..ce5acd262e9f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-regenerator-used-generator/output.mjs
@@ -0,0 +1,17 @@
+import "regenerator-runtime/runtime";
+
+var _marked =
+/*#__PURE__*/
+regeneratorRuntime.mark(a);
+
+function a() {
+  return regeneratorRuntime.wrap(function a$(_context) {
+    while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _marked);
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/input.mjs
new file mode 100644
index 000000000000..39641419b1cb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/input.mjs
@@ -0,0 +1,26 @@
+Array.from; // static method
+Map; // built-in
+new Promise(); // new builtin
+Symbol.match; // as member expression
+_arr[Symbol.iterator](); // Symbol.iterator
+
+// no import
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+_arr9[Symbol2.iterator]();
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+function H(WeakMap) { var blah = new WeakMap(); } // shadowed
+
+const foo = new Promise((resolve) => {
+  resolve(new Map());
+});
+
+queueMicrotask(() => globalThis);
+
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/options.json
new file mode 100644
index 000000000000..5549e374aa53
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/options.json
@@ -0,0 +1,13 @@
+{
+  "sourceType": "module",
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "shippedProposals": true,
+        "useBuiltIns": "usage",
+        "corejs": 3
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/output.js b/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/output.js
new file mode 100644
index 000000000000..c8fb626d57dd
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-shippedProposals/output.js
@@ -0,0 +1,69 @@
+"use strict";
+
+require("core-js/modules/es.symbol");
+
+require("core-js/modules/es.symbol.description");
+
+require("core-js/modules/es.symbol.iterator");
+
+require("core-js/modules/es.symbol.match");
+
+require("core-js/modules/es.array.from");
+
+require("core-js/modules/es.array.iterator");
+
+require("core-js/modules/es.map");
+
+require("core-js/modules/es.object.to-string");
+
+require("core-js/modules/es.promise");
+
+require("core-js/modules/es.regexp.exec");
+
+require("core-js/modules/es.string.iterator");
+
+require("core-js/modules/es.string.match");
+
+require("core-js/modules/web.dom-collections.iterator");
+
+require("core-js/modules/web.queue-microtask");
+
+require("core-js/modules/esnext.global-this");
+
+Array.from; // static method
+
+Map; // built-in
+
+new Promise(); // new builtin
+
+Symbol.match; // as member expression
+
+_arr[Symbol.iterator](); // Symbol.iterator
+// no import
+
+
+Array.asdf;
+Array2.from;
+Map2;
+new Promise2();
+Symbol.asdf;
+Symbol2.match;
+
+_arr9[Symbol2.iterator]();
+
+_arr9[Symbol.iterator2]();
+
+G.assign; // static method
+
+function H(WeakMap) {
+  var blah = new WeakMap();
+} // shadowed
+
+
+var foo = new Promise(function (resolve) {
+  resolve(new Map());
+});
+queueMicrotask(function () {
+  return globalThis;
+});
+Observable.from(10);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/input.js b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/input.js
new file mode 100644
index 000000000000..39f9e5858b8c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/input.js
@@ -0,0 +1,8 @@
+require("foo");
+
+const x = new Promise(resolve => {
+  const p = [];
+
+  if (p.includes("a")) {
+  }
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/options.json
new file mode 100644
index 000000000000..7db8c24ae52a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "targets": {
+          "node": "4.0.0"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "shippedProposals": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/output.js b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/output.js
new file mode 100644
index 000000000000..b089b3d0a5f3
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script-query/output.js
@@ -0,0 +1,13 @@
+require("core-js/modules/es.array.includes");
+
+require("core-js/modules/es.object.to-string");
+
+require("core-js/modules/es.promise");
+
+require("foo");
+
+var x = new Promise(function (resolve) {
+  var p = [];
+
+  if (p.includes("a")) {}
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/input.js b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/input.js
new file mode 100644
index 000000000000..39f9e5858b8c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/input.js
@@ -0,0 +1,8 @@
+require("foo");
+
+const x = new Promise(resolve => {
+  const p = [];
+
+  if (p.includes("a")) {
+  }
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/options.json
new file mode 100644
index 000000000000..7db8c24ae52a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/options.json
@@ -0,0 +1,16 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "modules": false,
+        "targets": {
+          "node": "4.0.0"
+        },
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "shippedProposals": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/output.js b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/output.js
new file mode 100644
index 000000000000..b089b3d0a5f3
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-source-type-script/output.js
@@ -0,0 +1,13 @@
+require("core-js/modules/es.array.includes");
+
+require("core-js/modules/es.object.to-string");
+
+require("core-js/modules/es.promise");
+
+require("foo");
+
+var x = new Promise(function (resolve) {
+  var p = [];
+
+  if (p.includes("a")) {}
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/input.mjs
new file mode 100644
index 000000000000..457ddbbd55fe
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/input.mjs
@@ -0,0 +1 @@
+a = [b, ...c];
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/options.json
new file mode 100644
index 000000000000..ae6c1c0b3d04
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-spread"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/output.mjs
new file mode 100644
index 000000000000..a7a87ab7066d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-spread/output.mjs
@@ -0,0 +1,4 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+a = [b, ...c];
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/input.mjs
new file mode 100644
index 000000000000..12ff05d97b25
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/input.mjs
@@ -0,0 +1,4 @@
+Object.keys(foo);
+const getOwnPropertySymbols = Object.getOwnPropertySymbols;
+const { assign } = Object;
+'defineProperty' in Object;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/options.json
new file mode 100644
index 000000000000..d868cc145bcd
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "targets": {
+          "chrome": 71
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/output.mjs
new file mode 100644
index 000000000000..155f173e48a7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods-native-support/output.mjs
@@ -0,0 +1,6 @@
+Object.keys(foo);
+const getOwnPropertySymbols = Object.getOwnPropertySymbols;
+const {
+  assign
+} = Object;
+'defineProperty' in Object;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/input.mjs
new file mode 100644
index 000000000000..12ff05d97b25
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/input.mjs
@@ -0,0 +1,4 @@
+Object.keys(foo);
+const getOwnPropertySymbols = Object.getOwnPropertySymbols;
+const { assign } = Object;
+'defineProperty' in Object;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/options.json
new file mode 100644
index 000000000000..66007aa56ae9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false,
+        "exclude": ["transform-destructuring"]
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/output.mjs
new file mode 100644
index 000000000000..ffd45f77578e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-static-methods/output.mjs
@@ -0,0 +1,10 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.object.assign";
+import "core-js/modules/es.object.define-property";
+import "core-js/modules/es.object.keys";
+Object.keys(foo);
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+var {
+  assign: assign
+} = Object;
+'defineProperty' in Object;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/input.mjs
new file mode 100644
index 000000000000..3d72e8e71cf1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/input.mjs
@@ -0,0 +1 @@
+Symbol.iterator in arr
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/output.mjs
new file mode 100644
index 000000000000..6260f4e1fa77
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator-in/output.mjs
@@ -0,0 +1,8 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+Symbol.iterator in arr;
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/input.mjs
new file mode 100644
index 000000000000..c44a50ddfddc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/input.mjs
@@ -0,0 +1 @@
+arr[Symbol.iterator]()
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/output.mjs
new file mode 100644
index 000000000000..01d8ee8fb522
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-symbol-iterator/output.mjs
@@ -0,0 +1,8 @@
+import "core-js/modules/es.symbol";
+import "core-js/modules/es.symbol.description";
+import "core-js/modules/es.symbol.iterator";
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.string.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+arr[Symbol.iterator]();
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/input.mjs
new file mode 100644
index 000000000000..0f5be0d2da0e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/input.mjs
@@ -0,0 +1,5 @@
+Promise.resolve().then(it => {
+  setTimeout(foo, 1, 2);
+  setInterval(foo, 1, 2);
+  setImmediate(foo, 1, 2);
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/output.mjs
new file mode 100644
index 000000000000..dc5557373e12
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-timers/output.mjs
@@ -0,0 +1,9 @@
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.promise";
+import "core-js/modules/web.immediate";
+import "core-js/modules/web.timers";
+Promise.resolve().then(function (it) {
+  setTimeout(foo, 1, 2);
+  setInterval(foo, 1, 2);
+  setImmediate(foo, 1, 2);
+});
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/input.mjs
new file mode 100644
index 000000000000..b0bc068aa063
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/input.mjs
@@ -0,0 +1 @@
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/options.json
new file mode 100644
index 000000000000..87de5aba498d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "targets": {
+          "edge": "13"
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/output.mjs
new file mode 100644
index 000000000000..f2fbbbe4b600
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-edge-13/output.mjs
@@ -0,0 +1,6 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.to-locale-string";
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/input.mjs
new file mode 100644
index 000000000000..2394d067f859
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/input.mjs
@@ -0,0 +1 @@
+Int8Array.of();
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/output.mjs
new file mode 100644
index 000000000000..469c6467c34a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array-static/output.mjs
@@ -0,0 +1,29 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array-buffer.slice";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.of";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+Int8Array.of();
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/input.mjs
new file mode 100644
index 000000000000..b0bc068aa063
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/input.mjs
@@ -0,0 +1 @@
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/options.json
new file mode 100644
index 000000000000..c7f8e1de8403
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/output.mjs
new file mode 100644
index 000000000000..dcce776d0823
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-typed-array/output.mjs
@@ -0,0 +1,28 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/es.array-buffer.slice";
+import "core-js/modules/es.object.to-string";
+import "core-js/modules/es.typed-array.int8-array";
+import "core-js/modules/es.typed-array.copy-within";
+import "core-js/modules/es.typed-array.every";
+import "core-js/modules/es.typed-array.fill";
+import "core-js/modules/es.typed-array.filter";
+import "core-js/modules/es.typed-array.find";
+import "core-js/modules/es.typed-array.find-index";
+import "core-js/modules/es.typed-array.for-each";
+import "core-js/modules/es.typed-array.includes";
+import "core-js/modules/es.typed-array.index-of";
+import "core-js/modules/es.typed-array.iterator";
+import "core-js/modules/es.typed-array.join";
+import "core-js/modules/es.typed-array.last-index-of";
+import "core-js/modules/es.typed-array.map";
+import "core-js/modules/es.typed-array.reduce";
+import "core-js/modules/es.typed-array.reduce-right";
+import "core-js/modules/es.typed-array.reverse";
+import "core-js/modules/es.typed-array.set";
+import "core-js/modules/es.typed-array.slice";
+import "core-js/modules/es.typed-array.some";
+import "core-js/modules/es.typed-array.sort";
+import "core-js/modules/es.typed-array.subarray";
+import "core-js/modules/es.typed-array.to-locale-string";
+import "core-js/modules/es.typed-array.to-string";
+new Int8Array(1);
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/input.mjs
new file mode 100644
index 000000000000..927d2f2772bc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/input.mjs
@@ -0,0 +1,3 @@
+function* a() {
+  yield 1;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/options.json
new file mode 100644
index 000000000000..f288ad5a3902
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/output.mjs
new file mode 100644
index 000000000000..927d2f2772bc
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-non-star/output.mjs
@@ -0,0 +1,3 @@
+function* a() {
+  yield 1;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/input.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/input.mjs
new file mode 100644
index 000000000000..4915d62092eb
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/input.mjs
@@ -0,0 +1,3 @@
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/options.json b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/options.json
new file mode 100644
index 000000000000..f288ad5a3902
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/options.json
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "useBuiltIns": "usage",
+        "corejs": 3,
+        "targets": {
+          "chrome": 55
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/output.mjs b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/output.mjs
new file mode 100644
index 000000000000..be5b5a63a311
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/corejs3/usage-yield-star/output.mjs
@@ -0,0 +1,6 @@
+import "core-js/modules/es.array.iterator";
+import "core-js/modules/web.dom-collections.iterator";
+
+function* a() {
+  yield* 1;
+}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/options.json b/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator-in/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/options.json b/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/dom-iterable/symbol-iterator/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-non-star/options.json b/packages/babel-preset-env/test/fixtures/dom-iterable/yield-non-star/options.json
deleted file mode 100644
index 66d4ffba1a52..000000000000
--- a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-non-star/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "targets": {
-          "chrome": 55
-        },
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-star/options.json b/packages/babel-preset-env/test/fixtures/dom-iterable/yield-star/options.json
deleted file mode 100644
index 66d4ffba1a52..000000000000
--- a/packages/babel-preset-env/test/fixtures/dom-iterable/yield-star/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "targets": {
-          "chrome": 55
-        },
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/input.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/input.mjs
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/input.mjs
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/options.json
new file mode 100644
index 000000000000..154ea4199025
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/options.json
@@ -0,0 +1,8 @@
+{
+  "caller": {
+    "name": "test-fixture",
+    "supportsStaticESM": true,
+    "supportsDynamicImport": true
+  },
+  "presets": ["env"]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/output.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/output.mjs
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-supported/output.mjs
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/input.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/input.mjs
new file mode 100644
index 000000000000..9261e2a807b7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/input.mjs
@@ -0,0 +1 @@
+import("foo"); // warns
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/options.json
new file mode 100644
index 000000000000..c444f60ae955
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/options.json
@@ -0,0 +1,8 @@
+{
+  "caller": {
+    "name": "test-fixture",
+    "supportsStaticESM": true,
+    "supportsDynamicImport": false
+  },
+  "presets": ["env"]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/output.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/output.mjs
new file mode 100644
index 000000000000..9261e2a807b7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-supported-import-unsupported/output.mjs
@@ -0,0 +1 @@
+import("foo"); // warns
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/input.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/input.mjs
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/input.mjs
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/options.json
new file mode 100644
index 000000000000..370b48e76fb2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/options.json
@@ -0,0 +1,8 @@
+{
+  "caller": {
+    "name": "test-fixture",
+    "supportsStaticESM": false,
+    "supportsSynamicImport": false
+  },
+  "presets": ["env"]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/output.js b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/output.js
new file mode 100644
index 000000000000..9c2292edabb1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
+
+Promise.resolve().then(function () {
+  return _interopRequireWildcard(require("foo"));
+});
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/input.js b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/input.js
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/input.js
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/options.json
new file mode 100644
index 000000000000..e34f77e9664c
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/options.json
@@ -0,0 +1,3 @@
+{
+  "presets": [["env", { "modules": "amd" }]]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/output.js b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/output.js
new file mode 100644
index 000000000000..07297795f680
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-amd/output.js
@@ -0,0 +1,9 @@
+define(["require"], function (_require) {
+  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
+
+  new Promise(function (_resolve, _reject) {
+    return _require(["foo"], function (imported) {
+      return _resolve(_interopRequireWildcard(imported));
+    }, _reject);
+  });
+});
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/input.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/input.mjs
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/input.mjs
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/options.json
new file mode 100644
index 000000000000..1b03b37c6f6d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/options.json
@@ -0,0 +1,3 @@
+{
+  "presets": [["env", { "modules": "cjs" }]]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/output.js b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/output.js
new file mode 100644
index 000000000000..9c2292edabb1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/output.js
@@ -0,0 +1,7 @@
+"use strict";
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj["default"] = obj; return newObj; } }
+
+Promise.resolve().then(function () {
+  return _interopRequireWildcard(require("foo"));
+});
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/input.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/input.mjs
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/input.mjs
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/options.json
new file mode 100644
index 000000000000..3c22b6872e58
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/options.json
@@ -0,0 +1,3 @@
+{
+  "presets": [["env", { "modules": false }]]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/output.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/output.mjs
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-false/output.mjs
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/input.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/input.mjs
new file mode 100644
index 000000000000..99223a45b37d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/input.mjs
@@ -0,0 +1 @@
+import("foo");
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/options.json
new file mode 100644
index 000000000000..9be6fdb3812e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/options.json
@@ -0,0 +1,3 @@
+{
+  "presets": [["env", { "modules": "systemjs" }]]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/output.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/output.mjs
new file mode 100644
index 000000000000..6fbdfb301c4e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-systemjs/output.mjs
@@ -0,0 +1,10 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  return {
+    setters: [],
+    execute: function () {
+      _context["import"]("foo");
+    }
+  };
+});
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/input.mjs b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/input.mjs
new file mode 100644
index 000000000000..9261e2a807b7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/input.mjs
@@ -0,0 +1 @@
+import("foo"); // warns
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/options.json
new file mode 100644
index 000000000000..da7772e2d584
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/options.json
@@ -0,0 +1,3 @@
+{
+  "presets": [["env", { "modules": "umd" }]]
+}
diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/output.js b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/output.js
new file mode 100644
index 000000000000..f66adb1fb317
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-umd/output.js
@@ -0,0 +1,17 @@
+(function (global, factory) {
+  if (typeof define === "function" && define.amd) {
+    define([], factory);
+  } else if (typeof exports !== "undefined") {
+    factory();
+  } else {
+    var mod = {
+      exports: {}
+    };
+    factory();
+    global.input = mod.exports;
+  }
+})(this, function () {
+  "use strict";
+
+  import("foo"); // warns
+});
diff --git a/packages/babel-preset-env/test/fixtures/modules/auto-cjs/output.js b/packages/babel-preset-env/test/fixtures/modules/auto-cjs/output.js
index d79cb698b5b8..aef3b486e943 100644
--- a/packages/babel-preset-env/test/fixtures/modules/auto-cjs/output.js
+++ b/packages/babel-preset-env/test/fixtures/modules/auto-cjs/output.js
@@ -2,6 +2,6 @@
 
 var _mod = _interopRequireDefault(require("mod"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-console.log(_mod.default);
+console.log(_mod["default"]);
diff --git a/packages/babel-preset-env/test/fixtures/modules/auto-unknown/output.js b/packages/babel-preset-env/test/fixtures/modules/auto-unknown/output.js
index d79cb698b5b8..aef3b486e943 100644
--- a/packages/babel-preset-env/test/fixtures/modules/auto-unknown/output.js
+++ b/packages/babel-preset-env/test/fixtures/modules/auto-unknown/output.js
@@ -2,6 +2,6 @@
 
 var _mod = _interopRequireDefault(require("mod"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-console.log(_mod.default);
+console.log(_mod["default"]);
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-amd-loose/input.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-amd-loose/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-amd-loose/input.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-amd-loose/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-amd-loose/options.json b/packages/babel-preset-env/test/fixtures/modules/modules-amd-loose/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-amd-loose/options.json
rename to packages/babel-preset-env/test/fixtures/modules/modules-amd-loose/options.json
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-amd-loose/output.js b/packages/babel-preset-env/test/fixtures/modules/modules-amd-loose/output.js
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-amd-loose/output.js
rename to packages/babel-preset-env/test/fixtures/modules/modules-amd-loose/output.js
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-cjs/input.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-cjs/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-cjs/input.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-cjs/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-cjs/options.json b/packages/babel-preset-env/test/fixtures/modules/modules-cjs/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-cjs/options.json
rename to packages/babel-preset-env/test/fixtures/modules/modules-cjs/options.json
diff --git a/packages/babel-preset-env/test/fixtures/modules/modules-cjs/output.js b/packages/babel-preset-env/test/fixtures/modules/modules-cjs/output.js
new file mode 100644
index 000000000000..c2c99b9ac3b7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/modules/modules-cjs/output.js
@@ -0,0 +1,5 @@
+"use strict";
+
+var _a = _interopRequireDefault(require("a"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-commonjs/input.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-commonjs/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-commonjs/input.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-commonjs/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-commonjs/options.json b/packages/babel-preset-env/test/fixtures/modules/modules-commonjs/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-commonjs/options.json
rename to packages/babel-preset-env/test/fixtures/modules/modules-commonjs/options.json
diff --git a/packages/babel-preset-env/test/fixtures/modules/modules-commonjs/output.js b/packages/babel-preset-env/test/fixtures/modules/modules-commonjs/output.js
new file mode 100644
index 000000000000..c2c99b9ac3b7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/modules/modules-commonjs/output.js
@@ -0,0 +1,5 @@
+"use strict";
+
+var _a = _interopRequireDefault(require("a"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-false/input.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-false/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-false/input.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-false/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-false/options.json b/packages/babel-preset-env/test/fixtures/modules/modules-false/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-false/options.json
rename to packages/babel-preset-env/test/fixtures/modules/modules-false/options.json
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-false/output.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-false/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-false/output.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-false/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-systemjs/input.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-systemjs/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-systemjs/input.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-systemjs/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-systemjs/options.json b/packages/babel-preset-env/test/fixtures/modules/modules-systemjs/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-systemjs/options.json
rename to packages/babel-preset-env/test/fixtures/modules/modules-systemjs/options.json
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-systemjs/output.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-systemjs/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-systemjs/output.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-systemjs/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-umd/input.mjs b/packages/babel-preset-env/test/fixtures/modules/modules-umd/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-umd/input.mjs
rename to packages/babel-preset-env/test/fixtures/modules/modules-umd/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-umd/options.json b/packages/babel-preset-env/test/fixtures/modules/modules-umd/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options/modules-umd/options.json
rename to packages/babel-preset-env/test/fixtures/modules/modules-umd/options.json
diff --git a/packages/babel-preset-env/test/fixtures/modules/modules-umd/output.js b/packages/babel-preset-env/test/fixtures/modules/modules-umd/output.js
new file mode 100644
index 000000000000..231614902dde
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/modules/modules-umd/output.js
@@ -0,0 +1,19 @@
+(function (global, factory) {
+  if (typeof define === "function" && define.amd) {
+    define(["a"], factory);
+  } else if (typeof exports !== "undefined") {
+    factory(require("a"));
+  } else {
+    var mod = {
+      exports: {}
+    };
+    factory(global.a);
+    global.input = mod.exports;
+  }
+})(this, function (_a) {
+  "use strict";
+
+  _a = _interopRequireDefault(_a);
+
+  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+});
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/options.json b/packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/options.json
deleted file mode 100644
index de03c1982f7b..000000000000
--- a/packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "plugins": [
-    [
-      "../../../../lib/use-built-ins-entry-plugin",
-      {
-        "polyfills": [
-          "es6.typed.data-view",
-          "es6.typed.data-view",
-          "es6.reflect.apply"
-        ]
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/output.mjs b/packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/output.mjs
deleted file mode 100644
index 6a01cbb4c3b6..000000000000
--- a/packages/babel-preset-env/test/fixtures/plugin-options/filters-duplicates/output.mjs
+++ /dev/null
@@ -1,2 +0,0 @@
-import "core-js/modules/es6.typed.data-view";
-import "core-js/modules/es6.reflect.apply";
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-false/options.json b/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-false/options.json
deleted file mode 100644
index 122e5e85dd14..000000000000
--- a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-false/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "plugins": [
-    [
-      "../../../../lib/use-built-ins-entry-plugin",
-      {
-        "regenerator": false,
-        "polyfills": []
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/options.json b/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/options.json
deleted file mode 100644
index f68b3a1f0efc..000000000000
--- a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "plugins": [
-    [
-      "../../../../lib/use-built-ins-entry-plugin",
-      {
-        "regenerator": true,
-        "polyfills": []
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/output.mjs b/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/output.mjs
deleted file mode 100644
index 50dec607eff9..000000000000
--- a/packages/babel-preset-env/test/fixtures/plugin-options/regenerator-true/output.mjs
+++ /dev/null
@@ -1 +0,0 @@
-import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/options.json
deleted file mode 100644
index 77edc18b6566..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "configPath":
-          "../fixtures/preset-options-add-used-built-ins/browserslist-config-ignore",
-        "modules": false,
-        "targets": { "esmodules": true },
-        "useBuiltIns": "usage",
-        "debug": true
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/output.mjs
deleted file mode 100644
index ecbade1e6b58..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/browserslist-config-ignore/output.mjs
+++ /dev/null
@@ -1,2 +0,0 @@
-import "core-js/modules/web.dom.iterable";
-const a = new Map();
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/output.mjs
deleted file mode 100644
index 094de00c826b..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-class-methods/output.mjs
+++ /dev/null
@@ -1,16 +0,0 @@
-import "core-js/modules/es6.object.assign";
-import "core-js/modules/web.dom.iterable";
-import "core-js/modules/es6.array.iterator";
-var objectClass = Object;
-var arrayInstance = [];
-var assignStr = "assign";
-var entriesStr = "entries";
-var valuesStr = "values";
-var inclidesStr = "includes";
-var findStr = "find"; // Allow static methods be assigned to variables only directly in the module.
-
-externalVar[valuesStr]; // don't include
-
-objectClass[assignStr]({}); // include
-
-arrayInstance[entriesStr]({}); // don't include
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-evaluated-instance-methods/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods-native-support/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods-native-support/options.json
deleted file mode 100644
index b1891c2b584f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods-native-support/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false,
-        "targets": {
-          "chrome": 58
-        }
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/output.mjs
deleted file mode 100644
index 7ea36860ca91..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-instance-methods/output.mjs
+++ /dev/null
@@ -1,54 +0,0 @@
-import "core-js/modules/es6.regexp.split";
-import "core-js/modules/es6.regexp.replace";
-import "core-js/modules/es6.regexp.search";
-import "core-js/modules/es6.array.copy-within";
-import "core-js/modules/es6.string.ends-with";
-import "core-js/modules/es6.string.code-point-at";
-import "core-js/modules/es6.string.starts-with";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es6.array.fill";
-import "core-js/modules/es6.function.bind";
-import "core-js/modules/es6.array.find-index";
-import "core-js/modules/es6.array.find";
-import "core-js/modules/es7.array.includes";
-import "core-js/modules/es6.string.includes";
-import "core-js/modules/web.dom.iterable";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.map";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.array.from";
-Array.from; // static function
-
-Map; // top level built-in
-// instance methods may have false positives (which is ok)
-
-a.includes(); // method call
-
-b['find']; // computed string?
-
-c.prototype.findIndex(); // .prototype
-
-d.fill.bind(); //.bind
-
-e.padStart.apply(); // .apply
-
-f.padEnd.call(); // .call
-
-String.prototype.startsWith.call; // prototype.call
-
-var _k = k,
-    codePointAt = _k.codePointAt,
-    endsWith = _k.endsWith; // destructuring
-
-var asdf = "copyWithin";
-var asdf2 = "split";
-var asdf3 = "re" + "place";
-i[asdf]; // computed with identifier
-
-j["search"]; // computed with template
-
-k[asdf3]; // computed with concat strings
-
-var _k2 = k,
-    _a = _k2[asdf2]; // computed
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/options.json
deleted file mode 100644
index b1891c2b584f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false,
-        "targets": {
-          "chrome": 58
-        }
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/output.mjs
deleted file mode 100644
index c266710b0fd3..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used-native-support/output.mjs
+++ /dev/null
@@ -1,38 +0,0 @@
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/web.dom.iterable";
-Array.from; // static method
-
-Map; // built-in
-
-new Promise(); // new builtin
-
-Symbol.match; // as member expression
-// no import
-
-Array.asdf;
-Array2.from;
-Map2;
-new Promise2();
-Symbol.asdf;
-Symbol2.match;
-
-_arr9[Symbol2.iterator]();
-
-_arr9[Symbol.iterator2]();
-
-G.assign; // static method
-
-function H(WeakMap) {
-  var blah = new WeakMap();
-} // shadowed
-// not covered by this plugin
-
-
-var asdf = 'copyWithin';
-i[asdf]; // computed with identifier
-
-j[`copyWithin`]; // computed with template
-
-var {
-  [asdf]: _a
-} = k; // computed
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/output.mjs
deleted file mode 100644
index 207b71443275..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-used/output.mjs
+++ /dev/null
@@ -1,37 +0,0 @@
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es6.symbol";
-import "core-js/modules/es6.regexp.match";
-import "core-js/modules/es6.promise";
-import "core-js/modules/web.dom.iterable";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.map";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.array.from";
-Array.from; // static method
-
-Map; // built-in
-
-new Promise(); // new builtin
-
-Symbol.match; // as member expression
-
-_arr[Symbol.iterator](); // Symbol.iterator
-// no import
-
-
-Array.asdf;
-Array2.from;
-Map2;
-new Promise2();
-Symbol.asdf;
-Symbol2.match;
-
-_arr9[Symbol2.iterator]();
-
-_arr9[Symbol.iterator2]();
-
-G.assign; // static method
-
-function H(WeakMap) {
-  var blah = new WeakMap();
-} // shadowed
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-with/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-with/options.json
deleted file mode 100644
index c7849884df3f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-with/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "node": "7"
-        },
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/options.json
deleted file mode 100644
index 895761e20beb..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "node": "8"
-        },
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/output.mjs
deleted file mode 100644
index 925203985fe3..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/for-of-destructure-without/output.mjs
+++ /dev/null
@@ -1,6 +0,0 @@
-for (const _ref of foo) {
-  const {
-    a
-  } = _ref;
-  console.log(a);
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/no-builtins-used/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/no-builtins-used/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/no-builtins-used/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/number-ie11/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/number-ie11/options.json
deleted file mode 100644
index a7327659bd85..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/number-ie11/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "ie": "11"
-        },
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/options.json
deleted file mode 100644
index eeb3ed89dd1f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "browsers": ["ie > 10"]
-        },
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/output.mjs
deleted file mode 100644
index 2a50ee751f7d..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-all/output.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-import "core-js/modules/web.dom.iterable";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.promise";
-var p = Promise.resolve(0);
-Promise.all([p]).then(function (outcome) {
-  alert("OK");
-});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/options.json
deleted file mode 100644
index eeb3ed89dd1f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "browsers": ["ie > 10"]
-        },
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/output.mjs
deleted file mode 100644
index 966401f6c67f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-finally/output.mjs
+++ /dev/null
@@ -1,6 +0,0 @@
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.promise";
-var p = Promise.resolve(0);
-p.finally(function () {
-  alert("OK");
-});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/options.json
deleted file mode 100644
index eeb3ed89dd1f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "browsers": ["ie > 10"]
-        },
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/output.mjs
deleted file mode 100644
index 099125598ebe..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/promise-race/output.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-import "core-js/modules/web.dom.iterable";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.promise";
-var p = Promise.resolve(0);
-Promise.race([p]).then(function (outcome) {
-  alert("OK");
-});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async-native-support/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async-native-support/options.json
deleted file mode 100644
index 708d581db624..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async-native-support/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false,
-        "targets": {
-          "chrome": 55
-        }
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/output.mjs
deleted file mode 100644
index 8b1751630982..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-async/output.mjs
+++ /dev/null
@@ -1,27 +0,0 @@
-import "regenerator-runtime/runtime";
-import "core-js/modules/es6.promise";
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function a() {
-  return _a.apply(this, arguments);
-}
-
-function _a() {
-  _a = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-  return _a.apply(this, arguments);
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator-native-support/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator-native-support/options.json
deleted file mode 100644
index 455a456415fa..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator-native-support/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false,
-        "targets": {
-          "node": 6
-        }
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/output.mjs
deleted file mode 100644
index ed7b9e86d169..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/regenerator-used-generator/output.mjs
+++ /dev/null
@@ -1,17 +0,0 @@
-import "regenerator-runtime/runtime";
-
-var _marked =
-/*#__PURE__*/
-regeneratorRuntime.mark(a);
-
-function a() {
-  return regeneratorRuntime.wrap(function a$(_context) {
-    while (1) {
-      switch (_context.prev = _context.next) {
-        case 0:
-        case "end":
-          return _context.stop();
-      }
-    }
-  }, _marked, this);
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/options.json
deleted file mode 100644
index 0724294c9bee..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "useBuiltIns": "usage",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/options.json
deleted file mode 100644
index b9f676d13128..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "modules": false,
-        "targets": {
-          "node": "4.0.0"
-        },
-        "useBuiltIns": "usage",
-        "shippedProposals": true
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/output.js b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/output.js
deleted file mode 100644
index d98c7e41c6af..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script-query/output.js
+++ /dev/null
@@ -1,11 +0,0 @@
-require("core-js/modules/es7.array.includes");
-
-require("core-js/modules/es6.promise");
-
-require("foo");
-
-var x = new Promise(function (resolve) {
-  var p = [];
-
-  if (p.includes("a")) {}
-});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/options.json b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/options.json
deleted file mode 100644
index b9f676d13128..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "modules": false,
-        "targets": {
-          "node": "4.0.0"
-        },
-        "useBuiltIns": "usage",
-        "shippedProposals": true
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/output.js b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/output.js
deleted file mode 100644
index d98c7e41c6af..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/output.js
+++ /dev/null
@@ -1,11 +0,0 @@
-require("core-js/modules/es7.array.includes");
-
-require("core-js/modules/es6.promise");
-
-require("foo");
-
-var x = new Promise(function (resolve) {
-  var p = [];
-
-  if (p.includes("a")) {}
-});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/output.js b/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/output.js
deleted file mode 100644
index 0c960918864f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/output.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-require("core-js/modules/es6.promise");
-
-Promise;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-config-with-false/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-config-with-false/options.json
index 772ac0d056ae..e5b755470d66 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-config-with-false/options.json
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-config-with-false/options.json
@@ -3,8 +3,7 @@
     [
       "../../../../lib",
       {
-        "configPath":
-          "../fixtures/preset-options/browserslist-config-ignore-with-false",
+        "configPath": "../fixtures/preset-options/browserslist-config-ignore-with-false",
         "modules": false,
         "ignoreBrowserslistConfig": true
       }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-package-with-false/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-package-with-false/options.json
index 772ac0d056ae..e5b755470d66 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-package-with-false/options.json
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config-ignore-package-with-false/options.json
@@ -3,8 +3,7 @@
     [
       "../../../../lib",
       {
-        "configPath":
-          "../fixtures/preset-options/browserslist-config-ignore-with-false",
+        "configPath": "../fixtures/preset-options/browserslist-config-ignore-with-false",
         "modules": false,
         "ignoreBrowserslistConfig": true
       }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config/options.json
index ec82f53a37b2..7fa5af3baafb 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config/options.json
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-config/options.json
@@ -3,8 +3,7 @@
     [
       "../../../../lib",
       {
-        "configPath":
-          "packages/babel-preset-env/test/fixtures/preset-options/browserslist-config",
+        "configPath": "packages/babel-preset-env/test/fixtures/preset-options/browserslist-config",
         "modules": false
       }
     ]
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/browserslist b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/browserslist
new file mode 100644
index 000000000000..e94f8140cc00
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/browserslist
@@ -0,0 +1 @@
+defaults
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/input.mjs
new file mode 100644
index 000000000000..bf68e2dbd8c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/input.mjs
@@ -0,0 +1 @@
+const test = () => "";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/options.json
new file mode 100644
index 000000000000..678d07617515
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/options.json
@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "configPath": "packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config",
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/output.mjs
new file mode 100644
index 000000000000..0b90fe8593a7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-default-via-config/output.mjs
@@ -0,0 +1,3 @@
+var test = function test() {
+  return "";
+};
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/input.mjs
new file mode 100644
index 000000000000..e984854c838b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/input.mjs
@@ -0,0 +1 @@
+const test = (a, [b], c) => "";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/options.json
new file mode 100644
index 000000000000..7ee0ee1a8a81
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "node": "current",
+          "browsers": ["defaults", "not ie <= 10"]
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/output.js b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/output.js
new file mode 100644
index 000000000000..f894dda6a490
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults-2/output.js
@@ -0,0 +1,16 @@
+"use strict";
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var test = function test(a, _ref, c) {
+  var _ref2 = _slicedToArray(_ref, 1),
+      b = _ref2[0];
+
+  return "";
+};
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/input.mjs
new file mode 100644
index 000000000000..bf68e2dbd8c9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/input.mjs
@@ -0,0 +1 @@
+const test = () => "";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/options.json
new file mode 100644
index 000000000000..fb7e8d2043b6
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/options.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": "defaults"
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/output.js b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/output.js
new file mode 100644
index 000000000000..a5703ba6f53d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-defaults/output.js
@@ -0,0 +1,5 @@
+"use strict";
+
+var test = function test() {
+  return "";
+};
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package-ignore-with-targets/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package-ignore-with-targets/options.json
index d019d62723c7..edb525659be2 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package-ignore-with-targets/options.json
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package-ignore-with-targets/options.json
@@ -3,8 +3,7 @@
     [
       "../../../../lib",
       {
-        "configPath":
-          "../fixtures/preset-options/browserslist-package-ignore-with-array",
+        "configPath": "../fixtures/preset-options/browserslist-package-ignore-with-array",
         "targets": {
           "chrome": 55
         },
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package/options.json b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package/options.json
index c5435b615af0..79c5b70108b0 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package/options.json
+++ b/packages/babel-preset-env/test/fixtures/preset-options/browserslist-package/options.json
@@ -3,8 +3,7 @@
     [
       "../../../../lib",
       {
-        "configPath":
-          "packages/babel-preset-env/test/fixtures/preset-options/browserslist-package",
+        "configPath": "packages/babel-preset-env/test/fixtures/preset-options/browserslist-package",
         "modules": false
       }
     ]
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/core-js/options.json b/packages/babel-preset-env/test/fixtures/preset-options/core-js/options.json
deleted file mode 100644
index 6053ab0e29e1..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/core-js/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 55
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/core-js/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/core-js/output.mjs
deleted file mode 100644
index 8241589a94c2..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/core-js/output.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/input.js b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/input.js
new file mode 100644
index 000000000000..e09b4ffd23db
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/input.js
@@ -0,0 +1,3 @@
+((a, { b = 0, c = 3 }) => {
+  return a === 1 && b === 2 && c === 3;
+})(1, { b: 2 });
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/options.json b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/options.json
new file mode 100644
index 000000000000..d14a50fd6c9a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["edge >= 15"]
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/output.js b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/output.js
new file mode 100644
index 000000000000..dfec033c1bc9
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/destructuring-edge/output.js
@@ -0,0 +1,9 @@
+((a, _ref) => {
+  let {
+    b = 0,
+    c = 3
+  } = _ref;
+  return a === 1 && b === 2 && c === 3;
+})(1, {
+  b: 2
+});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/electron/options.json b/packages/babel-preset-env/test/fixtures/preset-options/electron/options.json
deleted file mode 100644
index 0ebb7522209b..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/electron/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "electron": "1.4"
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/electron/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/electron/output.mjs
deleted file mode 100644
index ebe428ccf6b5..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/electron/output.mjs
+++ /dev/null
@@ -1,17 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es6.function.bind";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.entries";
-import "core-js/modules/es7.object.get-own-property-descriptors";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.object.values";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-a ** b;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/input.mjs
new file mode 100644
index 000000000000..09032f0c517d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/input.mjs
@@ -0,0 +1 @@
+async function f () { }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/options.json b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/options.json
new file mode 100644
index 000000000000..7d6cc027791b
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/options.json
@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": { "esmodules": true },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/output.mjs
new file mode 100644
index 000000000000..38a063fb21a5
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/esmodules-async-functions/output.mjs
@@ -0,0 +1,12 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function f() {
+  return _f.apply(this, arguments);
+}
+
+function _f() {
+  _f = _asyncToGenerator(function* () {});
+  return _f.apply(this, arguments);
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/options.json b/packages/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/options.json
deleted file mode 100644
index 368eff47d48d..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/options.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 63
-        },
-        "modules": false,
-        "useBuiltIns": "entry",
-        "exclude": [
-          "es7.string.pad-start",
-          "es7.string.pad-end",
-          "web.timers",
-          "web.immediate",
-          "web.dom.iterable"
-        ]
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-include/options.json b/packages/babel-preset-env/test/fixtures/preset-options/exclude-include/options.json
deleted file mode 100644
index 5835e72a3694..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/exclude-include/options.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 55
-        },
-        "modules": false,
-        "useBuiltIns": "entry",
-        "exclude": [
-          "transform-async-to-generator",
-          "transform-regenerator",
-          "es7.string.pad-start"
-        ],
-        "include": ["transform-arrow-functions", "es6.map"]
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-include/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/exclude-include/output.mjs
deleted file mode 100644
index 7417071cd263..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/exclude-include/output.mjs
+++ /dev/null
@@ -1,18 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es6.map";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-
-async function a() {
-  await 1;
-}
-
-(function () {});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/options.json b/packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/options.json
deleted file mode 100644
index 7e047ae37cc1..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/options.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "modules": false,
-        "useBuiltIns": "entry",
-        "exclude": ["transform-regenerator"]
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/output.mjs
deleted file mode 100644
index 7201ee62c96d..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/exclude-regenerator/output.mjs
+++ /dev/null
@@ -1,144 +0,0 @@
-import "core-js/modules/es6.array.copy-within";
-import "core-js/modules/es6.array.every";
-import "core-js/modules/es6.array.fill";
-import "core-js/modules/es6.array.filter";
-import "core-js/modules/es6.array.find";
-import "core-js/modules/es6.array.find-index";
-import "core-js/modules/es6.array.for-each";
-import "core-js/modules/es6.array.from";
-import "core-js/modules/es7.array.includes";
-import "core-js/modules/es6.array.index-of";
-import "core-js/modules/es6.array.is-array";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.array.last-index-of";
-import "core-js/modules/es6.array.map";
-import "core-js/modules/es6.array.of";
-import "core-js/modules/es6.array.reduce";
-import "core-js/modules/es6.array.reduce-right";
-import "core-js/modules/es6.array.some";
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es6.array.species";
-import "core-js/modules/es6.date.now";
-import "core-js/modules/es6.date.to-iso-string";
-import "core-js/modules/es6.date.to-json";
-import "core-js/modules/es6.date.to-primitive";
-import "core-js/modules/es6.date.to-string";
-import "core-js/modules/es6.function.bind";
-import "core-js/modules/es6.function.has-instance";
-import "core-js/modules/es6.function.name";
-import "core-js/modules/es6.map";
-import "core-js/modules/es6.math.acosh";
-import "core-js/modules/es6.math.asinh";
-import "core-js/modules/es6.math.atanh";
-import "core-js/modules/es6.math.cbrt";
-import "core-js/modules/es6.math.clz32";
-import "core-js/modules/es6.math.cosh";
-import "core-js/modules/es6.math.expm1";
-import "core-js/modules/es6.math.fround";
-import "core-js/modules/es6.math.hypot";
-import "core-js/modules/es6.math.imul";
-import "core-js/modules/es6.math.log1p";
-import "core-js/modules/es6.math.log10";
-import "core-js/modules/es6.math.log2";
-import "core-js/modules/es6.math.sign";
-import "core-js/modules/es6.math.sinh";
-import "core-js/modules/es6.math.tanh";
-import "core-js/modules/es6.math.trunc";
-import "core-js/modules/es6.number.constructor";
-import "core-js/modules/es6.number.epsilon";
-import "core-js/modules/es6.number.is-finite";
-import "core-js/modules/es6.number.is-integer";
-import "core-js/modules/es6.number.is-nan";
-import "core-js/modules/es6.number.is-safe-integer";
-import "core-js/modules/es6.number.max-safe-integer";
-import "core-js/modules/es6.number.min-safe-integer";
-import "core-js/modules/es6.number.parse-float";
-import "core-js/modules/es6.number.parse-int";
-import "core-js/modules/es6.object.assign";
-import "core-js/modules/es6.object.create";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es6.object.define-property";
-import "core-js/modules/es6.object.define-properties";
-import "core-js/modules/es7.object.entries";
-import "core-js/modules/es6.object.freeze";
-import "core-js/modules/es6.object.get-own-property-descriptor";
-import "core-js/modules/es7.object.get-own-property-descriptors";
-import "core-js/modules/es6.object.get-own-property-names";
-import "core-js/modules/es6.object.get-prototype-of";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es6.object.prevent-extensions";
-import "core-js/modules/es6.object.is";
-import "core-js/modules/es6.object.is-frozen";
-import "core-js/modules/es6.object.is-sealed";
-import "core-js/modules/es6.object.is-extensible";
-import "core-js/modules/es6.object.keys";
-import "core-js/modules/es6.object.seal";
-import "core-js/modules/es6.object.set-prototype-of";
-import "core-js/modules/es7.object.values";
-import "core-js/modules/es6.promise";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.reflect.apply";
-import "core-js/modules/es6.reflect.construct";
-import "core-js/modules/es6.reflect.define-property";
-import "core-js/modules/es6.reflect.delete-property";
-import "core-js/modules/es6.reflect.get";
-import "core-js/modules/es6.reflect.get-own-property-descriptor";
-import "core-js/modules/es6.reflect.get-prototype-of";
-import "core-js/modules/es6.reflect.has";
-import "core-js/modules/es6.reflect.is-extensible";
-import "core-js/modules/es6.reflect.own-keys";
-import "core-js/modules/es6.reflect.prevent-extensions";
-import "core-js/modules/es6.reflect.set";
-import "core-js/modules/es6.reflect.set-prototype-of";
-import "core-js/modules/es6.regexp.constructor";
-import "core-js/modules/es6.regexp.flags";
-import "core-js/modules/es6.regexp.match";
-import "core-js/modules/es6.regexp.replace";
-import "core-js/modules/es6.regexp.split";
-import "core-js/modules/es6.regexp.search";
-import "core-js/modules/es6.regexp.to-string";
-import "core-js/modules/es6.set";
-import "core-js/modules/es6.symbol";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es6.string.anchor";
-import "core-js/modules/es6.string.big";
-import "core-js/modules/es6.string.blink";
-import "core-js/modules/es6.string.bold";
-import "core-js/modules/es6.string.code-point-at";
-import "core-js/modules/es6.string.ends-with";
-import "core-js/modules/es6.string.fixed";
-import "core-js/modules/es6.string.fontcolor";
-import "core-js/modules/es6.string.fontsize";
-import "core-js/modules/es6.string.from-code-point";
-import "core-js/modules/es6.string.includes";
-import "core-js/modules/es6.string.italics";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.string.link";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/es6.string.raw";
-import "core-js/modules/es6.string.repeat";
-import "core-js/modules/es6.string.small";
-import "core-js/modules/es6.string.starts-with";
-import "core-js/modules/es6.string.strike";
-import "core-js/modules/es6.string.sub";
-import "core-js/modules/es6.string.sup";
-import "core-js/modules/es6.string.trim";
-import "core-js/modules/es6.typed.array-buffer";
-import "core-js/modules/es6.typed.data-view";
-import "core-js/modules/es6.typed.int8-array";
-import "core-js/modules/es6.typed.uint8-array";
-import "core-js/modules/es6.typed.uint8-clamped-array";
-import "core-js/modules/es6.typed.int16-array";
-import "core-js/modules/es6.typed.uint16-array";
-import "core-js/modules/es6.typed.int32-array";
-import "core-js/modules/es6.typed.uint32-array";
-import "core-js/modules/es6.typed.float32-array";
-import "core-js/modules/es6.typed.float64-array";
-import "core-js/modules/es6.weak-map";
-import "core-js/modules/es6.weak-set";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/exclude/options.json b/packages/babel-preset-env/test/fixtures/preset-options/exclude/options.json
deleted file mode 100644
index ffe95aded8ad..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/exclude/options.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "modules": false,
-        "useBuiltIns": "usage",
-        "exclude": ["transform-async-to-generator", "transform-regenerator"]
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/options.json b/packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/options.json
deleted file mode 100644
index bbb2830a6bc5..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 55
-        },
-        "modules": false,
-        "useBuiltIns": "entry",
-        "forceAllTransforms": true
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/output.mjs
deleted file mode 100644
index 814a9aefea16..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/force-all-transforms/output.mjs
+++ /dev/null
@@ -1,14 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-import "regenerator-runtime/runtime";
-var a = 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/options.json b/packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/options.json
deleted file mode 100644
index be71dc8e1115..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "ie": 11
-        },
-        "modules": false,
-        "useBuiltIns": "entry",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/output.mjs
deleted file mode 100644
index 8ace0aa1e2e8..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/ie-11-built-ins/output.mjs
+++ /dev/null
@@ -1,123 +0,0 @@
-import "core-js/modules/es6.array.copy-within";
-import "core-js/modules/es6.array.fill";
-import "core-js/modules/es6.array.find";
-import "core-js/modules/es6.array.find-index";
-import "core-js/modules/es6.array.from";
-import "core-js/modules/es7.array.includes";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.array.of";
-import "core-js/modules/es6.array.species";
-import "core-js/modules/es6.date.to-primitive";
-import "core-js/modules/es6.function.has-instance";
-import "core-js/modules/es6.function.name";
-import "core-js/modules/es6.map";
-import "core-js/modules/es6.math.acosh";
-import "core-js/modules/es6.math.asinh";
-import "core-js/modules/es6.math.atanh";
-import "core-js/modules/es6.math.cbrt";
-import "core-js/modules/es6.math.clz32";
-import "core-js/modules/es6.math.cosh";
-import "core-js/modules/es6.math.expm1";
-import "core-js/modules/es6.math.fround";
-import "core-js/modules/es6.math.hypot";
-import "core-js/modules/es6.math.imul";
-import "core-js/modules/es6.math.log1p";
-import "core-js/modules/es6.math.log10";
-import "core-js/modules/es6.math.log2";
-import "core-js/modules/es6.math.sign";
-import "core-js/modules/es6.math.sinh";
-import "core-js/modules/es6.math.tanh";
-import "core-js/modules/es6.math.trunc";
-import "core-js/modules/es6.number.constructor";
-import "core-js/modules/es6.number.epsilon";
-import "core-js/modules/es6.number.is-finite";
-import "core-js/modules/es6.number.is-integer";
-import "core-js/modules/es6.number.is-nan";
-import "core-js/modules/es6.number.is-safe-integer";
-import "core-js/modules/es6.number.max-safe-integer";
-import "core-js/modules/es6.number.min-safe-integer";
-import "core-js/modules/es6.number.parse-float";
-import "core-js/modules/es6.number.parse-int";
-import "core-js/modules/es6.object.assign";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.entries";
-import "core-js/modules/es6.object.freeze";
-import "core-js/modules/es6.object.get-own-property-descriptor";
-import "core-js/modules/es7.object.get-own-property-descriptors";
-import "core-js/modules/es6.object.get-own-property-names";
-import "core-js/modules/es6.object.get-prototype-of";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es6.object.prevent-extensions";
-import "core-js/modules/es6.object.is";
-import "core-js/modules/es6.object.is-frozen";
-import "core-js/modules/es6.object.is-sealed";
-import "core-js/modules/es6.object.is-extensible";
-import "core-js/modules/es6.object.keys";
-import "core-js/modules/es6.object.seal";
-import "core-js/modules/es7.object.values";
-import "core-js/modules/es6.promise";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.reflect.apply";
-import "core-js/modules/es6.reflect.construct";
-import "core-js/modules/es6.reflect.define-property";
-import "core-js/modules/es6.reflect.delete-property";
-import "core-js/modules/es6.reflect.get";
-import "core-js/modules/es6.reflect.get-own-property-descriptor";
-import "core-js/modules/es6.reflect.get-prototype-of";
-import "core-js/modules/es6.reflect.has";
-import "core-js/modules/es6.reflect.is-extensible";
-import "core-js/modules/es6.reflect.own-keys";
-import "core-js/modules/es6.reflect.prevent-extensions";
-import "core-js/modules/es6.reflect.set";
-import "core-js/modules/es6.reflect.set-prototype-of";
-import "core-js/modules/es6.regexp.constructor";
-import "core-js/modules/es6.regexp.flags";
-import "core-js/modules/es6.regexp.match";
-import "core-js/modules/es6.regexp.replace";
-import "core-js/modules/es6.regexp.split";
-import "core-js/modules/es6.regexp.search";
-import "core-js/modules/es6.regexp.to-string";
-import "core-js/modules/es6.set";
-import "core-js/modules/es6.symbol";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es6.string.anchor";
-import "core-js/modules/es6.string.big";
-import "core-js/modules/es6.string.blink";
-import "core-js/modules/es6.string.bold";
-import "core-js/modules/es6.string.code-point-at";
-import "core-js/modules/es6.string.ends-with";
-import "core-js/modules/es6.string.fixed";
-import "core-js/modules/es6.string.fontcolor";
-import "core-js/modules/es6.string.fontsize";
-import "core-js/modules/es6.string.from-code-point";
-import "core-js/modules/es6.string.includes";
-import "core-js/modules/es6.string.italics";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.string.link";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/es6.string.raw";
-import "core-js/modules/es6.string.repeat";
-import "core-js/modules/es6.string.small";
-import "core-js/modules/es6.string.starts-with";
-import "core-js/modules/es6.string.strike";
-import "core-js/modules/es6.string.sub";
-import "core-js/modules/es6.string.sup";
-import "core-js/modules/es6.typed.array-buffer";
-import "core-js/modules/es6.typed.int8-array";
-import "core-js/modules/es6.typed.uint8-array";
-import "core-js/modules/es6.typed.uint8-clamped-array";
-import "core-js/modules/es6.typed.int16-array";
-import "core-js/modules/es6.typed.uint16-array";
-import "core-js/modules/es6.typed.int32-array";
-import "core-js/modules/es6.typed.uint32-array";
-import "core-js/modules/es6.typed.float32-array";
-import "core-js/modules/es6.typed.float64-array";
-import "core-js/modules/es6.weak-map";
-import "core-js/modules/es6.weak-set";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/options.json b/packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/options.json
deleted file mode 100644
index efae47165111..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 55
-        },
-        "include": ["es6.map", "es6.set"],
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/output.mjs
deleted file mode 100644
index 2188ac33c93a..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/include-built-ins/output.mjs
+++ /dev/null
@@ -1,14 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es6.map";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.set";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/input.mjs
new file mode 100644
index 000000000000..4e6a6de65314
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/input.mjs
@@ -0,0 +1 @@
+class Foo {}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/options.json b/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/options.json
new file mode 100644
index 000000000000..e990f37eb8d0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/options.json
@@ -0,0 +1,14 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "chrome": 61
+        },
+        "include": ["@babel/plugin-transform-classes"],
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/output.mjs
new file mode 100644
index 000000000000..0040583f4714
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/include-scoped/output.mjs
@@ -0,0 +1,5 @@
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+let Foo = function Foo() {
+  _classCallCheck(this, Foo);
+};
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs
index 02d939c57fc1..98caa184e618 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-10/output.mjs
@@ -1 +1 @@
-const a = () => 1;
+var a = () => 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/input.mjs
new file mode 100644
index 000000000000..539f11356fae
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/input.mjs
@@ -0,0 +1,2 @@
+const a = () => 1;
+
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/options.json b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/options.json
new file mode 100644
index 000000000000..34749d2aede0
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ios >= 10.3"]
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/output.mjs
new file mode 100644
index 000000000000..98caa184e618
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-10_3/output.mjs
@@ -0,0 +1 @@
+var a = () => 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-11/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-11/input.mjs
new file mode 100644
index 000000000000..539f11356fae
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-11/input.mjs
@@ -0,0 +1,2 @@
+const a = () => 1;
+
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-11/options.json b/packages/babel-preset-env/test/fixtures/preset-options/ios-11/options.json
new file mode 100644
index 000000000000..073d89cfc80f
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-11/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ios >= 11"]
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-11/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-11/output.mjs
new file mode 100644
index 000000000000..02d939c57fc1
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-11/output.mjs
@@ -0,0 +1 @@
+const a = () => 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-6/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-6/input.mjs
index c3fee8a17564..02d939c57fc1 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/ios-6/input.mjs
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-6/input.mjs
@@ -1 +1 @@
-import "core-js";
+const a = () => 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-6/options.json b/packages/babel-preset-env/test/fixtures/preset-options/ios-6/options.json
index 96778c122b56..ef1f77b91a1f 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/ios-6/options.json
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-6/options.json
@@ -6,8 +6,7 @@
         "targets": {
           "browsers": ["ios >= 6"]
         },
-        "modules": false,
-        "useBuiltIns": "usage"
+        "modules": false
       }
     ]
   ]
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/ios-6/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/ios-6/output.mjs
new file mode 100644
index 000000000000..6bf835e390cf
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/ios-6/output.mjs
@@ -0,0 +1,3 @@
+var a = function a() {
+  return 1;
+};
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-cjs/output.js b/packages/babel-preset-env/test/fixtures/preset-options/modules-cjs/output.js
deleted file mode 100644
index 5948a626bd97..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/modules-cjs/output.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-var _a = _interopRequireDefault(require("a"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-commonjs/output.js b/packages/babel-preset-env/test/fixtures/preset-options/modules-commonjs/output.js
deleted file mode 100644
index 5948a626bd97..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/modules-commonjs/output.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-var _a = _interopRequireDefault(require("a"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/modules-umd/output.js b/packages/babel-preset-env/test/fixtures/preset-options/modules-umd/output.js
deleted file mode 100644
index f6258b3eb504..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/modules-umd/output.js
+++ /dev/null
@@ -1,19 +0,0 @@
-(function (global, factory) {
-  if (typeof define === "function" && define.amd) {
-    define(["a"], factory);
-  } else if (typeof exports !== "undefined") {
-    factory(require("a"));
-  } else {
-    var mod = {
-      exports: {}
-    };
-    factory(global.a);
-    global.input = mod.exports;
-  }
-})(this, function (_a) {
-  "use strict";
-
-  _a = _interopRequireDefault(_a);
-
-  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-});
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/no-transform/options.json b/packages/babel-preset-env/test/fixtures/preset-options/no-transform/options.json
deleted file mode 100644
index 993ea7009f98..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/no-transform/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": "55"
-        },
-        "modules": false,
-        "useBuiltIns": "usage"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/input.mjs
new file mode 100644
index 000000000000..e94d1ea8cf38
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/input.mjs
@@ -0,0 +1 @@
+({ if: 42 }).if == 42;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/options.json b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/options.json
new file mode 100644
index 000000000000..fe3139009d7a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie 8"]
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/output.mjs
new file mode 100644
index 000000000000..94935cbf0e46
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie8/output.mjs
@@ -0,0 +1,3 @@
+({
+  "if": 42
+})["if"] == 42;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/input.mjs
new file mode 100644
index 000000000000..e94d1ea8cf38
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/input.mjs
@@ -0,0 +1 @@
+({ if: 42 }).if == 42;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/options.json b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/options.json
new file mode 100644
index 000000000000..f762db2a15e2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie 9"]
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/output.mjs
new file mode 100644
index 000000000000..2d428718c2e7
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-keys-ie9/output.mjs
@@ -0,0 +1,3 @@
+({
+  if: 42
+}).if == 42;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/input.mjs
new file mode 100644
index 000000000000..b19e8003c346
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/input.mjs
@@ -0,0 +1 @@
+var abstract = 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/options.json b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/options.json
new file mode 100644
index 000000000000..fe3139009d7a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie 8"]
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/output.mjs
new file mode 100644
index 000000000000..ef9ec72b0c2d
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie8/output.mjs
@@ -0,0 +1 @@
+var _abstract = 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/input.mjs
new file mode 100644
index 000000000000..b19e8003c346
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/input.mjs
@@ -0,0 +1 @@
+var abstract = 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/options.json b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/options.json
new file mode 100644
index 000000000000..f762db2a15e2
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": ["ie 9"]
+        },
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/output.mjs
new file mode 100644
index 000000000000..b19e8003c346
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/reserved-names-ie9/output.mjs
@@ -0,0 +1 @@
+var abstract = 1;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/input.js b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/input.js
new file mode 100644
index 000000000000..4012fcd0553a
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/input.js
@@ -0,0 +1,5 @@
+{
+  let a = 3
+}
+
+let a = 3
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/options.json b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/options.json
new file mode 100644
index 000000000000..7eca9afc37fe
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "debug": true,
+        "targets": {
+          "safari": "10"
+        }
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/output.js b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/output.js
new file mode 100644
index 000000000000..410ac6d405f8
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-10_3-block-scoped/output.js
@@ -0,0 +1,4 @@
+{
+  var _a = 3;
+}
+var a = 3;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/input.js b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/input.js
new file mode 100644
index 000000000000..4d45d4de3a41
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/input.js
@@ -0,0 +1 @@
+tag`Safari 12 borked`;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/options.json b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/options.json
new file mode 100644
index 000000000000..97a5889f7656
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/options.json
@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "../../../../lib",
+      {
+        "targets": {
+          "browsers": "safari 9"
+        },
+        "shippedProposals": true
+      }
+    ]
+  ]
+}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/output.js b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/output.js
new file mode 100644
index 000000000000..bbeb47d3ed6e
--- /dev/null
+++ b/packages/babel-preset-env/test/fixtures/preset-options/safari-tagged-template-literals/output.js
@@ -0,0 +1,13 @@
+function _templateObject() {
+  var data = _taggedTemplateLiteral(["Safari 12 borked"]);
+
+  _templateObject = function _templateObject() {
+    return data;
+  };
+
+  return data;
+}
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+tag(_templateObject());
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/options.json b/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/options.json
deleted file mode 100644
index c5b86606ca84..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "shippedProposals": true,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/output.js b/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/output.js
deleted file mode 100644
index 3de31bedccf2..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-entry/output.js
+++ /dev/null
@@ -1,67 +0,0 @@
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
-
-function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
-
-function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
-
-if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
-
-_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
-
-_AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
-
-_AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
-
-function _AwaitValue(value) { this.wrapped = value; }
-
-var _x$y$a$b = {
-  x: 1,
-  y: 2,
-  a: 3,
-  b: 4
-},
-    x = _x$y$a$b.x,
-    y = _x$y$a$b.y,
-    z = _objectWithoutProperties(_x$y$a$b, ["x", "y"]);
-
-var n = _objectSpread({
-  x: x,
-  y: y
-}, z);
-
-function agf() {
-  return _agf.apply(this, arguments);
-}
-
-function _agf() {
-  _agf = _wrapAsyncGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _awaitAsyncGenerator(1);
-
-          case 2:
-            _context.next = 4;
-            return 2;
-
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-  return _agf.apply(this, arguments);
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/input.js b/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/input.js
deleted file mode 100644
index d95854b64f8c..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-let { x, y, ...z } = { x: 1, y: 2, a: 3, b: 4 };
-let n = { x, y, ...z };
-async function* agf() {
-  await 1;
-  yield 2;
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/options.json b/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/options.json
deleted file mode 100644
index 1f13f288b950..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/options.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "sourceType": "module",
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "shippedProposals": true,
-        "useBuiltIns": "usage"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/output.js b/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/output.js
deleted file mode 100644
index abf23a239322..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/output.js
+++ /dev/null
@@ -1,91 +0,0 @@
-"use strict";
-
-require("core-js/modules/es6.array.for-each");
-
-require("core-js/modules/es6.array.filter");
-
-require("core-js/modules/es6.object.define-property");
-
-require("core-js/modules/es6.array.index-of");
-
-require("core-js/modules/web.dom.iterable");
-
-require("core-js/modules/es6.array.iterator");
-
-require("core-js/modules/es6.object.keys");
-
-require("regenerator-runtime/runtime");
-
-require("core-js/modules/es7.symbol.async-iterator");
-
-require("core-js/modules/es6.symbol");
-
-require("core-js/modules/es6.promise");
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
-
-function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
-
-function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
-
-if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
-
-_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
-
-_AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
-
-_AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
-
-function _AwaitValue(value) { this.wrapped = value; }
-
-var _x$y$a$b = {
-  x: 1,
-  y: 2,
-  a: 3,
-  b: 4
-},
-    x = _x$y$a$b.x,
-    y = _x$y$a$b.y,
-    z = _objectWithoutProperties(_x$y$a$b, ["x", "y"]);
-
-var n = _objectSpread({
-  x: x,
-  y: y
-}, z);
-
-function agf() {
-  return _agf.apply(this, arguments);
-}
-
-function _agf() {
-  _agf = _wrapAsyncGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return _awaitAsyncGenerator(1);
-
-          case 2:
-            _context.next = 4;
-            return 2;
-
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, this);
-  }));
-  return _agf.apply(this, arguments);
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals/output.js b/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals/output.js
index 3de31bedccf2..4719ee3716e8 100644
--- a/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals/output.js
+++ b/packages/babel-preset-env/test/fixtures/preset-options/shippedProposals/output.js
@@ -1,4 +1,6 @@
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -10,15 +12,15 @@ function _awaitAsyncGenerator(value) { return new _AwaitValue(value); }
 
 function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; }
 
-function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } }
+function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume("next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen["return"] !== "function") { this["return"] = undefined; } }
 
 if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; }
 
 _AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); };
 
-_AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); };
+_AsyncGenerator.prototype["throw"] = function (arg) { return this._invoke("throw", arg); };
 
-_AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); };
+_AsyncGenerator.prototype["return"] = function (arg) { return this._invoke("return", arg); };
 
 function _AwaitValue(value) { this.wrapped = value; }
 
@@ -61,7 +63,7 @@ function _agf() {
             return _context.stop();
         }
       }
-    }, _callee, this);
+    }, _callee);
   }));
   return _agf.apply(this, arguments);
 }
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/options.json
deleted file mode 100644
index 315805ef816f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/options.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/output.mjs
deleted file mode 100644
index 70fb9c55258f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-all/output.mjs
+++ /dev/null
@@ -1,145 +0,0 @@
-import "core-js/modules/es6.array.copy-within";
-import "core-js/modules/es6.array.every";
-import "core-js/modules/es6.array.fill";
-import "core-js/modules/es6.array.filter";
-import "core-js/modules/es6.array.find";
-import "core-js/modules/es6.array.find-index";
-import "core-js/modules/es6.array.for-each";
-import "core-js/modules/es6.array.from";
-import "core-js/modules/es7.array.includes";
-import "core-js/modules/es6.array.index-of";
-import "core-js/modules/es6.array.is-array";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.array.last-index-of";
-import "core-js/modules/es6.array.map";
-import "core-js/modules/es6.array.of";
-import "core-js/modules/es6.array.reduce";
-import "core-js/modules/es6.array.reduce-right";
-import "core-js/modules/es6.array.some";
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es6.array.species";
-import "core-js/modules/es6.date.now";
-import "core-js/modules/es6.date.to-iso-string";
-import "core-js/modules/es6.date.to-json";
-import "core-js/modules/es6.date.to-primitive";
-import "core-js/modules/es6.date.to-string";
-import "core-js/modules/es6.function.bind";
-import "core-js/modules/es6.function.has-instance";
-import "core-js/modules/es6.function.name";
-import "core-js/modules/es6.map";
-import "core-js/modules/es6.math.acosh";
-import "core-js/modules/es6.math.asinh";
-import "core-js/modules/es6.math.atanh";
-import "core-js/modules/es6.math.cbrt";
-import "core-js/modules/es6.math.clz32";
-import "core-js/modules/es6.math.cosh";
-import "core-js/modules/es6.math.expm1";
-import "core-js/modules/es6.math.fround";
-import "core-js/modules/es6.math.hypot";
-import "core-js/modules/es6.math.imul";
-import "core-js/modules/es6.math.log1p";
-import "core-js/modules/es6.math.log10";
-import "core-js/modules/es6.math.log2";
-import "core-js/modules/es6.math.sign";
-import "core-js/modules/es6.math.sinh";
-import "core-js/modules/es6.math.tanh";
-import "core-js/modules/es6.math.trunc";
-import "core-js/modules/es6.number.constructor";
-import "core-js/modules/es6.number.epsilon";
-import "core-js/modules/es6.number.is-finite";
-import "core-js/modules/es6.number.is-integer";
-import "core-js/modules/es6.number.is-nan";
-import "core-js/modules/es6.number.is-safe-integer";
-import "core-js/modules/es6.number.max-safe-integer";
-import "core-js/modules/es6.number.min-safe-integer";
-import "core-js/modules/es6.number.parse-float";
-import "core-js/modules/es6.number.parse-int";
-import "core-js/modules/es6.object.assign";
-import "core-js/modules/es6.object.create";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es6.object.define-property";
-import "core-js/modules/es6.object.define-properties";
-import "core-js/modules/es7.object.entries";
-import "core-js/modules/es6.object.freeze";
-import "core-js/modules/es6.object.get-own-property-descriptor";
-import "core-js/modules/es7.object.get-own-property-descriptors";
-import "core-js/modules/es6.object.get-own-property-names";
-import "core-js/modules/es6.object.get-prototype-of";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es6.object.prevent-extensions";
-import "core-js/modules/es6.object.is";
-import "core-js/modules/es6.object.is-frozen";
-import "core-js/modules/es6.object.is-sealed";
-import "core-js/modules/es6.object.is-extensible";
-import "core-js/modules/es6.object.keys";
-import "core-js/modules/es6.object.seal";
-import "core-js/modules/es6.object.set-prototype-of";
-import "core-js/modules/es7.object.values";
-import "core-js/modules/es6.promise";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.reflect.apply";
-import "core-js/modules/es6.reflect.construct";
-import "core-js/modules/es6.reflect.define-property";
-import "core-js/modules/es6.reflect.delete-property";
-import "core-js/modules/es6.reflect.get";
-import "core-js/modules/es6.reflect.get-own-property-descriptor";
-import "core-js/modules/es6.reflect.get-prototype-of";
-import "core-js/modules/es6.reflect.has";
-import "core-js/modules/es6.reflect.is-extensible";
-import "core-js/modules/es6.reflect.own-keys";
-import "core-js/modules/es6.reflect.prevent-extensions";
-import "core-js/modules/es6.reflect.set";
-import "core-js/modules/es6.reflect.set-prototype-of";
-import "core-js/modules/es6.regexp.constructor";
-import "core-js/modules/es6.regexp.flags";
-import "core-js/modules/es6.regexp.match";
-import "core-js/modules/es6.regexp.replace";
-import "core-js/modules/es6.regexp.split";
-import "core-js/modules/es6.regexp.search";
-import "core-js/modules/es6.regexp.to-string";
-import "core-js/modules/es6.set";
-import "core-js/modules/es6.symbol";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es6.string.anchor";
-import "core-js/modules/es6.string.big";
-import "core-js/modules/es6.string.blink";
-import "core-js/modules/es6.string.bold";
-import "core-js/modules/es6.string.code-point-at";
-import "core-js/modules/es6.string.ends-with";
-import "core-js/modules/es6.string.fixed";
-import "core-js/modules/es6.string.fontcolor";
-import "core-js/modules/es6.string.fontsize";
-import "core-js/modules/es6.string.from-code-point";
-import "core-js/modules/es6.string.includes";
-import "core-js/modules/es6.string.italics";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.string.link";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/es6.string.raw";
-import "core-js/modules/es6.string.repeat";
-import "core-js/modules/es6.string.small";
-import "core-js/modules/es6.string.starts-with";
-import "core-js/modules/es6.string.strike";
-import "core-js/modules/es6.string.sub";
-import "core-js/modules/es6.string.sup";
-import "core-js/modules/es6.string.trim";
-import "core-js/modules/es6.typed.array-buffer";
-import "core-js/modules/es6.typed.data-view";
-import "core-js/modules/es6.typed.int8-array";
-import "core-js/modules/es6.typed.uint8-array";
-import "core-js/modules/es6.typed.uint8-clamped-array";
-import "core-js/modules/es6.typed.int16-array";
-import "core-js/modules/es6.typed.uint16-array";
-import "core-js/modules/es6.typed.int32-array";
-import "core-js/modules/es6.typed.uint32-array";
-import "core-js/modules/es6.typed.float32-array";
-import "core-js/modules/es6.typed.float64-array";
-import "core-js/modules/es6.weak-map";
-import "core-js/modules/es6.weak-set";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/options.json
deleted file mode 100644
index 24aed40ad17c..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 48
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/output.mjs
deleted file mode 100644
index fee20819e493..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-48/output.mjs
+++ /dev/null
@@ -1,57 +0,0 @@
-import "core-js/modules/es6.array.from";
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es6.array.species";
-import "core-js/modules/es6.function.has-instance";
-import "core-js/modules/es6.map";
-import "core-js/modules/es6.object.assign";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.entries";
-import "core-js/modules/es7.object.get-own-property-descriptors";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.object.values";
-import "core-js/modules/es6.promise";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.reflect.apply";
-import "core-js/modules/es6.reflect.construct";
-import "core-js/modules/es6.reflect.define-property";
-import "core-js/modules/es6.reflect.delete-property";
-import "core-js/modules/es6.reflect.get";
-import "core-js/modules/es6.reflect.get-own-property-descriptor";
-import "core-js/modules/es6.reflect.get-prototype-of";
-import "core-js/modules/es6.reflect.has";
-import "core-js/modules/es6.reflect.is-extensible";
-import "core-js/modules/es6.reflect.own-keys";
-import "core-js/modules/es6.reflect.prevent-extensions";
-import "core-js/modules/es6.reflect.set";
-import "core-js/modules/es6.reflect.set-prototype-of";
-import "core-js/modules/es6.regexp.constructor";
-import "core-js/modules/es6.regexp.flags";
-import "core-js/modules/es6.regexp.match";
-import "core-js/modules/es6.regexp.replace";
-import "core-js/modules/es6.regexp.split";
-import "core-js/modules/es6.regexp.search";
-import "core-js/modules/es6.regexp.to-string";
-import "core-js/modules/es6.set";
-import "core-js/modules/es6.symbol";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/es6.typed.array-buffer";
-import "core-js/modules/es6.typed.int8-array";
-import "core-js/modules/es6.typed.uint8-array";
-import "core-js/modules/es6.typed.uint8-clamped-array";
-import "core-js/modules/es6.typed.int16-array";
-import "core-js/modules/es6.typed.uint16-array";
-import "core-js/modules/es6.typed.int32-array";
-import "core-js/modules/es6.typed.uint32-array";
-import "core-js/modules/es6.typed.float32-array";
-import "core-js/modules/es6.typed.float64-array";
-import "core-js/modules/es6.weak-map";
-import "core-js/modules/es6.weak-set";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-import "regenerator-runtime/runtime";
-Math.pow(1, 2);
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/options.json
deleted file mode 100644
index c1d306666c14..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 49
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/output.mjs
deleted file mode 100644
index a231fd04af36..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-49/output.mjs
+++ /dev/null
@@ -1,42 +0,0 @@
-import "core-js/modules/es6.array.from";
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es6.array.species";
-import "core-js/modules/es6.function.has-instance";
-import "core-js/modules/es6.map";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.entries";
-import "core-js/modules/es7.object.get-own-property-descriptors";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.object.values";
-import "core-js/modules/es6.promise";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.regexp.constructor";
-import "core-js/modules/es6.regexp.match";
-import "core-js/modules/es6.regexp.replace";
-import "core-js/modules/es6.regexp.split";
-import "core-js/modules/es6.regexp.search";
-import "core-js/modules/es6.regexp.to-string";
-import "core-js/modules/es6.set";
-import "core-js/modules/es6.symbol";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/es6.typed.array-buffer";
-import "core-js/modules/es6.typed.int8-array";
-import "core-js/modules/es6.typed.uint8-array";
-import "core-js/modules/es6.typed.uint8-clamped-array";
-import "core-js/modules/es6.typed.int16-array";
-import "core-js/modules/es6.typed.uint16-array";
-import "core-js/modules/es6.typed.int32-array";
-import "core-js/modules/es6.typed.uint32-array";
-import "core-js/modules/es6.typed.float32-array";
-import "core-js/modules/es6.typed.float64-array";
-import "core-js/modules/es6.weak-map";
-import "core-js/modules/es6.weak-set";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-import "regenerator-runtime/runtime";
-Math.pow(1, 2);
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-66/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-66/options.json
deleted file mode 100644
index 70efcddddcb3..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chrome-66/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": "66"
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/options.json
deleted file mode 100644
index 463fc50978aa..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "browsers": "chromeandroid 59"
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/output.mjs
deleted file mode 100644
index 1fda3d0a1340..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-chromeandroid/output.mjs
+++ /dev/null
@@ -1,4 +0,0 @@
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/input.mjs
deleted file mode 100644
index b4ece7b964c9..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/input.mjs
+++ /dev/null
@@ -1 +0,0 @@
-import "@babel/polyfill";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/options.json
deleted file mode 100644
index cb0e9069ff6f..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "ie": 9
-        },
-        "modules": false,
-        "useBuiltIns": "entry",
-        "modules": false
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/output.mjs
deleted file mode 100644
index a0f5cab60787..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-ie-9/output.mjs
+++ /dev/null
@@ -1,126 +0,0 @@
-import "core-js/modules/es6.array.copy-within";
-import "core-js/modules/es6.array.fill";
-import "core-js/modules/es6.array.find";
-import "core-js/modules/es6.array.find-index";
-import "core-js/modules/es6.array.from";
-import "core-js/modules/es7.array.includes";
-import "core-js/modules/es6.array.iterator";
-import "core-js/modules/es6.array.of";
-import "core-js/modules/es6.array.species";
-import "core-js/modules/es6.date.to-primitive";
-import "core-js/modules/es6.date.to-string";
-import "core-js/modules/es6.function.has-instance";
-import "core-js/modules/es6.function.name";
-import "core-js/modules/es6.map";
-import "core-js/modules/es6.math.acosh";
-import "core-js/modules/es6.math.asinh";
-import "core-js/modules/es6.math.atanh";
-import "core-js/modules/es6.math.cbrt";
-import "core-js/modules/es6.math.clz32";
-import "core-js/modules/es6.math.cosh";
-import "core-js/modules/es6.math.expm1";
-import "core-js/modules/es6.math.fround";
-import "core-js/modules/es6.math.hypot";
-import "core-js/modules/es6.math.imul";
-import "core-js/modules/es6.math.log1p";
-import "core-js/modules/es6.math.log10";
-import "core-js/modules/es6.math.log2";
-import "core-js/modules/es6.math.sign";
-import "core-js/modules/es6.math.sinh";
-import "core-js/modules/es6.math.tanh";
-import "core-js/modules/es6.math.trunc";
-import "core-js/modules/es6.number.constructor";
-import "core-js/modules/es6.number.epsilon";
-import "core-js/modules/es6.number.is-finite";
-import "core-js/modules/es6.number.is-integer";
-import "core-js/modules/es6.number.is-nan";
-import "core-js/modules/es6.number.is-safe-integer";
-import "core-js/modules/es6.number.max-safe-integer";
-import "core-js/modules/es6.number.min-safe-integer";
-import "core-js/modules/es6.number.parse-float";
-import "core-js/modules/es6.number.parse-int";
-import "core-js/modules/es6.object.assign";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.entries";
-import "core-js/modules/es6.object.freeze";
-import "core-js/modules/es6.object.get-own-property-descriptor";
-import "core-js/modules/es7.object.get-own-property-descriptors";
-import "core-js/modules/es6.object.get-own-property-names";
-import "core-js/modules/es6.object.get-prototype-of";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es6.object.prevent-extensions";
-import "core-js/modules/es6.object.is";
-import "core-js/modules/es6.object.is-frozen";
-import "core-js/modules/es6.object.is-sealed";
-import "core-js/modules/es6.object.is-extensible";
-import "core-js/modules/es6.object.keys";
-import "core-js/modules/es6.object.seal";
-import "core-js/modules/es6.object.set-prototype-of";
-import "core-js/modules/es7.object.values";
-import "core-js/modules/es6.promise";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es6.reflect.apply";
-import "core-js/modules/es6.reflect.construct";
-import "core-js/modules/es6.reflect.define-property";
-import "core-js/modules/es6.reflect.delete-property";
-import "core-js/modules/es6.reflect.get";
-import "core-js/modules/es6.reflect.get-own-property-descriptor";
-import "core-js/modules/es6.reflect.get-prototype-of";
-import "core-js/modules/es6.reflect.has";
-import "core-js/modules/es6.reflect.is-extensible";
-import "core-js/modules/es6.reflect.own-keys";
-import "core-js/modules/es6.reflect.prevent-extensions";
-import "core-js/modules/es6.reflect.set";
-import "core-js/modules/es6.reflect.set-prototype-of";
-import "core-js/modules/es6.regexp.constructor";
-import "core-js/modules/es6.regexp.flags";
-import "core-js/modules/es6.regexp.match";
-import "core-js/modules/es6.regexp.replace";
-import "core-js/modules/es6.regexp.split";
-import "core-js/modules/es6.regexp.search";
-import "core-js/modules/es6.regexp.to-string";
-import "core-js/modules/es6.set";
-import "core-js/modules/es6.symbol";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es6.string.anchor";
-import "core-js/modules/es6.string.big";
-import "core-js/modules/es6.string.blink";
-import "core-js/modules/es6.string.bold";
-import "core-js/modules/es6.string.code-point-at";
-import "core-js/modules/es6.string.ends-with";
-import "core-js/modules/es6.string.fixed";
-import "core-js/modules/es6.string.fontcolor";
-import "core-js/modules/es6.string.fontsize";
-import "core-js/modules/es6.string.from-code-point";
-import "core-js/modules/es6.string.includes";
-import "core-js/modules/es6.string.italics";
-import "core-js/modules/es6.string.iterator";
-import "core-js/modules/es6.string.link";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/es6.string.raw";
-import "core-js/modules/es6.string.repeat";
-import "core-js/modules/es6.string.small";
-import "core-js/modules/es6.string.starts-with";
-import "core-js/modules/es6.string.strike";
-import "core-js/modules/es6.string.sub";
-import "core-js/modules/es6.string.sup";
-import "core-js/modules/es6.typed.array-buffer";
-import "core-js/modules/es6.typed.data-view";
-import "core-js/modules/es6.typed.int8-array";
-import "core-js/modules/es6.typed.uint8-array";
-import "core-js/modules/es6.typed.uint8-clamped-array";
-import "core-js/modules/es6.typed.int16-array";
-import "core-js/modules/es6.typed.uint16-array";
-import "core-js/modules/es6.typed.int32-array";
-import "core-js/modules/es6.typed.uint32-array";
-import "core-js/modules/es6.typed.float32-array";
-import "core-js/modules/es6.typed.float64-array";
-import "core-js/modules/es6.weak-map";
-import "core-js/modules/es6.weak-set";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/options.json
deleted file mode 100644
index 6053ab0e29e1..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": 55
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/output.mjs
deleted file mode 100644
index f7c13851bd3c..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-import/output.mjs
+++ /dev/null
@@ -1,13 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/input.mjs
deleted file mode 100644
index b4ece7b964c9..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/input.mjs
+++ /dev/null
@@ -1 +0,0 @@
-import "@babel/polyfill";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/options.json
deleted file mode 100644
index 594b2443f288..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/options.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": "55",
-          "node": "7.6"
-        },
-        "modules": false,
-        "useBuiltIns": "entry",
-        "forceAllTransforms": true
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/output.mjs
deleted file mode 100644
index 86694d57ca96..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node-web/output.mjs
+++ /dev/null
@@ -1,13 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "core-js/modules/web.timers";
-import "core-js/modules/web.immediate";
-import "core-js/modules/web.dom.iterable";
-import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/input.mjs
deleted file mode 100644
index b4ece7b964c9..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/input.mjs
+++ /dev/null
@@ -1 +0,0 @@
-import "@babel/polyfill";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/options.json
deleted file mode 100644
index f4e793dddf18..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/options.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "node": "7.6"
-        },
-        "modules": false,
-        "useBuiltIns": "entry",
-        "forceAllTransforms": true
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/output.mjs
deleted file mode 100644
index 6f861c0172f7..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-node/output.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-import "core-js/modules/es6.array.sort";
-import "core-js/modules/es7.object.define-getter";
-import "core-js/modules/es7.object.define-setter";
-import "core-js/modules/es7.object.lookup-getter";
-import "core-js/modules/es7.object.lookup-setter";
-import "core-js/modules/es7.promise.finally";
-import "core-js/modules/es7.symbol.async-iterator";
-import "core-js/modules/es7.string.pad-start";
-import "core-js/modules/es7.string.pad-end";
-import "regenerator-runtime/runtime";
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/options.json b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/options.json
deleted file mode 100644
index 1e2b3ea2c19e..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/options.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "presets": [
-    [
-      "../../../../lib",
-      {
-        "targets": {
-          "chrome": "55"
-        },
-        "modules": false,
-        "useBuiltIns": "entry"
-      }
-    ]
-  ]
-}
diff --git a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/output.js b/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/output.js
deleted file mode 100644
index 6d828e5bdefe..000000000000
--- a/packages/babel-preset-env/test/fixtures/preset-options/use-builtins-require/output.js
+++ /dev/null
@@ -1,25 +0,0 @@
-require("core-js/modules/es6.array.sort");
-
-require("core-js/modules/es7.object.define-getter");
-
-require("core-js/modules/es7.object.define-setter");
-
-require("core-js/modules/es7.object.lookup-getter");
-
-require("core-js/modules/es7.object.lookup-setter");
-
-require("core-js/modules/es7.promise.finally");
-
-require("core-js/modules/es7.symbol.async-iterator");
-
-require("core-js/modules/es7.string.pad-start");
-
-require("core-js/modules/es7.string.pad-end");
-
-require("core-js/modules/web.timers");
-
-require("core-js/modules/web.immediate");
-
-require("core-js/modules/web.dom.iterable");
-
-1 ** 2;
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-false/input.mjs b/packages/babel-preset-env/test/fixtures/preset-options/useBuiltIns-false/input.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-false/input.mjs
rename to packages/babel-preset-env/test/fixtures/preset-options/useBuiltIns-false/input.mjs
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-false/options.json b/packages/babel-preset-env/test/fixtures/preset-options/useBuiltIns-false/options.json
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-false/options.json
rename to packages/babel-preset-env/test/fixtures/preset-options/useBuiltIns-false/options.json
diff --git a/packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-false/output.mjs b/packages/babel-preset-env/test/fixtures/preset-options/useBuiltIns-false/output.mjs
similarity index 100%
rename from packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/builtins-false/output.mjs
rename to packages/babel-preset-env/test/fixtures/preset-options/useBuiltIns-false/output.mjs
diff --git a/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/output.js b/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/output.js
index 1671a0f847c9..391887c3e15c 100644
--- a/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/output.js
+++ b/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/output.js
@@ -31,8 +31,8 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return != null) {
-      _iterator.return();
+    if (!_iteratorNormalCompletion && _iterator["return"] != null) {
+      _iterator["return"]();
     }
   } finally {
     if (_didIteratorError) {
diff --git a/packages/babel-preset-env/test/get-option-specific-excludes.spec.js b/packages/babel-preset-env/test/get-option-specific-excludes.spec.js
new file mode 100644
index 000000000000..ea0cd6950c7d
--- /dev/null
+++ b/packages/babel-preset-env/test/get-option-specific-excludes.spec.js
@@ -0,0 +1,24 @@
+"use strict";
+
+const getOptionSpecificExcludesFor = require("../lib/get-option-specific-excludes")
+  .default;
+
+describe("defaults", () => {
+  describe("getOptionSpecificExcludesFor", () => {
+    it("should return correct excludes for `loose` mode", () => {
+      const defaultWebIncludesForChromeAndNode = getOptionSpecificExcludesFor({
+        loose: true,
+      });
+      expect(defaultWebIncludesForChromeAndNode).toEqual([
+        "transform-typeof-symbol",
+      ]);
+    });
+
+    it("shouldn't return excludes for non-`loose` mode", () => {
+      const defaultWebIncludesForChromeAndNode = getOptionSpecificExcludesFor({
+        loose: false,
+      });
+      expect(defaultWebIncludesForChromeAndNode).toBeNull();
+    });
+  });
+});
diff --git a/packages/babel-preset-env/test/get-platform-specific-default.spec.js b/packages/babel-preset-env/test/get-platform-specific-default.spec.js
new file mode 100644
index 000000000000..1958a7fa6d0e
--- /dev/null
+++ b/packages/babel-preset-env/test/get-platform-specific-default.spec.js
@@ -0,0 +1,31 @@
+"use strict";
+
+const getCoreJS2PlatformSpecificDefaultFor = require("../lib/polyfills/corejs2/get-platform-specific-default")
+  .default;
+
+describe("defaults", () => {
+  describe("getCoreJS2PlatformSpecificDefaultFor", () => {
+    it("should return web polyfills for non-`node` platform", () => {
+      const defaultWebIncludesForChromeAndNode = getCoreJS2PlatformSpecificDefaultFor(
+        {
+          chrome: "63",
+          node: "8",
+        },
+      );
+      expect(defaultWebIncludesForChromeAndNode).toEqual([
+        "web.timers",
+        "web.immediate",
+        "web.dom.iterable",
+      ]);
+    });
+
+    it("shouldn't return web polyfills for node platform", () => {
+      const defaultWebIncludesForChromeAndNode = getCoreJS2PlatformSpecificDefaultFor(
+        {
+          node: "8",
+        },
+      );
+      expect(defaultWebIncludesForChromeAndNode).toBeNull();
+    });
+  });
+});
diff --git a/packages/babel-preset-env/test/index.spec.js b/packages/babel-preset-env/test/index.spec.js
index 155207c8b1a4..7b281f4e1885 100644
--- a/packages/babel-preset-env/test/index.spec.js
+++ b/packages/babel-preset-env/test/index.spec.js
@@ -1,87 +1,8 @@
 "use strict";
 
-const babelPresetEnv = require("../lib/index.js");
+const babelPresetEnv = require("../lib/index");
 
 describe("babel-preset-env", () => {
-  describe("isPluginRequired", () => {
-    const MAX_VERSION = `${Number.MAX_SAFE_INTEGER}.0.0`;
-
-    it("returns true if no targets are specified", () => {
-      expect(babelPresetEnv.isPluginRequired({}, {})).toBe(true);
-    });
-
-    it("returns true if plugin feature is not implemented in one or more targets", () => {
-      let targets;
-      const plugin = {
-        edge: false,
-        firefox: 45,
-        chrome: 49,
-      };
-
-      targets = {
-        chrome: MAX_VERSION,
-        firefox: MAX_VERSION,
-      };
-      expect(babelPresetEnv.isPluginRequired(targets, plugin)).toBe(false);
-
-      targets = {
-        edge: "12",
-      };
-      expect(babelPresetEnv.isPluginRequired(targets, plugin)).toBe(true);
-    });
-
-    it("returns false if plugin feature is implemented by lower than target", () => {
-      const plugin = {
-        chrome: 49,
-      };
-      const targets = {
-        chrome: MAX_VERSION,
-      };
-
-      expect(babelPresetEnv.isPluginRequired(targets, plugin)).toBe(false);
-    });
-
-    it("returns false if plugin feature is implemented is equal to target", () => {
-      const plugin = {
-        chrome: 49,
-      };
-      const targets = {
-        chrome: "49.0.0",
-      };
-      expect(babelPresetEnv.isPluginRequired(targets, plugin)).toBe(false);
-    });
-
-    it("returns true if plugin feature is implemented is greater than target", () => {
-      const plugin = {
-        chrome: 50,
-      };
-      const targets = {
-        chrome: "49.0.0",
-      };
-      expect(babelPresetEnv.isPluginRequired(targets, plugin)).toBe(true);
-    });
-
-    it("returns when target is a decimal", () => {
-      const plugin = {
-        node: 6.9,
-      };
-      const targets = {
-        node: "6.10.0",
-      };
-      expect(babelPresetEnv.isPluginRequired(targets, plugin)).toBe(false);
-    });
-
-    it("throws an error if target version is invalid", () => {
-      const plugin = {
-        chrome: 50,
-      };
-      const targets = {
-        chrome: 55,
-      };
-      expect(() => babelPresetEnv.isPluginRequired(targets, plugin)).toThrow();
-    });
-  });
-
   describe("transformIncludesAndExcludes", () => {
     it("should return in transforms array", () => {
       expect(
@@ -96,10 +17,10 @@ describe("babel-preset-env", () => {
     });
 
     it("should return in built-ins array", () => {
-      expect(babelPresetEnv.transformIncludesAndExcludes(["es6.map"])).toEqual({
-        all: ["es6.map"],
+      expect(babelPresetEnv.transformIncludesAndExcludes(["es.map"])).toEqual({
+        all: ["es.map"],
         plugins: new Set(),
-        builtIns: new Set(["es6.map"]),
+        builtIns: new Set(["es.map"]),
       });
     });
   });
diff --git a/packages/babel-preset-env/test/is-plugin-required.js b/packages/babel-preset-env/test/is-plugin-required.js
new file mode 100644
index 000000000000..be999b7c9828
--- /dev/null
+++ b/packages/babel-preset-env/test/is-plugin-required.js
@@ -0,0 +1,82 @@
+"use strict";
+
+const presetEnv = require("../");
+
+describe("isPluginRequired", () => {
+  const MAX_VERSION = `${Number.MAX_SAFE_INTEGER}.0.0`;
+
+  it("returns true if no targets are specified", () => {
+    expect(presetEnv.isPluginRequired({}, {})).toBe(true);
+  });
+
+  it("returns true if plugin feature is not implemented in one or more targets", () => {
+    let targets;
+    const plugin = {
+      edge: false,
+      firefox: 45,
+      chrome: 49,
+    };
+
+    targets = {
+      chrome: MAX_VERSION,
+      firefox: MAX_VERSION,
+    };
+    expect(presetEnv.isPluginRequired(targets, plugin)).toBe(false);
+
+    targets = {
+      edge: "12",
+    };
+    expect(presetEnv.isPluginRequired(targets, plugin)).toBe(true);
+  });
+
+  it("returns false if plugin feature is implemented by lower than target", () => {
+    const plugin = {
+      chrome: 49,
+    };
+    const targets = {
+      chrome: MAX_VERSION,
+    };
+
+    expect(presetEnv.isPluginRequired(targets, plugin)).toBe(false);
+  });
+
+  it("returns false if plugin feature is implemented is equal to target", () => {
+    const plugin = {
+      chrome: 49,
+    };
+    const targets = {
+      chrome: "49.0.0",
+    };
+    expect(presetEnv.isPluginRequired(targets, plugin)).toBe(false);
+  });
+
+  it("returns true if plugin feature is implemented is greater than target", () => {
+    const plugin = {
+      chrome: 50,
+    };
+    const targets = {
+      chrome: "49.0.0",
+    };
+    expect(presetEnv.isPluginRequired(targets, plugin)).toBe(true);
+  });
+
+  it("returns when target is a decimal", () => {
+    const plugin = {
+      node: 6.9,
+    };
+    const targets = {
+      node: "6.10.0",
+    };
+    expect(presetEnv.isPluginRequired(targets, plugin)).toBe(false);
+  });
+
+  it("throws an error if target version is invalid", () => {
+    const plugin = {
+      chrome: 50,
+    };
+    const targets = {
+      chrome: 55,
+    };
+    expect(() => presetEnv.isPluginRequired(targets, plugin)).toThrow();
+  });
+});
diff --git a/packages/babel-preset-env/test/normalize-options.spec.js b/packages/babel-preset-env/test/normalize-options.spec.js
index 7a0f481f7bf7..eefb69e45f46 100644
--- a/packages/babel-preset-env/test/normalize-options.spec.js
+++ b/packages/babel-preset-env/test/normalize-options.spec.js
@@ -12,11 +12,30 @@ describe("normalize-options", () => {
   describe("normalizeOptions", () => {
     it("should return normalized `include` and `exclude`", () => {
       const normalized = normalizeOptions.default({
-        include: ["babel-plugin-transform-spread", "transform-classes"],
+        include: [
+          "babel-plugin-transform-spread",
+          "transform-classes",
+          "@babel/plugin-transform-unicode-regex",
+          "@babel/transform-block-scoping",
+        ],
+        exclude: [
+          "babel-plugin-transform-for-of",
+          "transform-parameters",
+          "@babel/plugin-transform-regenerator",
+          "@babel/transform-new-target",
+        ],
       });
       expect(normalized.include).toEqual([
         "transform-spread",
         "transform-classes",
+        "transform-unicode-regex",
+        "transform-block-scoping",
+      ]);
+      expect(normalized.exclude).toEqual([
+        "transform-for-of",
+        "transform-parameters",
+        "transform-regenerator",
+        "transform-new-target",
       ]);
     });
 
@@ -25,14 +44,45 @@ describe("normalize-options", () => {
       expect(normalized).toBe("prefix-babel-plugin-postfix");
     });
 
-    it("should throw if duplicate names in `include` and `exclude`", () => {
-      const normalizeWithSameIncludes = () => {
-        normalizeOptions.default({
-          include: ["babel-plugin-transform-spread"],
-          exclude: ["transform-spread"],
+    test.each`
+      include                               | exclude
+      ${["babel-plugin-transform-spread"]}  | ${["transform-spread"]}
+      ${["@babel/plugin-transform-spread"]} | ${["transform-spread"]}
+      ${["transform-spread"]}               | ${["babel-plugin-transform-spread"]}
+      ${["transform-spread"]}               | ${["@babel/plugin-transform-spread"]}
+      ${["babel-plugin-transform-spread"]}  | ${["@babel/plugin-transform-spread"]}
+      ${["@babel/plugin-transform-spread"]} | ${["babel-plugin-transform-spread"]}
+      ${["@babel/plugin-transform-spread"]} | ${["@babel/transform-spread"]}
+      ${["@babel/transform-spread"]}        | ${["@babel/plugin-transform-spread"]}
+      ${["babel-plugin-transform-spread"]}  | ${["@babel/transform-spread"]}
+      ${["@babel/transform-spread"]}        | ${["babel-plugin-transform-spread"]}
+    `(
+      "should throw if with includes $include and excludes $exclude",
+      ({ include, exclude }) => {
+        expect(() =>
+          normalizeOptions.default({ include, exclude }),
+        ).toThrowError(/were found in both/);
+      },
+    );
+
+    it("should not throw if corejs version is valid", () => {
+      [2, 2.1, 3, 3.5].forEach(corejs => {
+        ["entry", "usage"].forEach(useBuiltIns => {
+          expect(() =>
+            normalizeOptions.default({ useBuiltIns, corejs }),
+          ).not.toThrowError();
         });
-      };
-      expect(normalizeWithSameIncludes).toThrow();
+      });
+    });
+
+    it("should throw if corejs version is invalid", () => {
+      [1, 1.2, 4, 4.5].forEach(corejs => {
+        ["entry", "usage"].forEach(useBuiltIns => {
+          expect(() =>
+            normalizeOptions.default({ useBuiltIns, corejs }),
+          ).toThrowError(/The version passed to `corejs` is invalid./);
+        });
+      });
     });
   });
 
@@ -67,20 +117,24 @@ describe("normalize-options", () => {
 
     it("should expand regular expressions in `include` and `exclude`", () => {
       const normalized = normalizeOptions.default({
-        exclude: ["es6.math.log.*"],
+        useBuiltIns: "entry",
+        corejs: 3,
+        exclude: ["es.math.log.*"],
       });
       expect(normalized.exclude).toEqual([
-        "es6.math.log1p",
-        "es6.math.log10",
-        "es6.math.log2",
+        "es.math.log10",
+        "es.math.log1p",
+        "es.math.log2",
       ]);
     });
 
     it("should not allow the same modules in `include` and `exclude`", () => {
       const normalizeWithNonExistingPlugin = () => {
         normalizeOptions.default({
-          include: ["es6.math.log2"],
-          exclude: ["es6.math.log.*"],
+          useBuiltIns: "entry",
+          corejs: 3,
+          include: ["es.math.log2"],
+          exclude: ["es.math.log.*"],
         });
       };
       expect(normalizeWithNonExistingPlugin).toThrow(Error);
@@ -88,11 +142,13 @@ describe("normalize-options", () => {
 
     it("should not do partial match if not explicitly defined `include` and `exclude`", () => {
       const normalized = normalizeOptions.default({
-        include: ["es6.reflect.set-prototype-of"],
-        exclude: ["es6.reflect.set"],
+        useBuiltIns: "entry",
+        corejs: 3,
+        include: ["es.reflect.set-prototype-of"],
+        exclude: ["es.reflect.set"],
       });
-      expect(normalized.include).toEqual(["es6.reflect.set-prototype-of"]);
-      expect(normalized.exclude).toEqual(["es6.reflect.set"]);
+      expect(normalized.include).toEqual(["es.reflect.set-prototype-of"]);
+      expect(normalized.exclude).toEqual(["es.reflect.set"]);
     });
   });
 
diff --git a/packages/babel-preset-env/test/targets-parser.spec.js b/packages/babel-preset-env/test/targets-parser.spec.js
index fe6e2fac314a..7b9f669d2d01 100644
--- a/packages/babel-preset-env/test/targets-parser.spec.js
+++ b/packages/babel-preset-env/test/targets-parser.spec.js
@@ -20,6 +20,15 @@ describe("getTargets", () => {
     });
   });
 
+  it("allows 'defaults' query", () => {
+    const browserslistDefaults = browserslist.defaults;
+
+    const expected = getTargets({ browsers: browserslistDefaults });
+    const actual = getTargets({ browsers: "defaults" });
+
+    expect(actual).toEqual(expected);
+  });
+
   it("does not clobber browserslists defaults", () => {
     const browserslistDefaults = browserslist.defaults;
 
@@ -99,11 +108,12 @@ describe("getTargets", () => {
     it("works with current node version and string type browsers", () => {
       expect(
         getTargets({
-          browsers: "current node, chrome 55",
+          browsers: "current node, chrome 55, opera 42",
         }),
       ).toEqual({
         node: process.versions.node,
         chrome: "55.0.0",
+        opera: "42.0.0",
       });
     });
 
@@ -178,6 +188,7 @@ describe("getTargets", () => {
         chrome: "61.0.0",
         safari: "10.1.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
         ios: "10.3.0",
         edge: "16.0.0",
       });
@@ -193,6 +204,7 @@ describe("getTargets", () => {
         chrome: "61.0.0",
         safari: "10.1.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
         ios: "10.3.0",
         edge: "16.0.0",
       });
@@ -208,6 +220,7 @@ describe("getTargets", () => {
         chrome: "61.0.0",
         safari: "10.1.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
         ios: "10.3.0",
         ie: "11.0.0",
         edge: "16.0.0",
@@ -228,6 +241,7 @@ describe("getTargets", () => {
         ie: "11.0.0",
         edge: "16.0.0",
         firefox: "60.0.0",
+        opera: "48.0.0",
       });
     });
   });
diff --git a/packages/babel-preset-stage-0/README.md b/packages/babel-preset-stage-0/README.md
index e4cdd326b02d..682610488941 100644
--- a/packages/babel-preset-stage-0/README.md
+++ b/packages/babel-preset-stage-0/README.md
@@ -32,7 +32,7 @@ If you want the same configuration as before:
     // Stage 3
     "@babel/plugin-syntax-dynamic-import",
     "@babel/plugin-syntax-import-meta",
-    ["@babel/plugin-proposal-class-properties", { "loose": false }],
+    ["@babel/plugin-proposal-class-properties", { "loose": true }],
     "@babel/plugin-proposal-json-strings"
   ]
 }
@@ -48,7 +48,7 @@ module.exports = function() {
     plugins: [
       require("@babel/plugin-syntax-dynamic-import"),
       [require("@babel/plugin-proposal-decorators"), { "legacy": true }],
-      [require("@babel/plugin-proposal-class-properties"), { "loose": false }],
+      [require("@babel/plugin-proposal-class-properties"), { "loose": true }],
     ],
     presets: [
       // ...
@@ -56,3 +56,10 @@ module.exports = function() {
   };
 };
 ```
+
+**NOTE: Compatibility between `@babel/plugin-proposal-class-properties` and `@babel/plugin-proposal-decorators`**
+If you are including your plugins manually and using `@babel/plugin-proposal-class-properties`, make sure that `@babel/plugin-proposal-decorators` comes before `@babel/plugin-proposal-class-properties`.
+
+When using the `legacy: true` option of `@babel/plugin-proposal-decorators`, `@babel/plugin-proposal-class-properties` must be used in `loose: true` mode.
+
+If you are not using `@babel/plugin-proposal-decorators`, `loose` mode is not needed.
\ No newline at end of file
diff --git a/packages/babel-preset-stage-1/README.md b/packages/babel-preset-stage-1/README.md
index 6cd8f4750091..f8757e944ad2 100644
--- a/packages/babel-preset-stage-1/README.md
+++ b/packages/babel-preset-stage-1/README.md
@@ -29,7 +29,7 @@ If you want the same configuration as before:
     // Stage 3
     "@babel/plugin-syntax-dynamic-import",
     "@babel/plugin-syntax-import-meta",
-    ["@babel/plugin-proposal-class-properties", { "loose": false }],
+    ["@babel/plugin-proposal-class-properties", { "loose": true }],
     "@babel/plugin-proposal-json-strings"
   ]
 }
@@ -53,3 +53,10 @@ module.exports = function() {
   };
 };
 ```
+
+**NOTE: Compatibility between `@babel/plugin-proposal-class-properties` and `@babel/plugin-proposal-decorators`**
+If you are including your plugins manually and using `@babel/plugin-proposal-class-properties`, make sure that `@babel/plugin-proposal-decorators` comes before `@babel/plugin-proposal-class-properties`.
+
+When using the `legacy: true` option of `@babel/plugin-proposal-decorators`, `@babel/plugin-proposal-class-properties` must be used in `loose: true` mode.
+
+If you are not using `@babel/plugin-proposal-decorators`, `loose` mode is not needed.
\ No newline at end of file
diff --git a/packages/babel-preset-stage-2/README.md b/packages/babel-preset-stage-2/README.md
index f1f9abfebf2c..920801e0004a 100644
--- a/packages/babel-preset-stage-2/README.md
+++ b/packages/babel-preset-stage-2/README.md
@@ -21,7 +21,7 @@ If you want the same configuration as before:
     // Stage 3
     "@babel/plugin-syntax-dynamic-import",
     "@babel/plugin-syntax-import-meta",
-    ["@babel/plugin-proposal-class-properties", { "loose": false }],
+    ["@babel/plugin-proposal-class-properties", { "loose": true }],
     "@babel/plugin-proposal-json-strings"
   ]
 }
@@ -45,3 +45,10 @@ module.exports = function() {
   };
 };
 ```
+
+**NOTE: Compatibility between `@babel/plugin-proposal-class-properties` and `@babel/plugin-proposal-decorators`**
+If you are including your plugins manually and using `@babel/plugin-proposal-class-properties`, make sure that `@babel/plugin-proposal-decorators` comes before `@babel/plugin-proposal-class-properties`.
+
+When using the `legacy: true` option of `@babel/plugin-proposal-decorators`, `@babel/plugin-proposal-class-properties` must be used in `loose: true` mode.
+
+If you are not using `@babel/plugin-proposal-decorators`, `loose` mode is not needed.
\ No newline at end of file
diff --git a/packages/babel-preset-stage-3/README.md b/packages/babel-preset-stage-3/README.md
index cf6e28c258f6..33ec721e3045 100644
--- a/packages/babel-preset-stage-3/README.md
+++ b/packages/babel-preset-stage-3/README.md
@@ -29,7 +29,7 @@ module.exports = function() {
     plugins: [
       require("@babel/plugin-syntax-dynamic-import"),
       [require("@babel/plugin-proposal-decorators"), { "legacy": true }],
-      [require("@babel/plugin-proposal-class-properties"), { "loose": false }],
+      [require("@babel/plugin-proposal-class-properties"), { "loose": true }],
     ],
     presets: [
       // ...
@@ -37,3 +37,10 @@ module.exports = function() {
   };
 };
 ```
+
+**NOTE: Compatibility between `@babel/plugin-proposal-class-properties` and `@babel/plugin-proposal-decorators`**
+If you are including your plugins manually and using `@babel/plugin-proposal-class-properties`, make sure that `@babel/plugin-proposal-decorators` comes before `@babel/plugin-proposal-class-properties`.
+
+When using the `legacy: true` option of `@babel/plugin-proposal-decorators`, `@babel/plugin-proposal-class-properties` must be used in `loose: true` mode.
+
+If you are not using `@babel/plugin-proposal-decorators`, `loose` mode is not needed.
\ No newline at end of file
diff --git a/packages/babel-preset-typescript/package.json b/packages/babel-preset-typescript/package.json
index bc79cd413afd..b4db8bc25602 100644
--- a/packages/babel-preset-typescript/package.json
+++ b/packages/babel-preset-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/preset-typescript",
-  "version": "7.1.0",
+  "version": "7.3.3",
   "description": "Babel preset for TypeScript.",
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-preset-typescript",
   "license": "MIT",
@@ -14,13 +14,13 @@
   ],
   "dependencies": {
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-transform-typescript": "^7.1.0"
+    "@babel/plugin-transform-typescript": "^7.3.2"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.3.3",
     "@babel/helper-plugin-test-runner": "^7.0.0"
   }
 }
diff --git a/packages/babel-preset-typescript/test/fixtures/flow-compat/js-invalid/options.json b/packages/babel-preset-typescript/test/fixtures/flow-compat/js-invalid/options.json
index e91f37cda819..fe0ad873dac4 100644
--- a/packages/babel-preset-typescript/test/fixtures/flow-compat/js-invalid/options.json
+++ b/packages/babel-preset-typescript/test/fixtures/flow-compat/js-invalid/options.json
@@ -1,4 +1,4 @@
 {
   "presets": [["flow", {}, "before"], "typescript", ["flow", {}, "after"]],
-  "throws": "enum is a reserved word (1:0)"
+  "throws": "Unexpected reserved word 'enum' (1:0)"
 }
diff --git a/packages/babel-preset-typescript/test/fixtures/jsx-compat/ts-invalid/options.json b/packages/babel-preset-typescript/test/fixtures/jsx-compat/ts-invalid/options.json
index 345e1f87c98b..4c0aa124656f 100644
--- a/packages/babel-preset-typescript/test/fixtures/jsx-compat/ts-invalid/options.json
+++ b/packages/babel-preset-typescript/test/fixtures/jsx-compat/ts-invalid/options.json
@@ -1,4 +1,3 @@
 {
-  "presets": [["react", {}, "before"], "typescript", ["react", {}, "after"]],
-  "throws": "Unexpected token, expected \"</>\" (1:6)"
+  "throws": "Unexpected token, expected \"</>/<=/>=\" (1:6)"
 }
diff --git a/packages/babel-register/package.json b/packages/babel-register/package.json
index e0790a406d8c..28923cfdd186 100644
--- a/packages/babel-register/package.json
+++ b/packages/babel-register/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/register",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "babel require hook",
   "license": "MIT",
   "publishConfig": {
@@ -13,10 +13,9 @@
     "./lib/node.js": "./lib/browser.js"
   },
   "dependencies": {
-    "core-js": "^2.5.7",
-    "find-cache-dir": "^1.0.0",
-    "home-or-tmp": "^3.0.0",
-    "lodash": "^4.17.10",
+    "core-js": "^3.0.0",
+    "find-cache-dir": "^2.0.0",
+    "lodash": "^4.17.13",
     "mkdirp": "^0.5.1",
     "pirates": "^4.0.0",
     "source-map-support": "^0.5.9"
@@ -25,7 +24,7 @@
     "@babel/core": "^7.0.0-0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "default-require-extensions": "^2.0.0"
   }
 }
diff --git a/packages/babel-register/src/cache.js b/packages/babel-register/src/cache.js
index 22b590eb9379..439c92c30851 100644
--- a/packages/babel-register/src/cache.js
+++ b/packages/babel-register/src/cache.js
@@ -1,12 +1,12 @@
 import path from "path";
 import fs from "fs";
+import os from "os";
 import { sync as mkdirpSync } from "mkdirp";
-import homeOrTmp from "home-or-tmp";
 import * as babel from "@babel/core";
 import findCacheDir from "find-cache-dir";
 
 const DEFAULT_CACHE_DIR =
-  findCacheDir({ name: "@babel/register" }) || homeOrTmp;
+  findCacheDir({ name: "@babel/register" }) || os.homedir() || os.tmpdir();
 const DEFAULT_FILENAME = path.join(
   DEFAULT_CACHE_DIR,
   `.babel.${babel.version}.${babel.getEnv()}.json`,
diff --git a/packages/babel-runtime-corejs2/package.json b/packages/babel-runtime-corejs2/package.json
index 79c8509afa2e..5ae56e822e16 100644
--- a/packages/babel-runtime-corejs2/package.json
+++ b/packages/babel-runtime-corejs2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/runtime-corejs2",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "babel's modular runtime helpers with core-js@2 polyfilling",
   "license": "MIT",
   "publishConfig": {
@@ -9,7 +9,10 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-runtime-corejs2",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "dependencies": {
-    "core-js": "^2.5.7",
-    "regenerator-runtime": "^0.12.0"
+    "core-js": "^2.6.5",
+    "regenerator-runtime": "^0.13.2"
+  },
+  "devDependencies": {
+    "@babel/helpers": "^7.5.5"
   }
 }
diff --git a/packages/babel-runtime-corejs3/.npmignore b/packages/babel-runtime-corejs3/.npmignore
new file mode 100644
index 000000000000..f9806945836e
--- /dev/null
+++ b/packages/babel-runtime-corejs3/.npmignore
@@ -0,0 +1,3 @@
+src
+test
+*.log
diff --git a/packages/babel-runtime-corejs3/README.md b/packages/babel-runtime-corejs3/README.md
new file mode 100644
index 000000000000..78ce1b4b8ef9
--- /dev/null
+++ b/packages/babel-runtime-corejs3/README.md
@@ -0,0 +1,17 @@
+# @babel/runtime-corejs3
+
+> babel's modular runtime helpers with core-js@3 polyfilling
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/runtime-corejs3
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/runtime-corejs3 --dev
+```
diff --git a/packages/babel-runtime-corejs3/package.json b/packages/babel-runtime-corejs3/package.json
new file mode 100644
index 000000000000..5a0f640973d6
--- /dev/null
+++ b/packages/babel-runtime-corejs3/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@babel/runtime-corejs3",
+  "version": "7.5.5",
+  "description": "babel's modular runtime helpers with core-js@3 polyfilling",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-runtime-corejs3",
+  "author": "Denis Pushkarev <zloirock@zloirock.ru>",
+  "dependencies": {
+    "core-js-pure": "^3.0.0",
+    "regenerator-runtime": "^0.13.2"
+  }
+}
diff --git a/packages/babel-runtime-corejs3/regenerator/index.js b/packages/babel-runtime-corejs3/regenerator/index.js
new file mode 100644
index 000000000000..9fd4158a6d85
--- /dev/null
+++ b/packages/babel-runtime-corejs3/regenerator/index.js
@@ -0,0 +1 @@
+module.exports = require("regenerator-runtime");
diff --git a/packages/babel-runtime-corejs3/test/index.spec.js b/packages/babel-runtime-corejs3/test/index.spec.js
new file mode 100644
index 000000000000..5f58d25022aa
--- /dev/null
+++ b/packages/babel-runtime-corejs3/test/index.spec.js
@@ -0,0 +1,503 @@
+"use strict";
+
+describe("babel-runtime", () => {
+  describe("instance methods entries", () => {
+    it("at, exists", () => {
+      expect(
+        require("../core-js/instance/at")("").call("a", 0),
+      ).toEqual("a");
+    });
+
+    it("at, missing", () => {
+      expect(
+        require("../core-js/instance/at")({}),
+      ).toEqual(undefined);
+    });
+
+    it("bind, exists", () => {
+      expect(
+        require("../core-js/instance/bind")(() => {}).call(function () { return this; }, 42)(),
+      ).toEqual(42);
+    });
+
+    it("bind, missing", () => {
+      expect(
+        require("../core-js/instance/bind")({}),
+      ).toEqual(undefined);
+    });
+
+    it("codePointAt, exists", () => {
+      expect(
+        require("../core-js/instance/code-point-at")("").call("a", 0),
+      ).toEqual(97);
+    });
+
+    it("codePointAt, missing", () => {
+      expect(
+        require("../core-js/instance/code-point-at")({}),
+      ).toEqual(undefined);
+    });
+
+    it("codePoints, exists", () => {
+      expect(
+        typeof require("../core-js/instance/code-points")("").call("a").next,
+      ).toEqual("function");
+    });
+
+    it("codePoints, missing", () => {
+      expect(
+        require("../core-js/instance/code-points")({}),
+      ).toEqual(undefined);
+    });
+
+    it("concat, exists", () => {
+      expect(
+        require("../core-js/instance/concat")([]).call([1, 2], [3, 4]).length,
+      ).toEqual(4);
+    });
+
+    it("concat, missing", () => {
+      expect(
+        require("../core-js/instance/concat")({}),
+      ).toEqual(undefined);
+    });
+
+    it("copyWithin, exists", () => {
+      expect(
+        require("../core-js/instance/copy-within")([]).call([1, 2, 3], 1)[2],
+      ).toEqual(2);
+    });
+
+    it("copyWithin, missing", () => {
+      expect(
+        require("../core-js/instance/copy-within")({}),
+      ).toEqual(undefined);
+    });
+
+    it("endsWith, exists", () => {
+      expect(
+        require("../core-js/instance/ends-with")("").call("qwe", "we"),
+      ).toEqual(true);
+    });
+
+    it("endsWith, missing", () => {
+      expect(
+        require("../core-js/instance/ends-with")({}),
+      ).toEqual(undefined);
+    });
+
+    it("entries, exists", () => {
+      expect(
+        require("../core-js/instance/entries")([]).call([]).next().done,
+      ).toEqual(true);
+    });
+
+    it("entries, missing", () => {
+      expect(
+        require("../core-js/instance/entries")({}),
+      ).toEqual(undefined);
+    });
+
+    it("every, exists", () => {
+      expect(
+        require("../core-js/instance/every")([]).call([1, 2, 3], it => typeof it === "number"),
+      ).toEqual(true);
+    });
+
+    it("every, missing", () => {
+      expect(
+        require("../core-js/instance/every")({}),
+      ).toEqual(undefined);
+    });
+
+    it("fill, exists", () => {
+      expect(
+        require("../core-js/instance/fill")([]).call([1, 2, 3], 42)[1],
+      ).toEqual(42);
+    });
+
+    it("fill, missing", () => {
+      expect(
+        require("../core-js/instance/fill")({}),
+      ).toEqual(undefined);
+    });
+
+    it("filter, exists", () => {
+      expect(
+        require("../core-js/instance/filter")([]).call([1, 2, 3], it => it % 2).length,
+      ).toEqual(2);
+    });
+
+    it("filter, missing", () => {
+      expect(
+        require("../core-js/instance/filter")({}),
+      ).toEqual(undefined);
+    });
+
+    it("find, exists", () => {
+      expect(
+        require("../core-js/instance/find")([]).call([1, 2, 3], it => !(it % 2)),
+      ).toEqual(2);
+    });
+
+    it("find, missing", () => {
+      expect(
+        require("../core-js/instance/find")({}),
+      ).toEqual(undefined);
+    });
+
+    it("findIndex, exists", () => {
+      expect(
+        require("../core-js/instance/find-index")([]).call([1, 2, 3], it => !(it % 2)),
+      ).toEqual(1);
+    });
+
+    it("findIndex, missing", () => {
+      expect(
+        require("../core-js/instance/find-index")({}),
+      ).toEqual(undefined);
+    });
+
+    it("flags, exists", () => {
+      expect(
+        require("../core-js/instance/flags")(/./gim),
+      ).toEqual("gim");
+    });
+
+    it("flags, missing", () => {
+      expect(
+        require("../core-js/instance/flags")({}),
+      ).toEqual(undefined);
+    });
+
+    it("flatMap, exists", () => {
+      expect(
+        require("../core-js/instance/flat-map")([]).call([1, 2, [3, 4]], it => it).length,
+      ).toEqual(4);
+    });
+
+    it("flatMap, missing", () => {
+      expect(
+        require("../core-js/instance/flat-map")({}),
+      ).toEqual(undefined);
+    });
+
+    it("flat, exists", () => {
+      expect(
+        require("../core-js/instance/flat")([]).call([1, 2, [3, 4]]).length,
+      ).toEqual(4);
+    });
+
+    it("flat, missing", () => {
+      expect(
+        require("../core-js/instance/flat")({}),
+      ).toEqual(undefined);
+    });
+
+    it("forEach, exists", () => {
+      expect(
+        typeof require("../core-js/instance/for-each")([]),
+      ).toEqual("function");
+    });
+
+    it("forEach, missing", () => {
+      expect(
+        require("../core-js/instance/for-each")({}),
+      ).toEqual(undefined);
+    });
+
+    it("includes, array", () => {
+      expect(
+        require("../core-js/instance/includes")([]).call([1, 2, 3], 2),
+      ).toEqual(true);
+    });
+
+    it("includes, string", () => {
+      expect(
+        require("../core-js/instance/includes")("").call("qweasd", "ea"),
+      ).toEqual(true);
+    });
+
+    it("includes, missing", () => {
+      expect(
+        require("../core-js/instance/includes")({}),
+      ).toEqual(undefined);
+    });
+
+    it("indexOf, exists", () => {
+      expect(
+        require("../core-js/instance/index-of")([]).call([1, 2, 3], 4),
+      ).toEqual(-1);
+    });
+
+    it("indexOf, missing", () => {
+      expect(
+        require("../core-js/instance/index-of")({}),
+      ).toEqual(undefined);
+    });
+
+    it("keys, exists", () => {
+      expect(
+        require("../core-js/instance/keys")([]).call([]).next().done,
+      ).toEqual(true);
+    });
+
+    it("keys, missing", () => {
+      expect(
+        require("../core-js/instance/keys")({}),
+      ).toEqual(undefined);
+    });
+
+    it("lastIndexOf, exists", () => {
+      expect(
+        require("../core-js/instance/last-index-of")([]).call([1, 2, 3], 4),
+      ).toEqual(-1);
+    });
+
+    it("lastIndexOf, missing", () => {
+      expect(
+        require("../core-js/instance/last-index-of")({}),
+      ).toEqual(undefined);
+    });
+
+    it("map, exists", () => {
+      expect(
+        require("../core-js/instance/map")([]).call([1, 2, 3], it => it * it)[2],
+      ).toEqual(9);
+    });
+
+    it("map, missing", () => {
+      expect(
+        require("../core-js/instance/map")({}),
+      ).toEqual(undefined);
+    });
+
+    it("matchAll, exists", () => {
+      expect(
+        typeof require("../core-js/instance/match-all")("").call("qwe", /./).next,
+      ).toEqual("function");
+    });
+
+    it("matchAll, missing", () => {
+      expect(
+        require("../core-js/instance/match-all")({}),
+      ).toEqual(undefined);
+    });
+
+    it("padEnd, exists", () => {
+      expect(
+        require("../core-js/instance/pad-end")("").call("qwe", 6),
+      ).toEqual("qwe   ");
+    });
+
+    it("padEnd, missing", () => {
+      expect(
+        require("../core-js/instance/pad-end")({}),
+      ).toEqual(undefined);
+    });
+
+    it("padStart, exists", () => {
+      expect(
+        require("../core-js/instance/pad-start")("").call("qwe", 6),
+      ).toEqual("   qwe");
+    });
+
+    it("padStart, missing", () => {
+      expect(
+        require("../core-js/instance/pad-start")({}),
+      ).toEqual(undefined);
+    });
+
+    it("reduce, exists", () => {
+      expect(
+        require("../core-js/instance/reduce")([]).call([1, 2, 3], (a, b) => a + b),
+      ).toEqual(6);
+    });
+
+    it("reduce, missing", () => {
+      expect(
+        require("../core-js/instance/reduce")({}),
+      ).toEqual(undefined);
+    });
+
+    it("reduceRight, exists", () => {
+      expect(
+        require("../core-js/instance/reduce-right")([]).call([1, 2, 3], (a, b) => a + b),
+      ).toEqual(6);
+    });
+
+    it("reduceRight, missing", () => {
+      expect(
+        require("../core-js/instance/reduce-right")({}),
+      ).toEqual(undefined);
+    });
+
+    it("repeat, exists", () => {
+      expect(
+        require("../core-js/instance/repeat")("").call("q", 6),
+      ).toEqual("qqqqqq");
+    });
+
+    it("repeat, missing", () => {
+      expect(
+        require("../core-js/instance/repeat")({}),
+      ).toEqual(undefined);
+    });
+
+    it("replaceAll, exists", () => {
+      expect(
+        require("../core-js/instance/replace-all")("").call("qwe", "w", "r"),
+      ).toEqual("qre");
+    });
+
+    it("replaceAll, missing", () => {
+      expect(
+        require("../core-js/instance/replace-all")({}),
+      ).toEqual(undefined);
+    });
+
+    it("reverse, exists", () => {
+      expect(
+        require("../core-js/instance/reverse")([]).call([1, 2, 3]).join(''),
+      ).toEqual("321");
+    });
+
+    it("reverse, missing", () => {
+      expect(
+        require("../core-js/instance/reverse")({}),
+      ).toEqual(undefined);
+    });
+
+    it("slice, exists", () => {
+      expect(
+        require("../core-js/instance/slice")([]).call([1, 2, 3], 1)[0],
+      ).toEqual(2);
+    });
+
+    it("slice, missing", () => {
+      expect(
+        require("../core-js/instance/slice")({}),
+      ).toEqual(undefined);
+    });
+
+    it("some, exists", () => {
+      expect(
+        require("../core-js/instance/some")([]).call([1, 2, 3], it => typeof it === "number"),
+      ).toEqual(true);
+    });
+
+    it("some, missing", () => {
+      expect(
+        require("../core-js/instance/some")({}),
+      ).toEqual(undefined);
+    });
+
+    it("sort, exists", () => {
+      expect(
+        typeof require("../core-js/instance/sort")([]),
+      ).toEqual("function");
+    });
+
+    it("sort, missing", () => {
+      expect(
+        require("../core-js/instance/sort")({}),
+      ).toEqual(undefined);
+    });
+
+    it("splice, exists", () => {
+      expect(
+        typeof require("../core-js/instance/splice")([]),
+      ).toEqual("function");
+    });
+
+    it("splice, missing", () => {
+      expect(
+        require("../core-js/instance/splice")({}),
+      ).toEqual(undefined);
+    });
+
+    it("startsWith, exists", () => {
+      expect(
+        require("../core-js/instance/starts-with")("").call("qwe", "qw"),
+      ).toEqual(true);
+    });
+
+    it("startsWith, missing", () => {
+      expect(
+        require("../core-js/instance/starts-with")({}),
+      ).toEqual(undefined);
+    });
+
+    it("trim, exists", () => {
+      expect(
+        require("../core-js/instance/trim")("").call(" qwe  "),
+      ).toEqual("qwe");
+    });
+
+    it("trim, missing", () => {
+      expect(
+        require("../core-js/instance/trim")({}),
+      ).toEqual(undefined);
+    });
+
+    it("trimEnd, exists", () => {
+      expect(
+        require("../core-js/instance/trim-end")("").call(" qwe  "),
+      ).toEqual(" qwe");
+    });
+
+    it("trimEnd, missing", () => {
+      expect(
+        require("../core-js/instance/trim-end")({}),
+      ).toEqual(undefined);
+    });
+
+    it("trimLeft, exists", () => {
+      expect(
+        require("../core-js/instance/trim-left")("").call(" qwe  "),
+      ).toEqual("qwe  ");
+    });
+
+    it("trimLeft, missing", () => {
+      expect(
+        require("../core-js/instance/trim-left")({}),
+      ).toEqual(undefined);
+    });
+
+    it("trimRight, exists", () => {
+      expect(
+        require("../core-js/instance/trim-right")("").call(" qwe  "),
+      ).toEqual(" qwe");
+    });
+
+    it("trimRight, missing", () => {
+      expect(
+        require("../core-js/instance/trim-right")({}),
+      ).toEqual(undefined);
+    });
+
+    it("trimStart, exists", () => {
+      expect(
+        require("../core-js/instance/trim-start")("").call(" qwe  "),
+      ).toEqual("qwe  ");
+    });
+
+    it("trimStart, missing", () => {
+      expect(
+        require("../core-js/instance/trim-start")({}),
+      ).toEqual(undefined);
+    });
+
+    it("values, exists", () => {
+      expect(
+        require("../core-js/instance/values")([]).call([]).next().done,
+      ).toEqual(true);
+    });
+
+    it("values, missing", () => {
+      expect(
+        require("../core-js/instance/values")({}),
+      ).toEqual(undefined);
+    });
+  });
+});
diff --git a/packages/babel-runtime/README.md b/packages/babel-runtime/README.md
index 75087e35603c..72e8daa31877 100644
--- a/packages/babel-runtime/README.md
+++ b/packages/babel-runtime/README.md
@@ -9,11 +9,11 @@ See our website [@babel/runtime](https://babeljs.io/docs/en/next/babel-runtime.h
 Using npm:
 
 ```sh
-npm install --save-dev @babel/runtime
+npm install --save @babel/runtime
 ```
 
 or using yarn:
 
 ```sh
-yarn add @babel/runtime --dev
+yarn add @babel/runtime 
 ```
diff --git a/packages/babel-runtime/package.json b/packages/babel-runtime/package.json
index 4886520d18e7..bb097bddded6 100644
--- a/packages/babel-runtime/package.json
+++ b/packages/babel-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/runtime",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "babel's modular runtime helpers",
   "license": "MIT",
   "publishConfig": {
@@ -9,6 +9,9 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-runtime",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "dependencies": {
-    "regenerator-runtime": "^0.12.0"
+    "regenerator-runtime": "^0.13.2"
+  },
+  "devDependencies": {
+    "@babel/helpers": "^7.5.5"
   }
 }
diff --git a/packages/babel-standalone/package.json b/packages/babel-standalone/package.json
index 55fed226a74f..7d94b31d7a1c 100644
--- a/packages/babel-standalone/package.json
+++ b/packages/babel-standalone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/standalone",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "Standalone build of Babel for use in non-Node.js environments.",
   "main": "babel.js",
   "files": [
@@ -9,92 +9,95 @@
     "src"
   ],
   "devDependencies": {
-    "@babel/core": "^7.0.0",
+    "@babel/core": "^7.5.5",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/plugin-external-helpers": "^7.0.0",
-    "@babel/plugin-proposal-async-generator-functions": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.0.0",
-    "@babel/plugin-proposal-decorators": "^7.0.0",
-    "@babel/plugin-proposal-do-expressions": "^7.0.0",
-    "@babel/plugin-proposal-export-default-from": "^7.0.0",
-    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
-    "@babel/plugin-proposal-function-bind": "^7.0.0",
-    "@babel/plugin-proposal-function-sent": "^7.0.0",
-    "@babel/plugin-proposal-json-strings": "^7.0.0",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
-    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
-    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
-    "@babel/plugin-proposal-unicode-property-regex": "^7.0.0",
-    "@babel/plugin-syntax-async-generators": "^7.0.0",
-    "@babel/plugin-syntax-class-properties": "^7.0.0",
-    "@babel/plugin-syntax-decorators": "^7.0.0",
-    "@babel/plugin-syntax-do-expressions": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-syntax-export-default-from": "^7.0.0",
-    "@babel/plugin-syntax-export-namespace-from": "^7.0.0",
-    "@babel/plugin-syntax-flow": "^7.0.0",
-    "@babel/plugin-syntax-function-bind": "^7.0.0",
-    "@babel/plugin-syntax-function-sent": "^7.0.0",
-    "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "@babel/plugin-syntax-jsx": "^7.0.0",
-    "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-    "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
-    "@babel/plugin-syntax-pipeline-operator": "^7.0.0",
-    "@babel/plugin-syntax-typescript": "^7.0.0",
-    "@babel/plugin-transform-arrow-functions": "^7.0.0",
-    "@babel/plugin-transform-async-to-generator": "^7.0.0",
-    "@babel/plugin-transform-block-scoped-functions": "^7.0.0",
-    "@babel/plugin-transform-block-scoping": "^7.0.0",
-    "@babel/plugin-transform-classes": "^7.0.0",
-    "@babel/plugin-transform-computed-properties": "^7.0.0",
-    "@babel/plugin-transform-destructuring": "^7.0.0",
-    "@babel/plugin-transform-dotall-regex": "^7.0.0",
-    "@babel/plugin-transform-duplicate-keys": "^7.0.0",
-    "@babel/plugin-transform-exponentiation-operator": "^7.0.0",
-    "@babel/plugin-transform-flow-comments": "^7.0.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-    "@babel/plugin-transform-for-of": "^7.0.0",
-    "@babel/plugin-transform-function-name": "^7.0.0",
-    "@babel/plugin-transform-instanceof": "^7.0.0",
-    "@babel/plugin-transform-jscript": "^7.0.0",
-    "@babel/plugin-transform-literals": "^7.0.0",
-    "@babel/plugin-transform-member-expression-literals": "^7.0.0",
-    "@babel/plugin-transform-modules-amd": "^7.0.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.0.0",
-    "@babel/plugin-transform-modules-systemjs": "^7.0.0",
-    "@babel/plugin-transform-modules-umd": "^7.0.0",
-    "@babel/plugin-transform-new-target": "^7.0.0",
-    "@babel/plugin-transform-object-assign": "^7.0.0",
-    "@babel/plugin-transform-object-set-prototype-of-to-assign": "^7.0.0",
-    "@babel/plugin-transform-object-super": "^7.0.0",
-    "@babel/plugin-transform-parameters": "^7.0.0",
-    "@babel/plugin-transform-property-literals": "^7.0.0",
-    "@babel/plugin-transform-property-mutators": "^7.0.0",
-    "@babel/plugin-transform-proto-to-assign": "^7.0.0",
-    "@babel/plugin-transform-react-constant-elements": "^7.0.0",
-    "@babel/plugin-transform-react-display-name": "^7.0.0",
-    "@babel/plugin-transform-react-inline-elements": "^7.0.0",
-    "@babel/plugin-transform-react-jsx": "^7.0.0",
-    "@babel/plugin-transform-react-jsx-compat": "^7.0.0",
-    "@babel/plugin-transform-react-jsx-self": "^7.0.0",
-    "@babel/plugin-transform-react-jsx-source": "^7.0.0",
-    "@babel/plugin-transform-regenerator": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
-    "@babel/plugin-transform-shorthand-properties": "^7.0.0",
-    "@babel/plugin-transform-spread": "^7.0.0",
-    "@babel/plugin-transform-sticky-regex": "^7.0.0",
-    "@babel/plugin-transform-strict-mode": "^7.0.0",
-    "@babel/plugin-transform-template-literals": "^7.0.0",
-    "@babel/plugin-transform-typeof-symbol": "^7.0.0",
-    "@babel/plugin-transform-typescript": "^7.0.0",
-    "@babel/plugin-transform-unicode-regex": "^7.0.0",
+    "@babel/plugin-external-helpers": "^7.2.0",
+    "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-decorators": "^7.4.4",
+    "@babel/plugin-proposal-do-expressions": "^7.5.0",
+    "@babel/plugin-proposal-export-default-from": "^7.5.2",
+    "@babel/plugin-proposal-export-namespace-from": "^7.5.2",
+    "@babel/plugin-proposal-function-bind": "^7.2.0",
+    "@babel/plugin-proposal-function-sent": "^7.5.0",
+    "@babel/plugin-proposal-json-strings": "^7.2.0",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.2.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
+    "@babel/plugin-proposal-numeric-separator": "^7.2.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
+    "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
+    "@babel/plugin-proposal-pipeline-operator": "^7.5.0",
+    "@babel/plugin-proposal-private-methods": "^7.4.4",
+    "@babel/plugin-proposal-throw-expressions": "^7.2.0",
+    "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+    "@babel/plugin-syntax-async-generators": "^7.2.0",
+    "@babel/plugin-syntax-class-properties": "^7.2.0",
+    "@babel/plugin-syntax-decorators": "^7.2.0",
+    "@babel/plugin-syntax-do-expressions": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-syntax-export-default-from": "^7.2.0",
+    "@babel/plugin-syntax-export-namespace-from": "^7.2.0",
+    "@babel/plugin-syntax-flow": "^7.2.0",
+    "@babel/plugin-syntax-function-bind": "^7.2.0",
+    "@babel/plugin-syntax-function-sent": "^7.2.0",
+    "@babel/plugin-syntax-import-meta": "^7.2.0",
+    "@babel/plugin-syntax-jsx": "^7.2.0",
+    "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+    "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+    "@babel/plugin-syntax-pipeline-operator": "^7.5.0",
+    "@babel/plugin-syntax-typescript": "^7.3.3",
+    "@babel/plugin-transform-arrow-functions": "^7.2.0",
+    "@babel/plugin-transform-async-to-generator": "^7.5.0",
+    "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+    "@babel/plugin-transform-block-scoping": "^7.5.5",
+    "@babel/plugin-transform-classes": "^7.5.5",
+    "@babel/plugin-transform-computed-properties": "^7.2.0",
+    "@babel/plugin-transform-destructuring": "^7.5.0",
+    "@babel/plugin-transform-dotall-regex": "^7.4.4",
+    "@babel/plugin-transform-duplicate-keys": "^7.5.0",
+    "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+    "@babel/plugin-transform-flow-comments": "^7.5.5",
+    "@babel/plugin-transform-flow-strip-types": "^7.4.4",
+    "@babel/plugin-transform-for-of": "^7.4.4",
+    "@babel/plugin-transform-function-name": "^7.4.4",
+    "@babel/plugin-transform-instanceof": "^7.5.5",
+    "@babel/plugin-transform-jscript": "^7.2.0",
+    "@babel/plugin-transform-literals": "^7.2.0",
+    "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+    "@babel/plugin-transform-modules-amd": "^7.5.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+    "@babel/plugin-transform-modules-systemjs": "^7.5.0",
+    "@babel/plugin-transform-modules-umd": "^7.2.0",
+    "@babel/plugin-transform-new-target": "^7.4.4",
+    "@babel/plugin-transform-object-assign": "^7.2.0",
+    "@babel/plugin-transform-object-set-prototype-of-to-assign": "^7.2.0",
+    "@babel/plugin-transform-object-super": "^7.5.5",
+    "@babel/plugin-transform-parameters": "^7.4.4",
+    "@babel/plugin-transform-property-literals": "^7.2.0",
+    "@babel/plugin-transform-property-mutators": "^7.2.0",
+    "@babel/plugin-transform-proto-to-assign": "^7.5.5",
+    "@babel/plugin-transform-react-constant-elements": "^7.5.0",
+    "@babel/plugin-transform-react-display-name": "^7.2.0",
+    "@babel/plugin-transform-react-inline-elements": "^7.2.0",
+    "@babel/plugin-transform-react-jsx": "^7.3.0",
+    "@babel/plugin-transform-react-jsx-compat": "^7.2.0",
+    "@babel/plugin-transform-react-jsx-self": "^7.2.0",
+    "@babel/plugin-transform-react-jsx-source": "^7.5.0",
+    "@babel/plugin-transform-regenerator": "^7.4.5",
+    "@babel/plugin-transform-reserved-words": "^7.2.0",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+    "@babel/plugin-transform-spread": "^7.2.2",
+    "@babel/plugin-transform-sticky-regex": "^7.2.0",
+    "@babel/plugin-transform-strict-mode": "^7.2.0",
+    "@babel/plugin-transform-template-literals": "^7.4.4",
+    "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+    "@babel/plugin-transform-typescript": "^7.5.5",
+    "@babel/plugin-transform-unicode-regex": "^7.4.4",
     "@babel/preset-flow": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
-    "@babel/preset-typescript": "^7.0.0"
+    "@babel/preset-typescript": "^7.3.3"
   },
   "keywords": [
     "babel",
@@ -109,7 +112,7 @@
     "access": "public"
   },
   "bugs": {
-    "url": "https://github.com/babel/babel-standalone/issues"
+    "url": "https://github.com/babel/babel/issues"
   },
-  "homepage": "https://github.com/babel/babel-standalone#readme"
+  "homepage": "https://github.com/babel/babel/tree/master/packages/babel-standalone"
 }
diff --git a/packages/babel-standalone/scripts/generate.js b/packages/babel-standalone/scripts/generate.js
new file mode 100644
index 000000000000..a1c1cafb215d
--- /dev/null
+++ b/packages/babel-standalone/scripts/generate.js
@@ -0,0 +1,37 @@
+// @flow
+const pluginConfig = require("./pluginConfig.json");
+const path = require("path");
+const chalk = require("chalk");
+const camelCase = require("lodash/camelCase");
+const format = require("../../../scripts/utils/formatCode");
+const writeFile = require("../../../scripts/utils/writeFileAndMkDir");
+
+const outputFile = path.join(__dirname, "../src/generated/plugins.js");
+
+console.log("Generating @babel/standalone files");
+
+let imports = "";
+let list = "";
+let allList = "";
+
+for (const plugin of pluginConfig) {
+  const camelPlugin = camelCase(plugin);
+  imports += `import ${camelPlugin} from "@babel/plugin-${plugin}";`;
+  list += `${camelPlugin},`;
+  allList += `"${plugin}": ${camelPlugin},`;
+}
+
+const fileContent = `// @flow
+/*
+ * This file is auto-generated! Do not modify it directly.
+ * To re-generate run 'make build'
+ */
+${imports}
+
+export {${list}};
+
+export const all = {${allList}};
+`;
+
+writeFile(outputFile, format(fileContent, outputFile));
+console.log(`  ${chalk.green("✔")} Generated plugin list`);
diff --git a/packages/babel-standalone/scripts/pluginConfig.json b/packages/babel-standalone/scripts/pluginConfig.json
new file mode 100644
index 000000000000..338d1d1f1bc9
--- /dev/null
+++ b/packages/babel-standalone/scripts/pluginConfig.json
@@ -0,0 +1,86 @@
+[
+  "external-helpers",
+  "syntax-async-generators",
+  "syntax-class-properties",
+  "syntax-decorators",
+  "syntax-do-expressions",
+  "syntax-dynamic-import",
+  "syntax-export-default-from",
+  "syntax-export-namespace-from",
+  "syntax-flow",
+  "syntax-function-bind",
+  "syntax-function-sent",
+  "syntax-import-meta",
+  "syntax-jsx",
+  "syntax-object-rest-spread",
+  "syntax-optional-catch-binding",
+  "syntax-pipeline-operator",
+  "syntax-typescript",
+  "proposal-async-generator-functions",
+  "proposal-class-properties",
+  "proposal-decorators",
+  "proposal-do-expressions",
+  "proposal-export-default-from",
+  "proposal-export-namespace-from",
+  "proposal-function-bind",
+  "proposal-function-sent",
+  "proposal-json-strings",
+  "proposal-logical-assignment-operators",
+  "proposal-nullish-coalescing-operator",
+  "proposal-numeric-separator",
+  "proposal-object-rest-spread",
+  "proposal-optional-catch-binding",
+  "proposal-optional-chaining",
+  "proposal-pipeline-operator",
+  "proposal-private-methods",
+  "proposal-throw-expressions",
+  "proposal-unicode-property-regex",
+  "transform-async-to-generator",
+  "transform-arrow-functions",
+  "transform-block-scoped-functions",
+  "transform-block-scoping",
+  "transform-classes",
+  "transform-computed-properties",
+  "transform-destructuring",
+  "transform-dotall-regex",
+  "transform-duplicate-keys",
+  "transform-exponentiation-operator",
+  "transform-flow-comments",
+  "transform-flow-strip-types",
+  "transform-for-of",
+  "transform-function-name",
+  "transform-instanceof",
+  "transform-jscript",
+  "transform-literals",
+  "transform-member-expression-literals",
+  "transform-modules-amd",
+  "transform-modules-commonjs",
+  "transform-modules-systemjs",
+  "transform-modules-umd",
+  "transform-new-target",
+  "transform-object-assign",
+  "transform-object-super",
+  "transform-object-set-prototype-of-to-assign",
+  "transform-parameters",
+  "transform-property-literals",
+  "transform-property-mutators",
+  "transform-proto-to-assign",
+  "transform-react-constant-elements",
+  "transform-react-display-name",
+  "transform-react-inline-elements",
+  "transform-react-jsx",
+  "transform-react-jsx-compat",
+  "transform-react-jsx-self",
+  "transform-react-jsx-source",
+  "transform-regenerator",
+  "transform-reserved-words",
+  "transform-runtime",
+  "transform-shorthand-properties",
+  "transform-spread",
+  "transform-sticky-regex",
+  "transform-strict-mode",
+  "transform-template-literals",
+  "transform-typeof-symbol",
+  "transform-typescript",
+  "transform-unicode-regex"
+]
diff --git a/packages/babel-standalone/scripts/prepublish.js b/packages/babel-standalone/scripts/prepublish.js
new file mode 100644
index 000000000000..daadffb117ef
--- /dev/null
+++ b/packages/babel-standalone/scripts/prepublish.js
@@ -0,0 +1,7 @@
+// This file is executed by lerna before publishing @babel/standalone,
+// so that it has the new version and not the old one.
+
+require("child_process").execSync("make prepublish-build-standalone", {
+  cwd: require("path").resolve(__dirname, "../../.."),
+  stdio: "inherit",
+});
diff --git a/packages/babel-standalone/src/generated/plugins.js b/packages/babel-standalone/src/generated/plugins.js
new file mode 100644
index 000000000000..3967a839565c
--- /dev/null
+++ b/packages/babel-standalone/src/generated/plugins.js
@@ -0,0 +1,263 @@
+// @flow
+/*
+ * This file is auto-generated! Do not modify it directly.
+ * To re-generate run 'make build'
+ */
+import externalHelpers from "@babel/plugin-external-helpers";
+import syntaxAsyncGenerators from "@babel/plugin-syntax-async-generators";
+import syntaxClassProperties from "@babel/plugin-syntax-class-properties";
+import syntaxDecorators from "@babel/plugin-syntax-decorators";
+import syntaxDoExpressions from "@babel/plugin-syntax-do-expressions";
+import syntaxDynamicImport from "@babel/plugin-syntax-dynamic-import";
+import syntaxExportDefaultFrom from "@babel/plugin-syntax-export-default-from";
+import syntaxExportNamespaceFrom from "@babel/plugin-syntax-export-namespace-from";
+import syntaxFlow from "@babel/plugin-syntax-flow";
+import syntaxFunctionBind from "@babel/plugin-syntax-function-bind";
+import syntaxFunctionSent from "@babel/plugin-syntax-function-sent";
+import syntaxImportMeta from "@babel/plugin-syntax-import-meta";
+import syntaxJsx from "@babel/plugin-syntax-jsx";
+import syntaxObjectRestSpread from "@babel/plugin-syntax-object-rest-spread";
+import syntaxOptionalCatchBinding from "@babel/plugin-syntax-optional-catch-binding";
+import syntaxPipelineOperator from "@babel/plugin-syntax-pipeline-operator";
+import syntaxTypescript from "@babel/plugin-syntax-typescript";
+import proposalAsyncGeneratorFunctions from "@babel/plugin-proposal-async-generator-functions";
+import proposalClassProperties from "@babel/plugin-proposal-class-properties";
+import proposalDecorators from "@babel/plugin-proposal-decorators";
+import proposalDoExpressions from "@babel/plugin-proposal-do-expressions";
+import proposalExportDefaultFrom from "@babel/plugin-proposal-export-default-from";
+import proposalExportNamespaceFrom from "@babel/plugin-proposal-export-namespace-from";
+import proposalFunctionBind from "@babel/plugin-proposal-function-bind";
+import proposalFunctionSent from "@babel/plugin-proposal-function-sent";
+import proposalJsonStrings from "@babel/plugin-proposal-json-strings";
+import proposalLogicalAssignmentOperators from "@babel/plugin-proposal-logical-assignment-operators";
+import proposalNullishCoalescingOperator from "@babel/plugin-proposal-nullish-coalescing-operator";
+import proposalNumericSeparator from "@babel/plugin-proposal-numeric-separator";
+import proposalObjectRestSpread from "@babel/plugin-proposal-object-rest-spread";
+import proposalOptionalCatchBinding from "@babel/plugin-proposal-optional-catch-binding";
+import proposalOptionalChaining from "@babel/plugin-proposal-optional-chaining";
+import proposalPipelineOperator from "@babel/plugin-proposal-pipeline-operator";
+import proposalPrivateMethods from "@babel/plugin-proposal-private-methods";
+import proposalThrowExpressions from "@babel/plugin-proposal-throw-expressions";
+import proposalUnicodePropertyRegex from "@babel/plugin-proposal-unicode-property-regex";
+import transformAsyncToGenerator from "@babel/plugin-transform-async-to-generator";
+import transformArrowFunctions from "@babel/plugin-transform-arrow-functions";
+import transformBlockScopedFunctions from "@babel/plugin-transform-block-scoped-functions";
+import transformBlockScoping from "@babel/plugin-transform-block-scoping";
+import transformClasses from "@babel/plugin-transform-classes";
+import transformComputedProperties from "@babel/plugin-transform-computed-properties";
+import transformDestructuring from "@babel/plugin-transform-destructuring";
+import transformDotallRegex from "@babel/plugin-transform-dotall-regex";
+import transformDuplicateKeys from "@babel/plugin-transform-duplicate-keys";
+import transformExponentiationOperator from "@babel/plugin-transform-exponentiation-operator";
+import transformFlowComments from "@babel/plugin-transform-flow-comments";
+import transformFlowStripTypes from "@babel/plugin-transform-flow-strip-types";
+import transformForOf from "@babel/plugin-transform-for-of";
+import transformFunctionName from "@babel/plugin-transform-function-name";
+import transformInstanceof from "@babel/plugin-transform-instanceof";
+import transformJscript from "@babel/plugin-transform-jscript";
+import transformLiterals from "@babel/plugin-transform-literals";
+import transformMemberExpressionLiterals from "@babel/plugin-transform-member-expression-literals";
+import transformModulesAmd from "@babel/plugin-transform-modules-amd";
+import transformModulesCommonjs from "@babel/plugin-transform-modules-commonjs";
+import transformModulesSystemjs from "@babel/plugin-transform-modules-systemjs";
+import transformModulesUmd from "@babel/plugin-transform-modules-umd";
+import transformNewTarget from "@babel/plugin-transform-new-target";
+import transformObjectAssign from "@babel/plugin-transform-object-assign";
+import transformObjectSuper from "@babel/plugin-transform-object-super";
+import transformObjectSetPrototypeOfToAssign from "@babel/plugin-transform-object-set-prototype-of-to-assign";
+import transformParameters from "@babel/plugin-transform-parameters";
+import transformPropertyLiterals from "@babel/plugin-transform-property-literals";
+import transformPropertyMutators from "@babel/plugin-transform-property-mutators";
+import transformProtoToAssign from "@babel/plugin-transform-proto-to-assign";
+import transformReactConstantElements from "@babel/plugin-transform-react-constant-elements";
+import transformReactDisplayName from "@babel/plugin-transform-react-display-name";
+import transformReactInlineElements from "@babel/plugin-transform-react-inline-elements";
+import transformReactJsx from "@babel/plugin-transform-react-jsx";
+import transformReactJsxCompat from "@babel/plugin-transform-react-jsx-compat";
+import transformReactJsxSelf from "@babel/plugin-transform-react-jsx-self";
+import transformReactJsxSource from "@babel/plugin-transform-react-jsx-source";
+import transformRegenerator from "@babel/plugin-transform-regenerator";
+import transformReservedWords from "@babel/plugin-transform-reserved-words";
+import transformRuntime from "@babel/plugin-transform-runtime";
+import transformShorthandProperties from "@babel/plugin-transform-shorthand-properties";
+import transformSpread from "@babel/plugin-transform-spread";
+import transformStickyRegex from "@babel/plugin-transform-sticky-regex";
+import transformStrictMode from "@babel/plugin-transform-strict-mode";
+import transformTemplateLiterals from "@babel/plugin-transform-template-literals";
+import transformTypeofSymbol from "@babel/plugin-transform-typeof-symbol";
+import transformTypescript from "@babel/plugin-transform-typescript";
+import transformUnicodeRegex from "@babel/plugin-transform-unicode-regex";
+
+export {
+  externalHelpers,
+  syntaxAsyncGenerators,
+  syntaxClassProperties,
+  syntaxDecorators,
+  syntaxDoExpressions,
+  syntaxDynamicImport,
+  syntaxExportDefaultFrom,
+  syntaxExportNamespaceFrom,
+  syntaxFlow,
+  syntaxFunctionBind,
+  syntaxFunctionSent,
+  syntaxImportMeta,
+  syntaxJsx,
+  syntaxObjectRestSpread,
+  syntaxOptionalCatchBinding,
+  syntaxPipelineOperator,
+  syntaxTypescript,
+  proposalAsyncGeneratorFunctions,
+  proposalClassProperties,
+  proposalDecorators,
+  proposalDoExpressions,
+  proposalExportDefaultFrom,
+  proposalExportNamespaceFrom,
+  proposalFunctionBind,
+  proposalFunctionSent,
+  proposalJsonStrings,
+  proposalLogicalAssignmentOperators,
+  proposalNullishCoalescingOperator,
+  proposalNumericSeparator,
+  proposalObjectRestSpread,
+  proposalOptionalCatchBinding,
+  proposalOptionalChaining,
+  proposalPipelineOperator,
+  proposalPrivateMethods,
+  proposalThrowExpressions,
+  proposalUnicodePropertyRegex,
+  transformAsyncToGenerator,
+  transformArrowFunctions,
+  transformBlockScopedFunctions,
+  transformBlockScoping,
+  transformClasses,
+  transformComputedProperties,
+  transformDestructuring,
+  transformDotallRegex,
+  transformDuplicateKeys,
+  transformExponentiationOperator,
+  transformFlowComments,
+  transformFlowStripTypes,
+  transformForOf,
+  transformFunctionName,
+  transformInstanceof,
+  transformJscript,
+  transformLiterals,
+  transformMemberExpressionLiterals,
+  transformModulesAmd,
+  transformModulesCommonjs,
+  transformModulesSystemjs,
+  transformModulesUmd,
+  transformNewTarget,
+  transformObjectAssign,
+  transformObjectSuper,
+  transformObjectSetPrototypeOfToAssign,
+  transformParameters,
+  transformPropertyLiterals,
+  transformPropertyMutators,
+  transformProtoToAssign,
+  transformReactConstantElements,
+  transformReactDisplayName,
+  transformReactInlineElements,
+  transformReactJsx,
+  transformReactJsxCompat,
+  transformReactJsxSelf,
+  transformReactJsxSource,
+  transformRegenerator,
+  transformReservedWords,
+  transformRuntime,
+  transformShorthandProperties,
+  transformSpread,
+  transformStickyRegex,
+  transformStrictMode,
+  transformTemplateLiterals,
+  transformTypeofSymbol,
+  transformTypescript,
+  transformUnicodeRegex,
+};
+
+export const all = {
+  "external-helpers": externalHelpers,
+  "syntax-async-generators": syntaxAsyncGenerators,
+  "syntax-class-properties": syntaxClassProperties,
+  "syntax-decorators": syntaxDecorators,
+  "syntax-do-expressions": syntaxDoExpressions,
+  "syntax-dynamic-import": syntaxDynamicImport,
+  "syntax-export-default-from": syntaxExportDefaultFrom,
+  "syntax-export-namespace-from": syntaxExportNamespaceFrom,
+  "syntax-flow": syntaxFlow,
+  "syntax-function-bind": syntaxFunctionBind,
+  "syntax-function-sent": syntaxFunctionSent,
+  "syntax-import-meta": syntaxImportMeta,
+  "syntax-jsx": syntaxJsx,
+  "syntax-object-rest-spread": syntaxObjectRestSpread,
+  "syntax-optional-catch-binding": syntaxOptionalCatchBinding,
+  "syntax-pipeline-operator": syntaxPipelineOperator,
+  "syntax-typescript": syntaxTypescript,
+  "proposal-async-generator-functions": proposalAsyncGeneratorFunctions,
+  "proposal-class-properties": proposalClassProperties,
+  "proposal-decorators": proposalDecorators,
+  "proposal-do-expressions": proposalDoExpressions,
+  "proposal-export-default-from": proposalExportDefaultFrom,
+  "proposal-export-namespace-from": proposalExportNamespaceFrom,
+  "proposal-function-bind": proposalFunctionBind,
+  "proposal-function-sent": proposalFunctionSent,
+  "proposal-json-strings": proposalJsonStrings,
+  "proposal-logical-assignment-operators": proposalLogicalAssignmentOperators,
+  "proposal-nullish-coalescing-operator": proposalNullishCoalescingOperator,
+  "proposal-numeric-separator": proposalNumericSeparator,
+  "proposal-object-rest-spread": proposalObjectRestSpread,
+  "proposal-optional-catch-binding": proposalOptionalCatchBinding,
+  "proposal-optional-chaining": proposalOptionalChaining,
+  "proposal-pipeline-operator": proposalPipelineOperator,
+  "proposal-private-methods": proposalPrivateMethods,
+  "proposal-throw-expressions": proposalThrowExpressions,
+  "proposal-unicode-property-regex": proposalUnicodePropertyRegex,
+  "transform-async-to-generator": transformAsyncToGenerator,
+  "transform-arrow-functions": transformArrowFunctions,
+  "transform-block-scoped-functions": transformBlockScopedFunctions,
+  "transform-block-scoping": transformBlockScoping,
+  "transform-classes": transformClasses,
+  "transform-computed-properties": transformComputedProperties,
+  "transform-destructuring": transformDestructuring,
+  "transform-dotall-regex": transformDotallRegex,
+  "transform-duplicate-keys": transformDuplicateKeys,
+  "transform-exponentiation-operator": transformExponentiationOperator,
+  "transform-flow-comments": transformFlowComments,
+  "transform-flow-strip-types": transformFlowStripTypes,
+  "transform-for-of": transformForOf,
+  "transform-function-name": transformFunctionName,
+  "transform-instanceof": transformInstanceof,
+  "transform-jscript": transformJscript,
+  "transform-literals": transformLiterals,
+  "transform-member-expression-literals": transformMemberExpressionLiterals,
+  "transform-modules-amd": transformModulesAmd,
+  "transform-modules-commonjs": transformModulesCommonjs,
+  "transform-modules-systemjs": transformModulesSystemjs,
+  "transform-modules-umd": transformModulesUmd,
+  "transform-new-target": transformNewTarget,
+  "transform-object-assign": transformObjectAssign,
+  "transform-object-super": transformObjectSuper,
+  "transform-object-set-prototype-of-to-assign": transformObjectSetPrototypeOfToAssign,
+  "transform-parameters": transformParameters,
+  "transform-property-literals": transformPropertyLiterals,
+  "transform-property-mutators": transformPropertyMutators,
+  "transform-proto-to-assign": transformProtoToAssign,
+  "transform-react-constant-elements": transformReactConstantElements,
+  "transform-react-display-name": transformReactDisplayName,
+  "transform-react-inline-elements": transformReactInlineElements,
+  "transform-react-jsx": transformReactJsx,
+  "transform-react-jsx-compat": transformReactJsxCompat,
+  "transform-react-jsx-self": transformReactJsxSelf,
+  "transform-react-jsx-source": transformReactJsxSource,
+  "transform-regenerator": transformRegenerator,
+  "transform-reserved-words": transformReservedWords,
+  "transform-runtime": transformRuntime,
+  "transform-shorthand-properties": transformShorthandProperties,
+  "transform-spread": transformSpread,
+  "transform-sticky-regex": transformStickyRegex,
+  "transform-strict-mode": transformStrictMode,
+  "transform-template-literals": transformTemplateLiterals,
+  "transform-typeof-symbol": transformTypeofSymbol,
+  "transform-typescript": transformTypescript,
+  "transform-unicode-regex": transformUnicodeRegex,
+};
diff --git a/packages/babel-standalone/src/index.js b/packages/babel-standalone/src/index.js
index 10fad226a964..1e7c83d30c6c 100644
--- a/packages/babel-standalone/src/index.js
+++ b/packages/babel-standalone/src/index.js
@@ -1,15 +1,29 @@
 /**
  * Entry point for @babel/standalone. This wraps Babel's API in a version that's
- * friendlier for use in web browers. It removes the automagical detection of
+ * friendlier for use in web browsers. It removes the automagical detection of
  * plugins, instead explicitly registering all the available plugins and
  * presets, and requiring custom ones to be registered through `registerPlugin`
  * and `registerPreset` respectively.
+ * @flow
  */
 
 /* global VERSION */
 /* eslint-disable max-len */
 
-import * as Babel from "@babel/core";
+import {
+  transformFromAst as babelTransformFromAst,
+  transform as babelTransform,
+  buildExternalHelpers as babelBuildExternalHelpers,
+} from "@babel/core";
+import { all } from "./generated/plugins";
+import preset2015 from "./preset-es2015";
+import presetStage0 from "./preset-stage-0";
+import presetStage1 from "./preset-stage-1";
+import presetStage2 from "./preset-stage-2";
+import presetStage3 from "./preset-stage-3";
+import presetReact from "@babel/preset-react";
+import presetFlow from "@babel/preset-flow";
+import presetTypescript from "@babel/preset-typescript";
 
 import { runScripts } from "./transformScriptTags";
 
@@ -84,20 +98,20 @@ function processOptions(options) {
   };
 }
 
-export function transform(code, options) {
-  return Babel.transform(code, processOptions(options));
+export function transform(code: string, options: Object) {
+  return babelTransform(code, processOptions(options));
 }
 
-export function transformFromAst(ast, code, options) {
-  return Babel.transformFromAst(ast, code, processOptions(options));
+export function transformFromAst(ast: Object, code: string, options: Object) {
+  return babelTransformFromAst(ast, code, processOptions(options));
 }
 export const availablePlugins = {};
 export const availablePresets = {};
-export const buildExternalHelpers = Babel.buildExternalHelpers;
+export const buildExternalHelpers = babelBuildExternalHelpers;
 /**
  * Registers a named plugin for use with Babel.
  */
-export function registerPlugin(name, plugin) {
+export function registerPlugin(name: string, plugin: Object | Function): void {
   if (availablePlugins.hasOwnProperty(name)) {
     console.warn(
       `A plugin named "${name}" is already registered, it will be overridden`,
@@ -109,7 +123,9 @@ export function registerPlugin(name, plugin) {
  * Registers multiple plugins for use with Babel. `newPlugins` should be an object where the key
  * is the name of the plugin, and the value is the plugin itself.
  */
-export function registerPlugins(newPlugins) {
+export function registerPlugins(newPlugins: {
+  [string]: Object | Function,
+}): void {
   Object.keys(newPlugins).forEach(name =>
     registerPlugin(name, newPlugins[name]),
   );
@@ -118,7 +134,7 @@ export function registerPlugins(newPlugins) {
 /**
  * Registers a named preset for use with Babel.
  */
-export function registerPreset(name, preset) {
+export function registerPreset(name: string, preset: Object | Function): void {
   if (availablePresets.hasOwnProperty(name)) {
     console.warn(
       `A preset named "${name}" is already registered, it will be overridden`,
@@ -130,7 +146,9 @@ export function registerPreset(name, preset) {
  * Registers multiple presets for use with Babel. `newPresets` should be an object where the key
  * is the name of the preset, and the value is the preset itself.
  */
-export function registerPresets(newPresets) {
+export function registerPresets(newPresets: {
+  [string]: Object | Function,
+}): void {
   Object.keys(newPresets).forEach(name =>
     registerPreset(name, newPresets[name]),
   );
@@ -139,89 +157,13 @@ export function registerPresets(newPresets) {
 // All the plugins we should bundle
 // Want to get rid of this long whitelist of plugins?
 // Wait! Please read https://github.com/babel/babel/pull/6177 first.
-registerPlugins({
-  "external-helpers": require("@babel/plugin-external-helpers"),
-  "syntax-async-generators": require("@babel/plugin-syntax-async-generators"),
-  "syntax-class-properties": require("@babel/plugin-syntax-class-properties"),
-  "syntax-decorators": require("@babel/plugin-syntax-decorators"),
-  "syntax-do-expressions": require("@babel/plugin-syntax-do-expressions"),
-  "syntax-dynamic-import": require("@babel/plugin-syntax-dynamic-import"),
-  "syntax-export-default-from": require("@babel/plugin-syntax-export-default-from"),
-  "syntax-export-namespace-from": require("@babel/plugin-syntax-export-namespace-from"),
-  "syntax-flow": require("@babel/plugin-syntax-flow"),
-  "syntax-function-bind": require("@babel/plugin-syntax-function-bind"),
-  "syntax-function-sent": require("@babel/plugin-syntax-function-sent"),
-  "syntax-import-meta": require("@babel/plugin-syntax-import-meta"),
-  "syntax-jsx": require("@babel/plugin-syntax-jsx"),
-  "syntax-object-rest-spread": require("@babel/plugin-syntax-object-rest-spread"),
-  "syntax-optional-catch-binding": require("@babel/plugin-syntax-optional-catch-binding"),
-  "syntax-pipeline-operator": require("@babel/plugin-syntax-pipeline-operator"),
-  "syntax-typescript": require("@babel/plugin-syntax-typescript"),
-  "transform-async-to-generator": require("@babel/plugin-transform-async-to-generator"),
-  "proposal-async-generator-functions": require("@babel/plugin-proposal-async-generator-functions"),
-  "proposal-class-properties": require("@babel/plugin-proposal-class-properties"),
-  "proposal-decorators": require("@babel/plugin-proposal-decorators"),
-  "proposal-do-expressions": require("@babel/plugin-proposal-do-expressions"),
-  "proposal-export-default-from": require("@babel/plugin-proposal-export-default-from"),
-  "proposal-export-namespace-from": require("@babel/plugin-proposal-export-namespace-from"),
-  "proposal-pipeline-operator": require("@babel/plugin-proposal-pipeline-operator"),
-  "transform-arrow-functions": require("@babel/plugin-transform-arrow-functions"),
-  "transform-block-scoped-functions": require("@babel/plugin-transform-block-scoped-functions"),
-  "transform-block-scoping": require("@babel/plugin-transform-block-scoping"),
-  "transform-classes": require("@babel/plugin-transform-classes"),
-  "transform-computed-properties": require("@babel/plugin-transform-computed-properties"),
-  "transform-destructuring": require("@babel/plugin-transform-destructuring"),
-  "transform-dotall-regex": require("@babel/plugin-transform-dotall-regex"),
-  "transform-duplicate-keys": require("@babel/plugin-transform-duplicate-keys"),
-  "transform-for-of": require("@babel/plugin-transform-for-of"),
-  "transform-function-name": require("@babel/plugin-transform-function-name"),
-  "transform-instanceof": require("@babel/plugin-transform-instanceof"),
-  "transform-literals": require("@babel/plugin-transform-literals"),
-  "transform-modules-amd": require("@babel/plugin-transform-modules-amd"),
-  "transform-modules-commonjs": require("@babel/plugin-transform-modules-commonjs"),
-  "transform-modules-systemjs": require("@babel/plugin-transform-modules-systemjs"),
-  "transform-modules-umd": require("@babel/plugin-transform-modules-umd"),
-  "transform-object-super": require("@babel/plugin-transform-object-super"),
-  "transform-parameters": require("@babel/plugin-transform-parameters"),
-  "transform-shorthand-properties": require("@babel/plugin-transform-shorthand-properties"),
-  "transform-spread": require("@babel/plugin-transform-spread"),
-  "transform-sticky-regex": require("@babel/plugin-transform-sticky-regex"),
-  "transform-template-literals": require("@babel/plugin-transform-template-literals"),
-  "transform-typeof-symbol": require("@babel/plugin-transform-typeof-symbol"),
-  "transform-typescript": require("@babel/plugin-transform-typescript"),
-  "transform-unicode-regex": require("@babel/plugin-transform-unicode-regex"),
-  "transform-member-expression-literals": require("@babel/plugin-transform-member-expression-literals"),
-  "transform-property-literals": require("@babel/plugin-transform-property-literals"),
-  "transform-property-mutators": require("@babel/plugin-transform-property-mutators"),
-  "transform-exponentiation-operator": require("@babel/plugin-transform-exponentiation-operator"),
-  "transform-flow-comments": require("@babel/plugin-transform-flow-comments"),
-  "transform-flow-strip-types": require("@babel/plugin-transform-flow-strip-types"),
-  "proposal-function-bind": require("@babel/plugin-proposal-function-bind"),
-  "transform-jscript": require("@babel/plugin-transform-jscript"),
-  "transform-new-target": require("@babel/plugin-transform-new-target"),
-  "transform-object-assign": require("@babel/plugin-transform-object-assign"),
-  "proposal-object-rest-spread": require("@babel/plugin-proposal-object-rest-spread"),
-  "transform-object-set-prototype-of-to-assign": require("@babel/plugin-transform-object-set-prototype-of-to-assign"),
-  "proposal-optional-catch-binding": require("@babel/plugin-proposal-optional-catch-binding"),
-  "transform-proto-to-assign": require("@babel/plugin-transform-proto-to-assign"),
-  "transform-react-constant-elements": require("@babel/plugin-transform-react-constant-elements"),
-  "transform-react-display-name": require("@babel/plugin-transform-react-display-name"),
-  "transform-react-inline-elements": require("@babel/plugin-transform-react-inline-elements"),
-  "transform-react-jsx": require("@babel/plugin-transform-react-jsx"),
-  "transform-react-jsx-compat": require("@babel/plugin-transform-react-jsx-compat"),
-  "transform-react-jsx-self": require("@babel/plugin-transform-react-jsx-self"),
-  "transform-react-jsx-source": require("@babel/plugin-transform-react-jsx-source"),
-  "transform-regenerator": require("@babel/plugin-transform-regenerator"),
-  "transform-runtime": require("@babel/plugin-transform-runtime"),
-  "transform-strict-mode": require("@babel/plugin-transform-strict-mode"),
-  "proposal-unicode-property-regex": require("@babel/plugin-proposal-unicode-property-regex"),
-});
+registerPlugins(all);
 
 // All the presets we should bundle
 // Want to get rid of this whitelist of presets?
 // Wait! Please read https://github.com/babel/babel/pull/6177 first.
 registerPresets({
-  es2015: require("./preset-es2015"),
+  es2015: preset2015,
   es2016: () => {
     return {
       plugins: [availablePlugins["transform-exponentiation-operator"]],
@@ -232,22 +174,23 @@ registerPresets({
       plugins: [availablePlugins["transform-async-to-generator"]],
     };
   },
-  react: require("@babel/preset-react"),
-  "stage-0": require("./preset-stage-0"),
-  "stage-1": require("./preset-stage-1"),
-  "stage-2": require("./preset-stage-2"),
-  "stage-3": require("./preset-stage-3"),
+  react: presetReact,
+  "stage-0": presetStage0,
+  "stage-1": presetStage1,
+  "stage-2": presetStage2,
+  "stage-3": presetStage3,
   "es2015-loose": {
-    presets: [[require("./preset-es2015"), { loose: true }]],
+    presets: [[preset2015, { loose: true }]],
   },
   // ES2015 preset with es2015-modules-commonjs removed
   "es2015-no-commonjs": {
-    presets: [[require("./preset-es2015"), { modules: false }]],
+    presets: [[preset2015, { modules: false }]],
   },
-  typescript: require("@babel/preset-typescript"),
-  flow: require("@babel/preset-flow"),
+  typescript: presetTypescript,
+  flow: presetFlow,
 });
 
+// $FlowIgnore
 export const version = VERSION;
 
 function onDOMContentLoaded() {
@@ -264,7 +207,7 @@ if (typeof window !== "undefined" && window && window.addEventListener) {
  * Transform <script> tags with "text/babel" type.
  * @param {Array} scriptTags specify script tags to transform, transform all in the <head> if not given
  */
-export function transformScriptTags(scriptTags) {
+export function transformScriptTags(scriptTags?: Array<any>) {
   runScripts(transform, scriptTags);
 }
 
diff --git a/packages/babel-standalone/src/preset-es2015.js b/packages/babel-standalone/src/preset-es2015.js
index c06632f65411..0b48bb6f673b 100644
--- a/packages/babel-standalone/src/preset-es2015.js
+++ b/packages/babel-standalone/src/preset-es2015.js
@@ -1,29 +1,7 @@
-import transformES2015TemplateLiterals from "@babel/plugin-transform-template-literals";
-import transformES2015Literals from "@babel/plugin-transform-literals";
-import transformES2015FunctionName from "@babel/plugin-transform-function-name";
-import transformES2015ArrowFunctions from "@babel/plugin-transform-arrow-functions";
-import transformES2015BlockScopedFunctions from "@babel/plugin-transform-block-scoped-functions";
-import transformES2015Classes from "@babel/plugin-transform-classes";
-import transformES2015ObjectSuper from "@babel/plugin-transform-object-super";
-import transformES2015ShorthandProperties from "@babel/plugin-transform-shorthand-properties";
-import transformES2015DuplicateKeys from "@babel/plugin-transform-duplicate-keys";
-import transformES2015ComputedProperties from "@babel/plugin-transform-computed-properties";
-import transformES2015ForOf from "@babel/plugin-transform-for-of";
-import transformES2015StickyRegex from "@babel/plugin-transform-sticky-regex";
-import transformES2015UnicodeRegex from "@babel/plugin-transform-unicode-regex";
-import transformES2015Spread from "@babel/plugin-transform-spread";
-import transformES2015Parameters from "@babel/plugin-transform-parameters";
-import transformES2015Destructuring from "@babel/plugin-transform-destructuring";
-import transformES2015BlockScoping from "@babel/plugin-transform-block-scoping";
-import transformES2015TypeofSymbol from "@babel/plugin-transform-typeof-symbol";
-import transformES2015ModulesCommonJS from "@babel/plugin-transform-modules-commonjs";
-import transformES2015ModulesSystemJS from "@babel/plugin-transform-modules-systemjs";
-import transformES2015ModulesAMD from "@babel/plugin-transform-modules-amd";
-import transformES2015ModulesUMD from "@babel/plugin-transform-modules-umd";
-import transformES2015Instanceof from "@babel/plugin-transform-instanceof";
-import transformRegenerator from "@babel/plugin-transform-regenerator";
+// @flow
+import * as babelPlugins from "./generated/plugins";
 
-export default (_, opts) => {
+export default (_: any, opts: Object): Object => {
   let loose = false;
   let modules = "commonjs";
   let spec = false;
@@ -39,33 +17,39 @@ export default (_, opts) => {
 
   return {
     plugins: [
-      [transformES2015TemplateLiterals, { loose, spec }],
-      transformES2015Literals,
-      transformES2015FunctionName,
-      [transformES2015ArrowFunctions, { spec }],
-      transformES2015BlockScopedFunctions,
-      [transformES2015Classes, optsLoose],
-      transformES2015ObjectSuper,
-      transformES2015ShorthandProperties,
-      transformES2015DuplicateKeys,
-      [transformES2015ComputedProperties, optsLoose],
-      [transformES2015ForOf, optsLoose],
-      transformES2015StickyRegex,
-      transformES2015UnicodeRegex,
-      [transformES2015Spread, optsLoose],
-      [transformES2015Parameters, optsLoose],
-      [transformES2015Destructuring, optsLoose],
-      transformES2015BlockScoping,
-      transformES2015TypeofSymbol,
-      transformES2015Instanceof,
+      [babelPlugins.transformTemplateLiterals, { loose, spec }],
+      babelPlugins.transformLiterals,
+      babelPlugins.transformFunctionName,
+      [babelPlugins.transformArrowFunctions, { spec }],
+      babelPlugins.transformBlockScopedFunctions,
+      [babelPlugins.transformClasses, optsLoose],
+      babelPlugins.transformObjectSuper,
+      babelPlugins.transformShorthandProperties,
+      babelPlugins.transformDuplicateKeys,
+      [babelPlugins.transformComputedProperties, optsLoose],
+      [babelPlugins.transformForOf, optsLoose],
+      babelPlugins.transformStickyRegex,
+      babelPlugins.transformUnicodeRegex,
+      [babelPlugins.transformSpread, optsLoose],
+      [babelPlugins.transformParameters, optsLoose],
+      [babelPlugins.transformDestructuring, optsLoose],
+      babelPlugins.transformBlockScoping,
+      babelPlugins.transformTypeofSymbol,
+      babelPlugins.transformInstanceof,
       (modules === "commonjs" || modules === "cjs") && [
-        transformES2015ModulesCommonJS,
+        babelPlugins.transformModulesCommonjs,
         optsLoose,
       ],
-      modules === "systemjs" && [transformES2015ModulesSystemJS, optsLoose],
-      modules === "amd" && [transformES2015ModulesAMD, optsLoose],
-      modules === "umd" && [transformES2015ModulesUMD, optsLoose],
-      [transformRegenerator, { async: false, asyncGenerators: false }],
+      modules === "systemjs" && [
+        babelPlugins.transformModulesSystemjs,
+        optsLoose,
+      ],
+      modules === "amd" && [babelPlugins.transformModulesAmd, optsLoose],
+      modules === "umd" && [babelPlugins.transformModulesUmd, optsLoose],
+      [
+        babelPlugins.transformRegenerator,
+        { async: false, asyncGenerators: false },
+      ],
     ].filter(Boolean), // filter out falsy values
   };
 };
diff --git a/packages/babel-standalone/src/preset-stage-0.js b/packages/babel-standalone/src/preset-stage-0.js
index 03426cb11a72..223c0dc20537 100644
--- a/packages/babel-standalone/src/preset-stage-0.js
+++ b/packages/babel-standalone/src/preset-stage-0.js
@@ -1,8 +1,8 @@
+// @flow
 import presetStage1 from "./preset-stage-1";
+import { proposalFunctionBind } from "./generated/plugins";
 
-import transformFunctionBind from "@babel/plugin-proposal-function-bind";
-
-export default (_, opts = {}) => {
+export default (_: any, opts: Object = {}) => {
   const {
     loose = false,
     useBuiltIns = false,
@@ -24,6 +24,6 @@ export default (_, opts = {}) => {
         },
       ],
     ],
-    plugins: [transformFunctionBind],
+    plugins: [proposalFunctionBind],
   };
 };
diff --git a/packages/babel-standalone/src/preset-stage-1.js b/packages/babel-standalone/src/preset-stage-1.js
index 4a485df10ad4..0018a48f4334 100644
--- a/packages/babel-standalone/src/preset-stage-1.js
+++ b/packages/babel-standalone/src/preset-stage-1.js
@@ -1,13 +1,8 @@
+// @flow
 import presetStage2 from "./preset-stage-2";
+import * as babelPlugins from "./generated/plugins";
 
-import transformExportDefaultFrom from "@babel/plugin-proposal-export-default-from";
-import transformLogicalAssignmentOperators from "@babel/plugin-proposal-logical-assignment-operators";
-import transformOptionalChaining from "@babel/plugin-proposal-optional-chaining";
-import transformPipelineOperator from "@babel/plugin-proposal-pipeline-operator";
-import transformNullishCoalescingOperator from "@babel/plugin-proposal-nullish-coalescing-operator";
-import transformDoExpressions from "@babel/plugin-proposal-do-expressions";
-
-export default (_, opts = {}) => {
+export default (_: any, opts: Object = {}) => {
   const {
     loose = false,
     useBuiltIns = false,
@@ -24,12 +19,12 @@ export default (_, opts = {}) => {
       ],
     ],
     plugins: [
-      transformExportDefaultFrom,
-      transformLogicalAssignmentOperators,
-      [transformOptionalChaining, { loose }],
-      [transformPipelineOperator, { proposal: pipelineProposal }],
-      [transformNullishCoalescingOperator, { loose }],
-      transformDoExpressions,
+      babelPlugins.proposalExportDefaultFrom,
+      babelPlugins.proposalLogicalAssignmentOperators,
+      [babelPlugins.proposalOptionalChaining, { loose }],
+      [babelPlugins.proposalPipelineOperator, { proposal: pipelineProposal }],
+      [babelPlugins.proposalNullishCoalescingOperator, { loose }],
+      babelPlugins.proposalDoExpressions,
     ],
   };
 };
diff --git a/packages/babel-standalone/src/preset-stage-2.js b/packages/babel-standalone/src/preset-stage-2.js
index 689578d35405..b7ba787ae64c 100644
--- a/packages/babel-standalone/src/preset-stage-2.js
+++ b/packages/babel-standalone/src/preset-stage-2.js
@@ -1,12 +1,8 @@
+// @flow
 import presetStage3 from "./preset-stage-3";
+import * as babelPlugins from "./generated/plugins";
 
-import transformDecorators from "@babel/plugin-proposal-decorators";
-import transformFunctionSent from "@babel/plugin-proposal-function-sent";
-import transformExportNamespaceFrom from "@babel/plugin-proposal-export-namespace-from";
-import transformNumericSeparator from "@babel/plugin-proposal-numeric-separator";
-import transformThrowExpressions from "@babel/plugin-proposal-throw-expressions";
-
-export default (_, opts = {}) => {
+export default (_: any, opts: Object = {}) => {
   const {
     loose = false,
     useBuiltIns = false,
@@ -18,13 +14,13 @@ export default (_, opts = {}) => {
     presets: [[presetStage3, { loose, useBuiltIns }]],
     plugins: [
       [
-        transformDecorators,
+        babelPlugins.proposalDecorators,
         { legacy: decoratorsLegacy, decoratorsBeforeExport },
       ],
-      transformFunctionSent,
-      transformExportNamespaceFrom,
-      transformNumericSeparator,
-      transformThrowExpressions,
+      babelPlugins.proposalFunctionSent,
+      babelPlugins.proposalExportNamespaceFrom,
+      babelPlugins.proposalNumericSeparator,
+      babelPlugins.proposalThrowExpressions,
     ],
   };
 };
diff --git a/packages/babel-standalone/src/preset-stage-3.js b/packages/babel-standalone/src/preset-stage-3.js
index e16237dbcd4f..6885719f2fd2 100644
--- a/packages/babel-standalone/src/preset-stage-3.js
+++ b/packages/babel-standalone/src/preset-stage-3.js
@@ -1,9 +1,7 @@
-import syntaxDynamicImport from "@babel/plugin-syntax-dynamic-import";
-import syntaxImportMeta from "@babel/plugin-syntax-import-meta";
-import transformClassProperties from "@babel/plugin-proposal-class-properties";
-import transformJsonStrings from "@babel/plugin-proposal-json-strings";
+// @flow
+import * as babelPlugins from "./generated/plugins";
 
-export default (_, opts) => {
+export default (_: any, opts: Object) => {
   let loose = false;
 
   if (opts !== undefined) {
@@ -12,10 +10,11 @@ export default (_, opts) => {
 
   return {
     plugins: [
-      syntaxDynamicImport,
-      syntaxImportMeta,
-      [transformClassProperties, { loose }],
-      transformJsonStrings,
+      babelPlugins.syntaxDynamicImport,
+      babelPlugins.syntaxImportMeta,
+      [babelPlugins.proposalClassProperties, { loose }],
+      babelPlugins.proposalJsonStrings,
+      [babelPlugins.proposalPrivateMethods, { loose }],
     ],
   };
 };
diff --git a/packages/babel-template/package.json b/packages/babel-template/package.json
index 365a922cda31..40c19ddee051 100644
--- a/packages/babel-template/package.json
+++ b/packages/babel-template/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/template",
-  "version": "7.1.0",
+  "version": "7.4.4",
   "description": "Generate an AST from a string template.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -12,7 +12,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/code-frame": "^7.0.0",
-    "@babel/parser": "^7.1.0",
-    "@babel/types": "^7.0.0"
+    "@babel/parser": "^7.4.4",
+    "@babel/types": "^7.4.4"
   }
 }
diff --git a/packages/babel-template/src/index.js b/packages/babel-template/src/index.js
index d3946dfb59e4..7322d9ab99f2 100644
--- a/packages/babel-template/src/index.js
+++ b/packages/babel-template/src/index.js
@@ -3,11 +3,11 @@
 import * as formatters from "./formatters";
 import createTemplateBuilder from "./builder";
 
-export const smart = createTemplateBuilder(formatters.smart);
-export const statement = createTemplateBuilder(formatters.statement);
-export const statements = createTemplateBuilder(formatters.statements);
-export const expression = createTemplateBuilder(formatters.expression);
-export const program = createTemplateBuilder(formatters.program);
+export const smart = createTemplateBuilder<*>(formatters.smart);
+export const statement = createTemplateBuilder<*>(formatters.statement);
+export const statements = createTemplateBuilder<*>(formatters.statements);
+export const expression = createTemplateBuilder<*>(formatters.expression);
+export const program = createTemplateBuilder<*>(formatters.program);
 
 type DefaultTemplateBuilder = typeof smart & {
   smart: typeof smart,
diff --git a/packages/babel-template/src/literal.js b/packages/babel-template/src/literal.js
index ef78142497a1..0cc7415e72fa 100644
--- a/packages/babel-template/src/literal.js
+++ b/packages/babel-template/src/literal.js
@@ -74,6 +74,7 @@ function buildLiteralData<T>(
       ),
       placeholderPattern: opts.placeholderPattern,
       preserveComments: opts.preserveComments,
+      syntacticPlaceholders: opts.syntacticPlaceholders,
     });
   } while (
     metadata.placeholders.some(
diff --git a/packages/babel-template/src/options.js b/packages/babel-template/src/options.js
index fa1e275a64e9..cb2639319e51 100644
--- a/packages/babel-template/src/options.js
+++ b/packages/babel-template/src/options.js
@@ -1,5 +1,9 @@
 // @flow
 
+import type { Options as ParserOpts } from "@babel/parser/src/options";
+
+export type { ParserOpts };
+
 /**
  * These are the options that 'babel-template' actually accepts and typechecks
  * when called. All other options are passed through to the parser.
@@ -8,6 +12,8 @@ export type PublicOpts = {
   /**
    * A set of placeholder names to automatically accept, ignoring the given
    * pattern entirely.
+   *
+   * This option can be used when using %%foo%% style placeholders.
    */
   placeholderWhitelist?: ?Set<string>,
 
@@ -19,6 +25,8 @@ export type PublicOpts = {
    * 'placeholderWhitelist' value to find replacements.
    *
    * Defaults to /^[_$A-Z0-9]+$/.
+   *
+   * This option can be used when using %%foo%% style placeholders.
    */
   placeholderPattern?: ?(RegExp | false),
 
@@ -27,13 +35,22 @@ export type PublicOpts = {
    * or 'false' to automatically discard comments. Defaults to 'false'.
    */
   preserveComments?: ?boolean,
+
+  /**
+   * 'true' to use %%foo%% style placeholders, 'false' to use legacy placeholders
+   * described by placeholderPattern or placeholderWhitelist.
+   * When it is not set, it behaves as 'true' if there are syntactic placeholders,
+   * otherwise as 'false'.
+   */
+  syntacticPlaceholders?: ?boolean,
 };
 
 export type TemplateOpts = {|
-  parser: {},
+  parser: ParserOpts,
   placeholderWhitelist: Set<string> | void,
   placeholderPattern: RegExp | false | void,
   preserveComments: boolean | void,
+  syntacticPlaceholders: boolean | void,
 |};
 
 export function merge(a: TemplateOpts, b: TemplateOpts): TemplateOpts {
@@ -41,6 +58,7 @@ export function merge(a: TemplateOpts, b: TemplateOpts): TemplateOpts {
     placeholderWhitelist = a.placeholderWhitelist,
     placeholderPattern = a.placeholderPattern,
     preserveComments = a.preserveComments,
+    syntacticPlaceholders = a.syntacticPlaceholders,
   } = b;
 
   return {
@@ -51,6 +69,7 @@ export function merge(a: TemplateOpts, b: TemplateOpts): TemplateOpts {
     placeholderWhitelist,
     placeholderPattern,
     preserveComments,
+    syntacticPlaceholders,
   };
 }
 
@@ -63,9 +82,9 @@ export function validate(opts: mixed): TemplateOpts {
     placeholderWhitelist,
     placeholderPattern,
     preserveComments,
+    syntacticPlaceholders,
     ...parser
-  } =
-    opts || {};
+  } = opts || {};
 
   if (placeholderWhitelist != null && !(placeholderWhitelist instanceof Set)) {
     throw new Error(
@@ -89,12 +108,32 @@ export function validate(opts: mixed): TemplateOpts {
     );
   }
 
+  if (
+    syntacticPlaceholders != null &&
+    typeof syntacticPlaceholders !== "boolean"
+  ) {
+    throw new Error(
+      "'.syntacticPlaceholders' must be a boolean, null, or undefined",
+    );
+  }
+  if (
+    syntacticPlaceholders === true &&
+    (placeholderWhitelist != null || placeholderPattern != null)
+  ) {
+    throw new Error(
+      "'.placeholderWhitelist' and '.placeholderPattern' aren't compatible" +
+        " with '.syntacticPlaceholders: true'",
+    );
+  }
+
   return {
     parser,
     placeholderWhitelist: placeholderWhitelist || undefined,
     placeholderPattern:
       placeholderPattern == null ? undefined : placeholderPattern,
     preserveComments: preserveComments == null ? false : preserveComments,
+    syntacticPlaceholders:
+      syntacticPlaceholders == null ? undefined : syntacticPlaceholders,
   };
 }
 
diff --git a/packages/babel-template/src/parse.js b/packages/babel-template/src/parse.js
index 9186780f1cab..d4d54890482b 100644
--- a/packages/babel-template/src/parse.js
+++ b/packages/babel-template/src/parse.js
@@ -3,7 +3,7 @@ import * as t from "@babel/types";
 import type { TraversalAncestors, TraversalHandler } from "@babel/types";
 import { parse } from "@babel/parser";
 import { codeFrameColumns } from "@babel/code-frame";
-import type { TemplateOpts } from "./options";
+import type { TemplateOpts, ParserOpts } from "./options";
 import type { Formatter } from "./formatters";
 
 export type Metadata = {
@@ -31,8 +31,9 @@ export default function parseAndBuildMetadata<T>(
 
   const {
     placeholderWhitelist,
-    placeholderPattern = PATTERN,
+    placeholderPattern,
     preserveComments,
+    syntacticPlaceholders,
   } = opts;
 
   t.removePropertiesDeep(ast, {
@@ -41,20 +42,28 @@ export default function parseAndBuildMetadata<T>(
 
   formatter.validate(ast);
 
-  const placeholders = [];
-  const placeholderNames = new Set();
+  const syntactic = {
+    placeholders: [],
+    placeholderNames: new Set(),
+  };
+  const legacy = {
+    placeholders: [],
+    placeholderNames: new Set(),
+  };
+  const isLegacyRef = { value: undefined };
 
   t.traverse(ast, (placeholderVisitorHandler: TraversalHandler<*>), {
-    placeholders,
-    placeholderNames,
+    syntactic,
+    legacy,
+    isLegacyRef,
     placeholderWhitelist,
     placeholderPattern,
+    syntacticPlaceholders,
   });
 
   return {
     ast,
-    placeholders,
-    placeholderNames,
+    ...(isLegacyRef.value ? legacy : syntactic),
   };
 }
 
@@ -64,16 +73,45 @@ function placeholderVisitorHandler(
   state: MetadataState,
 ) {
   let name;
-  if (t.isIdentifier(node) || t.isJSXIdentifier(node)) {
+
+  if (t.isPlaceholder(node)) {
+    if (state.syntacticPlaceholders === false) {
+      throw new Error(
+        "%%foo%%-style placeholders can't be used when " +
+          "'.syntacticPlaceholders' is false.",
+      );
+    } else {
+      name = ((node: any).name: BabelNodeIdentifier).name;
+      state.isLegacyRef.value = false;
+    }
+  } else if (state.isLegacyRef.value === false || state.syntacticPlaceholders) {
+    return;
+  } else if (t.isIdentifier(node) || t.isJSXIdentifier(node)) {
     name = ((node: any): BabelNodeIdentifier).name;
+    state.isLegacyRef.value = true;
   } else if (t.isStringLiteral(node)) {
     name = ((node: any): BabelNodeStringLiteral).value;
+    state.isLegacyRef.value = true;
   } else {
     return;
   }
 
   if (
-    (!state.placeholderPattern || !state.placeholderPattern.test(name)) &&
+    !state.isLegacyRef.value &&
+    (state.placeholderPattern != null || state.placeholderWhitelist != null)
+  ) {
+    // This check is also in options.js. We need it there to handle the default
+    // .syntacticPlaceholders behavior.
+    throw new Error(
+      "'.placeholderWhitelist' and '.placeholderPattern' aren't compatible" +
+        " with '.syntacticPlaceholders: true'",
+    );
+  }
+
+  if (
+    state.isLegacyRef.value &&
+    (state.placeholderPattern === false ||
+      !(state.placeholderPattern || PATTERN).test(name)) &&
     (!state.placeholderWhitelist || !state.placeholderWhitelist.has(name))
   ) {
     return;
@@ -85,7 +123,10 @@ function placeholderVisitorHandler(
   const { node: parent, key } = ancestors[ancestors.length - 1];
 
   let type: PlaceholderType;
-  if (t.isStringLiteral(node)) {
+  if (
+    t.isStringLiteral(node) ||
+    t.isPlaceholder(node, { expectedNode: "StringLiteral" })
+  ) {
     type = "string";
   } else if (
     (t.isNewExpression(parent) && key === "arguments") ||
@@ -93,20 +134,26 @@ function placeholderVisitorHandler(
     (t.isFunction(parent) && key === "params")
   ) {
     type = "param";
-  } else if (t.isExpressionStatement(parent)) {
+  } else if (t.isExpressionStatement(parent) && !t.isPlaceholder(node)) {
     type = "statement";
     ancestors = ancestors.slice(0, -1);
+  } else if (t.isStatement(node) && t.isPlaceholder(node)) {
+    type = "statement";
   } else {
     type = "other";
   }
 
-  state.placeholders.push({
+  const { placeholders, placeholderNames } = state.isLegacyRef.value
+    ? state.legacy
+    : state.syntactic;
+
+  placeholders.push({
     name,
     type,
     resolve: ast => resolveAncestors(ast, ancestors),
-    isDuplicate: state.placeholderNames.has(name),
+    isDuplicate: placeholderNames.has(name),
   });
-  state.placeholderNames.add(name);
+  placeholderNames.add(name);
 }
 
 function resolveAncestors(ast: BabelNodeFile, ancestors: TraversalAncestors) {
@@ -127,18 +174,30 @@ function resolveAncestors(ast: BabelNodeFile, ancestors: TraversalAncestors) {
 }
 
 type MetadataState = {
-  placeholders: Array<Placeholder>,
-  placeholderNames: Set<string>,
+  syntactic: {
+    placeholders: Array<Placeholder>,
+    placeholderNames: Set<string>,
+  },
+  legacy: {
+    placeholders: Array<Placeholder>,
+    placeholderNames: Set<string>,
+  },
+  isLegacyRef: { value: boolean | void },
   placeholderWhitelist: Set<string> | void,
-  placeholderPattern: RegExp | false,
+  placeholderPattern: RegExp | false | void,
+  syntacticPlaceholders: boolean | void,
 };
 
-function parseWithCodeFrame(code: string, parserOpts: {}): BabelNodeFile {
+function parseWithCodeFrame(
+  code: string,
+  parserOpts: ParserOpts,
+): BabelNodeFile {
   parserOpts = {
     allowReturnOutsideFunction: true,
     allowSuperOutsideMethod: true,
     sourceType: "module",
     ...parserOpts,
+    plugins: (parserOpts.plugins || []).concat("placeholders"),
   };
 
   try {
diff --git a/packages/babel-template/test/index.js b/packages/babel-template/test/index.js
index 854ad2f4b5f9..a90db40540e4 100644
--- a/packages/babel-template/test/index.js
+++ b/packages/babel-template/test/index.js
@@ -218,4 +218,105 @@ describe("@babel/template", function() {
       expect(generator(result).code).toEqual("<div>{'content'}</div>");
     });
   });
+
+  describe.only(".syntacticPlaceholders", () => {
+    it("works in function body", () => {
+      const output = template(`function f() %%A%%`)({
+        A: t.blockStatement([]),
+      });
+      expect(generator(output).code).toMatchInlineSnapshot(`"function f() {}"`);
+    });
+
+    it("works in class body", () => {
+      const output = template(`class C %%A%%`)({
+        A: t.classBody([]),
+      });
+      expect(generator(output).code).toMatchInlineSnapshot(`"class C {}"`);
+    });
+
+    it("replaces lowercase names", () => {
+      const output = template(`%%foo%%`)({
+        foo: t.numericLiteral(1),
+      });
+      expect(generator(output).code).toMatchInlineSnapshot(`"1;"`);
+    });
+
+    it("pattern", () => {
+      expect(() => {
+        template(`%%A%% + %%B%%`, {
+          placeholderPattern: /B/,
+        })();
+      }).toThrow(/aren't compatible with '.syntacticPlaceholders: true'/);
+    });
+
+    it("whitelist", () => {
+      expect(() => {
+        template(`%%A%% + %%B%%`, {
+          placeholderPattern: false,
+          placeholderWhitelist: new Set(["B"]),
+        })();
+      }).toThrow(/aren't compatible with '.syntacticPlaceholders: true'/);
+    });
+
+    describe("option value", () => {
+      describe("true", () => {
+        it("allows placeholders", () => {
+          const output = template(`%%FOO%%`, { syntacticPlaceholders: true })({
+            FOO: t.numericLiteral(1),
+          });
+          expect(generator(output).code).toMatchInlineSnapshot(`"1;"`);
+        });
+
+        it("doesn't replace identifiers", () => {
+          expect(() => {
+            template(`FOO`, { syntacticPlaceholders: true })({
+              FOO: t.numericLiteral(1),
+            });
+          }).toThrow(/Unknown substitution/);
+        });
+      });
+
+      describe("false", () => {
+        it("disallow placeholders", () => {
+          expect(() => {
+            template(`%%FOO%%`, { syntacticPlaceholders: false })({
+              FOO: t.numericLiteral(1),
+            });
+          }).toThrow(/%%.*placeholders can't be used/);
+        });
+
+        it("replaces identifiers", () => {
+          const output = template(`FOO`, { syntacticPlaceholders: false })({
+            FOO: t.numericLiteral(1),
+          });
+          expect(generator(output).code).toMatchInlineSnapshot(`"1;"`);
+        });
+      });
+
+      describe("undefined", () => {
+        it("allows placeholders", () => {
+          const output = template(`%%FOO%%`)({
+            FOO: t.numericLiteral(1),
+          });
+          expect(generator(output).code).toMatchInlineSnapshot(`"1;"`);
+        });
+
+        it("replaces identifiers", () => {
+          expect(() => {
+            const output = template(`FOO`)({
+              FOO: t.numericLiteral(1),
+            });
+            expect(generator(output).code).toMatchInlineSnapshot(`"1;"`);
+          });
+        });
+
+        it("doesn't mix placeholder styles", () => {
+          const output = template(`FOO + %%FOO%%`)({
+            FOO: t.numericLiteral(1),
+          });
+          expect(generator(output).code).toMatchInlineSnapshot(`"FOO + 1;"`);
+        });
+      });
+    });
+  });
 });
diff --git a/packages/babel-traverse/package.json b/packages/babel-traverse/package.json
index 9468d832c4c6..ea0fee988408 100644
--- a/packages/babel-traverse/package.json
+++ b/packages/babel-traverse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/traverse",
-  "version": "7.1.0",
+  "version": "7.5.5",
   "description": "The Babel Traverse module maintains the overall tree state, and is responsible for replacing, removing, and adding nodes",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -11,15 +11,15 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-traverse",
   "main": "lib/index.js",
   "dependencies": {
-    "@babel/code-frame": "^7.0.0",
-    "@babel/generator": "^7.0.0",
+    "@babel/code-frame": "^7.5.5",
+    "@babel/generator": "^7.5.5",
     "@babel/helper-function-name": "^7.1.0",
-    "@babel/helper-split-export-declaration": "^7.0.0",
-    "@babel/parser": "^7.1.0",
-    "@babel/types": "^7.0.0",
-    "debug": "^3.1.0",
+    "@babel/helper-split-export-declaration": "^7.4.4",
+    "@babel/parser": "^7.5.5",
+    "@babel/types": "^7.5.5",
+    "debug": "^4.1.0",
     "globals": "^11.1.0",
-    "lodash": "^4.17.10"
+    "lodash": "^4.17.13"
   },
   "devDependencies": {
     "@babel/helper-plugin-test-runner": "^7.0.0"
diff --git a/packages/babel-traverse/src/path/context.js b/packages/babel-traverse/src/path/context.js
index a97045e10f16..faa5e9d3f15e 100644
--- a/packages/babel-traverse/src/path/context.js
+++ b/packages/babel-traverse/src/path/context.js
@@ -31,7 +31,7 @@ export function _call(fns?: Array<Function>): boolean {
     if (ret && typeof ret === "object" && typeof ret.then === "function") {
       throw new Error(
         `You appear to be using a plugin with an async traversal visitor, ` +
-          `which your current version of Babel does not support.` +
+          `which your current version of Babel does not support. ` +
           `If you're using a published plugin, you may need to upgrade ` +
           `your @babel/core version.`,
       );
@@ -169,7 +169,7 @@ export function _resyncKey() {
       }
     }
   } else {
-    for (const key in this.container) {
+    for (const key of Object.keys(this.container)) {
       if (this.container[key] === this.node) {
         return this.setKey(key);
       }
diff --git a/packages/babel-traverse/src/path/conversion.js b/packages/babel-traverse/src/path/conversion.js
index cf45cc320b2b..99a2b00a733c 100644
--- a/packages/babel-traverse/src/path/conversion.js
+++ b/packages/babel-traverse/src/path/conversion.js
@@ -200,7 +200,6 @@ function hoistFunctionEnvironment(
         child.skip();
       },
       ClassProperty(child) {
-        if (child.node.static) return;
         child.skip();
       },
       CallExpression(child) {
@@ -453,7 +452,6 @@ function getThisBinding(thisEnvFn, inConstructor) {
         child.skip();
       },
       ClassProperty(child) {
-        if (child.node.static) return;
         child.skip();
       },
       CallExpression(child) {
@@ -461,9 +459,14 @@ function getThisBinding(thisEnvFn, inConstructor) {
         if (supers.has(child.node)) return;
         supers.add(child.node);
 
-        child.replaceWith(
-          t.assignmentExpression("=", t.identifier(thisBinding), child.node),
-        );
+        child.replaceWithMultiple([
+          child.node,
+          t.assignmentExpression(
+            "=",
+            t.identifier(thisBinding),
+            t.identifier("this"),
+          ),
+        ]);
       },
     });
   });
@@ -576,7 +579,6 @@ function getScopeInformation(fnPath) {
 
   fnPath.traverse({
     ClassProperty(child) {
-      if (child.node.static) return;
       child.skip();
     },
     Function(child) {
diff --git a/packages/babel-traverse/src/path/evaluation.js b/packages/babel-traverse/src/path/evaluation.js
index 90029cbe1e3c..a970bd9aee73 100644
--- a/packages/babel-traverse/src/path/evaluation.js
+++ b/packages/babel-traverse/src/path/evaluation.js
@@ -257,7 +257,7 @@ function _evaluate(path, state) {
   }
 
   if (path.isLogicalExpression()) {
-    // If we are confident that one side of an && is false, or the left
+    // If we are confident that the left side of an && is false, or the left
     // side of an || is true, we can be confident about the entire expression
     const wasConfident = state.confident;
     const left = evaluateCached(path.get("left"), state);
@@ -265,25 +265,17 @@ function _evaluate(path, state) {
     state.confident = wasConfident;
     const right = evaluateCached(path.get("right"), state);
     const rightConfident = state.confident;
-    state.confident = leftConfident && rightConfident;
 
     switch (node.operator) {
       case "||":
         // TODO consider having a "truthy type" that doesn't bail on
         // left uncertainty but can still evaluate to truthy.
-        if (left && leftConfident) {
-          state.confident = true;
-          return left;
-        }
-
+        state.confident = leftConfident && (!!left || rightConfident);
         if (!state.confident) return;
 
         return left || right;
       case "&&":
-        if ((!left && leftConfident) || (!right && rightConfident)) {
-          state.confident = true;
-        }
-
+        state.confident = leftConfident && (!left || rightConfident);
         if (!state.confident) return;
 
         return left && right;
diff --git a/packages/babel-traverse/src/path/family.js b/packages/babel-traverse/src/path/family.js
index 6ef3f4535cb6..0af3d2b110cb 100644
--- a/packages/babel-traverse/src/path/family.js
+++ b/packages/babel-traverse/src/path/family.js
@@ -1,3 +1,4 @@
+// @flow
 // This file contains methods responsible for dealing with/retrieving children or siblings.
 
 import type TraversalContext from "../index";
@@ -17,7 +18,7 @@ function addCompletionRecords(path, paths) {
   return paths;
 }
 
-export function getCompletionRecords(): Array {
+export function getCompletionRecords(): NodePath[] {
   let paths = [];
 
   if (this.isIfStatement()) {
@@ -42,7 +43,7 @@ export function getCompletionRecords(): Array {
   return paths;
 }
 
-export function getSibling(key): NodePath {
+export function getSibling(key: string): NodePath {
   return NodePath.get({
     parentPath: this.parentPath,
     parent: this.parent,
@@ -60,10 +61,10 @@ export function getNextSibling(): NodePath {
   return this.getSibling(this.key + 1);
 }
 
-export function getAllNextSiblings(): Array<NodePath> {
+export function getAllNextSiblings(): NodePath[] {
   let _key = this.key;
-  let sibling: NodePath = this.getSibling(++_key);
-  const siblings: Array<NodePath> = [];
+  let sibling = this.getSibling(++_key);
+  const siblings = [];
   while (sibling.node) {
     siblings.push(sibling);
     sibling = this.getSibling(++_key);
@@ -71,10 +72,10 @@ export function getAllNextSiblings(): Array<NodePath> {
   return siblings;
 }
 
-export function getAllPrevSiblings(): Array<NodePath> {
+export function getAllPrevSiblings(): NodePath[] {
   let _key = this.key;
-  let sibling: NodePath = this.getSibling(--_key);
-  const siblings: Array<NodePath> = [];
+  let sibling = this.getSibling(--_key);
+  const siblings = [];
   while (sibling.node) {
     siblings.push(sibling);
     sibling = this.getSibling(--_key);
@@ -85,7 +86,7 @@ export function getAllPrevSiblings(): Array<NodePath> {
 export function get(
   key: string,
   context?: boolean | TraversalContext,
-): NodePath {
+): NodePath | NodePath[] {
   if (context === true) context = this.context;
   const parts = key.split(".");
   if (parts.length === 1) {
@@ -97,7 +98,10 @@ export function get(
   }
 }
 
-export function _getKey(key, context?) {
+export function _getKey(
+  key: string,
+  context?: TraversalContext,
+): NodePath | NodePath[] {
   const node = this.node;
   const container = node[key];
 
@@ -122,9 +126,12 @@ export function _getKey(key, context?) {
   }
 }
 
-export function _getPattern(parts, context) {
+export function _getPattern(
+  parts: string[],
+  context?: TraversalContext,
+): NodePath | NodePath[] {
   let path = this;
-  for (const part of (parts: Array)) {
+  for (const part of parts) {
     if (part === ".") {
       path = path.parentPath;
     } else {
@@ -138,11 +145,11 @@ export function _getPattern(parts, context) {
   return path;
 }
 
-export function getBindingIdentifiers(duplicates?): Object {
+export function getBindingIdentifiers(duplicates?: boolean): Object {
   return t.getBindingIdentifiers(this.node, duplicates);
 }
 
-export function getOuterBindingIdentifiers(duplicates?): Object {
+export function getOuterBindingIdentifiers(duplicates?: boolean): Object {
   return t.getOuterBindingIdentifiers(this.node, duplicates);
 }
 
@@ -150,9 +157,9 @@ export function getOuterBindingIdentifiers(duplicates?): Object {
 // path.getBindingIdentifiers returns nodes where the following re-implementation
 // returns paths
 export function getBindingIdentifierPaths(
-  duplicates = false,
-  outerOnly = false,
-) {
+  duplicates?: boolean = false,
+  outerOnly?: boolean = false,
+): { [string]: NodePath } {
   const path = this;
   let search = [].concat(path);
   const ids = Object.create(null);
@@ -203,9 +210,12 @@ export function getBindingIdentifierPaths(
     }
   }
 
+  // $FlowIssue Object.create() is object type
   return ids;
 }
 
-export function getOuterBindingIdentifierPaths(duplicates?) {
+export function getOuterBindingIdentifierPaths(
+  duplicates?: boolean,
+): { [string]: NodePath } {
   return this.getBindingIdentifierPaths(duplicates, true);
 }
diff --git a/packages/babel-traverse/src/path/index.js b/packages/babel-traverse/src/path/index.js
index 506a25e95ded..a1be4f5d8d00 100644
--- a/packages/babel-traverse/src/path/index.js
+++ b/packages/babel-traverse/src/path/index.js
@@ -28,7 +28,7 @@ export default class NodePath {
     this.parent = parent;
     this.hub = hub;
     this.contexts = [];
-    this.data = {};
+    this.data = Object.create(null);
     this.shouldSkip = false;
     this.shouldStop = false;
     this.removed = false;
@@ -116,7 +116,7 @@ export default class NodePath {
 
   getData(key: string, def?: any): any {
     let val = this.data[key];
-    if (!val && def) val = this.data[key] = def;
+    if (val === undefined && def !== undefined) val = this.data[key] = def;
     return val;
   }
 
@@ -183,7 +183,7 @@ for (const type of (t.TYPES: Array<string>)) {
   };
 }
 
-for (const type in virtualTypes) {
+for (const type of Object.keys(virtualTypes)) {
   if (type[0] === "_") continue;
   if (t.TYPES.indexOf(type) < 0) t.TYPES.push(type);
 
diff --git a/packages/babel-traverse/src/path/inference/inferer-reference.js b/packages/babel-traverse/src/path/inference/inferer-reference.js
index 1cac5e10641b..0af6f1eedb04 100644
--- a/packages/babel-traverse/src/path/inference/inferer-reference.js
+++ b/packages/babel-traverse/src/path/inference/inferer-reference.js
@@ -102,7 +102,7 @@ function getConstantViolationsBefore(binding, path, functions) {
   return violations.filter(violation => {
     violation = violation.resolve();
     const status = violation._guessExecutionStatusRelativeTo(path);
-    if (functions && status === "function") functions.push(violation);
+    if (functions && status === "unknown") functions.push(violation);
     return status === "before";
   });
 }
diff --git a/packages/babel-traverse/src/path/inference/inferers.js b/packages/babel-traverse/src/path/inference/inferers.js
index 2f8ab658389b..fb9a467b1f64 100644
--- a/packages/babel-traverse/src/path/inference/inferers.js
+++ b/packages/babel-traverse/src/path/inference/inferers.js
@@ -102,6 +102,10 @@ export function SequenceExpression() {
     .getTypeAnnotation();
 }
 
+export function ParenthesizedExpression() {
+  return this.get("expression").getTypeAnnotation();
+}
+
 export function AssignmentExpression() {
   return this.get("right").getTypeAnnotation();
 }
diff --git a/packages/babel-traverse/src/path/introspection.js b/packages/babel-traverse/src/path/introspection.js
index 0752bc88574d..5089b0a1d461 100644
--- a/packages/babel-traverse/src/path/introspection.js
+++ b/packages/babel-traverse/src/path/introspection.js
@@ -206,115 +206,208 @@ export function willIMaybeExecuteBefore(target) {
   return this._guessExecutionStatusRelativeTo(target) !== "after";
 }
 
+function getOuterFunction(path) {
+  return (path.scope.getFunctionParent() || path.scope.getProgramParent()).path;
+}
+
+function isExecutionUncertain(type, key) {
+  switch (type) {
+    // a && FOO
+    // a || FOO
+    case "LogicalExpression":
+      return key === "right";
+
+    // a ? FOO : FOO
+    // if (a) FOO; else FOO;
+    case "ConditionalExpression":
+    case "IfStatement":
+      return key === "consequent" || key === "alternate";
+
+    // while (a) FOO;
+    case "WhileStatement":
+    case "DoWhileStatement":
+    case "ForInStatement":
+    case "ForOfStatement":
+      return key === "body";
+
+    // for (a; b; FOO) FOO;
+    case "ForStatement":
+      return key === "body" || key === "update";
+
+    // switch (a) { FOO }
+    case "SwitchStatement":
+      return key === "cases";
+
+    // try { a } catch FOO finally { b }
+    case "TryStatement":
+      return key === "handler";
+
+    // var [ x = FOO ]
+    case "AssignmentPattern":
+      return key === "right";
+
+    // a?.[FOO]
+    case "OptionalMemberExpression":
+      return key === "property";
+
+    // a?.(FOO)
+    case "OptionalCallExpression":
+      return key === "arguments";
+
+    default:
+      return false;
+  }
+}
+
+function isExecutionUncertainInList(paths, maxIndex) {
+  for (let i = 0; i < maxIndex; i++) {
+    const path = paths[i];
+    if (isExecutionUncertain(path.parent.type, path.parentKey)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// TODO (Babel 8)
+// This can be { before: boolean, after: boolean, unknown: boolean }.
+// This allows transforms like the tdz one to treat cases when the status
+// is both before and unknown/after like if it were before.
+type RelativeExecutionStatus = "before" | "after" | "unknown";
+
 /**
  * Given a `target` check the execution status of it relative to the current path.
  *
- * "Execution status" simply refers to where or not we **think** this will execuete
+ * "Execution status" simply refers to where or not we **think** this will execute
  * before or after the input `target` element.
  */
 
-export function _guessExecutionStatusRelativeTo(target) {
+export function _guessExecutionStatusRelativeTo(
+  target: NodePath,
+): RelativeExecutionStatus {
   // check if the two paths are in different functions, we can't track execution of these
-  const targetFuncParent =
-    target.scope.getFunctionParent() || target.scope.getProgramParent();
-  const selfFuncParent =
-    this.scope.getFunctionParent() || target.scope.getProgramParent();
+  const funcParent = {
+    this: getOuterFunction(this),
+    target: getOuterFunction(target),
+  };
 
   // here we check the `node` equality as sometimes we may have different paths for the
   // same node due to path thrashing
-  if (targetFuncParent.node !== selfFuncParent.node) {
-    const status = this._guessExecutionStatusRelativeToDifferentFunctions(
-      targetFuncParent,
+  if (funcParent.target.node !== funcParent.this.node) {
+    return this._guessExecutionStatusRelativeToDifferentFunctions(
+      funcParent.target,
     );
-    if (status) {
-      return status;
-    } else {
-      target = targetFuncParent.path;
-    }
   }
 
-  const targetPaths = target.getAncestry();
-  if (targetPaths.indexOf(this) >= 0) return "after";
+  const paths = {
+    target: target.getAncestry(),
+    this: this.getAncestry(),
+  };
 
-  const selfPaths = this.getAncestry();
+  // If this is an ancestor of the target path,
+  // e.g. f(g); where this is f and target is g.
+  if (paths.target.indexOf(this) >= 0) return "after";
+  if (paths.this.indexOf(target) >= 0) return "before";
 
   // get ancestor where the branches intersect
   let commonPath;
-  let targetIndex;
-  let selfIndex;
-  for (selfIndex = 0; selfIndex < selfPaths.length; selfIndex++) {
-    const selfPath = selfPaths[selfIndex];
-    targetIndex = targetPaths.indexOf(selfPath);
-    if (targetIndex >= 0) {
-      commonPath = selfPath;
-      break;
+  const commonIndex = { target: 0, this: 0 };
+
+  while (!commonPath && commonIndex.this < paths.this.length) {
+    const path = paths.this[commonIndex.this];
+    commonIndex.target = paths.target.indexOf(path);
+    if (commonIndex.target >= 0) {
+      commonPath = path;
+    } else {
+      commonIndex.this++;
     }
   }
+
   if (!commonPath) {
-    return "before";
+    throw new Error(
+      "Internal Babel error - The two compared nodes" +
+        " don't appear to belong to the same program.",
+    );
   }
 
-  // get the relationship paths that associate these nodes to their common ancestor
-  const targetRelationship = targetPaths[targetIndex - 1];
-  const selfRelationship = selfPaths[selfIndex - 1];
-  if (!targetRelationship || !selfRelationship) {
-    return "before";
+  if (
+    isExecutionUncertainInList(paths.this, commonIndex.this - 1) ||
+    isExecutionUncertainInList(paths.target, commonIndex.target - 1)
+  ) {
+    return "unknown";
   }
 
+  const divergence = {
+    this: paths.this[commonIndex.this - 1],
+    target: paths.target[commonIndex.target - 1],
+  };
+
   // container list so let's see which one is after the other
+  // e.g. [ THIS, TARGET ]
   if (
-    targetRelationship.listKey &&
-    targetRelationship.container === selfRelationship.container
+    divergence.target.listKey &&
+    divergence.this.listKey &&
+    divergence.target.container === divergence.this.container
   ) {
-    return targetRelationship.key > selfRelationship.key ? "before" : "after";
+    return divergence.target.key > divergence.this.key ? "before" : "after";
   }
 
   // otherwise we're associated by a parent node, check which key comes before the other
   const keys = t.VISITOR_KEYS[commonPath.type];
-  const targetKeyPosition = keys.indexOf(targetRelationship.key);
-  const selfKeyPosition = keys.indexOf(selfRelationship.key);
-  return targetKeyPosition > selfKeyPosition ? "before" : "after";
+  const keyPosition = {
+    this: keys.indexOf(divergence.this.parentKey),
+    target: keys.indexOf(divergence.target.parentKey),
+  };
+  return keyPosition.target > keyPosition.this ? "before" : "after";
 }
 
+// Used to avoid infinite recursion in cases like
+//   function f() { if (false) f(); }
+//   f();
+// It also works with indirect recursion.
+const executionOrderCheckedNodes = new WeakSet();
+
 export function _guessExecutionStatusRelativeToDifferentFunctions(
-  targetFuncParent,
-) {
-  const targetFuncPath = targetFuncParent.path;
-  if (!targetFuncPath.isFunctionDeclaration()) return;
+  target: NodePath,
+): RelativeExecutionStatus {
+  if (!target.isFunctionDeclaration()) return "unknown";
 
   // so we're in a completely different function, if this is a function declaration
   // then we can be a bit smarter and handle cases where the function is either
   // a. not called at all (part of an export)
   // b. called directly
-  const binding = targetFuncPath.scope.getBinding(targetFuncPath.node.id.name);
+  const binding = target.scope.getBinding(target.node.id.name);
 
   // no references!
   if (!binding.references) return "before";
 
   const referencePaths: Array<NodePath> = binding.referencePaths;
 
-  // verify that all of the references are calls
-  for (const path of referencePaths) {
-    if (path.key !== "callee" || !path.parentPath.isCallExpression()) {
-      return;
-    }
-  }
-
   let allStatus;
 
   // verify that all the calls have the same execution status
   for (const path of referencePaths) {
     // if a reference is a child of the function we're checking against then we can
-    // safelty ignore it
-    const childOfFunction = !!path.find(
-      path => path.node === targetFuncPath.node,
-    );
+    // safely ignore it
+    const childOfFunction = !!path.find(path => path.node === target.node);
     if (childOfFunction) continue;
 
+    if (path.key !== "callee" || !path.parentPath.isCallExpression()) {
+      // This function is passed as a reference, so we don't
+      // know when it will be called.
+      return "unknown";
+    }
+
+    // Prevent infinte loops in recursive functions
+    if (executionOrderCheckedNodes.has(path.node)) continue;
+    executionOrderCheckedNodes.add(path.node);
+
     const status = this._guessExecutionStatusRelativeTo(path);
 
-    if (allStatus) {
-      if (allStatus !== status) return;
+    executionOrderCheckedNodes.delete(path.node);
+
+    if (allStatus && allStatus !== status) {
+      return "unknown";
     } else {
       allStatus = status;
     }
diff --git a/packages/babel-traverse/src/path/lib/hoister.js b/packages/babel-traverse/src/path/lib/hoister.js
index edd27385105d..2fd8339eaa7d 100644
--- a/packages/babel-traverse/src/path/lib/hoister.js
+++ b/packages/babel-traverse/src/path/lib/hoister.js
@@ -58,7 +58,7 @@ export default class PathHoister {
 
   // A scope is compatible if all required bindings are reachable.
   isCompatibleScope(scope) {
-    for (const key in this.bindings) {
+    for (const key of Object.keys(this.bindings)) {
       const binding = this.bindings[key];
       if (!scope.bindingIdentifierEquals(key, binding.identifier)) {
         return false;
@@ -98,7 +98,7 @@ export default class PathHoister {
 
     // avoid hoisting to a scope that contains bindings that are executed after our attachment path
     if (targetScope.path.isProgram() || targetScope.path.isFunction()) {
-      for (const name in this.bindings) {
+      for (const name of Object.keys(this.bindings)) {
         // check binding is a direct child of this paths scope
         if (!targetScope.hasOwnBinding(name)) continue;
 
@@ -182,7 +182,7 @@ export default class PathHoister {
 
   // Returns true if a scope has param bindings.
   hasOwnParamBindings(scope) {
-    for (const name in this.bindings) {
+    for (const name of Object.keys(this.bindings)) {
       if (!scope.hasOwnBinding(name)) continue;
 
       const binding = this.bindings[name];
diff --git a/packages/babel-traverse/src/path/lib/virtual-types.js b/packages/babel-traverse/src/path/lib/virtual-types.js
index 35319f6ee894..97cec0e3af99 100644
--- a/packages/babel-traverse/src/path/lib/virtual-types.js
+++ b/packages/babel-traverse/src/path/lib/virtual-types.js
@@ -4,7 +4,8 @@ import * as t from "@babel/types";
 
 export const ReferencedIdentifier = {
   types: ["Identifier", "JSXIdentifier"],
-  checkPath({ node, parent }: NodePath, opts?: Object): boolean {
+  checkPath(path: NodePath, opts?: Object): boolean {
+    const { node, parent } = path;
     if (!t.isIdentifier(node, opts) && !t.isJSXMemberExpression(parent, opts)) {
       if (t.isJSXIdentifier(node, opts)) {
         if (react.isCompatTag(node.name)) return false;
@@ -15,7 +16,7 @@ export const ReferencedIdentifier = {
     }
 
     // check if node is referenced
-    return t.isReferenced(node, parent);
+    return t.isReferenced(node, parent, path.parentPath.parent);
   },
 };
 
@@ -28,8 +29,10 @@ export const ReferencedMemberExpression = {
 
 export const BindingIdentifier = {
   types: ["Identifier"],
-  checkPath({ node, parent }: NodePath): boolean {
-    return t.isIdentifier(node) && t.isBinding(node, parent);
+  checkPath(path: NodePath): boolean {
+    const { node, parent } = path;
+    const grandparent = path.parentPath.parent;
+    return t.isIdentifier(node) && t.isBinding(node, parent, grandparent);
   },
 };
 
diff --git a/packages/babel-traverse/src/path/modification.js b/packages/babel-traverse/src/path/modification.js
index 0092a206522e..6039a94c6090 100644
--- a/packages/babel-traverse/src/path/modification.js
+++ b/packages/babel-traverse/src/path/modification.js
@@ -24,9 +24,7 @@ export function insertBefore(nodes) {
   ) {
     return parentPath.insertBefore(nodes);
   } else if (
-    (this.isNodeType("Expression") &&
-      this.listKey !== "params" &&
-      this.listKey !== "arguments") ||
+    (this.isNodeType("Expression") && !this.isJSXElement()) ||
     (parentPath.isForStatement() && this.key === "init")
   ) {
     if (this.node) nodes.push(this.node);
@@ -105,9 +103,19 @@ export function insertAfter(nodes) {
     parentPath.isExportNamedDeclaration() ||
     (parentPath.isExportDefaultDeclaration() && this.isDeclaration())
   ) {
-    return parentPath.insertAfter(nodes);
+    return parentPath.insertAfter(
+      nodes.map(node => {
+        // Usually after an expression we can safely insert another expression:
+        //   A.insertAfter(B)
+        //     foo = A;  -> foo = (A, B);
+        // If A is an expression statement, it isn't safe anymore so we need to
+        // convert B to an expression statement
+        //     A;        -> A; B // No semicolon! It could break if followed by [!
+        return t.isExpression(node) ? t.expressionStatement(node) : node;
+      }),
+    );
   } else if (
-    this.isNodeType("Expression") ||
+    (this.isNodeType("Expression") && !this.isJSXElement()) ||
     (parentPath.isForStatement() && this.key === "init")
   ) {
     if (this.node) {
@@ -210,7 +218,7 @@ export function unshiftContainer(listKey, nodes) {
     key: 0,
   });
 
-  return path.insertBefore(nodes);
+  return path._containerInsertBefore(nodes);
 }
 
 export function pushContainer(listKey, nodes) {
diff --git a/packages/babel-traverse/src/path/replacement.js b/packages/babel-traverse/src/path/replacement.js
index 07691853345e..f0e74dbc1172 100644
--- a/packages/babel-traverse/src/path/replacement.js
+++ b/packages/babel-traverse/src/path/replacement.js
@@ -15,7 +15,7 @@ const hoistVariablesVisitor = {
     if (path.node.kind !== "var") return;
 
     const bindings = path.getBindingIdentifiers();
-    for (const key in bindings) {
+    for (const key of Object.keys(bindings)) {
       path.scope.push({ id: bindings[key] });
     }
 
@@ -215,6 +215,10 @@ export function replaceExpressionWithStatements(nodes: Array<Object>) {
   if (toSequenceExpression) {
     return this.replaceWith(toSequenceExpression)[0].get("expressions");
   }
+
+  const functionParent = this.getFunctionParent();
+  const isParentAsync = functionParent && functionParent.is("async");
+
   const container = t.arrowFunctionExpression([], t.blockStatement(nodes));
 
   this.replaceWith(t.callExpression(container, []));
@@ -255,6 +259,19 @@ export function replaceExpressionWithStatements(nodes: Array<Object>) {
   const callee = this.get("callee");
   callee.arrowFunctionToExpression();
 
+  // (() => await xxx)() -> await (async () => await xxx)();
+  if (
+    isParentAsync &&
+    traverse.hasType(
+      this.get("callee.body").node,
+      "AwaitExpression",
+      t.FUNCTION_TYPES,
+    )
+  ) {
+    callee.set("async", true);
+    this.replaceWith(t.awaitExpression(this.node));
+  }
+
   return callee.get("body.body");
 }
 
diff --git a/packages/babel-traverse/src/scope/index.js b/packages/babel-traverse/src/scope/index.js
index b91eeeb25c4b..375d5827b970 100644
--- a/packages/babel-traverse/src/scope/index.js
+++ b/packages/babel-traverse/src/scope/index.js
@@ -97,8 +97,7 @@ const collectorVisitor = {
         if (binding) binding.reference(path);
       } else if (t.isVariableDeclaration(declar)) {
         for (const decl of (declar.declarations: Array<Object>)) {
-          const ids = t.getBindingIdentifiers(decl);
-          for (const name in ids) {
+          for (const name of Object.keys(t.getBindingIdentifiers(decl))) {
             const binding = scope.getBinding(name);
             if (binding) binding.reference(path);
           }
@@ -349,9 +348,6 @@ export default class Scope {
     // class expression
     if (local.kind === "local") return;
 
-    // ignore hoisted functions if there's also a local let
-    if (kind === "hoisted" && local.kind === "let") return;
-
     const duplicate =
       // don't allow duplicate bindings to exist alongside
       kind === "let" ||
@@ -391,7 +387,7 @@ export default class Scope {
     let scope = this;
     do {
       console.log("#", scope.block.type);
-      for (const name in scope.bindings) {
+      for (const name of Object.keys(scope.bindings)) {
         const binding = scope.bindings[name];
         console.log(" -", name, {
           constant: binding.constant,
@@ -497,13 +493,14 @@ export default class Scope {
     if (this.hasBinding("undefined")) {
       return t.unaryExpression("void", t.numericLiteral(0), true);
     } else {
+      // eslint-disable-next-line @babel/development/no-undefined-identifier
       return t.identifier("undefined");
     }
   }
 
   registerConstantViolation(path: NodePath) {
     const ids = path.getBindingIdentifiers();
-    for (const name in ids) {
+    for (const name of Object.keys(ids)) {
       const binding = this.getBinding(name);
       if (binding) binding.reassign(path);
     }
@@ -521,9 +518,9 @@ export default class Scope {
     }
 
     const parent = this.getProgramParent();
-    const ids = path.getBindingIdentifiers(true);
+    const ids = path.getOuterBindingIdentifiers(true);
 
-    for (const name in ids) {
+    for (const name of Object.keys(ids)) {
       for (const id of (ids[name]: Array<Object>)) {
         const local = this.getOwnBinding(name);
 
@@ -748,7 +745,7 @@ export default class Scope {
       // register undeclared bindings as globals
       const ids = path.getBindingIdentifiers();
       let programParent;
-      for (const name in ids) {
+      for (const name of Object.keys(ids)) {
         if (path.scope.getBinding(name)) continue;
 
         programParent = programParent || path.scope.getProgramParent();
@@ -888,7 +885,7 @@ export default class Scope {
     for (const kind of (arguments: Array)) {
       let scope = this;
       do {
-        for (const name in scope.bindings) {
+        for (const name of Object.keys(scope.bindings)) {
           const binding = scope.bindings[name];
           if (binding.kind === kind) ids[name] = binding;
         }
diff --git a/packages/babel-traverse/src/visitors.js b/packages/babel-traverse/src/visitors.js
index fd8a8ece29bd..77c1488d5d55 100644
--- a/packages/babel-traverse/src/visitors.js
+++ b/packages/babel-traverse/src/visitors.js
@@ -23,7 +23,7 @@ export function explode(visitor) {
   visitor._exploded = true;
 
   // normalise pipes
-  for (const nodeType in visitor) {
+  for (const nodeType of Object.keys(visitor)) {
     if (shouldIgnoreKey(nodeType)) continue;
 
     const parts: Array<string> = nodeType.split("|");
@@ -59,7 +59,7 @@ export function explode(visitor) {
 
     // wrap all the functions
     const fns = visitor[nodeType];
-    for (const type in fns) {
+    for (const type of Object.keys(fns)) {
       fns[type] = wrapCheck(wrapper, fns[type]);
     }
 
@@ -81,7 +81,7 @@ export function explode(visitor) {
   }
 
   // add aliases
-  for (const nodeType in visitor) {
+  for (const nodeType of Object.keys(visitor)) {
     if (shouldIgnoreKey(nodeType)) continue;
 
     const fns = visitor[nodeType];
@@ -111,7 +111,7 @@ export function explode(visitor) {
     }
   }
 
-  for (const nodeType in visitor) {
+  for (const nodeType of Object.keys(visitor)) {
     if (shouldIgnoreKey(nodeType)) continue;
 
     ensureCallbackArrays(visitor[nodeType]);
@@ -130,7 +130,7 @@ export function verify(visitor) {
     );
   }
 
-  for (const nodeType in visitor) {
+  for (const nodeType of Object.keys(visitor)) {
     if (nodeType === "enter" || nodeType === "exit") {
       validateVisitorMethods(nodeType, visitor[nodeType]);
     }
@@ -145,7 +145,7 @@ export function verify(visitor) {
 
     const visitors = visitor[nodeType];
     if (typeof visitors === "object") {
-      for (const visitorKey in visitors) {
+      for (const visitorKey of Object.keys(visitors)) {
         if (visitorKey === "enter" || visitorKey === "exit") {
           // verify that it just contains functions
           validateVisitorMethods(
@@ -189,7 +189,7 @@ export function merge(
 
     explode(visitor);
 
-    for (const type in visitor) {
+    for (const type of Object.keys(visitor)) {
       let visitorType = visitor[type];
 
       // if we have state or wrapper then overload the callbacks to take it
@@ -208,7 +208,7 @@ export function merge(
 function wrapWithStateOrWrapper(oldVisitor, state, wrapper: ?Function) {
   const newVisitor = {};
 
-  for (const key in oldVisitor) {
+  for (const key of Object.keys(oldVisitor)) {
     let fns = oldVisitor[key];
 
     // not an enter/exit array of callbacks
@@ -237,7 +237,7 @@ function wrapWithStateOrWrapper(oldVisitor, state, wrapper: ?Function) {
 }
 
 function ensureEntranceObjects(obj) {
-  for (const key in obj) {
+  for (const key of Object.keys(obj)) {
     if (shouldIgnoreKey(key)) continue;
 
     const fns = obj[key];
@@ -278,7 +278,7 @@ function shouldIgnoreKey(key) {
 }
 
 function mergePair(dest, src) {
-  for (const key in src) {
+  for (const key of Object.keys(src)) {
     dest[key] = [].concat(dest[key] || [], src[key]);
   }
 }
diff --git a/packages/babel-traverse/test/__snapshots__/scope.js.snap b/packages/babel-traverse/test/__snapshots__/scope.js.snap
new file mode 100644
index 000000000000..631ca61d5af7
--- /dev/null
+++ b/packages/babel-traverse/test/__snapshots__/scope.js.snap
@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`scope duplicate bindings catch const 1`] = `"Duplicate declaration \\"e\\""`;
+
+exports[`scope duplicate bindings catch let 1`] = `"Duplicate declaration \\"e\\""`;
+
+exports[`scope duplicate bindings global class/function 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global const/class 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global const/const 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global const/function 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global const/let 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global const/var 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global let/class 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global let/function 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global let/let 1`] = `"Duplicate declaration \\"foo\\""`;
+
+exports[`scope duplicate bindings global let/var 1`] = `"Duplicate declaration \\"foo\\""`;
diff --git a/packages/babel-traverse/test/arrow-transform.js b/packages/babel-traverse/test/arrow-transform.js
index d74ca8f71196..f21ba52ac3ec 100644
--- a/packages/babel-traverse/test/arrow-transform.js
+++ b/packages/babel-traverse/test/arrow-transform.js
@@ -65,7 +65,7 @@ describe("arrow function conversion", () => {
       _supercall();
       () => _supercall();
     `,
-      { methodName: "constructor" },
+      { methodName: "constructor", extend: true },
     );
   });
 
@@ -82,8 +82,8 @@ describe("arrow function conversion", () => {
       () => this;
     `,
       `
-      var _supercall = (..._args) => _this = super(..._args),
-          _this;
+      var _supercall = (..._args) => (super(..._args), _this = this),
+        _this;
 
       (function () {
         _supercall(345);
@@ -115,9 +115,10 @@ describe("arrow function conversion", () => {
       (function () {
         _this;
       });
-      _this = super();
+      super();
+      _this = this;
       this;
-      () => _this = super();
+      () => (super(), _this = this);
       () => this;
     `,
       { methodName: "constructor", extend: true },
@@ -144,9 +145,10 @@ describe("arrow function conversion", () => {
 
         _this;
       }).bind(_arrowCheckId);
-      _this = super();
+      super();
+      _this = this;
       this;
-      () => _this = super();
+      () => (super(), _this = this);
       () => this;
     `,
       {
diff --git a/packages/babel-traverse/test/evaluation.js b/packages/babel-traverse/test/evaluation.js
index 5c1b51beb02e..a9502b1c8025 100644
--- a/packages/babel-traverse/test/evaluation.js
+++ b/packages/babel-traverse/test/evaluation.js
@@ -40,6 +40,29 @@ describe("evaluation", function() {
     ).toBe(false);
   });
 
+  it("should short-circuit && and ||", function() {
+    expect(
+      getPath("x === 'y' || 42")
+        .get("body")[0]
+        .evaluate().confident,
+    ).toBe(false);
+    expect(
+      getPath("x === 'y' && 0")
+        .get("body")[0]
+        .evaluate().confident,
+    ).toBe(false);
+    expect(
+      getPath("42 || x === 'y'")
+        .get("body")[0]
+        .evaluate().value,
+    ).toBe(42);
+    expect(
+      getPath("0 && x === 'y'")
+        .get("body")[0]
+        .evaluate().value,
+    ).toBe(0);
+  });
+
   it("should work with repeated, indeterminate identifiers", function() {
     expect(
       getPath("var num = foo(); (num > 0 && num < 100);")
diff --git a/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/input.ts b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/input.ts
new file mode 100644
index 000000000000..06818eda99e8
--- /dev/null
+++ b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/input.ts
@@ -0,0 +1 @@
+let x: (number) => void;
diff --git a/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/options.json b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/options.json
new file mode 100644
index 000000000000..05760686b47b
--- /dev/null
+++ b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["syntax-typescript", "./plugin"]
+}
diff --git a/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/output.js b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/output.js
new file mode 100644
index 000000000000..a3d4a2a51514
--- /dev/null
+++ b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/output.js
@@ -0,0 +1 @@
+let x: (string) => void;
diff --git a/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/plugin.js b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/plugin.js
new file mode 100644
index 000000000000..b2294ab7014e
--- /dev/null
+++ b/packages/babel-traverse/test/fixtures/regression/visit-tsfunctiontype-parameters/plugin.js
@@ -0,0 +1,11 @@
+module.exports = function() {
+  return {
+    visitor: {
+      Identifier(path) {
+        if (path.node.name == "number") {
+          path.node.name = "string";
+        }
+      }
+    }
+  };
+}
diff --git a/packages/babel-traverse/test/inference.js b/packages/babel-traverse/test/inference.js
index 5c893545a72a..e3c55c23a436 100644
--- a/packages/babel-traverse/test/inference.js
+++ b/packages/babel-traverse/test/inference.js
@@ -3,7 +3,7 @@ import { parse } from "@babel/parser";
 import * as t from "@babel/types";
 
 function getPath(code) {
-  const ast = parse(code, { plugins: ["flow", "asyncGenerators"] });
+  const ast = parse(code, { plugins: ["flow"] });
   let path;
   traverse(ast, {
     Program: function(_path) {
diff --git a/packages/babel-traverse/test/modification.js b/packages/babel-traverse/test/modification.js
index 0f56fe5f9e42..a4ccc90823ab 100644
--- a/packages/babel-traverse/test/modification.js
+++ b/packages/babel-traverse/test/modification.js
@@ -36,6 +36,19 @@ describe("modification", function() {
 
       expect(generateCode(rootPath)).toBe("function test(a) {\n  b;\n}");
     });
+
+    it("properly handles more than one arguments", function() {
+      const code = "foo(a, b);";
+      const ast = parse(code);
+      traverse(ast, {
+        CallExpression: function(path) {
+          path.pushContainer("arguments", t.identifier("d"));
+          expect(generateCode(path)).toBe("foo(a, b, d);");
+          path.pushContainer("arguments", t.stringLiteral("s"));
+          expect(generateCode(path)).toBe(`foo(a, b, d, "s");`);
+        },
+      });
+    });
   });
   describe("unshiftContainer", function() {
     it("unshifts identifier into params", function() {
@@ -116,6 +129,32 @@ describe("modification", function() {
       );
     });
 
+    it("returns inserted path with nested JSXElement", function() {
+      const ast = parse("<div><span>foo</span></div>", {
+        plugins: ["jsx"],
+      });
+      let path;
+      traverse(ast, {
+        Program: function(_path) {
+          path = _path.get("body.0");
+        },
+        JSXElement: function(path) {
+          const tagName = path.node.openingElement.name.name;
+          if (tagName !== "span") return;
+          path.insertBefore(
+            t.JSXElement(
+              t.JSXOpeningElement(t.JSXIdentifier("div"), [], false),
+              t.JSXClosingElement(t.JSXIdentifier("div")),
+              [],
+            ),
+          );
+        },
+      });
+      expect(generateCode(path)).toBe(
+        "<div><div></div><span>foo</span></div>;",
+      );
+    });
+
     describe("when the parent is an export declaration inserts the node before", function() {
       it("the ExportNamedDeclaration", function() {
         const bodyPath = getPath("export function a() {}", {
@@ -200,6 +239,32 @@ describe("modification", function() {
       );
     });
 
+    it("returns inserted path with nested JSXElement", function() {
+      const ast = parse("<div><span>foo</span></div>", {
+        plugins: ["jsx"],
+      });
+      let path;
+      traverse(ast, {
+        Program: function(_path) {
+          path = _path.get("body.0");
+        },
+        JSXElement: function(path) {
+          const tagName = path.node.openingElement.name.name;
+          if (tagName !== "span") return;
+          path.insertAfter(
+            t.JSXElement(
+              t.JSXOpeningElement(t.JSXIdentifier("div"), [], false),
+              t.JSXClosingElement(t.JSXIdentifier("div")),
+              [],
+            ),
+          );
+        },
+      });
+      expect(generateCode(path)).toBe(
+        "<div><span>foo</span><div></div></div>;",
+      );
+    });
+
     describe("when the parent is an export declaration inserts the node after", function() {
       it("the ExportNamedDeclaration", function() {
         const bodyPath = getPath("export function a() {}", {
@@ -209,7 +274,9 @@ describe("modification", function() {
         fnPath.insertAfter(t.identifier("x"));
 
         expect(bodyPath.get("body")).toHaveLength(2);
-        expect(bodyPath.get("body.1").node).toEqual(t.identifier("x"));
+        expect(bodyPath.get("body.1").node).toEqual(
+          t.expressionStatement(t.identifier("x")),
+        );
       });
 
       it("the ExportDefaultDeclaration, if a declaration is exported", function() {
@@ -220,7 +287,9 @@ describe("modification", function() {
         fnPath.insertAfter(t.identifier("x"));
 
         expect(bodyPath.get("body")).toHaveLength(2);
-        expect(bodyPath.get("body.1").node).toEqual(t.identifier("x"));
+        expect(bodyPath.get("body.1").node).toEqual(
+          t.expressionStatement(t.identifier("x")),
+        );
       });
 
       it("the exported expression", function() {
diff --git a/packages/babel-traverse/test/path/index.js b/packages/babel-traverse/test/path/index.js
new file mode 100644
index 000000000000..5758a13cf838
--- /dev/null
+++ b/packages/babel-traverse/test/path/index.js
@@ -0,0 +1,43 @@
+import { NodePath } from "../../lib";
+
+describe("NodePath", () => {
+  describe("setData/getData", () => {
+    it("can set default value", () => {
+      const path = new NodePath({}, {});
+
+      expect(path.getData("foo", "test")).toBe("test");
+    });
+    it("can set false", () => {
+      const path = new NodePath({}, {});
+      path.setData("foo", false);
+
+      expect(path.getData("foo", true)).toBe(false);
+    });
+
+    it("can set true", () => {
+      const path = new NodePath({}, {});
+      path.setData("foo", true);
+
+      expect(path.getData("foo", false)).toBe(true);
+    });
+
+    it("can set null", () => {
+      const path = new NodePath({}, {});
+      path.setData("foo", null);
+
+      expect(path.getData("foo", true)).toBe(null);
+    });
+
+    it("can use false as default", () => {
+      const path = new NodePath({}, {});
+
+      expect(path.getData("foo", false)).toBe(false);
+    });
+
+    it("does not use object base properties", () => {
+      const path = new NodePath({}, {});
+
+      expect(path.getData("__proto__", "test")).toBe("test");
+    });
+  });
+});
diff --git a/packages/babel-traverse/test/scope.js b/packages/babel-traverse/test/scope.js
index c602c97b060f..aa7c0dba2752 100644
--- a/packages/babel-traverse/test/scope.js
+++ b/packages/babel-traverse/test/scope.js
@@ -1,8 +1,10 @@
-import traverse from "../lib";
+import traverse, { NodePath } from "../lib";
 import { parse } from "@babel/parser";
+import * as t from "@babel/types";
 
 function getPath(code, options) {
-  const ast = parse(code, options);
+  const ast =
+    typeof code === "string" ? parse(code, options) : createNode(code);
   let path;
   traverse(ast, {
     Program: function(_path) {
@@ -26,8 +28,27 @@ function getIdentifierPath(code) {
   return nodePath;
 }
 
-describe("scope", function() {
-  describe("binding paths", function() {
+function createNode(node) {
+  const ast = t.file(t.program(Array.isArray(node) ? node : [node]));
+
+  // This puts the path into the cache internally
+  // We afterwards traverse ast, as we need to start traversing
+  // at the File node and not the Program node
+  NodePath.get({
+    hub: {
+      buildError: (_, msg) => new Error(msg),
+    },
+    parentPath: null,
+    parent: ast,
+    container: ast,
+    key: "program",
+  }).setContext();
+
+  return ast;
+}
+
+describe("scope", () => {
+  describe("binding paths", () => {
     it("function declaration id", function() {
       expect(
         getPath("function foo() {}").scope.getBinding("foo").path.type,
@@ -250,4 +271,136 @@ describe("scope", function() {
       });
     });
   });
+
+  describe("duplicate bindings", () => {
+    /*
+     * These tests do not use the parser as the parser has
+     * its own scope tracking and we want to test the scope tracking
+     * of traverse here and see if it handles duplicate bindings correctly
+     */
+    describe("catch", () => {
+      // try {} catch (e) { let e; }
+      const createTryCatch = function(kind) {
+        return t.tryStatement(
+          t.blockStatement([]),
+          t.catchClause(
+            t.identifier("e"),
+            t.blockStatement([
+              t.variableDeclaration(kind, [
+                t.variableDeclarator(t.identifier("e"), t.stringLiteral("1")),
+              ]),
+            ]),
+          ),
+        );
+      };
+      ["let", "const"].forEach(name => {
+        it(name, () => {
+          const ast = createTryCatch(name);
+
+          expect(() => getPath(ast)).toThrowErrorMatchingSnapshot();
+        });
+      });
+
+      it("var", () => {
+        const ast = createTryCatch("var");
+
+        expect(() => getPath(ast)).not.toThrow();
+      });
+    });
+
+    ["let", "const"].forEach(name => {
+      it(`${name} and function in sub scope`, () => {
+        const ast = [
+          t.variableDeclaration(name, [
+            t.variableDeclarator(t.identifier("foo")),
+          ]),
+          t.blockStatement([
+            t.functionDeclaration(
+              t.identifier("foo"),
+              [],
+              t.blockStatement([]),
+            ),
+          ]),
+        ];
+
+        expect(() => getPath(ast)).not.toThrow();
+      });
+    });
+
+    describe("global", () => {
+      // node1, node2, success
+      // every line will run 2 tests `node1;node2;` and `node2;node1;`
+      // unless node1 === node2
+      const cases = [
+        ["const", "let", false],
+
+        ["const", "const", false],
+        ["const", "function", false],
+        ["const", "class", false],
+        ["const", "var", false],
+
+        ["let", "let", false],
+        ["let", "class", false],
+        ["let", "function", false],
+        ["let", "var", false],
+
+        //["var", "class", true],
+        ["var", "function", true],
+        ["var", "var", true],
+
+        ["class", "function", false],
+      ];
+
+      const createNode = function(kind) {
+        switch (kind) {
+          case "let":
+          case "const":
+          case "var":
+            return t.variableDeclaration(kind, [
+              t.variableDeclarator(t.identifier("foo")),
+            ]);
+          case "class":
+            return t.classDeclaration(
+              t.identifier("foo"),
+              null,
+              t.classBody([]),
+            );
+          case "function":
+            return t.functionDeclaration(
+              t.identifier("foo"),
+              [],
+              t.blockStatement([]),
+            );
+        }
+      };
+
+      const createAST = function(kind1, kind2) {
+        return [createNode(kind1), createNode(kind2)];
+      };
+
+      for (const [kind1, kind2, success] of cases) {
+        it(`${kind1}/${kind2}`, () => {
+          const ast = createAST(kind1, kind2);
+
+          if (success) {
+            expect(() => getPath(ast)).not.toThrow();
+          } else {
+            expect(() => getPath(ast)).toThrowErrorMatchingSnapshot();
+          }
+        });
+
+        /*if (kind1 !== kind2) {
+          it(`${kind2}/${kind1}`, () => {
+            const ast = createAST(kind2, kind1);
+
+            if (success) {
+              expect(() => getPath(ast)).not.toThrow();
+            } else {
+              expect(() => getPath(ast)).toThrowErrorMatchingSnapshot();
+            }
+          });
+        }*/
+      }
+    });
+  });
 });
diff --git a/packages/babel-types/package.json b/packages/babel-types/package.json
index dd13bee13bb3..66694f3b90f6 100644
--- a/packages/babel-types/package.json
+++ b/packages/babel-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@babel/types",
-  "version": "7.0.0",
+  "version": "7.5.5",
   "description": "Babel Types is a Lodash-esque utility library for AST nodes",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
@@ -10,11 +10,11 @@
   "types": "lib/index.d.ts",
   "dependencies": {
     "esutils": "^2.0.2",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.13",
     "to-fast-properties": "^2.0.0"
   },
   "devDependencies": {
-    "@babel/generator": "^7.0.0",
-    "@babel/parser": "^7.0.0"
+    "@babel/generator": "^7.5.5",
+    "@babel/parser": "^7.5.5"
   }
 }
diff --git a/packages/babel-types/scripts/generateTypeHelpers.js b/packages/babel-types/scripts/generateTypeHelpers.js
index e122145c3ca1..bf0b036c189e 100644
--- a/packages/babel-types/scripts/generateTypeHelpers.js
+++ b/packages/babel-types/scripts/generateTypeHelpers.js
@@ -1,31 +1,29 @@
 "use strict";
-const fs = require("fs");
 const path = require("path");
+const chalk = require("chalk");
 const generateBuilders = require("./generators/generateBuilders");
 const generateValidators = require("./generators/generateValidators");
 const generateAsserts = require("./generators/generateAsserts");
 const generateConstants = require("./generators/generateConstants");
-const format = require("./utils/formatCode");
+const format = require("../../../scripts/utils/formatCode");
+const writeFile = require("../../../scripts/utils/writeFileAndMkDir");
 
 const baseDir = path.join(__dirname, "../src");
 
-function writeFile(content, location) {
-  const file = path.join(baseDir, location);
+console.log("Generating @babel/types dynamic functions");
 
-  try {
-    fs.mkdirSync(path.dirname(file));
-  } catch (error) {
-    if (error.code !== "EEXIST") {
-      throw error;
-    }
-  }
+const buildersFile = path.join(baseDir, "builders/generated/index.js");
+writeFile(buildersFile, format(generateBuilders(), buildersFile));
+console.log(`  ${chalk.green("✔")} Generated builders`);
 
-  fs.writeFileSync(file, format(content, file));
-}
+const validatorsFile = path.join(baseDir, "validators/generated/index.js");
+writeFile(validatorsFile, format(generateValidators(), validatorsFile));
+console.log(`  ${chalk.green("✔")} Generated validators`);
 
-console.log("Generating @babel/types dynamic functions");
+const assertsFile = path.join(baseDir, "asserts/generated/index.js");
+writeFile(assertsFile, format(generateAsserts(), assertsFile));
+console.log(`  ${chalk.green("✔")} Generated asserts`);
 
-writeFile(generateBuilders(), "builders/generated/index.js");
-writeFile(generateValidators(), "validators/generated/index.js");
-writeFile(generateAsserts(), "asserts/generated/index.js");
-writeFile(generateConstants(), "constants/generated/index.js");
+const constantsFile = path.join(baseDir, "constants/generated/index.js");
+writeFile(constantsFile, format(generateConstants(), constantsFile));
+console.log(`  ${chalk.green("✔")} Generated constants`);
diff --git a/scripts/generators/docs.js b/packages/babel-types/scripts/generators/docs.js
similarity index 92%
rename from scripts/generators/docs.js
rename to packages/babel-types/scripts/generators/docs.js
index a4f9e6c12b7a..3bbb52362400 100644
--- a/scripts/generators/docs.js
+++ b/packages/babel-types/scripts/generators/docs.js
@@ -1,9 +1,10 @@
 "use strict";
 
 const util = require("util");
-const utils = require("./utils");
+const stringifyValidator = require("../utils/stringifyValidator");
+const toFunctionName = require("../utils/toFunctionName");
 
-const types = require("../../packages/babel-types");
+const types = require("../../");
 
 const readme = [
   `# @babel/types
@@ -43,7 +44,7 @@ Object.keys(types.BUILDER_KEYS)
     readme.push("```javascript");
     readme.push(
       "t." +
-        utils.toFunctionName(key) +
+        toFunctionName(key) +
         "(" +
         types.BUILDER_KEYS[key].join(", ") +
         ")"
@@ -87,7 +88,7 @@ Object.keys(types.BUILDER_KEYS)
         } else if (validator) {
           try {
             fieldDescription.push(
-              ": `" + utils.stringifyValidator(validator, "") + "`"
+              ": `" + stringifyValidator(validator, "") + "`"
             );
           } catch (ex) {
             if (ex.code === "UNEXPECTED_VALIDATOR_TYPE") {
diff --git a/scripts/generators/flow.js b/packages/babel-types/scripts/generators/flow.js
similarity index 85%
rename from scripts/generators/flow.js
rename to packages/babel-types/scripts/generators/flow.js
index b40aa2f2b25c..daab2411d742 100644
--- a/scripts/generators/flow.js
+++ b/packages/babel-types/scripts/generators/flow.js
@@ -1,12 +1,13 @@
 "use strict";
 
-const t = require("../../packages/babel-types");
-const utils = require("./utils");
+const t = require("../../");
+const stringifyValidator = require("../utils/stringifyValidator");
+const toFunctionName = require("../utils/toFunctionName");
 
 const NODE_PREFIX = "BabelNode";
 
 let code = `// NOTE: This file is autogenerated. Do not modify.
-// See scripts/generators/flow.js for script used.
+// See packages/babel-types/scripts/generators/flow.js for script used.
 
 declare class ${NODE_PREFIX}Comment {
   value: string;
@@ -15,12 +16,12 @@ declare class ${NODE_PREFIX}Comment {
   loc: ${NODE_PREFIX}SourceLocation;
 }
 
-declare class ${NODE_PREFIX}BlockComment extends ${NODE_PREFIX}Comment {
-  type: "BlockComment";
+declare class ${NODE_PREFIX}CommentBlock extends ${NODE_PREFIX}Comment {
+  type: "CommentBlock";
 }
 
-declare class ${NODE_PREFIX}LineComment extends ${NODE_PREFIX}Comment {
-  type: "LineComment";
+declare class ${NODE_PREFIX}CommentLine extends ${NODE_PREFIX}Comment {
+  type: "CommentLine";
 }
 
 declare class ${NODE_PREFIX}SourceLocation {
@@ -73,7 +74,7 @@ for (const type in t.NODE_FIELDS) {
 
       const validate = field.validate;
       if (validate) {
-        typeAnnotation = utils.stringifyValidator(validate, NODE_PREFIX);
+        typeAnnotation = stringifyValidator(validate, NODE_PREFIX);
       }
 
       if (typeAnnotation) {
@@ -94,7 +95,7 @@ for (const type in t.NODE_FIELDS) {
   // Flow chokes on super() and import() :/
   if (type !== "Super" && type !== "Import") {
     lines.push(
-      `declare function ${utils.toFunctionName(type)}(${args.join(
+      `declare function ${toFunctionName(type)}(${args.join(
         ", "
       )}): ${NODE_PREFIX}${type};`
     );
@@ -104,7 +105,7 @@ for (const type in t.NODE_FIELDS) {
 for (let i = 0; i < t.TYPES.length; i++) {
   let decl = `declare function is${
     t.TYPES[i]
-  }(node: Object, opts?: ?Object): boolean`;
+  }(node: ?Object, opts?: ?Object): boolean`;
 
   if (t.NODE_FIELDS[t.TYPES[i]]) {
     decl += ` %checks (node instanceof ${NODE_PREFIX}${t.TYPES[i]})`;
diff --git a/packages/babel-types/scripts/generators/generateValidators.js b/packages/babel-types/scripts/generators/generateValidators.js
index 0f02f0c5bb19..1455f99e5b67 100644
--- a/packages/babel-types/scripts/generators/generateValidators.js
+++ b/packages/babel-types/scripts/generators/generateValidators.js
@@ -1,22 +1,45 @@
 "use strict";
 const definitions = require("../../lib/definitions");
 
+const has = Function.call.bind(Object.prototype.hasOwnProperty);
+
+function joinComparisons(leftArr, right) {
+  return (
+    leftArr.map(JSON.stringify).join(` === ${right} || `) + ` === ${right}`
+  );
+}
+
 function addIsHelper(type, aliasKeys, deprecated) {
   const targetType = JSON.stringify(type);
   let aliasSource = "";
   if (aliasKeys) {
-    aliasSource =
-      " || " +
-      aliasKeys.map(JSON.stringify).join(" === nodeType || ") +
-      " === nodeType";
+    aliasSource = " || " + joinComparisons(aliasKeys, "nodeType");
+  }
+
+  let placeholderSource = "";
+  const placeholderTypes = [];
+  if (
+    definitions.PLACEHOLDERS.includes(type) &&
+    has(definitions.FLIPPED_ALIAS_KEYS, type)
+  ) {
+    placeholderTypes.push(type);
+  }
+  if (has(definitions.PLACEHOLDERS_FLIPPED_ALIAS, type)) {
+    placeholderTypes.push(...definitions.PLACEHOLDERS_FLIPPED_ALIAS[type]);
+  }
+  if (placeholderTypes.length > 0) {
+    placeholderSource =
+      ' || nodeType === "Placeholder" && (' +
+      joinComparisons(placeholderTypes, "node.expectedNode") +
+      ")";
   }
 
-  return `export function is${type}(node: Object, opts?: Object): boolean {
+  return `export function is${type}(node: ?Object, opts?: Object): boolean {
     ${deprecated || ""}
     if (!node) return false;
 
     const nodeType = node.type;
-    if (nodeType === ${targetType}${aliasSource}) {
+    if (nodeType === ${targetType}${aliasSource}${placeholderSource}) {
       if (typeof opts === "undefined") {
         return true;
       } else {
diff --git a/packages/babel-types/scripts/generators/typescript.js b/packages/babel-types/scripts/generators/typescript.js
new file mode 100644
index 000000000000..b6019ec37324
--- /dev/null
+++ b/packages/babel-types/scripts/generators/typescript.js
@@ -0,0 +1,200 @@
+"use strict";
+
+const t = require("../../");
+const stringifyValidator = require("../utils/stringifyValidator");
+const toFunctionName = require("../utils/toFunctionName");
+
+let code = `// NOTE: This file is autogenerated. Do not modify.
+// See packages/babel-types/scripts/generators/typescript.js for script used.
+
+interface BaseComment {
+  value: string;
+  start: number;
+  end: number;
+  loc: SourceLocation;
+  type: "CommentBlock" | "CommentLine";
+}
+
+export interface CommentBlock extends BaseComment {
+  type: "CommentBlock";
+}
+
+export interface CommentLine extends BaseComment {
+  type: "CommentLine";
+}
+
+export type Comment = CommentBlock | CommentLine;
+
+export interface SourceLocation {
+  start: {
+    line: number;
+    column: number;
+  };
+
+  end: {
+    line: number;
+    column: number;
+  };
+}
+
+interface BaseNode {
+  leadingComments: ReadonlyArray<Comment> | null;
+  innerComments: ReadonlyArray<Comment> | null;
+  trailingComments: ReadonlyArray<Comment> | null;
+  start: number | null;
+  end: number | null;
+  loc: SourceLocation | null;
+  type: Node["type"];
+}
+
+export type Node = ${t.TYPES.sort().join(" | ")};\n\n`;
+
+//
+
+const lines = [];
+
+for (const type in t.NODE_FIELDS) {
+  const fields = t.NODE_FIELDS[type];
+  const fieldNames = sortFieldNames(Object.keys(t.NODE_FIELDS[type]), type);
+
+  const struct = ['type: "' + type + '";'];
+  const args = [];
+
+  fieldNames.forEach(fieldName => {
+    const field = fields[fieldName];
+    let typeAnnotation = stringifyValidator(field.validate, "");
+
+    if (isNullable(field) && !hasDefault(field)) {
+      typeAnnotation += " | null";
+    }
+
+    if (areAllRemainingFieldsNullable(fieldName, fieldNames, fields)) {
+      args.push(
+        `${t.toBindingIdentifierName(fieldName)}${
+          isNullable(field) ? "?:" : ":"
+        } ${typeAnnotation}`
+      );
+    } else {
+      args.push(
+        `${t.toBindingIdentifierName(fieldName)}: ${typeAnnotation}${
+          isNullable(field) ? " | undefined" : ""
+        }`
+      );
+    }
+
+    const alphaNumeric = /^\w+$/;
+
+    if (t.isValidIdentifier(fieldName) || alphaNumeric.test(fieldName)) {
+      struct.push(`${fieldName}: ${typeAnnotation};`);
+    } else {
+      struct.push(`"${fieldName}": ${typeAnnotation};`);
+    }
+  });
+
+  code += `export interface ${type} extends BaseNode {
+  ${struct.join("\n  ").trim()}
+}\n\n`;
+
+  // super and import are reserved words in JavaScript
+  if (type !== "Super" && type !== "Import") {
+    lines.push(
+      `export function ${toFunctionName(type)}(${args.join(", ")}): ${type};`
+    );
+  }
+}
+
+for (let i = 0; i < t.TYPES.length; i++) {
+  let decl = `export function is${
+    t.TYPES[i]
+  }(node: object | null | undefined, opts?: object | null): `;
+
+  if (t.NODE_FIELDS[t.TYPES[i]]) {
+    decl += `node is ${t.TYPES[i]};`;
+  } else if (t.FLIPPED_ALIAS_KEYS[t.TYPES[i]]) {
+    decl += `node is ${t.TYPES[i]};`;
+  } else {
+    decl += `boolean;`;
+  }
+
+  lines.push(decl);
+}
+
+lines.push(
+  `export function validate(n: Node, key: string, value: any): void;`,
+  `export function clone<T extends Node>(n: T): T;`,
+  `export function cloneDeep<T extends Node>(n: T): T;`,
+  `export function removeProperties(
+  n: Node,
+  opts?: { preserveComments: boolean } | null
+): void;`,
+  `export function removePropertiesDeep<T extends Node>(
+  n: T,
+  opts?: { preserveComments: boolean } | null
+): T;`,
+  `export type TraversalAncestors = ReadonlyArray<{
+    node: Node,
+    key: string,
+    index?: number,
+  }>;
+  export type TraversalHandler<T> = (node: Node, parent: TraversalAncestors, type: T) => void;
+  export type TraversalHandlers<T> = {
+    enter?: TraversalHandler<T>,
+    exit?: TraversalHandler<T>,
+  };`.replace(/(^|\n) {2}/g, "$1"),
+  // eslint-disable-next-line
+  `export function traverse<T>(n: Node, h: TraversalHandler<T> | TraversalHandlers<T>, state?: T): void;`
+);
+
+for (const type in t.DEPRECATED_KEYS) {
+  code += `/**
+ * @deprecated Use \`${t.DEPRECATED_KEYS[type]}\`
+ */
+export type ${type} = ${t.DEPRECATED_KEYS[type]};\n
+`;
+}
+
+for (const type in t.FLIPPED_ALIAS_KEYS) {
+  const types = t.FLIPPED_ALIAS_KEYS[type];
+  code += `export type ${type} = ${types
+    .map(type => `${type}`)
+    .join(" | ")};\n`;
+}
+code += "\n";
+
+code += "export interface Aliases {\n";
+for (const type in t.FLIPPED_ALIAS_KEYS) {
+  code += `  ${type}: ${type};\n`;
+}
+code += "}\n\n";
+
+code += lines.join("\n") + "\n";
+
+//
+
+process.stdout.write(code);
+
+//
+
+function areAllRemainingFieldsNullable(fieldName, fieldNames, fields) {
+  const index = fieldNames.indexOf(fieldName);
+  return fieldNames.slice(index).every(_ => isNullable(fields[_]));
+}
+
+function hasDefault(field) {
+  return field.default != null;
+}
+
+function isNullable(field) {
+  return field.optional || hasDefault(field);
+}
+
+function sortFieldNames(fields, type) {
+  return fields.sort((fieldA, fieldB) => {
+    const indexA = t.BUILDER_KEYS[type].indexOf(fieldA);
+    const indexB = t.BUILDER_KEYS[type].indexOf(fieldB);
+    if (indexA === indexB) return fieldA < fieldB ? -1 : 1;
+    if (indexA === -1) return 1;
+    if (indexB === -1) return -1;
+    return indexA - indexB;
+  });
+}
diff --git a/packages/babel-types/scripts/utils/stringifyValidator.js b/packages/babel-types/scripts/utils/stringifyValidator.js
new file mode 100644
index 000000000000..2ea1e80357dd
--- /dev/null
+++ b/packages/babel-types/scripts/utils/stringifyValidator.js
@@ -0,0 +1,66 @@
+module.exports = function stringifyValidator(validator, nodePrefix) {
+  if (validator === undefined) {
+    return "any";
+  }
+
+  if (validator.each) {
+    return `Array<${stringifyValidator(validator.each, nodePrefix)}>`;
+  }
+
+  if (validator.chainOf) {
+    return stringifyValidator(validator.chainOf[1], nodePrefix);
+  }
+
+  if (validator.oneOf) {
+    return validator.oneOf.map(JSON.stringify).join(" | ");
+  }
+
+  if (validator.oneOfNodeTypes) {
+    return validator.oneOfNodeTypes.map(_ => nodePrefix + _).join(" | ");
+  }
+
+  if (validator.oneOfNodeOrValueTypes) {
+    return validator.oneOfNodeOrValueTypes
+      .map(_ => {
+        return isValueType(_) ? _ : nodePrefix + _;
+      })
+      .join(" | ");
+  }
+
+  if (validator.type) {
+    return validator.type;
+  }
+
+  if (validator.shapeOf) {
+    return (
+      "{ " +
+      Object.keys(validator.shapeOf)
+        .map(shapeKey => {
+          const propertyDefinition = validator.shapeOf[shapeKey];
+          if (propertyDefinition.validate) {
+            const isOptional =
+              propertyDefinition.optional || propertyDefinition.default != null;
+            return (
+              shapeKey +
+              (isOptional ? "?: " : ": ") +
+              stringifyValidator(propertyDefinition.validate)
+            );
+          }
+          return null;
+        })
+        .filter(Boolean)
+        .join(", ") +
+      " }"
+    );
+  }
+
+  return ["any"];
+};
+
+/**
+ * Heuristic to decide whether or not the given type is a value type (eg. "null")
+ * or a Node type (eg. "Expression").
+ */
+function isValueType(type) {
+  return type.charAt(0).toLowerCase() === type.charAt(0);
+}
diff --git a/packages/babel-types/scripts/utils/toFunctionName.js b/packages/babel-types/scripts/utils/toFunctionName.js
new file mode 100644
index 000000000000..627c9a7d8f01
--- /dev/null
+++ b/packages/babel-types/scripts/utils/toFunctionName.js
@@ -0,0 +1,4 @@
+module.exports = function toFunctionName(typeName) {
+  const _ = typeName.replace(/^TS/, "ts").replace(/^JSX/, "jsx");
+  return _.slice(0, 1).toLowerCase() + _.slice(1);
+};
diff --git a/packages/babel-types/src/asserts/generated/index.js b/packages/babel-types/src/asserts/generated/index.js
index 4fc988f4fd7d..3a4e81d34700 100644
--- a/packages/babel-types/src/asserts/generated/index.js
+++ b/packages/babel-types/src/asserts/generated/index.js
@@ -162,6 +162,12 @@ export function assertSequenceExpression(
 ): void {
   assert("SequenceExpression", node, opts);
 }
+export function assertParenthesizedExpression(
+  node: Object,
+  opts?: Object = {},
+): void {
+  assert("ParenthesizedExpression", node, opts);
+}
 export function assertSwitchCase(node: Object, opts?: Object = {}): void {
   assert("SwitchCase", node, opts);
 }
@@ -654,11 +660,14 @@ export function assertJSXClosingFragment(
 export function assertNoop(node: Object, opts?: Object = {}): void {
   assert("Noop", node, opts);
 }
-export function assertParenthesizedExpression(
+export function assertPlaceholder(node: Object, opts?: Object = {}): void {
+  assert("Placeholder", node, opts);
+}
+export function assertArgumentPlaceholder(
   node: Object,
   opts?: Object = {},
 ): void {
-  assert("ParenthesizedExpression", node, opts);
+  assert("ArgumentPlaceholder", node, opts);
 }
 export function assertAwaitExpression(node: Object, opts?: Object = {}): void {
   assert("AwaitExpression", node, opts);
@@ -675,6 +684,24 @@ export function assertOptionalMemberExpression(
 ): void {
   assert("OptionalMemberExpression", node, opts);
 }
+export function assertPipelineTopicExpression(
+  node: Object,
+  opts?: Object = {},
+): void {
+  assert("PipelineTopicExpression", node, opts);
+}
+export function assertPipelineBareFunction(
+  node: Object,
+  opts?: Object = {},
+): void {
+  assert("PipelineBareFunction", node, opts);
+}
+export function assertPipelinePrimaryTopicReference(
+  node: Object,
+  opts?: Object = {},
+): void {
+  assert("PipelinePrimaryTopicReference", node, opts);
+}
 export function assertOptionalCallExpression(
   node: Object,
   opts?: Object = {},
@@ -687,6 +714,12 @@ export function assertClassPrivateProperty(
 ): void {
   assert("ClassPrivateProperty", node, opts);
 }
+export function assertClassPrivateMethod(
+  node: Object,
+  opts?: Object = {},
+): void {
+  assert("ClassPrivateMethod", node, opts);
+}
 export function assertImport(node: Object, opts?: Object = {}): void {
   assert("Import", node, opts);
 }
@@ -762,6 +795,9 @@ export function assertTSIndexSignature(node: Object, opts?: Object = {}): void {
 export function assertTSAnyKeyword(node: Object, opts?: Object = {}): void {
   assert("TSAnyKeyword", node, opts);
 }
+export function assertTSUnknownKeyword(node: Object, opts?: Object = {}): void {
+  assert("TSUnknownKeyword", node, opts);
+}
 export function assertTSNumberKeyword(node: Object, opts?: Object = {}): void {
   assert("TSNumberKeyword", node, opts);
 }
@@ -822,6 +858,12 @@ export function assertTSArrayType(node: Object, opts?: Object = {}): void {
 export function assertTSTupleType(node: Object, opts?: Object = {}): void {
   assert("TSTupleType", node, opts);
 }
+export function assertTSOptionalType(node: Object, opts?: Object = {}): void {
+  assert("TSOptionalType", node, opts);
+}
+export function assertTSRestType(node: Object, opts?: Object = {}): void {
+  assert("TSRestType", node, opts);
+}
 export function assertTSUnionType(node: Object, opts?: Object = {}): void {
   assert("TSUnionType", node, opts);
 }
@@ -906,6 +948,9 @@ export function assertTSModuleDeclaration(
 export function assertTSModuleBlock(node: Object, opts?: Object = {}): void {
   assert("TSModuleBlock", node, opts);
 }
+export function assertTSImportType(node: Object, opts?: Object = {}): void {
+  assert("TSImportType", node, opts);
+}
 export function assertTSImportEqualsDeclaration(
   node: Object,
   opts?: Object = {},
diff --git a/packages/babel-types/src/builders/builder.js b/packages/babel-types/src/builders/builder.js
index 7458eb1c92be..e01cf9fd97d6 100644
--- a/packages/babel-types/src/builders/builder.js
+++ b/packages/babel-types/src/builders/builder.js
@@ -28,7 +28,7 @@ export default function builder(type: string, ...args: Array<any>): Object {
     i++;
   });
 
-  for (const key in node) {
+  for (const key of Object.keys(node)) {
     validate(node, key, node[key]);
   }
 
diff --git a/packages/babel-types/src/builders/generated/index.js b/packages/babel-types/src/builders/generated/index.js
index eda7514c11fe..e4ca375762cc 100644
--- a/packages/babel-types/src/builders/generated/index.js
+++ b/packages/babel-types/src/builders/generated/index.js
@@ -161,6 +161,10 @@ export function SequenceExpression(...args: Array<any>): Object {
   return builder("SequenceExpression", ...args);
 }
 export { SequenceExpression as sequenceExpression };
+export function ParenthesizedExpression(...args: Array<any>): Object {
+  return builder("ParenthesizedExpression", ...args);
+}
+export { ParenthesizedExpression as parenthesizedExpression };
 export function SwitchCase(...args: Array<any>): Object {
   return builder("SwitchCase", ...args);
 }
@@ -592,10 +596,14 @@ export function Noop(...args: Array<any>): Object {
   return builder("Noop", ...args);
 }
 export { Noop as noop };
-export function ParenthesizedExpression(...args: Array<any>): Object {
-  return builder("ParenthesizedExpression", ...args);
+export function Placeholder(...args: Array<any>): Object {
+  return builder("Placeholder", ...args);
 }
-export { ParenthesizedExpression as parenthesizedExpression };
+export { Placeholder as placeholder };
+export function ArgumentPlaceholder(...args: Array<any>): Object {
+  return builder("ArgumentPlaceholder", ...args);
+}
+export { ArgumentPlaceholder as argumentPlaceholder };
 export function AwaitExpression(...args: Array<any>): Object {
   return builder("AwaitExpression", ...args);
 }
@@ -612,6 +620,18 @@ export function OptionalMemberExpression(...args: Array<any>): Object {
   return builder("OptionalMemberExpression", ...args);
 }
 export { OptionalMemberExpression as optionalMemberExpression };
+export function PipelineTopicExpression(...args: Array<any>): Object {
+  return builder("PipelineTopicExpression", ...args);
+}
+export { PipelineTopicExpression as pipelineTopicExpression };
+export function PipelineBareFunction(...args: Array<any>): Object {
+  return builder("PipelineBareFunction", ...args);
+}
+export { PipelineBareFunction as pipelineBareFunction };
+export function PipelinePrimaryTopicReference(...args: Array<any>): Object {
+  return builder("PipelinePrimaryTopicReference", ...args);
+}
+export { PipelinePrimaryTopicReference as pipelinePrimaryTopicReference };
 export function OptionalCallExpression(...args: Array<any>): Object {
   return builder("OptionalCallExpression", ...args);
 }
@@ -620,6 +640,10 @@ export function ClassPrivateProperty(...args: Array<any>): Object {
   return builder("ClassPrivateProperty", ...args);
 }
 export { ClassPrivateProperty as classPrivateProperty };
+export function ClassPrivateMethod(...args: Array<any>): Object {
+  return builder("ClassPrivateMethod", ...args);
+}
+export { ClassPrivateMethod as classPrivateMethod };
 export function Import(...args: Array<any>): Object {
   return builder("Import", ...args);
 }
@@ -698,6 +722,11 @@ export function TSAnyKeyword(...args: Array<any>): Object {
 }
 export { TSAnyKeyword as tsAnyKeyword };
 export { TSAnyKeyword as tSAnyKeyword };
+export function TSUnknownKeyword(...args: Array<any>): Object {
+  return builder("TSUnknownKeyword", ...args);
+}
+export { TSUnknownKeyword as tsUnknownKeyword };
+export { TSUnknownKeyword as tSUnknownKeyword };
 export function TSNumberKeyword(...args: Array<any>): Object {
   return builder("TSNumberKeyword", ...args);
 }
@@ -788,6 +817,16 @@ export function TSTupleType(...args: Array<any>): Object {
 }
 export { TSTupleType as tsTupleType };
 export { TSTupleType as tSTupleType };
+export function TSOptionalType(...args: Array<any>): Object {
+  return builder("TSOptionalType", ...args);
+}
+export { TSOptionalType as tsOptionalType };
+export { TSOptionalType as tSOptionalType };
+export function TSRestType(...args: Array<any>): Object {
+  return builder("TSRestType", ...args);
+}
+export { TSRestType as tsRestType };
+export { TSRestType as tSRestType };
 export function TSUnionType(...args: Array<any>): Object {
   return builder("TSUnionType", ...args);
 }
@@ -883,6 +922,11 @@ export function TSModuleBlock(...args: Array<any>): Object {
 }
 export { TSModuleBlock as tsModuleBlock };
 export { TSModuleBlock as tSModuleBlock };
+export function TSImportType(...args: Array<any>): Object {
+  return builder("TSImportType", ...args);
+}
+export { TSImportType as tsImportType };
+export { TSImportType as tSImportType };
 export function TSImportEqualsDeclaration(...args: Array<any>): Object {
   return builder("TSImportEqualsDeclaration", ...args);
 }
diff --git a/packages/babel-types/src/clone/cloneNode.js b/packages/babel-types/src/clone/cloneNode.js
index 6e43d191aa66..72347d4a0d45 100644
--- a/packages/babel-types/src/clone/cloneNode.js
+++ b/packages/babel-types/src/clone/cloneNode.js
@@ -37,6 +37,16 @@ export default function cloneNode<T: Object>(node: T, deep: boolean = true): T {
   // Special-case identifiers since they are the most cloned nodes.
   if (type === "Identifier") {
     newNode.name = node.name;
+
+    if (has(node, "optional") && typeof node.optional === "boolean") {
+      newNode.optional = node.optional;
+    }
+
+    if (has(node, "typeAnnotation")) {
+      newNode.typeAnnotation = deep
+        ? cloneIfNodeOrArray(node.typeAnnotation, true)
+        : node.typeAnnotation;
+    }
   } else if (!has(NODE_FIELDS, type)) {
     throw new Error(`Unknown node type: "${type}"`);
   } else {
@@ -56,7 +66,7 @@ export default function cloneNode<T: Object>(node: T, deep: boolean = true): T {
     newNode.leadingComments = node.leadingComments;
   }
   if (has(node, "innerComments")) {
-    newNode.innerComments = node.innerCmments;
+    newNode.innerComments = node.innerComments;
   }
   if (has(node, "trailingComments")) {
     newNode.trailingComments = node.trailingComments;
diff --git a/packages/babel-types/src/converters/gatherSequenceExpressions.js b/packages/babel-types/src/converters/gatherSequenceExpressions.js
index 4b526767e224..e9808e6ed3ad 100644
--- a/packages/babel-types/src/converters/gatherSequenceExpressions.js
+++ b/packages/babel-types/src/converters/gatherSequenceExpressions.js
@@ -36,7 +36,7 @@ export default function gatherSequenceExpressions(
 
       for (const declar of (node.declarations: Array<any>)) {
         const bindings = getBindingIdentifiers(declar);
-        for (const key in bindings) {
+        for (const key of Object.keys(bindings)) {
           declars.push({
             kind: node.kind,
             id: cloneNode(bindings[key]),
diff --git a/packages/babel-types/src/converters/valueToNode.js b/packages/babel-types/src/converters/valueToNode.js
index a4f195765cfd..56bb7ff06be8 100644
--- a/packages/babel-types/src/converters/valueToNode.js
+++ b/packages/babel-types/src/converters/valueToNode.js
@@ -77,7 +77,7 @@ export default function valueToNode(value: any): Object {
   // object
   if (isPlainObject(value)) {
     const props = [];
-    for (const key in value) {
+    for (const key of Object.keys(value)) {
       let nodeKey;
       if (isValidIdentifier(key)) {
         nodeKey = identifier(key);
diff --git a/packages/babel-types/src/definitions/core.js b/packages/babel-types/src/definitions/core.js
index d6a5630b3688..1e4de3ebbfa0 100644
--- a/packages/babel-types/src/definitions/core.js
+++ b/packages/babel-types/src/definitions/core.js
@@ -138,7 +138,12 @@ defineType("CallExpression", {
       validate: chain(
         assertValueType("array"),
         assertEach(
-          assertNodeType("Expression", "SpreadElement", "JSXNamespacedName"),
+          assertNodeType(
+            "Expression",
+            "SpreadElement",
+            "JSXNamespacedName",
+            "ArgumentPlaceholder",
+          ),
         ),
       ),
     },
@@ -288,7 +293,14 @@ export const functionCommon = {
   params: {
     validate: chain(
       assertValueType("array"),
-      assertEach(assertNodeType("LVal")),
+      assertEach(
+        assertNodeType(
+          "Identifier",
+          "Pattern",
+          "RestElement",
+          "TSParameterProperty",
+        ),
+      ),
     ),
   },
   generator: {
@@ -388,7 +400,7 @@ export const patternLikeCommon = {
 
 defineType("Identifier", {
   builder: ["name"],
-  visitor: ["typeAnnotation"],
+  visitor: ["typeAnnotation", "decorators" /* for legacy param decorators */],
   aliases: ["Expression", "PatternLike", "LVal", "TSEntityName"],
   fields: {
     ...patternLikeCommon,
@@ -724,6 +736,16 @@ defineType("SequenceExpression", {
   aliases: ["Expression"],
 });
 
+defineType("ParenthesizedExpression", {
+  visitor: ["expression"],
+  aliases: ["Expression", "ExpressionWrapper"],
+  fields: {
+    expression: {
+      validate: assertNodeType("Expression"),
+    },
+  },
+});
+
 defineType("SwitchCase", {
   visitor: ["test", "consequent"],
   fields: {
diff --git a/packages/babel-types/src/definitions/es2015.js b/packages/babel-types/src/definitions/es2015.js
index 1147acd86790..26445747cdd3 100644
--- a/packages/babel-types/src/definitions/es2015.js
+++ b/packages/babel-types/src/definitions/es2015.js
@@ -1,10 +1,12 @@
 // @flow
 import defineType, {
+  assertShape,
   assertNodeType,
   assertValueType,
   chain,
   assertEach,
   assertOneOf,
+  validateOptional,
 } from "./utils";
 import {
   functionCommon,
@@ -13,13 +15,18 @@ import {
 } from "./core";
 
 defineType("AssignmentPattern", {
-  visitor: ["left", "right"],
+  visitor: ["left", "right", "decorators" /* for legacy param decorators */],
   builder: ["left", "right"],
   aliases: ["Pattern", "PatternLike", "LVal"],
   fields: {
     ...patternLikeCommon,
     left: {
-      validate: assertNodeType("Identifier", "ObjectPattern", "ArrayPattern"),
+      validate: assertNodeType(
+        "Identifier",
+        "ObjectPattern",
+        "ArrayPattern",
+        "MemberExpression",
+      ),
     },
     right: {
       validate: assertNodeType("Expression"),
@@ -87,6 +94,7 @@ defineType("ClassBody", {
         assertEach(
           assertNodeType(
             "ClassMethod",
+            "ClassPrivateMethod",
             "ClassProperty",
             "ClassPrivateProperty",
             "TSDeclareMethod",
@@ -259,6 +267,7 @@ defineType("ExportNamedDeclaration", {
       validate: assertNodeType("StringLiteral"),
       optional: true,
     },
+    exportKind: validateOptional(assertOneOf("type", "value")),
   },
 });
 
@@ -321,6 +330,11 @@ defineType("ImportDeclaration", {
     source: {
       validate: assertNodeType("StringLiteral"),
     },
+    importKind: {
+      // Handle Flowtype's extension "import {typeof foo} from"
+      validate: assertOneOf("type", "typeof", "value"),
+      optional: true,
+    },
   },
 });
 
@@ -356,7 +370,8 @@ defineType("ImportSpecifier", {
     },
     importKind: {
       // Handle Flowtype's extension "import {typeof foo} from"
-      validate: assertOneOf(null, "type", "typeof"),
+      validate: assertOneOf("type", "typeof"),
+      optional: true,
     },
   },
 });
@@ -471,7 +486,11 @@ defineType("ClassMethod", {
 });
 
 defineType("ObjectPattern", {
-  visitor: ["properties", "typeAnnotation"],
+  visitor: [
+    "properties",
+    "typeAnnotation",
+    "decorators" /* for legacy param decorators */,
+  ],
   builder: ["properties"],
   aliases: ["Pattern", "PatternLike", "LVal"],
   fields: {
@@ -524,7 +543,15 @@ defineType("TemplateElement", {
   builder: ["value", "tail"],
   fields: {
     value: {
-      // todo: flatten `raw` into main node
+      validate: assertShape({
+        raw: {
+          validate: assertValueType("string"),
+        },
+        cooked: {
+          validate: assertValueType("string"),
+          optional: true,
+        },
+      }),
     },
     tail: {
       validate: assertValueType("boolean"),
diff --git a/packages/babel-types/src/definitions/experimental.js b/packages/babel-types/src/definitions/experimental.js
index e933712f9877..ed088af74bd6 100644
--- a/packages/babel-types/src/definitions/experimental.js
+++ b/packages/babel-types/src/definitions/experimental.js
@@ -5,7 +5,12 @@ import defineType, {
   assertValueType,
   chain,
 } from "./utils";
-import { classMethodOrPropertyCommon } from "./es2015";
+import {
+  classMethodOrPropertyCommon,
+  classMethodOrDeclareMethodCommon,
+} from "./es2015";
+
+defineType("ArgumentPlaceholder", {});
 
 defineType("AwaitExpression", {
   builder: ["argument"],
@@ -86,6 +91,30 @@ defineType("OptionalMemberExpression", {
   },
 });
 
+defineType("PipelineTopicExpression", {
+  builder: ["expression"],
+  visitor: ["expression"],
+  fields: {
+    expression: {
+      validate: assertNodeType("Expression"),
+    },
+  },
+});
+
+defineType("PipelineBareFunction", {
+  builder: ["callee"],
+  visitor: ["callee"],
+  fields: {
+    callee: {
+      validate: assertNodeType("Expression"),
+    },
+  },
+});
+
+defineType("PipelinePrimaryTopicReference", {
+  aliases: ["Expression"],
+});
+
 defineType("OptionalCallExpression", {
   visitor: ["callee", "arguments", "typeParameters", "typeArguments"],
   builder: ["callee", "arguments", "optional"],
@@ -131,6 +160,35 @@ defineType("ClassPrivateProperty", {
   },
 });
 
+defineType("ClassPrivateMethod", {
+  builder: ["kind", "key", "params", "body", "static"],
+  visitor: [
+    "key",
+    "params",
+    "body",
+    "decorators",
+    "returnType",
+    "typeParameters",
+  ],
+  aliases: [
+    "Function",
+    "Scopable",
+    "BlockParent",
+    "FunctionParent",
+    "Method",
+    "Private",
+  ],
+  fields: {
+    ...classMethodOrDeclareMethodCommon,
+    key: {
+      validate: assertNodeType("PrivateName"),
+    },
+    body: {
+      validate: assertNodeType("BlockStatement"),
+    },
+  },
+});
+
 defineType("Import", {
   aliases: ["Expression"],
 });
diff --git a/packages/babel-types/src/definitions/flow.js b/packages/babel-types/src/definitions/flow.js
index fa4ad6e52d4c..75f6c8801966 100644
--- a/packages/babel-types/src/definitions/flow.js
+++ b/packages/babel-types/src/definitions/flow.js
@@ -72,7 +72,7 @@ defineType("ClassImplements", {
   },
 });
 
-defineInterfaceishType("DeclareClass", "TypeParameterInstantiation");
+defineInterfaceishType("DeclareClass");
 
 defineType("DeclareFunction", {
   visitor: ["id"],
@@ -150,7 +150,7 @@ defineType("DeclareExportAllDeclaration", {
   aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
   fields: {
     source: validateType("StringLiteral"),
-    exportKind: validateOptional(assertOneOf(["type", "value"])),
+    exportKind: validateOptional(assertOneOf("type", "value")),
   },
 });
 
@@ -191,7 +191,7 @@ defineType("GenericTypeAnnotation", {
   visitor: ["id", "typeParameters"],
   aliases: ["Flow", "FlowType"],
   fields: {
-    id: validateType("Identifier"),
+    id: validateType(["Identifier", "QualifiedTypeIdentifier"]),
     typeParameters: validateOptionalType("TypeParameterInstantiation"),
   },
 });
@@ -204,7 +204,7 @@ defineType("InterfaceExtends", {
   visitor: ["id", "typeParameters"],
   aliases: ["Flow"],
   fields: {
-    id: validateType("Identifier"),
+    id: validateType(["Identifier", "QualifiedTypeIdentifier"]),
     typeParameters: validateOptionalType("TypeParameterInstantiation"),
   },
 });
@@ -277,6 +277,10 @@ defineType("ObjectTypeAnnotation", {
       validate: assertValueType("boolean"),
       default: false,
     },
+    // If the inexact flag is present then this is an object type, and not a
+    // declare class, declare interface, or interface. If it is true, the
+    // object uses ... to express that it is inexact.
+    inexact: validateOptional(assertValueType("boolean")),
   },
 });
 
diff --git a/packages/babel-types/src/definitions/index.js b/packages/babel-types/src/definitions/index.js
index 6bab24993042..d6e1763ebdf0 100644
--- a/packages/babel-types/src/definitions/index.js
+++ b/packages/babel-types/src/definitions/index.js
@@ -15,6 +15,11 @@ import {
   BUILDER_KEYS,
   DEPRECATED_KEYS,
 } from "./utils";
+import {
+  PLACEHOLDERS,
+  PLACEHOLDERS_ALIAS,
+  PLACEHOLDERS_FLIPPED_ALIAS,
+} from "./placeholders";
 
 // We do this here, because at this point the visitor keys should be ready and setup
 toFastProperties(VISITOR_KEYS);
@@ -24,6 +29,9 @@ toFastProperties(NODE_FIELDS);
 toFastProperties(BUILDER_KEYS);
 toFastProperties(DEPRECATED_KEYS);
 
+toFastProperties(PLACEHOLDERS_ALIAS);
+toFastProperties(PLACEHOLDERS_FLIPPED_ALIAS);
+
 const TYPES: Array<string> = Object.keys(VISITOR_KEYS)
   .concat(Object.keys(FLIPPED_ALIAS_KEYS))
   .concat(Object.keys(DEPRECATED_KEYS));
@@ -35,5 +43,8 @@ export {
   NODE_FIELDS,
   BUILDER_KEYS,
   DEPRECATED_KEYS,
+  PLACEHOLDERS,
+  PLACEHOLDERS_ALIAS,
+  PLACEHOLDERS_FLIPPED_ALIAS,
   TYPES,
 };
diff --git a/packages/babel-types/src/definitions/jsx.js b/packages/babel-types/src/definitions/jsx.js
index 440427395603..776714c873f7 100644
--- a/packages/babel-types/src/definitions/jsx.js
+++ b/packages/babel-types/src/definitions/jsx.js
@@ -73,7 +73,7 @@ defineType("JSXExpressionContainer", {
   aliases: ["JSX", "Immutable"],
   fields: {
     expression: {
-      validate: assertNodeType("Expression"),
+      validate: assertNodeType("Expression", "JSXEmptyExpression"),
     },
   },
 });
diff --git a/packages/babel-types/src/definitions/misc.js b/packages/babel-types/src/definitions/misc.js
index 2fc1334aac61..e319235b2c15 100644
--- a/packages/babel-types/src/definitions/misc.js
+++ b/packages/babel-types/src/definitions/misc.js
@@ -1,16 +1,21 @@
 // @flow
-import defineType, { assertNodeType } from "./utils";
+import defineType, { assertNodeType, assertOneOf } from "./utils";
+import { PLACEHOLDERS } from "./placeholders";
 
 defineType("Noop", {
   visitor: [],
 });
 
-defineType("ParenthesizedExpression", {
-  visitor: ["expression"],
-  aliases: ["Expression", "ExpressionWrapper"],
+defineType("Placeholder", {
+  visitor: [],
+  builder: ["expectedNode", "name"],
+  // aliases: [], defined in placeholders.js
   fields: {
-    expression: {
-      validate: assertNodeType("Expression"),
+    name: {
+      validate: assertNodeType("Identifier"),
+    },
+    expectedNode: {
+      validate: assertOneOf(...PLACEHOLDERS),
     },
   },
 });
diff --git a/packages/babel-types/src/definitions/placeholders.js b/packages/babel-types/src/definitions/placeholders.js
new file mode 100644
index 000000000000..ba5e13cc1ccd
--- /dev/null
+++ b/packages/babel-types/src/definitions/placeholders.js
@@ -0,0 +1,33 @@
+import { ALIAS_KEYS } from "./utils";
+
+export const PLACEHOLDERS = [
+  "Identifier",
+  "StringLiteral",
+  "Expression",
+  "Statement",
+  "Declaration",
+  "BlockStatement",
+  "ClassBody",
+  "Pattern",
+];
+
+export const PLACEHOLDERS_ALIAS: { [string]: Array<string> } = {
+  Declaration: ["Statement"],
+  Pattern: ["PatternLike", "LVal"],
+};
+
+for (const type of PLACEHOLDERS) {
+  const alias = ALIAS_KEYS[type];
+  if (alias && alias.length) PLACEHOLDERS_ALIAS[type] = alias;
+}
+
+export const PLACEHOLDERS_FLIPPED_ALIAS: { [string]: Array<string> } = {};
+
+Object.keys(PLACEHOLDERS_ALIAS).forEach(type => {
+  PLACEHOLDERS_ALIAS[type].forEach(alias => {
+    if (!Object.hasOwnProperty.call(PLACEHOLDERS_FLIPPED_ALIAS, alias)) {
+      PLACEHOLDERS_FLIPPED_ALIAS[alias] = [];
+    }
+    PLACEHOLDERS_FLIPPED_ALIAS[alias].push(type);
+  });
+});
diff --git a/packages/babel-types/src/definitions/typescript.js b/packages/babel-types/src/definitions/typescript.js
index 270146c5ca16..843f2408ecc9 100644
--- a/packages/babel-types/src/definitions/typescript.js
+++ b/packages/babel-types/src/definitions/typescript.js
@@ -128,6 +128,7 @@ defineType("TSIndexSignature", {
 
 const tsKeywordTypes = [
   "TSAnyKeyword",
+  "TSUnknownKeyword",
   "TSNumberKeyword",
   "TSObjectKeyword",
   "TSBooleanKeyword",
@@ -155,7 +156,7 @@ defineType("TSThisType", {
 
 const fnOrCtr = {
   aliases: ["TSType"],
-  visitor: ["typeParameters", "typeAnnotation"],
+  visitor: ["typeParameters", "parameters", "typeAnnotation"],
   fields: signatureDeclarationCommon,
 };
 
@@ -184,7 +185,7 @@ defineType("TSTypeQuery", {
   aliases: ["TSType"],
   visitor: ["exprName"],
   fields: {
-    exprName: validateType("TSEntityName"),
+    exprName: validateType(["TSEntityName", "TSImportType"]),
   },
 });
 
@@ -212,6 +213,22 @@ defineType("TSTupleType", {
   },
 });
 
+defineType("TSOptionalType", {
+  aliases: ["TSType"],
+  visitor: ["typeAnnotation"],
+  fields: {
+    typeAnnotation: validateType("TSType"),
+  },
+});
+
+defineType("TSRestType", {
+  aliases: ["TSType"],
+  visitor: ["typeAnnotation"],
+  fields: {
+    typeAnnotation: validateType("TSType"),
+  },
+});
+
 const unionOrIntersection = {
   aliases: ["TSType"],
   visitor: ["types"],
@@ -382,12 +399,23 @@ defineType("TSModuleDeclaration", {
 });
 
 defineType("TSModuleBlock", {
+  aliases: ["Scopable", "Block", "BlockParent"],
   visitor: ["body"],
   fields: {
     body: validateArrayOfType("Statement"),
   },
 });
 
+defineType("TSImportType", {
+  aliases: ["TSType"],
+  visitor: ["argument", "qualifier", "typeParameters"],
+  fields: {
+    argument: validateType("StringLiteral"),
+    qualifier: validateOptionalType("TSEntityName"),
+    typeParameters: validateOptionalType("TSTypeParameterInstantiation"),
+  },
+});
+
 defineType("TSImportEqualsDeclaration", {
   aliases: ["Statement"],
   visitor: ["id", "moduleReference"],
diff --git a/packages/babel-types/src/definitions/utils.js b/packages/babel-types/src/definitions/utils.js
index 45cf72b297fa..3f7225bd50b2 100644
--- a/packages/babel-types/src/definitions/utils.js
+++ b/packages/babel-types/src/definitions/utils.js
@@ -1,5 +1,6 @@
 // @flow
 import is from "../validators/is";
+import { validateField } from "../validators/validate";
 
 export const VISITOR_KEYS: { [string]: Array<string> } = {};
 export const ALIAS_KEYS: { [string]: Array<string> } = {};
@@ -161,6 +162,34 @@ export function assertValueType(type: string): Validator {
   return validate;
 }
 
+export function assertShape(shape: { [string]: FieldOptions }): Validator {
+  function validate(node, key, val) {
+    const errors = [];
+    for (const property of Object.keys(shape)) {
+      try {
+        validateField(node, property, val[property], shape[property]);
+      } catch (error) {
+        if (error instanceof TypeError) {
+          errors.push(error.message);
+          continue;
+        }
+        throw error;
+      }
+    }
+    if (errors.length) {
+      throw new TypeError(
+        `Property ${key} of ${
+          node.type
+        } expected to have the following:\n${errors.join("\n")}`,
+      );
+    }
+  }
+
+  validate.shapeOf = shape;
+
+  return validate;
+}
+
 export function chain(...fns: Array<Validator>): Validator {
   function validate(...args) {
     for (const fn of fns) {
@@ -201,7 +230,7 @@ export default function defineType(
     fields[key] = fields[key] || {};
   }
 
-  for (const key in fields) {
+  for (const key of Object.keys(fields)) {
     const field = fields[key];
 
     if (builder.indexOf(key) === -1) {
diff --git a/packages/babel-types/src/index.js b/packages/babel-types/src/index.js
index 56d36125a93a..d3311dfc9f2f 100644
--- a/packages/babel-types/src/index.js
+++ b/packages/babel-types/src/index.js
@@ -100,6 +100,7 @@ export { default as isImmutable } from "./validators/isImmutable";
 export { default as isLet } from "./validators/isLet";
 export { default as isNode } from "./validators/isNode";
 export { default as isNodesEquivalent } from "./validators/isNodesEquivalent";
+export { default as isPlaceholderType } from "./validators/isPlaceholderType";
 export { default as isReferenced } from "./validators/isReferenced";
 export { default as isScope } from "./validators/isScope";
 export { default as isSpecifierDefault } from "./validators/isSpecifierDefault";
diff --git a/packages/babel-types/src/modifications/flow/removeTypeDuplicates.js b/packages/babel-types/src/modifications/flow/removeTypeDuplicates.js
index d27a8d257140..629c265ff55a 100644
--- a/packages/babel-types/src/modifications/flow/removeTypeDuplicates.js
+++ b/packages/babel-types/src/modifications/flow/removeTypeDuplicates.js
@@ -73,12 +73,12 @@ export default function removeTypeDuplicates(
   }
 
   // add back in bases
-  for (const type in bases) {
+  for (const type of Object.keys(bases)) {
     types.push(bases[type]);
   }
 
   // add back in generics
-  for (const name in generics) {
+  for (const name of Object.keys(generics)) {
     types.push(generics[name]);
   }
 
diff --git a/packages/babel-types/src/modifications/inherits.js b/packages/babel-types/src/modifications/inherits.js
index dba679c050c6..a8021828593a 100644
--- a/packages/babel-types/src/modifications/inherits.js
+++ b/packages/babel-types/src/modifications/inherits.js
@@ -16,7 +16,7 @@ export default function inherits<T: Object>(child: T, parent: Object): T {
   }
 
   // force inherit "private" properties
-  for (const key in parent) {
+  for (const key of Object.keys(parent)) {
     if (key[0] === "_" && key !== "__clone") child[key] = parent[key];
   }
 
diff --git a/packages/babel-types/src/modifications/removeProperties.js b/packages/babel-types/src/modifications/removeProperties.js
index 2f81d9cd7e06..e0f2af6c1a5e 100644
--- a/packages/babel-types/src/modifications/removeProperties.js
+++ b/packages/babel-types/src/modifications/removeProperties.js
@@ -20,7 +20,7 @@ export default function removeProperties(
     if (node[key] != null) node[key] = undefined;
   }
 
-  for (const key in node) {
+  for (const key of Object.keys(node)) {
     if (key[0] === "_" && node[key] != null) node[key] = undefined;
   }
 
diff --git a/packages/babel-types/src/validators/generated/index.js b/packages/babel-types/src/validators/generated/index.js
index 42de2ad2e8da..076495d5cb28 100644
--- a/packages/babel-types/src/validators/generated/index.js
+++ b/packages/babel-types/src/validators/generated/index.js
@@ -5,7 +5,7 @@
  */
 import shallowEqual from "../../utils/shallowEqual";
 
-export function isArrayExpression(node: Object, opts?: Object): boolean {
+export function isArrayExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -19,7 +19,7 @@ export function isArrayExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isAssignmentExpression(node: Object, opts?: Object): boolean {
+export function isAssignmentExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -33,7 +33,7 @@ export function isAssignmentExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBinaryExpression(node: Object, opts?: Object): boolean {
+export function isBinaryExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -47,7 +47,7 @@ export function isBinaryExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isInterpreterDirective(node: Object, opts?: Object): boolean {
+export function isInterpreterDirective(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -61,7 +61,7 @@ export function isInterpreterDirective(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDirective(node: Object, opts?: Object): boolean {
+export function isDirective(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -75,7 +75,7 @@ export function isDirective(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDirectiveLiteral(node: Object, opts?: Object): boolean {
+export function isDirectiveLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -89,7 +89,7 @@ export function isDirectiveLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBlockStatement(node: Object, opts?: Object): boolean {
+export function isBlockStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -103,7 +103,7 @@ export function isBlockStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBreakStatement(node: Object, opts?: Object): boolean {
+export function isBreakStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -117,7 +117,7 @@ export function isBreakStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isCallExpression(node: Object, opts?: Object): boolean {
+export function isCallExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -131,7 +131,7 @@ export function isCallExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isCatchClause(node: Object, opts?: Object): boolean {
+export function isCatchClause(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -145,7 +145,7 @@ export function isCatchClause(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isConditionalExpression(node: Object, opts?: Object): boolean {
+export function isConditionalExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -159,7 +159,7 @@ export function isConditionalExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isContinueStatement(node: Object, opts?: Object): boolean {
+export function isContinueStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -173,7 +173,7 @@ export function isContinueStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDebuggerStatement(node: Object, opts?: Object): boolean {
+export function isDebuggerStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -187,7 +187,7 @@ export function isDebuggerStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDoWhileStatement(node: Object, opts?: Object): boolean {
+export function isDoWhileStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -201,7 +201,7 @@ export function isDoWhileStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isEmptyStatement(node: Object, opts?: Object): boolean {
+export function isEmptyStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -215,7 +215,7 @@ export function isEmptyStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExpressionStatement(node: Object, opts?: Object): boolean {
+export function isExpressionStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -229,7 +229,7 @@ export function isExpressionStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFile(node: Object, opts?: Object): boolean {
+export function isFile(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -243,7 +243,7 @@ export function isFile(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isForInStatement(node: Object, opts?: Object): boolean {
+export function isForInStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -257,7 +257,7 @@ export function isForInStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isForStatement(node: Object, opts?: Object): boolean {
+export function isForStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -271,7 +271,7 @@ export function isForStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFunctionDeclaration(node: Object, opts?: Object): boolean {
+export function isFunctionDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -285,7 +285,7 @@ export function isFunctionDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFunctionExpression(node: Object, opts?: Object): boolean {
+export function isFunctionExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -299,7 +299,7 @@ export function isFunctionExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isIdentifier(node: Object, opts?: Object): boolean {
+export function isIdentifier(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -313,7 +313,7 @@ export function isIdentifier(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isIfStatement(node: Object, opts?: Object): boolean {
+export function isIfStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -327,7 +327,7 @@ export function isIfStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isLabeledStatement(node: Object, opts?: Object): boolean {
+export function isLabeledStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -341,7 +341,7 @@ export function isLabeledStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isStringLiteral(node: Object, opts?: Object): boolean {
+export function isStringLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -355,7 +355,7 @@ export function isStringLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isNumericLiteral(node: Object, opts?: Object): boolean {
+export function isNumericLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -369,7 +369,7 @@ export function isNumericLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isNullLiteral(node: Object, opts?: Object): boolean {
+export function isNullLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -383,7 +383,7 @@ export function isNullLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBooleanLiteral(node: Object, opts?: Object): boolean {
+export function isBooleanLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -397,7 +397,7 @@ export function isBooleanLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isRegExpLiteral(node: Object, opts?: Object): boolean {
+export function isRegExpLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -411,7 +411,7 @@ export function isRegExpLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isLogicalExpression(node: Object, opts?: Object): boolean {
+export function isLogicalExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -425,7 +425,7 @@ export function isLogicalExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isMemberExpression(node: Object, opts?: Object): boolean {
+export function isMemberExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -439,7 +439,7 @@ export function isMemberExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isNewExpression(node: Object, opts?: Object): boolean {
+export function isNewExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -453,7 +453,7 @@ export function isNewExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isProgram(node: Object, opts?: Object): boolean {
+export function isProgram(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -467,7 +467,7 @@ export function isProgram(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectExpression(node: Object, opts?: Object): boolean {
+export function isObjectExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -481,7 +481,7 @@ export function isObjectExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectMethod(node: Object, opts?: Object): boolean {
+export function isObjectMethod(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -495,7 +495,7 @@ export function isObjectMethod(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectProperty(node: Object, opts?: Object): boolean {
+export function isObjectProperty(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -509,7 +509,7 @@ export function isObjectProperty(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isRestElement(node: Object, opts?: Object): boolean {
+export function isRestElement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -523,7 +523,7 @@ export function isRestElement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isReturnStatement(node: Object, opts?: Object): boolean {
+export function isReturnStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -537,7 +537,7 @@ export function isReturnStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isSequenceExpression(node: Object, opts?: Object): boolean {
+export function isSequenceExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -551,7 +551,24 @@ export function isSequenceExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isSwitchCase(node: Object, opts?: Object): boolean {
+export function isParenthesizedExpression(
+  node: ?Object,
+  opts?: Object,
+): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "ParenthesizedExpression") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isSwitchCase(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -565,7 +582,7 @@ export function isSwitchCase(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isSwitchStatement(node: Object, opts?: Object): boolean {
+export function isSwitchStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -579,7 +596,7 @@ export function isSwitchStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isThisExpression(node: Object, opts?: Object): boolean {
+export function isThisExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -593,7 +610,7 @@ export function isThisExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isThrowStatement(node: Object, opts?: Object): boolean {
+export function isThrowStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -607,7 +624,7 @@ export function isThrowStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTryStatement(node: Object, opts?: Object): boolean {
+export function isTryStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -621,7 +638,7 @@ export function isTryStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isUnaryExpression(node: Object, opts?: Object): boolean {
+export function isUnaryExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -635,7 +652,7 @@ export function isUnaryExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isUpdateExpression(node: Object, opts?: Object): boolean {
+export function isUpdateExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -649,7 +666,7 @@ export function isUpdateExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isVariableDeclaration(node: Object, opts?: Object): boolean {
+export function isVariableDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -663,7 +680,7 @@ export function isVariableDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isVariableDeclarator(node: Object, opts?: Object): boolean {
+export function isVariableDeclarator(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -677,7 +694,7 @@ export function isVariableDeclarator(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isWhileStatement(node: Object, opts?: Object): boolean {
+export function isWhileStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -691,7 +708,7 @@ export function isWhileStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isWithStatement(node: Object, opts?: Object): boolean {
+export function isWithStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -705,7 +722,7 @@ export function isWithStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isAssignmentPattern(node: Object, opts?: Object): boolean {
+export function isAssignmentPattern(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -719,7 +736,7 @@ export function isAssignmentPattern(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isArrayPattern(node: Object, opts?: Object): boolean {
+export function isArrayPattern(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -734,7 +751,7 @@ export function isArrayPattern(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isArrowFunctionExpression(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -750,7 +767,7 @@ export function isArrowFunctionExpression(
 
   return false;
 }
-export function isClassBody(node: Object, opts?: Object): boolean {
+export function isClassBody(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -764,7 +781,7 @@ export function isClassBody(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isClassDeclaration(node: Object, opts?: Object): boolean {
+export function isClassDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -778,7 +795,7 @@ export function isClassDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isClassExpression(node: Object, opts?: Object): boolean {
+export function isClassExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -792,7 +809,7 @@ export function isClassExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExportAllDeclaration(node: Object, opts?: Object): boolean {
+export function isExportAllDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -807,7 +824,7 @@ export function isExportAllDeclaration(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isExportDefaultDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -823,7 +840,10 @@ export function isExportDefaultDeclaration(
 
   return false;
 }
-export function isExportNamedDeclaration(node: Object, opts?: Object): boolean {
+export function isExportNamedDeclaration(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -837,7 +857,7 @@ export function isExportNamedDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExportSpecifier(node: Object, opts?: Object): boolean {
+export function isExportSpecifier(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -851,7 +871,7 @@ export function isExportSpecifier(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isForOfStatement(node: Object, opts?: Object): boolean {
+export function isForOfStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -865,7 +885,7 @@ export function isForOfStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isImportDeclaration(node: Object, opts?: Object): boolean {
+export function isImportDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -879,7 +899,10 @@ export function isImportDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isImportDefaultSpecifier(node: Object, opts?: Object): boolean {
+export function isImportDefaultSpecifier(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -894,7 +917,7 @@ export function isImportDefaultSpecifier(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isImportNamespaceSpecifier(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -910,7 +933,7 @@ export function isImportNamespaceSpecifier(
 
   return false;
 }
-export function isImportSpecifier(node: Object, opts?: Object): boolean {
+export function isImportSpecifier(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -924,7 +947,7 @@ export function isImportSpecifier(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isMetaProperty(node: Object, opts?: Object): boolean {
+export function isMetaProperty(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -938,7 +961,7 @@ export function isMetaProperty(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isClassMethod(node: Object, opts?: Object): boolean {
+export function isClassMethod(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -952,7 +975,7 @@ export function isClassMethod(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectPattern(node: Object, opts?: Object): boolean {
+export function isObjectPattern(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -966,7 +989,7 @@ export function isObjectPattern(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isSpreadElement(node: Object, opts?: Object): boolean {
+export function isSpreadElement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -980,7 +1003,7 @@ export function isSpreadElement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isSuper(node: Object, opts?: Object): boolean {
+export function isSuper(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -995,7 +1018,7 @@ export function isSuper(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isTaggedTemplateExpression(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1011,7 +1034,7 @@ export function isTaggedTemplateExpression(
 
   return false;
 }
-export function isTemplateElement(node: Object, opts?: Object): boolean {
+export function isTemplateElement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1025,7 +1048,7 @@ export function isTemplateElement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTemplateLiteral(node: Object, opts?: Object): boolean {
+export function isTemplateLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1039,7 +1062,7 @@ export function isTemplateLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isYieldExpression(node: Object, opts?: Object): boolean {
+export function isYieldExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1053,7 +1076,7 @@ export function isYieldExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isAnyTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isAnyTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1067,7 +1090,7 @@ export function isAnyTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isArrayTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isArrayTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1081,7 +1104,7 @@ export function isArrayTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBooleanTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isBooleanTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1096,7 +1119,7 @@ export function isBooleanTypeAnnotation(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isBooleanLiteralTypeAnnotation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1113,7 +1136,7 @@ export function isBooleanLiteralTypeAnnotation(
   return false;
 }
 export function isNullLiteralTypeAnnotation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1129,7 +1152,7 @@ export function isNullLiteralTypeAnnotation(
 
   return false;
 }
-export function isClassImplements(node: Object, opts?: Object): boolean {
+export function isClassImplements(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1143,7 +1166,7 @@ export function isClassImplements(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareClass(node: Object, opts?: Object): boolean {
+export function isDeclareClass(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1157,7 +1180,7 @@ export function isDeclareClass(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareFunction(node: Object, opts?: Object): boolean {
+export function isDeclareFunction(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1171,7 +1194,7 @@ export function isDeclareFunction(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareInterface(node: Object, opts?: Object): boolean {
+export function isDeclareInterface(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1185,7 +1208,7 @@ export function isDeclareInterface(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareModule(node: Object, opts?: Object): boolean {
+export function isDeclareModule(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1199,7 +1222,7 @@ export function isDeclareModule(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareModuleExports(node: Object, opts?: Object): boolean {
+export function isDeclareModuleExports(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1213,7 +1236,7 @@ export function isDeclareModuleExports(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareTypeAlias(node: Object, opts?: Object): boolean {
+export function isDeclareTypeAlias(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1227,7 +1250,7 @@ export function isDeclareTypeAlias(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareOpaqueType(node: Object, opts?: Object): boolean {
+export function isDeclareOpaqueType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1241,7 +1264,7 @@ export function isDeclareOpaqueType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclareVariable(node: Object, opts?: Object): boolean {
+export function isDeclareVariable(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1256,7 +1279,7 @@ export function isDeclareVariable(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isDeclareExportDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1273,7 +1296,7 @@ export function isDeclareExportDeclaration(
   return false;
 }
 export function isDeclareExportAllDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1289,7 +1312,7 @@ export function isDeclareExportAllDeclaration(
 
   return false;
 }
-export function isDeclaredPredicate(node: Object, opts?: Object): boolean {
+export function isDeclaredPredicate(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1303,7 +1326,7 @@ export function isDeclaredPredicate(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExistsTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isExistsTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1317,7 +1340,10 @@ export function isExistsTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFunctionTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isFunctionTypeAnnotation(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1331,7 +1357,7 @@ export function isFunctionTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFunctionTypeParam(node: Object, opts?: Object): boolean {
+export function isFunctionTypeParam(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1345,7 +1371,7 @@ export function isFunctionTypeParam(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isGenericTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isGenericTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1359,7 +1385,7 @@ export function isGenericTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isInferredPredicate(node: Object, opts?: Object): boolean {
+export function isInferredPredicate(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1373,7 +1399,7 @@ export function isInferredPredicate(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isInterfaceExtends(node: Object, opts?: Object): boolean {
+export function isInterfaceExtends(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1387,7 +1413,7 @@ export function isInterfaceExtends(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isInterfaceDeclaration(node: Object, opts?: Object): boolean {
+export function isInterfaceDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1402,7 +1428,7 @@ export function isInterfaceDeclaration(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isInterfaceTypeAnnotation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1419,7 +1445,7 @@ export function isInterfaceTypeAnnotation(
   return false;
 }
 export function isIntersectionTypeAnnotation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1435,7 +1461,7 @@ export function isIntersectionTypeAnnotation(
 
   return false;
 }
-export function isMixedTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isMixedTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1449,7 +1475,7 @@ export function isMixedTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isEmptyTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isEmptyTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1463,7 +1489,10 @@ export function isEmptyTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isNullableTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isNullableTypeAnnotation(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1478,7 +1507,7 @@ export function isNullableTypeAnnotation(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isNumberLiteralTypeAnnotation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1494,7 +1523,7 @@ export function isNumberLiteralTypeAnnotation(
 
   return false;
 }
-export function isNumberTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isNumberTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1508,7 +1537,7 @@ export function isNumberTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isObjectTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1522,7 +1551,10 @@ export function isObjectTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectTypeInternalSlot(node: Object, opts?: Object): boolean {
+export function isObjectTypeInternalSlot(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1536,7 +1568,10 @@ export function isObjectTypeInternalSlot(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectTypeCallProperty(node: Object, opts?: Object): boolean {
+export function isObjectTypeCallProperty(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1550,7 +1585,7 @@ export function isObjectTypeCallProperty(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectTypeIndexer(node: Object, opts?: Object): boolean {
+export function isObjectTypeIndexer(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1564,7 +1599,7 @@ export function isObjectTypeIndexer(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectTypeProperty(node: Object, opts?: Object): boolean {
+export function isObjectTypeProperty(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1579,7 +1614,7 @@ export function isObjectTypeProperty(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isObjectTypeSpreadProperty(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1595,7 +1630,7 @@ export function isObjectTypeSpreadProperty(
 
   return false;
 }
-export function isOpaqueType(node: Object, opts?: Object): boolean {
+export function isOpaqueType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1610,7 +1645,7 @@ export function isOpaqueType(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isQualifiedTypeIdentifier(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1627,7 +1662,7 @@ export function isQualifiedTypeIdentifier(
   return false;
 }
 export function isStringLiteralTypeAnnotation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1643,7 +1678,7 @@ export function isStringLiteralTypeAnnotation(
 
   return false;
 }
-export function isStringTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isStringTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1657,7 +1692,7 @@ export function isStringTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isThisTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isThisTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1671,7 +1706,7 @@ export function isThisTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTupleTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isTupleTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1685,7 +1720,7 @@ export function isTupleTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTypeofTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isTypeofTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1699,7 +1734,7 @@ export function isTypeofTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTypeAlias(node: Object, opts?: Object): boolean {
+export function isTypeAlias(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1713,7 +1748,7 @@ export function isTypeAlias(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1727,7 +1762,7 @@ export function isTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTypeCastExpression(node: Object, opts?: Object): boolean {
+export function isTypeCastExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1741,7 +1776,7 @@ export function isTypeCastExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTypeParameter(node: Object, opts?: Object): boolean {
+export function isTypeParameter(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1756,7 +1791,7 @@ export function isTypeParameter(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isTypeParameterDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1773,7 +1808,7 @@ export function isTypeParameterDeclaration(
   return false;
 }
 export function isTypeParameterInstantiation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -1789,7 +1824,7 @@ export function isTypeParameterInstantiation(
 
   return false;
 }
-export function isUnionTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isUnionTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1803,7 +1838,7 @@ export function isUnionTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isVariance(node: Object, opts?: Object): boolean {
+export function isVariance(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1817,7 +1852,7 @@ export function isVariance(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isVoidTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isVoidTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1831,7 +1866,7 @@ export function isVoidTypeAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXAttribute(node: Object, opts?: Object): boolean {
+export function isJSXAttribute(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1845,7 +1880,7 @@ export function isJSXAttribute(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXClosingElement(node: Object, opts?: Object): boolean {
+export function isJSXClosingElement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1859,7 +1894,7 @@ export function isJSXClosingElement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXElement(node: Object, opts?: Object): boolean {
+export function isJSXElement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1873,7 +1908,7 @@ export function isJSXElement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXEmptyExpression(node: Object, opts?: Object): boolean {
+export function isJSXEmptyExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1887,7 +1922,10 @@ export function isJSXEmptyExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXExpressionContainer(node: Object, opts?: Object): boolean {
+export function isJSXExpressionContainer(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1901,7 +1939,7 @@ export function isJSXExpressionContainer(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXSpreadChild(node: Object, opts?: Object): boolean {
+export function isJSXSpreadChild(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1915,7 +1953,7 @@ export function isJSXSpreadChild(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXIdentifier(node: Object, opts?: Object): boolean {
+export function isJSXIdentifier(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1929,7 +1967,7 @@ export function isJSXIdentifier(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXMemberExpression(node: Object, opts?: Object): boolean {
+export function isJSXMemberExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1943,7 +1981,7 @@ export function isJSXMemberExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXNamespacedName(node: Object, opts?: Object): boolean {
+export function isJSXNamespacedName(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1957,7 +1995,7 @@ export function isJSXNamespacedName(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXOpeningElement(node: Object, opts?: Object): boolean {
+export function isJSXOpeningElement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1971,7 +2009,7 @@ export function isJSXOpeningElement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXSpreadAttribute(node: Object, opts?: Object): boolean {
+export function isJSXSpreadAttribute(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1985,7 +2023,7 @@ export function isJSXSpreadAttribute(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXText(node: Object, opts?: Object): boolean {
+export function isJSXText(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -1999,7 +2037,7 @@ export function isJSXText(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXFragment(node: Object, opts?: Object): boolean {
+export function isJSXFragment(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2013,7 +2051,7 @@ export function isJSXFragment(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXOpeningFragment(node: Object, opts?: Object): boolean {
+export function isJSXOpeningFragment(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2027,7 +2065,7 @@ export function isJSXOpeningFragment(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSXClosingFragment(node: Object, opts?: Object): boolean {
+export function isJSXClosingFragment(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2041,7 +2079,7 @@ export function isJSXClosingFragment(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isNoop(node: Object, opts?: Object): boolean {
+export function isNoop(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2055,14 +2093,11 @@ export function isNoop(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isParenthesizedExpression(
-  node: Object,
-  opts?: Object,
-): boolean {
+export function isPlaceholder(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
-  if (nodeType === "ParenthesizedExpression") {
+  if (nodeType === "Placeholder") {
     if (typeof opts === "undefined") {
       return true;
     } else {
@@ -2072,7 +2107,21 @@ export function isParenthesizedExpression(
 
   return false;
 }
-export function isAwaitExpression(node: Object, opts?: Object): boolean {
+export function isArgumentPlaceholder(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "ArgumentPlaceholder") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isAwaitExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2086,7 +2135,7 @@ export function isAwaitExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBindExpression(node: Object, opts?: Object): boolean {
+export function isBindExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2100,7 +2149,7 @@ export function isBindExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isClassProperty(node: Object, opts?: Object): boolean {
+export function isClassProperty(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2115,7 +2164,7 @@ export function isClassProperty(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isOptionalMemberExpression(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -2131,7 +2180,58 @@ export function isOptionalMemberExpression(
 
   return false;
 }
-export function isOptionalCallExpression(node: Object, opts?: Object): boolean {
+export function isPipelineTopicExpression(
+  node: ?Object,
+  opts?: Object,
+): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "PipelineTopicExpression") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isPipelineBareFunction(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "PipelineBareFunction") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isPipelinePrimaryTopicReference(
+  node: ?Object,
+  opts?: Object,
+): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "PipelinePrimaryTopicReference") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isOptionalCallExpression(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2145,7 +2245,7 @@ export function isOptionalCallExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isClassPrivateProperty(node: Object, opts?: Object): boolean {
+export function isClassPrivateProperty(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2159,7 +2259,21 @@ export function isClassPrivateProperty(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isImport(node: Object, opts?: Object): boolean {
+export function isClassPrivateMethod(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "ClassPrivateMethod") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isImport(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2173,7 +2287,7 @@ export function isImport(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDecorator(node: Object, opts?: Object): boolean {
+export function isDecorator(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2187,7 +2301,7 @@ export function isDecorator(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDoExpression(node: Object, opts?: Object): boolean {
+export function isDoExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2201,7 +2315,10 @@ export function isDoExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExportDefaultSpecifier(node: Object, opts?: Object): boolean {
+export function isExportDefaultSpecifier(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2216,7 +2333,7 @@ export function isExportDefaultSpecifier(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isExportNamespaceSpecifier(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -2232,7 +2349,7 @@ export function isExportNamespaceSpecifier(
 
   return false;
 }
-export function isPrivateName(node: Object, opts?: Object): boolean {
+export function isPrivateName(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2246,7 +2363,7 @@ export function isPrivateName(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBigIntLiteral(node: Object, opts?: Object): boolean {
+export function isBigIntLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2260,7 +2377,7 @@ export function isBigIntLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSParameterProperty(node: Object, opts?: Object): boolean {
+export function isTSParameterProperty(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2274,7 +2391,7 @@ export function isTSParameterProperty(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSDeclareFunction(node: Object, opts?: Object): boolean {
+export function isTSDeclareFunction(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2288,7 +2405,7 @@ export function isTSDeclareFunction(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSDeclareMethod(node: Object, opts?: Object): boolean {
+export function isTSDeclareMethod(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2302,7 +2419,7 @@ export function isTSDeclareMethod(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSQualifiedName(node: Object, opts?: Object): boolean {
+export function isTSQualifiedName(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2317,7 +2434,7 @@ export function isTSQualifiedName(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isTSCallSignatureDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -2334,7 +2451,7 @@ export function isTSCallSignatureDeclaration(
   return false;
 }
 export function isTSConstructSignatureDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -2350,7 +2467,7 @@ export function isTSConstructSignatureDeclaration(
 
   return false;
 }
-export function isTSPropertySignature(node: Object, opts?: Object): boolean {
+export function isTSPropertySignature(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2364,7 +2481,7 @@ export function isTSPropertySignature(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSMethodSignature(node: Object, opts?: Object): boolean {
+export function isTSMethodSignature(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2378,7 +2495,7 @@ export function isTSMethodSignature(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSIndexSignature(node: Object, opts?: Object): boolean {
+export function isTSIndexSignature(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2392,7 +2509,7 @@ export function isTSIndexSignature(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSAnyKeyword(node: Object, opts?: Object): boolean {
+export function isTSAnyKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2406,7 +2523,21 @@ export function isTSAnyKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSNumberKeyword(node: Object, opts?: Object): boolean {
+export function isTSUnknownKeyword(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "TSUnknownKeyword") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isTSNumberKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2420,7 +2551,7 @@ export function isTSNumberKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSObjectKeyword(node: Object, opts?: Object): boolean {
+export function isTSObjectKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2434,7 +2565,7 @@ export function isTSObjectKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSBooleanKeyword(node: Object, opts?: Object): boolean {
+export function isTSBooleanKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2448,7 +2579,7 @@ export function isTSBooleanKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSStringKeyword(node: Object, opts?: Object): boolean {
+export function isTSStringKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2462,7 +2593,7 @@ export function isTSStringKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSSymbolKeyword(node: Object, opts?: Object): boolean {
+export function isTSSymbolKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2476,7 +2607,7 @@ export function isTSSymbolKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSVoidKeyword(node: Object, opts?: Object): boolean {
+export function isTSVoidKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2490,7 +2621,7 @@ export function isTSVoidKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSUndefinedKeyword(node: Object, opts?: Object): boolean {
+export function isTSUndefinedKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2504,7 +2635,7 @@ export function isTSUndefinedKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSNullKeyword(node: Object, opts?: Object): boolean {
+export function isTSNullKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2518,7 +2649,7 @@ export function isTSNullKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSNeverKeyword(node: Object, opts?: Object): boolean {
+export function isTSNeverKeyword(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2532,7 +2663,7 @@ export function isTSNeverKeyword(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSThisType(node: Object, opts?: Object): boolean {
+export function isTSThisType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2546,7 +2677,7 @@ export function isTSThisType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSFunctionType(node: Object, opts?: Object): boolean {
+export function isTSFunctionType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2560,7 +2691,7 @@ export function isTSFunctionType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSConstructorType(node: Object, opts?: Object): boolean {
+export function isTSConstructorType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2574,7 +2705,7 @@ export function isTSConstructorType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypeReference(node: Object, opts?: Object): boolean {
+export function isTSTypeReference(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2588,7 +2719,7 @@ export function isTSTypeReference(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypePredicate(node: Object, opts?: Object): boolean {
+export function isTSTypePredicate(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2602,7 +2733,7 @@ export function isTSTypePredicate(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypeQuery(node: Object, opts?: Object): boolean {
+export function isTSTypeQuery(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2616,7 +2747,7 @@ export function isTSTypeQuery(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypeLiteral(node: Object, opts?: Object): boolean {
+export function isTSTypeLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2630,7 +2761,7 @@ export function isTSTypeLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSArrayType(node: Object, opts?: Object): boolean {
+export function isTSArrayType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2644,7 +2775,7 @@ export function isTSArrayType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTupleType(node: Object, opts?: Object): boolean {
+export function isTSTupleType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2658,7 +2789,35 @@ export function isTSTupleType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSUnionType(node: Object, opts?: Object): boolean {
+export function isTSOptionalType(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "TSOptionalType") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isTSRestType(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "TSRestType") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
+export function isTSUnionType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2672,7 +2831,7 @@ export function isTSUnionType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSIntersectionType(node: Object, opts?: Object): boolean {
+export function isTSIntersectionType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2686,7 +2845,7 @@ export function isTSIntersectionType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSConditionalType(node: Object, opts?: Object): boolean {
+export function isTSConditionalType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2700,7 +2859,7 @@ export function isTSConditionalType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSInferType(node: Object, opts?: Object): boolean {
+export function isTSInferType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2714,7 +2873,7 @@ export function isTSInferType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSParenthesizedType(node: Object, opts?: Object): boolean {
+export function isTSParenthesizedType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2728,7 +2887,7 @@ export function isTSParenthesizedType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypeOperator(node: Object, opts?: Object): boolean {
+export function isTSTypeOperator(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2742,7 +2901,7 @@ export function isTSTypeOperator(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSIndexedAccessType(node: Object, opts?: Object): boolean {
+export function isTSIndexedAccessType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2756,7 +2915,7 @@ export function isTSIndexedAccessType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSMappedType(node: Object, opts?: Object): boolean {
+export function isTSMappedType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2770,7 +2929,7 @@ export function isTSMappedType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSLiteralType(node: Object, opts?: Object): boolean {
+export function isTSLiteralType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2785,7 +2944,7 @@ export function isTSLiteralType(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isTSExpressionWithTypeArguments(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -2801,7 +2960,10 @@ export function isTSExpressionWithTypeArguments(
 
   return false;
 }
-export function isTSInterfaceDeclaration(node: Object, opts?: Object): boolean {
+export function isTSInterfaceDeclaration(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2815,7 +2977,7 @@ export function isTSInterfaceDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSInterfaceBody(node: Object, opts?: Object): boolean {
+export function isTSInterfaceBody(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2829,7 +2991,10 @@ export function isTSInterfaceBody(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypeAliasDeclaration(node: Object, opts?: Object): boolean {
+export function isTSTypeAliasDeclaration(
+  node: ?Object,
+  opts?: Object,
+): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2843,7 +3008,7 @@ export function isTSTypeAliasDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSAsExpression(node: Object, opts?: Object): boolean {
+export function isTSAsExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2857,7 +3022,7 @@ export function isTSAsExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypeAssertion(node: Object, opts?: Object): boolean {
+export function isTSTypeAssertion(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2871,7 +3036,7 @@ export function isTSTypeAssertion(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSEnumDeclaration(node: Object, opts?: Object): boolean {
+export function isTSEnumDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2885,7 +3050,7 @@ export function isTSEnumDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSEnumMember(node: Object, opts?: Object): boolean {
+export function isTSEnumMember(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2899,7 +3064,7 @@ export function isTSEnumMember(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSModuleDeclaration(node: Object, opts?: Object): boolean {
+export function isTSModuleDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2913,7 +3078,7 @@ export function isTSModuleDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSModuleBlock(node: Object, opts?: Object): boolean {
+export function isTSModuleBlock(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2927,8 +3092,22 @@ export function isTSModuleBlock(node: Object, opts?: Object): boolean {
 
   return false;
 }
+export function isTSImportType(node: ?Object, opts?: Object): boolean {
+  if (!node) return false;
+
+  const nodeType = node.type;
+  if (nodeType === "TSImportType") {
+    if (typeof opts === "undefined") {
+      return true;
+    } else {
+      return shallowEqual(node, opts);
+    }
+  }
+
+  return false;
+}
 export function isTSImportEqualsDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -2945,7 +3124,7 @@ export function isTSImportEqualsDeclaration(
   return false;
 }
 export function isTSExternalModuleReference(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -2961,7 +3140,7 @@ export function isTSExternalModuleReference(
 
   return false;
 }
-export function isTSNonNullExpression(node: Object, opts?: Object): boolean {
+export function isTSNonNullExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2975,7 +3154,7 @@ export function isTSNonNullExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSExportAssignment(node: Object, opts?: Object): boolean {
+export function isTSExportAssignment(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -2990,7 +3169,7 @@ export function isTSExportAssignment(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isTSNamespaceExportDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -3006,7 +3185,7 @@ export function isTSNamespaceExportDeclaration(
 
   return false;
 }
-export function isTSTypeAnnotation(node: Object, opts?: Object): boolean {
+export function isTSTypeAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3021,7 +3200,7 @@ export function isTSTypeAnnotation(node: Object, opts?: Object): boolean {
   return false;
 }
 export function isTSTypeParameterInstantiation(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -3038,7 +3217,7 @@ export function isTSTypeParameterInstantiation(
   return false;
 }
 export function isTSTypeParameterDeclaration(
-  node: Object,
+  node: ?Object,
   opts?: Object,
 ): boolean {
   if (!node) return false;
@@ -3054,7 +3233,7 @@ export function isTSTypeParameterDeclaration(
 
   return false;
 }
-export function isTSTypeParameter(node: Object, opts?: Object): boolean {
+export function isTSTypeParameter(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3068,7 +3247,7 @@ export function isTSTypeParameter(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExpression(node: Object, opts?: Object): boolean {
+export function isExpression(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3091,6 +3270,7 @@ export function isExpression(node: Object, opts?: Object): boolean {
     "NewExpression" === nodeType ||
     "ObjectExpression" === nodeType ||
     "SequenceExpression" === nodeType ||
+    "ParenthesizedExpression" === nodeType ||
     "ThisExpression" === nodeType ||
     "UnaryExpression" === nodeType ||
     "UpdateExpression" === nodeType ||
@@ -3104,17 +3284,21 @@ export function isExpression(node: Object, opts?: Object): boolean {
     "TypeCastExpression" === nodeType ||
     "JSXElement" === nodeType ||
     "JSXFragment" === nodeType ||
-    "ParenthesizedExpression" === nodeType ||
     "AwaitExpression" === nodeType ||
     "BindExpression" === nodeType ||
     "OptionalMemberExpression" === nodeType ||
+    "PipelinePrimaryTopicReference" === nodeType ||
     "OptionalCallExpression" === nodeType ||
     "Import" === nodeType ||
     "DoExpression" === nodeType ||
     "BigIntLiteral" === nodeType ||
     "TSAsExpression" === nodeType ||
     "TSTypeAssertion" === nodeType ||
-    "TSNonNullExpression" === nodeType
+    "TSNonNullExpression" === nodeType ||
+    (nodeType === "Placeholder" &&
+      ("Expression" === node.expectedNode ||
+        "Identifier" === node.expectedNode ||
+        "StringLiteral" === node.expectedNode))
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3125,7 +3309,7 @@ export function isExpression(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBinary(node: Object, opts?: Object): boolean {
+export function isBinary(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3143,7 +3327,7 @@ export function isBinary(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isScopable(node: Object, opts?: Object): boolean {
+export function isScopable(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3164,7 +3348,10 @@ export function isScopable(node: Object, opts?: Object): boolean {
     "ClassDeclaration" === nodeType ||
     "ClassExpression" === nodeType ||
     "ForOfStatement" === nodeType ||
-    "ClassMethod" === nodeType
+    "ClassMethod" === nodeType ||
+    "ClassPrivateMethod" === nodeType ||
+    "TSModuleBlock" === nodeType ||
+    (nodeType === "Placeholder" && "BlockStatement" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3175,7 +3362,7 @@ export function isScopable(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBlockParent(node: Object, opts?: Object): boolean {
+export function isBlockParent(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3194,7 +3381,10 @@ export function isBlockParent(node: Object, opts?: Object): boolean {
     "WhileStatement" === nodeType ||
     "ArrowFunctionExpression" === nodeType ||
     "ForOfStatement" === nodeType ||
-    "ClassMethod" === nodeType
+    "ClassMethod" === nodeType ||
+    "ClassPrivateMethod" === nodeType ||
+    "TSModuleBlock" === nodeType ||
+    (nodeType === "Placeholder" && "BlockStatement" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3205,14 +3395,16 @@ export function isBlockParent(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isBlock(node: Object, opts?: Object): boolean {
+export function isBlock(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
   if (
     nodeType === "Block" ||
     "BlockStatement" === nodeType ||
-    "Program" === nodeType
+    "Program" === nodeType ||
+    "TSModuleBlock" === nodeType ||
+    (nodeType === "Placeholder" && "BlockStatement" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3223,7 +3415,7 @@ export function isBlock(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isStatement(node: Object, opts?: Object): boolean {
+export function isStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3274,7 +3466,11 @@ export function isStatement(node: Object, opts?: Object): boolean {
     "TSModuleDeclaration" === nodeType ||
     "TSImportEqualsDeclaration" === nodeType ||
     "TSExportAssignment" === nodeType ||
-    "TSNamespaceExportDeclaration" === nodeType
+    "TSNamespaceExportDeclaration" === nodeType ||
+    (nodeType === "Placeholder" &&
+      ("Statement" === node.expectedNode ||
+        "Declaration" === node.expectedNode ||
+        "BlockStatement" === node.expectedNode))
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3285,7 +3481,7 @@ export function isStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTerminatorless(node: Object, opts?: Object): boolean {
+export function isTerminatorless(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3307,7 +3503,7 @@ export function isTerminatorless(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isCompletionStatement(node: Object, opts?: Object): boolean {
+export function isCompletionStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3327,7 +3523,7 @@ export function isCompletionStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isConditional(node: Object, opts?: Object): boolean {
+export function isConditional(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3345,7 +3541,7 @@ export function isConditional(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isLoop(node: Object, opts?: Object): boolean {
+export function isLoop(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3366,7 +3562,7 @@ export function isLoop(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isWhile(node: Object, opts?: Object): boolean {
+export function isWhile(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3384,15 +3580,15 @@ export function isWhile(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExpressionWrapper(node: Object, opts?: Object): boolean {
+export function isExpressionWrapper(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
   if (
     nodeType === "ExpressionWrapper" ||
     "ExpressionStatement" === nodeType ||
-    "TypeCastExpression" === nodeType ||
-    "ParenthesizedExpression" === nodeType
+    "ParenthesizedExpression" === nodeType ||
+    "TypeCastExpression" === nodeType
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3403,7 +3599,7 @@ export function isExpressionWrapper(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFor(node: Object, opts?: Object): boolean {
+export function isFor(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3422,7 +3618,7 @@ export function isFor(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isForXStatement(node: Object, opts?: Object): boolean {
+export function isForXStatement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3440,7 +3636,7 @@ export function isForXStatement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFunction(node: Object, opts?: Object): boolean {
+export function isFunction(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3450,7 +3646,8 @@ export function isFunction(node: Object, opts?: Object): boolean {
     "FunctionExpression" === nodeType ||
     "ObjectMethod" === nodeType ||
     "ArrowFunctionExpression" === nodeType ||
-    "ClassMethod" === nodeType
+    "ClassMethod" === nodeType ||
+    "ClassPrivateMethod" === nodeType
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3461,7 +3658,7 @@ export function isFunction(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFunctionParent(node: Object, opts?: Object): boolean {
+export function isFunctionParent(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3471,7 +3668,8 @@ export function isFunctionParent(node: Object, opts?: Object): boolean {
     "FunctionExpression" === nodeType ||
     "ObjectMethod" === nodeType ||
     "ArrowFunctionExpression" === nodeType ||
-    "ClassMethod" === nodeType
+    "ClassMethod" === nodeType ||
+    "ClassPrivateMethod" === nodeType
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3482,7 +3680,7 @@ export function isFunctionParent(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isPureish(node: Object, opts?: Object): boolean {
+export function isPureish(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3497,7 +3695,8 @@ export function isPureish(node: Object, opts?: Object): boolean {
     "ArrowFunctionExpression" === nodeType ||
     "ClassDeclaration" === nodeType ||
     "ClassExpression" === nodeType ||
-    "BigIntLiteral" === nodeType
+    "BigIntLiteral" === nodeType ||
+    (nodeType === "Placeholder" && "StringLiteral" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3508,7 +3707,7 @@ export function isPureish(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isDeclaration(node: Object, opts?: Object): boolean {
+export function isDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3538,7 +3737,8 @@ export function isDeclaration(node: Object, opts?: Object): boolean {
     "TSInterfaceDeclaration" === nodeType ||
     "TSTypeAliasDeclaration" === nodeType ||
     "TSEnumDeclaration" === nodeType ||
-    "TSModuleDeclaration" === nodeType
+    "TSModuleDeclaration" === nodeType ||
+    (nodeType === "Placeholder" && "Declaration" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3549,7 +3749,7 @@ export function isDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isPatternLike(node: Object, opts?: Object): boolean {
+export function isPatternLike(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3559,7 +3759,9 @@ export function isPatternLike(node: Object, opts?: Object): boolean {
     "RestElement" === nodeType ||
     "AssignmentPattern" === nodeType ||
     "ArrayPattern" === nodeType ||
-    "ObjectPattern" === nodeType
+    "ObjectPattern" === nodeType ||
+    (nodeType === "Placeholder" &&
+      ("Pattern" === node.expectedNode || "Identifier" === node.expectedNode))
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3570,7 +3772,7 @@ export function isPatternLike(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isLVal(node: Object, opts?: Object): boolean {
+export function isLVal(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3582,7 +3784,9 @@ export function isLVal(node: Object, opts?: Object): boolean {
     "AssignmentPattern" === nodeType ||
     "ArrayPattern" === nodeType ||
     "ObjectPattern" === nodeType ||
-    "TSParameterProperty" === nodeType
+    "TSParameterProperty" === nodeType ||
+    (nodeType === "Placeholder" &&
+      ("Pattern" === node.expectedNode || "Identifier" === node.expectedNode))
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3593,14 +3797,15 @@ export function isLVal(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSEntityName(node: Object, opts?: Object): boolean {
+export function isTSEntityName(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
   if (
     nodeType === "TSEntityName" ||
     "Identifier" === nodeType ||
-    "TSQualifiedName" === nodeType
+    "TSQualifiedName" === nodeType ||
+    (nodeType === "Placeholder" && "Identifier" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3611,7 +3816,7 @@ export function isTSEntityName(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isLiteral(node: Object, opts?: Object): boolean {
+export function isLiteral(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3623,7 +3828,8 @@ export function isLiteral(node: Object, opts?: Object): boolean {
     "BooleanLiteral" === nodeType ||
     "RegExpLiteral" === nodeType ||
     "TemplateLiteral" === nodeType ||
-    "BigIntLiteral" === nodeType
+    "BigIntLiteral" === nodeType ||
+    (nodeType === "Placeholder" && "StringLiteral" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3634,7 +3840,7 @@ export function isLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isImmutable(node: Object, opts?: Object): boolean {
+export function isImmutable(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3654,7 +3860,8 @@ export function isImmutable(node: Object, opts?: Object): boolean {
     "JSXFragment" === nodeType ||
     "JSXOpeningFragment" === nodeType ||
     "JSXClosingFragment" === nodeType ||
-    "BigIntLiteral" === nodeType
+    "BigIntLiteral" === nodeType ||
+    (nodeType === "Placeholder" && "StringLiteral" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3665,7 +3872,7 @@ export function isImmutable(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isUserWhitespacable(node: Object, opts?: Object): boolean {
+export function isUserWhitespacable(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3688,14 +3895,15 @@ export function isUserWhitespacable(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isMethod(node: Object, opts?: Object): boolean {
+export function isMethod(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
   if (
     nodeType === "Method" ||
     "ObjectMethod" === nodeType ||
-    "ClassMethod" === nodeType
+    "ClassMethod" === nodeType ||
+    "ClassPrivateMethod" === nodeType
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3706,7 +3914,7 @@ export function isMethod(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isObjectMember(node: Object, opts?: Object): boolean {
+export function isObjectMember(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3724,7 +3932,7 @@ export function isObjectMember(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isProperty(node: Object, opts?: Object): boolean {
+export function isProperty(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3743,7 +3951,7 @@ export function isProperty(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isUnaryLike(node: Object, opts?: Object): boolean {
+export function isUnaryLike(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3761,7 +3969,7 @@ export function isUnaryLike(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isPattern(node: Object, opts?: Object): boolean {
+export function isPattern(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3769,7 +3977,8 @@ export function isPattern(node: Object, opts?: Object): boolean {
     nodeType === "Pattern" ||
     "AssignmentPattern" === nodeType ||
     "ArrayPattern" === nodeType ||
-    "ObjectPattern" === nodeType
+    "ObjectPattern" === nodeType ||
+    (nodeType === "Placeholder" && "Pattern" === node.expectedNode)
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -3780,7 +3989,7 @@ export function isPattern(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isClass(node: Object, opts?: Object): boolean {
+export function isClass(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3798,7 +4007,7 @@ export function isClass(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isModuleDeclaration(node: Object, opts?: Object): boolean {
+export function isModuleDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3818,7 +4027,7 @@ export function isModuleDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isExportDeclaration(node: Object, opts?: Object): boolean {
+export function isExportDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3837,7 +4046,7 @@ export function isExportDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isModuleSpecifier(node: Object, opts?: Object): boolean {
+export function isModuleSpecifier(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3859,7 +4068,7 @@ export function isModuleSpecifier(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFlow(node: Object, opts?: Object): boolean {
+export function isFlow(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3928,7 +4137,7 @@ export function isFlow(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFlowType(node: Object, opts?: Object): boolean {
+export function isFlowType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3967,7 +4176,7 @@ export function isFlowType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFlowBaseAnnotation(node: Object, opts?: Object): boolean {
+export function isFlowBaseAnnotation(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -3992,7 +4201,7 @@ export function isFlowBaseAnnotation(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFlowDeclaration(node: Object, opts?: Object): boolean {
+export function isFlowDeclaration(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -4021,7 +4230,7 @@ export function isFlowDeclaration(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isFlowPredicate(node: Object, opts?: Object): boolean {
+export function isFlowPredicate(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -4039,7 +4248,7 @@ export function isFlowPredicate(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isJSX(node: Object, opts?: Object): boolean {
+export function isJSX(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -4070,13 +4279,14 @@ export function isJSX(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isPrivate(node: Object, opts?: Object): boolean {
+export function isPrivate(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
   if (
     nodeType === "Private" ||
     "ClassPrivateProperty" === nodeType ||
+    "ClassPrivateMethod" === nodeType ||
     "PrivateName" === nodeType
   ) {
     if (typeof opts === "undefined") {
@@ -4088,7 +4298,7 @@ export function isPrivate(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSTypeElement(node: Object, opts?: Object): boolean {
+export function isTSTypeElement(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
@@ -4109,13 +4319,14 @@ export function isTSTypeElement(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isTSType(node: Object, opts?: Object): boolean {
+export function isTSType(node: ?Object, opts?: Object): boolean {
   if (!node) return false;
 
   const nodeType = node.type;
   if (
     nodeType === "TSType" ||
     "TSAnyKeyword" === nodeType ||
+    "TSUnknownKeyword" === nodeType ||
     "TSNumberKeyword" === nodeType ||
     "TSObjectKeyword" === nodeType ||
     "TSBooleanKeyword" === nodeType ||
@@ -4134,6 +4345,8 @@ export function isTSType(node: Object, opts?: Object): boolean {
     "TSTypeLiteral" === nodeType ||
     "TSArrayType" === nodeType ||
     "TSTupleType" === nodeType ||
+    "TSOptionalType" === nodeType ||
+    "TSRestType" === nodeType ||
     "TSUnionType" === nodeType ||
     "TSIntersectionType" === nodeType ||
     "TSConditionalType" === nodeType ||
@@ -4143,7 +4356,8 @@ export function isTSType(node: Object, opts?: Object): boolean {
     "TSIndexedAccessType" === nodeType ||
     "TSMappedType" === nodeType ||
     "TSLiteralType" === nodeType ||
-    "TSExpressionWithTypeArguments" === nodeType
+    "TSExpressionWithTypeArguments" === nodeType ||
+    "TSImportType" === nodeType
   ) {
     if (typeof opts === "undefined") {
       return true;
@@ -4154,7 +4368,7 @@ export function isTSType(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isNumberLiteral(node: Object, opts?: Object): boolean {
+export function isNumberLiteral(node: ?Object, opts?: Object): boolean {
   console.trace(
     "The node type NumberLiteral has been renamed to NumericLiteral",
   );
@@ -4171,7 +4385,7 @@ export function isNumberLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isRegexLiteral(node: Object, opts?: Object): boolean {
+export function isRegexLiteral(node: ?Object, opts?: Object): boolean {
   console.trace("The node type RegexLiteral has been renamed to RegExpLiteral");
   if (!node) return false;
 
@@ -4186,7 +4400,7 @@ export function isRegexLiteral(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isRestProperty(node: Object, opts?: Object): boolean {
+export function isRestProperty(node: ?Object, opts?: Object): boolean {
   console.trace("The node type RestProperty has been renamed to RestElement");
   if (!node) return false;
 
@@ -4201,7 +4415,7 @@ export function isRestProperty(node: Object, opts?: Object): boolean {
 
   return false;
 }
-export function isSpreadProperty(node: Object, opts?: Object): boolean {
+export function isSpreadProperty(node: ?Object, opts?: Object): boolean {
   console.trace(
     "The node type SpreadProperty has been renamed to SpreadElement",
   );
diff --git a/packages/babel-types/src/validators/is.js b/packages/babel-types/src/validators/is.js
index 25cd7c735fc8..50cf945ff80c 100644
--- a/packages/babel-types/src/validators/is.js
+++ b/packages/babel-types/src/validators/is.js
@@ -1,6 +1,8 @@
 // @flow
 import shallowEqual from "../utils/shallowEqual";
 import isType from "./isType";
+import isPlaceholderType from "./isPlaceholderType";
+import { FLIPPED_ALIAS_KEYS } from "../definitions";
 
 /**
  * Returns whether `node` is of given `type`.
@@ -11,7 +13,21 @@ export default function is(type: string, node: Object, opts?: Object): boolean {
   if (!node) return false;
 
   const matches = isType(node.type, type);
-  if (!matches) return false;
+  if (!matches) {
+    if (!opts && node.type === "Placeholder" && type in FLIPPED_ALIAS_KEYS) {
+      // We can only return true if the placeholder doesn't replace a real node,
+      // but it replaces a category of nodes (an alias).
+      //
+      // t.is("Identifier", node) gives some guarantees about node's shape, so we
+      // can't say that Placeholder(expectedNode: "Identifier") is an identifier
+      // because it doesn't have the same properties.
+      // On the other hand, t.is("Expression", node) doesn't say anything about
+      // the shape of node because Expression can be many different nodes: we can,
+      // and should, safely report expression placeholders as Expressions.
+      return isPlaceholderType(node.expectedNode, type);
+    }
+    return false;
+  }
 
   if (typeof opts === "undefined") {
     return true;
diff --git a/packages/babel-types/src/validators/isBinding.js b/packages/babel-types/src/validators/isBinding.js
index b1719a3b3802..234da4f6ec33 100644
--- a/packages/babel-types/src/validators/isBinding.js
+++ b/packages/babel-types/src/validators/isBinding.js
@@ -3,7 +3,22 @@ import getBindingIdentifiers from "../retrievers/getBindingIdentifiers";
 /**
  * Check if the input `node` is a binding identifier.
  */
-export default function isBinding(node: Object, parent: Object): boolean {
+export default function isBinding(
+  node: Object,
+  parent: Object,
+  grandparent?: Object,
+): boolean {
+  if (
+    grandparent &&
+    node.type === "Identifier" &&
+    parent.type === "ObjectProperty" &&
+    grandparent.type === "ObjectExpression"
+  ) {
+    // We need to special-case this, because getBindingIdentifiers
+    // has an ObjectProperty->value entry for destructuring patterns.
+    return false;
+  }
+
   const keys = getBindingIdentifiers.keys[parent.type];
   if (keys) {
     for (let i = 0; i < keys.length; i++) {
diff --git a/packages/babel-types/src/validators/isNodesEquivalent.js b/packages/babel-types/src/validators/isNodesEquivalent.js
index 68672ff96475..26d61a122f7a 100644
--- a/packages/babel-types/src/validators/isNodesEquivalent.js
+++ b/packages/babel-types/src/validators/isNodesEquivalent.js
@@ -25,6 +25,11 @@ export default function isNodesEquivalent(a: any, b: any): boolean {
     if (typeof a[field] !== typeof b[field]) {
       return false;
     }
+    if (a[field] == null && b[field] == null) {
+      continue;
+    } else if (a[field] == null || b[field] == null) {
+      return false;
+    }
 
     if (Array.isArray(a[field])) {
       if (!Array.isArray(b[field])) {
@@ -46,7 +51,7 @@ export default function isNodesEquivalent(a: any, b: any): boolean {
       typeof a[field] === "object" &&
       (!visitorKeys || !visitorKeys.includes(field))
     ) {
-      for (const key in a[field]) {
+      for (const key of Object.keys(a[field])) {
         if (a[field][key] !== b[field][key]) {
           return false;
         }
diff --git a/packages/babel-types/src/validators/isPlaceholderType.js b/packages/babel-types/src/validators/isPlaceholderType.js
new file mode 100644
index 000000000000..fa775b7ed803
--- /dev/null
+++ b/packages/babel-types/src/validators/isPlaceholderType.js
@@ -0,0 +1,21 @@
+// @flow
+import { PLACEHOLDERS_ALIAS } from "../definitions";
+
+/**
+ * Test if a `placeholderType` is a `targetType` or if `targetType` is an alias of `placeholderType`.
+ */
+export default function isPlaceholderType(
+  placeholderType: ?string,
+  targetType: string,
+): boolean {
+  if (placeholderType === targetType) return true;
+
+  const aliases: ?Array<string> = PLACEHOLDERS_ALIAS[placeholderType];
+  if (aliases) {
+    for (const alias of aliases) {
+      if (targetType === alias) return true;
+    }
+  }
+
+  return false;
+}
diff --git a/packages/babel-types/src/validators/isReferenced.js b/packages/babel-types/src/validators/isReferenced.js
index 136cde829ede..699b291a01d6 100644
--- a/packages/babel-types/src/validators/isReferenced.js
+++ b/packages/babel-types/src/validators/isReferenced.js
@@ -2,7 +2,11 @@
 /**
  * Check if the input `node` is a reference to a bound variable.
  */
-export default function isReferenced(node: Object, parent: Object): boolean {
+export default function isReferenced(
+  node: Object,
+  parent: Object,
+  grandparent?: Object,
+): boolean {
   switch (parent.type) {
     // yes: PARENT[NODE]
     // yes: NODE.child
@@ -34,9 +38,17 @@ export default function isReferenced(node: Object, parent: Object): boolean {
       }
       return parent.local === node;
 
+    // no: class { #NODE; }
+    // no: class { get #NODE() {} }
+    // no: class { #NODE() {} }
+    // no: class { fn() { return this.#NODE; } }
+    case "PrivateName":
+      return false;
+
     // yes: { [NODE]: "" }
     // no: { NODE: "" }
     // depends: { NODE }
+    // depends: { key: NODE }
     case "ObjectProperty":
     // no: class { NODE = value; }
     // yes: class { [NODE] = value; }
@@ -46,11 +58,15 @@ export default function isReferenced(node: Object, parent: Object): boolean {
     // no: class { NODE() {} }
     // yes: class { [NODE]() {} }
     case "ClassMethod":
+    case "ClassPrivateMethod":
     case "ObjectMethod":
       if (parent.key === node) {
         return !!parent.computed;
       }
-      return parent.value === node;
+      if (parent.value === node) {
+        return !grandparent || grandparent.type !== "ObjectPattern";
+      }
+      return true;
 
     // no: class NODE {}
     // yes: class Foo extends NODE {}
@@ -125,6 +141,20 @@ export default function isReferenced(node: Object, parent: Object): boolean {
     // no: type X = { NODE: OtherType }
     case "ObjectTypeProperty":
       return parent.key !== node;
+
+    // yes: enum X { Foo = NODE }
+    // no: enum X { NODE }
+    case "TSEnumMember":
+      return parent.id !== node;
+
+    // yes: { [NODE]: value }
+    // no: { NODE: value }
+    case "TSPropertySignature":
+      if (parent.key === node) {
+        return !!parent.computed;
+      }
+
+      return true;
   }
 
   return true;
diff --git a/packages/babel-types/src/validators/isType.js b/packages/babel-types/src/validators/isType.js
index 6b5e0feade71..cf9a681a0a00 100644
--- a/packages/babel-types/src/validators/isType.js
+++ b/packages/babel-types/src/validators/isType.js
@@ -4,7 +4,7 @@ import { FLIPPED_ALIAS_KEYS, ALIAS_KEYS } from "../definitions";
 /**
  * Test if a `nodeType` is a `targetType` or if `targetType` is an alias of `nodeType`.
  */
-export default function isType(nodeType: string, targetType: string): boolean {
+export default function isType(nodeType: ?string, targetType: string): boolean {
   if (nodeType === targetType) return true;
 
   // This is a fast-path. If the test above failed, but an alias key is found, then the
diff --git a/packages/babel-types/src/validators/validate.js b/packages/babel-types/src/validators/validate.js
index 9b2e9a8cd02a..738683849927 100644
--- a/packages/babel-types/src/validators/validate.js
+++ b/packages/babel-types/src/validators/validate.js
@@ -8,6 +8,15 @@ export default function validate(node?: Object, key: string, val: any): void {
   if (!fields) return;
 
   const field = fields[key];
+  validateField(node, key, val, field);
+}
+
+export function validateField(
+  node?: Object,
+  key: string,
+  val: any,
+  field: any,
+): void {
   if (!field || !field.validate) return;
   if (field.optional && val == null) return;
 
diff --git a/packages/babel-types/test/builders/es2015/__snapshots__/templateElement.js.snap b/packages/babel-types/test/builders/es2015/__snapshots__/templateElement.js.snap
new file mode 100644
index 000000000000..a2f178169233
--- /dev/null
+++ b/packages/babel-types/test/builders/es2015/__snapshots__/templateElement.js.snap
@@ -0,0 +1,37 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`builders es2015 templateElement should validate 1`] = `
+Object {
+  "tail": false,
+  "type": "TemplateElement",
+  "value": Object {
+    "cooked": "foo",
+    "raw": "foo",
+  },
+}
+`;
+
+exports[`builders es2015 templateElement should validate 2`] = `
+Object {
+  "tail": false,
+  "type": "TemplateElement",
+  "value": Object {
+    "raw": "foo",
+  },
+}
+`;
+
+exports[`builders es2015 templateElement should validate 3`] = `
+"Property value of TemplateElement expected to have the following:
+Property raw expected type of string but got number"
+`;
+
+exports[`builders es2015 templateElement should validate 4`] = `
+"Property value of TemplateElement expected to have the following:
+Property cooked expected type of string but got number"
+`;
+
+exports[`builders es2015 templateElement should validate 5`] = `
+"Property value of TemplateElement expected to have the following:
+Property raw expected type of string but got undefined"
+`;
diff --git a/packages/babel-types/test/builders/es2015/templateElement.js b/packages/babel-types/test/builders/es2015/templateElement.js
new file mode 100644
index 000000000000..0a93e7c8662a
--- /dev/null
+++ b/packages/babel-types/test/builders/es2015/templateElement.js
@@ -0,0 +1,25 @@
+import * as t from "../../..";
+
+describe("builders", function() {
+  describe("es2015", function() {
+    describe("templateElement", function() {
+      it("should validate", function() {
+        expect(
+          t.templateElement({ raw: "foo", cooked: "foo" }),
+        ).toMatchSnapshot();
+
+        expect(t.templateElement({ raw: "foo" })).toMatchSnapshot();
+
+        expect(() =>
+          t.templateElement({ raw: 1 }),
+        ).toThrowErrorMatchingSnapshot();
+
+        expect(() =>
+          t.templateElement({ raw: "foo", cooked: 1 }),
+        ).toThrowErrorMatchingSnapshot();
+
+        expect(() => t.templateElement("foo")).toThrowErrorMatchingSnapshot();
+      });
+    });
+  });
+});
diff --git a/packages/babel-types/test/builders/flow/__snapshots__/createTypeAnnotationBasedOnTypeof.js.snap b/packages/babel-types/test/builders/flow/__snapshots__/createTypeAnnotationBasedOnTypeof.js.snap
new file mode 100644
index 000000000000..ee98fe3b5eeb
--- /dev/null
+++ b/packages/babel-types/test/builders/flow/__snapshots__/createTypeAnnotationBasedOnTypeof.js.snap
@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`builders flow createTypeAnnotationBasedOnTypeof function 1`] = `
+Object {
+  "id": Object {
+    "name": "Function",
+    "type": "Identifier",
+  },
+  "type": "GenericTypeAnnotation",
+  "typeParameters": null,
+}
+`;
+
+exports[`builders flow createTypeAnnotationBasedOnTypeof number 1`] = `
+Object {
+  "type": "NumberTypeAnnotation",
+}
+`;
+
+exports[`builders flow createTypeAnnotationBasedOnTypeof object 1`] = `
+Object {
+  "id": Object {
+    "name": "Object",
+    "type": "Identifier",
+  },
+  "type": "GenericTypeAnnotation",
+  "typeParameters": null,
+}
+`;
+
+exports[`builders flow createTypeAnnotationBasedOnTypeof string 1`] = `
+Object {
+  "type": "StringTypeAnnotation",
+}
+`;
+
+exports[`builders flow createTypeAnnotationBasedOnTypeof symbol 1`] = `
+Object {
+  "id": Object {
+    "name": "Symbol",
+    "type": "Identifier",
+  },
+  "type": "GenericTypeAnnotation",
+  "typeParameters": null,
+}
+`;
+
+exports[`builders flow createTypeAnnotationBasedOnTypeof true 1`] = `
+Object {
+  "type": "BooleanTypeAnnotation",
+}
+`;
+
+exports[`builders flow createTypeAnnotationBasedOnTypeof undefined 1`] = `
+Object {
+  "type": "VoidTypeAnnotation",
+}
+`;
diff --git a/packages/babel-types/test/builders/flow/createTypeAnnotationBasedOnTypeof.js b/packages/babel-types/test/builders/flow/createTypeAnnotationBasedOnTypeof.js
new file mode 100644
index 000000000000..b313ba693568
--- /dev/null
+++ b/packages/babel-types/test/builders/flow/createTypeAnnotationBasedOnTypeof.js
@@ -0,0 +1,31 @@
+import { createTypeAnnotationBasedOnTypeof } from "../../..";
+
+describe("builders", function() {
+  describe("flow", function() {
+    describe("createTypeAnnotationBasedOnTypeof", function() {
+      const values = {
+        string: typeof "string",
+        number: typeof 123,
+        true: typeof true,
+        object: typeof {},
+        undefined: typeof undefined,
+        function: typeof function() {},
+        symbol: typeof Symbol(),
+      };
+
+      for (const name in values) {
+        const value = values[name];
+        it(name, function() {
+          const result = createTypeAnnotationBasedOnTypeof(value);
+          expect(result).toMatchSnapshot();
+        });
+      }
+
+      it("invalid", function() {
+        expect(() =>
+          createTypeAnnotationBasedOnTypeof("thisdoesnotexist"),
+        ).toThrow(Error);
+      });
+    });
+  });
+});
diff --git a/packages/babel-types/test/builders/flow/declareClass.js b/packages/babel-types/test/builders/flow/declareClass.js
new file mode 100644
index 000000000000..38bbc0fd875f
--- /dev/null
+++ b/packages/babel-types/test/builders/flow/declareClass.js
@@ -0,0 +1,32 @@
+import * as t from "../../..";
+
+describe("builders", function() {
+  describe("flow", function() {
+    describe("declareClass", function() {
+      it("accept TypeParameterDeclaration as typeParameters", function() {
+        const typeParameter = t.typeParameter(null, null, null);
+        typeParameter.name = "T";
+        const declaredClass = t.declareClass(
+          t.identifier("A"),
+          t.typeParameterDeclaration([typeParameter]),
+          [],
+          t.objectTypeAnnotation([], [], [], []),
+        );
+        expect(t.isDeclareClass(declaredClass)).toBe(true);
+      });
+
+      it("not accept typeParameterInstantiation as typeParameters", function() {
+        expect(() =>
+          t.declareClass(
+            t.identifier("A"),
+            t.typeParameterInstantiation([
+              t.genericTypeAnnotation(t.identifier("T")),
+            ]),
+            [],
+            t.objectTypeAnnotation([], [], [], []),
+          ),
+        ).toThrow(Error);
+      });
+    });
+  });
+});
diff --git a/packages/babel-types/test/cloning.js b/packages/babel-types/test/cloning.js
index 0ad43fbfd781..83e7c70491e0 100644
--- a/packages/babel-types/test/cloning.js
+++ b/packages/babel-types/test/cloning.js
@@ -56,4 +56,20 @@ describe("cloneNode", function() {
     expect(node.object).toBe(cloned.object);
     expect(node.property).toBe(cloned.property);
   });
+
+  it("should preserve type annotations", function() {
+    const node = t.variableDeclaration("let", [
+      t.variableDeclarator({
+        ...t.identifier("value"),
+        typeAnnotation: t.anyTypeAnnotation(),
+      }),
+    ]);
+    const cloned = t.cloneNode(node, /* deep */ true);
+    expect(cloned.declarations[0].id.typeAnnotation).toEqual(
+      node.declarations[0].id.typeAnnotation,
+    );
+    expect(cloned.declarations[0].id.typeAnnotation).not.toBe(
+      node.declarations[0].id.typeAnnotation,
+    );
+  });
 });
diff --git a/packages/babel-types/test/validators.js b/packages/babel-types/test/validators.js
index f285b1105694..f08dedab1a87 100644
--- a/packages/babel-types/test/validators.js
+++ b/packages/babel-types/test/validators.js
@@ -121,5 +121,190 @@ describe("validators", function() {
 
       expect(t.isReferenced(node, parent)).toBe(true);
     });
+
+    it("returns true if node is a value of ObjectProperty of an expression", function() {
+      const node = t.identifier("a");
+      const parent = t.objectProperty(t.identifier("key"), node);
+      const grandparent = t.objectExpression([parent]);
+
+      expect(t.isReferenced(node, parent, grandparent)).toBe(true);
+    });
+
+    it("returns false if node is a value of ObjectProperty of a pattern", function() {
+      const node = t.identifier("a");
+      const parent = t.objectProperty(t.identifier("key"), node);
+      const grandparent = t.objectPattern([parent]);
+
+      expect(t.isReferenced(node, parent, grandparent)).toBe(false);
+    });
+
+    describe("TSPropertySignature", function() {
+      it("returns false if node is a key", function() {
+        // { A: string }
+        const node = t.identifier("A");
+        const parent = t.tsPropertySignature(
+          node,
+          t.tsTypeAnnotation(t.tsStringKeyword()),
+        );
+
+        expect(t.isReferenced(node, parent)).toBe(false);
+      });
+
+      it("returns true if node is a value", function() {
+        // { someKey: A }
+        const node = t.identifier("A");
+        const parent = t.tsPropertySignature(
+          t.identifier("someKey"),
+          t.tsTypeAnnotation(t.tsTypeReference(node)),
+        );
+
+        expect(t.isReferenced(node, parent)).toBe(true);
+      });
+    });
+
+    describe("TSEnumMember", function() {
+      it("returns false if node is an id", function() {
+        // enum X = { A };
+        const node = t.identifier("A");
+        const parent = t.tsEnumMember(node);
+
+        expect(t.isReferenced(node, parent)).toBe(false);
+      });
+
+      it("returns true if node is a value", function() {
+        // enum X = { Foo = A }
+        const node = t.identifier("A");
+        const parent = t.tsEnumMember(t.identifier("Foo"), node);
+
+        expect(t.isReferenced(node, parent)).toBe(true);
+      });
+    });
+  });
+
+  describe("isBinding", function() {
+    it("returns false if node id a value of ObjectProperty of an expression", function() {
+      const node = t.identifier("a");
+      const parent = t.objectProperty(t.identifier("key"), node);
+      const grandparent = t.objectExpression([parent]);
+
+      expect(t.isBinding(node, parent, grandparent)).toBe(false);
+    });
+
+    it("returns true if node id a value of ObjectProperty of a pattern", function() {
+      const node = t.identifier("a");
+      const parent = t.objectProperty(t.identifier("key"), node);
+      const grandparent = t.objectPattern([parent]);
+
+      expect(t.isBinding(node, parent, grandparent)).toBe(true);
+    });
+  });
+
+  describe("isType", function() {
+    it("returns true if nodeType equals targetType", function() {
+      expect(t.isType("Identifier", "Identifier")).toBe(true);
+    });
+    it("returns false if targetType is a primary node type", function() {
+      expect(t.isType("Expression", "ArrayExpression")).toBe(false);
+    });
+    it("returns true if targetType is an alias of nodeType", function() {
+      expect(t.isType("ArrayExpression", "Expression")).toBe(true);
+    });
+    it("returns false if nodeType and targetType are unrelated", function() {
+      expect(t.isType("ArrayExpression", "ClassBody")).toBe(false);
+    });
+    it("returns false if nodeType is undefined", function() {
+      expect(t.isType(undefined, "Expression")).toBe(false);
+    });
+  });
+
+  describe("placeholders", function() {
+    describe("isPlaceholderType", function() {
+      describe("when placeholderType is a specific node type", function() {
+        const placeholder = "Identifier";
+
+        it("returns true if targetType is placeholderType", function() {
+          expect(t.isPlaceholderType(placeholder, "Identifier")).toBe(true);
+        });
+        it("returns true if targetType an alias for placeholderType", function() {
+          expect(t.isPlaceholderType(placeholder, "Expression")).toBe(true);
+        });
+        it("returns false for unrelated types", function() {
+          expect(t.isPlaceholderType(placeholder, "String")).toBe(false);
+        });
+      });
+
+      describe("when placeholderType is a generic alias type", function() {
+        const placeholder = "Pattern";
+
+        it("returns true if targetType is placeholderType", function() {
+          expect(t.isPlaceholderType(placeholder, "Pattern")).toBe(true);
+        });
+        it("returns true if targetType an alias for placeholderType", function() {
+          expect(t.isPlaceholderType(placeholder, "LVal")).toBe(true);
+        });
+        it("returns false for unrelated types", function() {
+          expect(t.isPlaceholderType(placeholder, "Expression")).toBe(false);
+        });
+        it("returns false if targetType is aliased by placeholderType", function() {
+          // i.e. a Pattern might not be an Identifier
+          expect(t.isPlaceholderType(placeholder, "Identifier")).toBe(false);
+        });
+      });
+    });
+
+    describe("is", function() {
+      describe("when the placeholder matches a specific node", function() {
+        const identifier = t.placeholder("Identifier", t.identifier("foo"));
+
+        it("returns false if targetType is expectedNode", function() {
+          expect(t.is("Identifier", identifier)).toBe(false);
+        });
+        it("returns true if targetType is an alias", function() {
+          expect(t.is("LVal", identifier)).toBe(true);
+        });
+      });
+
+      describe("when the placeholder matches a generic alias", function() {
+        const pattern = t.placeholder("Pattern", t.identifier("bar"));
+
+        it("returns false if targetType is aliased as expectedNode", function() {
+          // i.e. a Pattern might not be an Identifier
+          expect(t.is("Identifier", pattern)).toBe(false);
+        });
+        it("returns true if targetType is expectedNode", function() {
+          expect(t.is("Pattern", pattern)).toBe(true);
+        });
+        it("returns true if targetType is an alias for expectedNode", function() {
+          expect(t.is("LVal", pattern)).toBe(true);
+        });
+      });
+    });
+
+    describe("is[Type]", function() {
+      describe("when the placeholder matches a specific node", function() {
+        const identifier = t.placeholder("Identifier", t.identifier("foo"));
+
+        it("returns false if targetType is expectedNode", function() {
+          expect(t.isIdentifier(identifier)).toBe(false);
+        });
+        it("returns true if targetType is an alias", function() {
+          expect(t.isLVal(identifier)).toBe(true);
+        });
+      });
+
+      describe("when the placeholder matches a generic alias", function() {
+        const pattern = t.placeholder("Pattern", t.identifier("bar"));
+
+        it("returns false if targetType is aliased as expectedNode", function() {
+          expect(t.isIdentifier(pattern)).toBe(false);
+        });
+        it("returns true if targetType is expectedNode", function() {
+          expect(t.isPattern(pattern)).toBe(true);
+        });
+        it("returns true if targetType is an alias for expectedNode", function() {
+          expect(t.isLVal(pattern)).toBe(true);
+        });
+      });
+    });
   });
 });
diff --git a/scripts/eslint_rules/no-deprecated-clone.js b/scripts/eslint_rules/no-deprecated-clone.js
deleted file mode 100644
index 323e5ed2255c..000000000000
--- a/scripts/eslint_rules/no-deprecated-clone.js
+++ /dev/null
@@ -1,265 +0,0 @@
-// @flow
-
-"use strict";
-
-function getVariableDefinition(name /*: string */, scope /*: Scope */) {
-  let currentScope = scope;
-  do {
-    const variable = currentScope.set.get(name);
-    if (variable && variable.defs[0]) {
-      return { scope: currentScope, definition: variable.defs[0] };
-    }
-  } while ((currentScope = currentScope.upper));
-}
-
-/*::
-type ReferenceOriginImport = { kind: "import", source: string, name: string };
-type ReferenceOriginParam = {
-  kind: "export param",
-  exportName: string,
-  index: number,
-};
-
-type ReferenceOrigin =
-  | ReferenceOriginImport
-  | ReferenceOriginParam
-  | { kind: "import *", source: string }
-  | {
-      kind: "property",
-      base: ReferenceOriginImport | ReferenceOriginParam,
-      path: string,
-    };
-*/
-
-// Given a node and a context, returns a description of where its value comes
-// from.
-// It resolves imports, parameters of exported functions and property accesses.
-// See the ReferenceOrigin type for more informations.
-function getReferenceOrigin(
-  node /*: Node */,
-  scope /*: Scope */
-) /*: ?ReferenceOrigin */ {
-  if (node.type === "Identifier") {
-    const variable = getVariableDefinition(node.name, scope);
-    if (!variable) return null;
-
-    const definition = variable.definition;
-    const defNode = definition.node;
-
-    if (definition.type === "ImportBinding") {
-      if (defNode.type === "ImportSpecifier") {
-        return {
-          kind: "import",
-          source: definition.parent.source.value,
-          name: defNode.imported.name,
-        };
-      }
-      if (defNode.type === "ImportNamespaceSpecifier") {
-        return {
-          kind: "import *",
-          source: definition.parent.source.value,
-        };
-      }
-    }
-
-    if (definition.type === "Variable" && defNode.init) {
-      const origin = getReferenceOrigin(defNode.init, variable.scope);
-      return origin && patternToProperty(definition.name, origin);
-    }
-
-    if (definition.type === "Parameter") {
-      const parent = defNode.parent;
-      let exportName /*: string */;
-      if (parent.type === "ExportDefaultDeclaration") {
-        exportName = "default";
-      } else if (parent.type === "ExportNamedDeclaration") {
-        exportName = defNode.id.name;
-      } else if (
-        parent.type === "AssignmentExpression" &&
-        parent.left.type === "MemberExpression" &&
-        parent.left.object.type === "Identifier" &&
-        parent.left.object.name === "module" &&
-        parent.left.property.type === "Identifier" &&
-        parent.left.property.name === "exports"
-      ) {
-        exportName = "module.exports";
-      } else {
-        return null;
-      }
-      return patternToProperty(definition.name, {
-        kind: "export param",
-        exportName,
-        index: definition.index,
-      });
-    }
-  }
-
-  if (node.type === "MemberExpression" && !node.computed) {
-    const origin = getReferenceOrigin(node.object, scope);
-    return origin && addProperty(origin, node.property.name);
-  }
-
-  return null;
-}
-
-function patternToProperty(
-  id /*: Node */,
-  base /*: ReferenceOrigin */
-) /*: ?ReferenceOrigin */ {
-  const path = getPatternPath(id);
-  return path && path.reduce(addProperty, base);
-}
-
-// Adds a property to a given origin. If it was a namespace import it becomes
-// a named import, so that `import * as x from "foo"; x.bar` and
-// `import { bar } from "foo"` have the same origin.
-function addProperty(
-  origin /*: ReferenceOrigin */,
-  name /*: string */
-) /* ReferenceOrigin */ {
-  if (origin.kind === "import *") {
-    return {
-      kind: "import",
-      source: origin.source,
-      name,
-    };
-  }
-  if (origin.kind === "property") {
-    return {
-      kind: "property",
-      base: origin.base,
-      path: origin.path + "." + name,
-    };
-  }
-  return {
-    kind: "property",
-    base: origin,
-    path: name,
-  };
-}
-
-// if "node" is c of { a: { b: c } }, the result is ["a","b"]
-function getPatternPath(node /*: Node */) /*: ?string[] */ {
-  let current = node;
-  const path = [];
-
-  // Unshift keys to path while going up
-  do {
-    const property = current.parent;
-    if (
-      property.type === "ArrayPattern" ||
-      property.type === "AssignmentPattern" ||
-      property.computed
-    ) {
-      // These nodes are not supported.
-      return null;
-    }
-    if (property.type === "Property") {
-      path.unshift(property.key.name);
-    } else {
-      // The destructuring pattern is finished
-      break;
-    }
-  } while ((current = current.parent.parent));
-
-  return path;
-}
-
-function reportError(context /*: Context */, node /*: Node */) {
-  const isMemberExpression = node.type === "MemberExpression";
-  const id = isMemberExpression ? node.property : node;
-  context.report({
-    node: id,
-    message: `t.${id.name}() is deprecated. Use t.cloneNode() instead.`,
-    fix(fixer) {
-      if (isMemberExpression) {
-        return fixer.replaceText(id, "cloneNode");
-      }
-    },
-  });
-}
-
-module.exports = {
-  meta: {
-    schema: [],
-    fixable: "code",
-  },
-  create(context /*: Context */) {
-    return {
-      CallExpression(node /*: Node */) {
-        const origin = getReferenceOrigin(node.callee, context.getScope());
-
-        if (!origin) return;
-
-        if (
-          origin.kind === "import" &&
-          (origin.name === "clone" || origin.name === "cloneDeep") &&
-          origin.source === "@babel/types"
-        ) {
-          // imported from @babel/types
-          return reportError(context, node.callee);
-        }
-
-        if (
-          origin.kind === "property" &&
-          (origin.path === "clone" || origin.path === "cloneDeep") &&
-          origin.base.kind === "import" &&
-          origin.base.name === "types" &&
-          origin.base.source === "@babel/core"
-        ) {
-          // imported from @babel/core
-          return reportError(context, node.callee);
-        }
-
-        if (
-          origin.kind === "property" &&
-          (origin.path === "types.clone" ||
-            origin.path === "types.cloneDeep") &&
-          origin.base.kind === "export param" &&
-          (origin.base.exportName === "default" ||
-            origin.base.exportName === "module.exports") &&
-          origin.base.index === 0
-        ) {
-          // export default function ({ types: t }) {}
-          // module.exports = function ({ types: t }) {}
-          return reportError(context, node.callee);
-        }
-      },
-    };
-  },
-};
-
-/*:: // ESLint types
-
-type Node = { type: string, [string]: any };
-
-type Definition = {
-  type: "ImportedBinding",
-  name: Node,
-  node: Node,
-  parent: Node,
-};
-
-type Variable = {
-  defs: Definition[],
-};
-
-type Scope = {
-  set: Map<string, Variable>,
-  upper: ?Scope,
-};
-
-type Context = {
-  report(options: {
-    node: Node,
-    message: string,
-    fix?: (fixer: Fixer) => ?Fixer,
-  }): void,
-
-  getScope(): Scope,
-};
-
-type Fixer = {
-  replaceText(node: Node, replacement: string): Fixer,
-};
-*/
diff --git a/scripts/eslint_rules/no-undefined-identifier.js b/scripts/eslint_rules/no-undefined-identifier.js
deleted file mode 100644
index b16e3620ddaa..000000000000
--- a/scripts/eslint_rules/no-undefined-identifier.js
+++ /dev/null
@@ -1,46 +0,0 @@
-"use strict";
-
-function argumentsIsUndefinedString(argumentsArray) {
-  return (
-    argumentsArray.length === 1 &&
-    argumentsArray[0].type === "Literal" &&
-    argumentsArray[0].value === "undefined"
-  );
-}
-
-module.exports = {
-  meta: {
-    schema: [],
-  },
-  create: function(context) {
-    if (context.getFilename().indexOf("packages/babel-plugin-") === -1) {
-      return {};
-    }
-
-    return {
-      CallExpression: function(node) {
-        const callee = node.callee;
-
-        if (
-          callee.type === "MemberExpression" &&
-          argumentsIsUndefinedString(node.arguments)
-        ) {
-          const object = callee.object,
-            property = callee.property;
-
-          if (
-            object.type === "Identifier" &&
-            object.name === "t" &&
-            property.type === "Identifier" &&
-            property.name === "identifier"
-          ) {
-            context.report(
-              node,
-              "Use path.scope.buildUndefinedNode() to create an undefined identifier directly."
-            );
-          }
-        }
-      },
-    };
-  },
-};
diff --git a/scripts/generators/readmes.js b/scripts/generators/readmes.js
index 1ab0b2521409..36bc9612a13c 100644
--- a/scripts/generators/readmes.js
+++ b/scripts/generators/readmes.js
@@ -13,19 +13,26 @@ const cwd = process.cwd();
 const packageDir = join(cwd, "packages");
 
 const packages = readdirSync(packageDir);
+const packagesInstalledToDep = ["@babel/polyfill", "@babel/runtime"];
 const getWebsiteLink = n => `https://babeljs.io/docs/en/next/${n}.html`;
 const getPackageJson = pkg => require(join(packageDir, pkg, "package.json"));
 const getIssueLabelLink = l =>
   `https://github.com/babel/babel/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3A%22${encodeURIComponent(
     l
   )}%22+is%3Aopen`;
+const getNpmInstall = name =>
+  `npm install ${
+    packagesInstalledToDep.includes(name) ? "--save" : "--save-dev"
+  } ${name}`;
+const getYarnAdd = name =>
+  `yarn add ${name} ${packagesInstalledToDep.includes(name) ? "" : "--dev"}`;
 
 const labels = {
   "babel-preset-flow": getIssueLabelLink("area: flow"),
   "babel-preset-node": getIssueLabelLink("area: node"),
   "babel-preset-react": getIssueLabelLink("area: react"),
   "babel-preset-typescript": getIssueLabelLink("area: typescript"),
-  "babel-parser": getIssueLabelLink("pkg: babylon"),
+  "babel-parser": getIssueLabelLink("pkg: parser (babylon)"),
   "babel-cli": getIssueLabelLink("pkg: cli"),
   "babel-core": getIssueLabelLink("pkg: core"),
   "babel-generator": getIssueLabelLink("pkg: generator"),
@@ -54,13 +61,13 @@ See our website [${name}](${websiteLink}) for more information${
 Using npm:
 
 \`\`\`sh
-npm install --save-dev ${name}
+${getNpmInstall(name)}
 \`\`\`
 
 or using yarn:
 
 \`\`\`sh
-yarn add ${name} --dev
+${getYarnAdd(name)}
 \`\`\`
 `;
 
diff --git a/scripts/generators/typescript.js b/scripts/generators/typescript.js
deleted file mode 100644
index 0cd5ff4042e2..000000000000
--- a/scripts/generators/typescript.js
+++ /dev/null
@@ -1,192 +0,0 @@
-"use strict";
-
-const t = require("../../packages/babel-types");
-const utils = require("./utils");
-
-let code = `// NOTE: This file is autogenerated. Do not modify.
-// See scripts/generators/typescript.js for script used.
-
-interface BaseComment {
-  value: string;
-  start: number;
-  end: number;
-  loc: SourceLocation;
-  type: "BlockComment" | "LineComment";
-}
-
-export interface BlockComment extends BaseComment {
-  type: "BlockComment";
-}
-
-export interface LineComment extends BaseComment {
-  type: "LineComment";
-}
-
-export type Comment = BlockComment | LineComment;
-
-export interface SourceLocation {
-  start: {
-    line: number;
-    column: number;
-  };
-
-  end: {
-    line: number;
-    column: number;
-  };
-}
-
-interface BaseNode {
-  leadingComments: ReadonlyArray<Comment> | null;
-  innerComments: ReadonlyArray<Comment> | null;
-  trailingComments: ReadonlyArray<Comment> | null;
-  start: number | null;
-  end: number | null;
-  loc: SourceLocation | null;
-  type: Node["type"];
-}
-
-export type Node = ${t.TYPES.sort().join(" | ")};\n\n`;
-
-//
-
-const lines = [];
-
-for (const type in t.NODE_FIELDS) {
-  const fields = t.NODE_FIELDS[type];
-  const fieldNames = sortFieldNames(Object.keys(t.NODE_FIELDS[type]), type);
-
-  const struct = ['type: "' + type + '";'];
-  const args = [];
-
-  fieldNames.forEach(fieldName => {
-    const field = fields[fieldName];
-    let typeAnnotation = utils.stringifyValidator(field.validate, "");
-
-    if (isNullable(field) && !hasDefault(field)) {
-      typeAnnotation += " | null";
-    }
-
-    if (areAllRemainingFieldsNullable(fieldName, fieldNames, fields)) {
-      args.push(
-        `${t.toBindingIdentifierName(fieldName)}${
-          isNullable(field) ? "?:" : ":"
-        } ${typeAnnotation}`
-      );
-    } else {
-      args.push(
-        `${t.toBindingIdentifierName(fieldName)}: ${typeAnnotation}${
-          isNullable(field) ? " | undefined" : ""
-        }`
-      );
-    }
-
-    const alphaNumeric = /^\w+$/;
-
-    if (t.isValidIdentifier(fieldName) || alphaNumeric.test(fieldName)) {
-      struct.push(`${fieldName}: ${typeAnnotation};`);
-    } else {
-      struct.push(`"${fieldName}": ${typeAnnotation};`);
-    }
-  });
-
-  code += `export interface ${type} extends BaseNode {
-  ${struct.join("\n  ").trim()}
-}\n\n`;
-
-  // super and import are reserved words in JavaScript
-  if (type !== "Super" && type !== "Import") {
-    lines.push(
-      `export function ${utils.toFunctionName(type)}(${args.join(
-        ", "
-      )}): ${type};`
-    );
-  }
-}
-
-for (let i = 0; i < t.TYPES.length; i++) {
-  let decl = `export function is${
-    t.TYPES[i]
-  }(node: object, opts?: object | null): `;
-
-  if (t.NODE_FIELDS[t.TYPES[i]]) {
-    decl += `node is ${t.TYPES[i]};`;
-  } else {
-    decl += `boolean;`;
-  }
-
-  lines.push(decl);
-}
-
-lines.push(
-  `export function validate(n: Node, key: string, value: any): void;`,
-  `export function clone<T extends Node>(n: T): T;`,
-  `export function cloneDeep<T extends Node>(n: T): T;`,
-  `export function removeProperties(
-  n: Node,
-  opts?: { preserveComments: boolean } | null
-): void;`,
-  `export function removePropertiesDeep<T extends Node>(
-  n: T,
-  opts?: { preserveComments: boolean } | null
-): T;`,
-  `export type TraversalAncestors = ReadonlyArray<{
-    node: Node,
-    key: string,
-    index?: number,
-  }>;
-  export type TraversalHandler<T> = (node: Node, parent: TraversalAncestors, type: T) => void;
-  export type TraversalHandlers<T> = {
-    enter?: TraversalHandler<T>,
-    exit?: TraversalHandler<T>,
-  };`.replace(/(^|\n) {2}/g, "$1"),
-  // eslint-disable-next-line
-  `export function traverse<T>(n: Node, h: TraversalHandler<T> | TraversalHandlers<T>, state?: T): void;`
-);
-
-for (const type in t.DEPRECATED_KEYS) {
-  code += `/**
- * @deprecated Use \`${t.DEPRECATED_KEYS[type]}\`
- */
-export type ${type} = ${t.DEPRECATED_KEYS[type]};\n
-`;
-}
-
-for (const type in t.FLIPPED_ALIAS_KEYS) {
-  const types = t.FLIPPED_ALIAS_KEYS[type];
-  code += `export type ${type} = ${types
-    .map(type => `${type}`)
-    .join(" | ")};\n`;
-}
-
-code += lines.join("\n") + "\n";
-
-//
-
-process.stdout.write(code);
-
-//
-
-function areAllRemainingFieldsNullable(fieldName, fieldNames, fields) {
-  const index = fieldNames.indexOf(fieldName);
-  return fieldNames.slice(index).every(_ => isNullable(fields[_]));
-}
-
-function hasDefault(field) {
-  return field.default != null;
-}
-
-function isNullable(field) {
-  return field.optional || hasDefault(field);
-}
-
-function sortFieldNames(fields, type) {
-  return fields.sort((fieldA, fieldB) => {
-    const indexA = t.BUILDER_KEYS[type].indexOf(fieldA);
-    const indexB = t.BUILDER_KEYS[type].indexOf(fieldB);
-    if (indexA === indexB) return fieldA < fieldB ? -1 : 1;
-    if (indexA === -1) return 1;
-    if (indexB === -1) return -1;
-    return indexA - indexB;
-  });
-}
diff --git a/scripts/generators/utils.js b/scripts/generators/utils.js
deleted file mode 100644
index 4f217edfcb30..000000000000
--- a/scripts/generators/utils.js
+++ /dev/null
@@ -1,51 +0,0 @@
-exports.stringifyValidator = function stringifyValidator(
-  validator,
-  nodePrefix
-) {
-  if (validator === undefined) {
-    return "any";
-  }
-
-  if (validator.each) {
-    return `Array<${stringifyValidator(validator.each, nodePrefix)}>`;
-  }
-
-  if (validator.chainOf) {
-    return stringifyValidator(validator.chainOf[1], nodePrefix);
-  }
-
-  if (validator.oneOf) {
-    return validator.oneOf.map(JSON.stringify).join(" | ");
-  }
-
-  if (validator.oneOfNodeTypes) {
-    return validator.oneOfNodeTypes.map(_ => nodePrefix + _).join(" | ");
-  }
-
-  if (validator.oneOfNodeOrValueTypes) {
-    return validator.oneOfNodeOrValueTypes
-      .map(_ => {
-        return isValueType(_) ? _ : nodePrefix + _;
-      })
-      .join(" | ");
-  }
-
-  if (validator.type) {
-    return validator.type;
-  }
-
-  return ["any"];
-};
-
-exports.toFunctionName = function toFunctionName(typeName) {
-  const _ = typeName.replace(/^TS/, "ts").replace(/^JSX/, "jsx");
-  return _.slice(0, 1).toLowerCase() + _.slice(1);
-};
-
-/**
- * Heuristic to decide whether or not the given type is a value type (eg. "null")
- * or a Node type (eg. "Expression").
- */
-function isValueType(type) {
-  return type.charAt(0).toLowerCase() === type.charAt(0);
-}
diff --git a/scripts/gulp-tasks.js b/scripts/gulp-tasks.js
index f3c696de50c6..73c1f7db2e3f 100644
--- a/scripts/gulp-tasks.js
+++ b/scripts/gulp-tasks.js
@@ -13,10 +13,14 @@
 
 const path = require("path");
 const pump = require("pump");
+const chalk = require("chalk");
+const through = require("through2");
+const fancyLog = require("fancy-log");
 const rename = require("gulp-rename");
-const RootMostResolvePlugin = require("webpack-dependency-suite")
-  .RootMostResolvePlugin;
 const webpack = require("webpack");
+const { RootMostResolvePlugin } = require("webpack-dependency-suite");
+const DuplicatePackageCheckerPlugin = require("duplicate-package-checker-webpack-plugin");
+const WarningsToErrorsPlugin = require("warnings-to-errors-webpack-plugin");
 const webpackStream = require("webpack-stream");
 const uglify = require("gulp-uglify");
 
@@ -59,6 +63,12 @@ function webpackBuild(opts) {
       libraryTarget: "umd",
     },
     plugins: [
+      new WarningsToErrorsPlugin(),
+      new DuplicatePackageCheckerPlugin({
+        exclude(instance) {
+          return instance.name === "semver";
+        },
+      }),
       new webpack.DefinePlugin({
         "process.env.NODE_ENV": '"production"',
         "process.env": JSON.stringify({ NODE_ENV: "production" }),
@@ -89,11 +99,38 @@ function webpackBuild(opts) {
   return webpackStream(config, webpack);
   // To write JSON for debugging:
   /*return webpackStream(config, webpack, (err, stats) => {
-    require('gulp-util').log(stats.toString({colors: true}));
-    require('fs').writeFileSync('webpack-debug.json', JSON.stringify(stats.toJson()));
+    require("fancy-log")(stats.toString({ colors: true }));
+    require("fs").writeFileSync(
+      "webpack-debug.json",
+      JSON.stringify(stats.toJson())
+    );
   });*/
 }
 
+function logUglify() {
+  return through.obj(function(file, enc, callback) {
+    fancyLog(
+      `Minifying '${chalk.cyan(
+        path.relative(path.join(__dirname, ".."), file.path)
+      )}'...`
+    );
+    callback(null, file);
+  });
+}
+
+function logNoUglify() {
+  return through.obj(function(file, enc, callback) {
+    fancyLog(
+      chalk.yellow(
+        `Skipped minification of '${chalk.cyan(
+          path.relative(path.join(__dirname, ".."), file.path)
+        )}' because not publishing`
+      )
+    );
+    callback(null, file);
+  });
+}
+
 function registerStandalonePackageTask(
   gulp,
   name,
@@ -116,8 +153,9 @@ function registerStandalonePackageTask(
         }),
         gulp.dest(standalonePath),
       ].concat(
-        // Minification is super slow, so we skip it in CI.
-        process.env.CI ? [] : uglify(),
+        // Minification is super slow, so we skip it unless we are publishing
+        process.env.IS_PUBLISH ? logUglify() : logNoUglify(),
+        process.env.IS_PUBLISH ? uglify() : [],
         rename({ extname: ".min.js" }),
         gulp.dest(standalonePath)
       ),
diff --git a/scripts/tests/flow/flow_tests_whitelist.txt b/scripts/tests/flow/flow_tests_whitelist.txt
index e9f6d0bc4262..7549e6a49ae1 100644
--- a/scripts/tests/flow/flow_tests_whitelist.txt
+++ b/scripts/tests/flow/flow_tests_whitelist.txt
@@ -10,32 +10,22 @@
 
 JSX_invalid/migrated_0000.js
 arrow_function_invalid/migrated_0002.js
-async_await/async_generic_method.js
+async_await/migrated_0007.js
 async_await/migrated_0020.js
 async_await/migrated_0024.js
 async_await/migrated_0027.js
 async_generators/migrated_0007.js
-catch/optional_catch_binding.js
-class_properties/migrated_0000.js
-class_properties/migrated_0005.js
-class_properties/migrated_0011.js
-class_properties/migrated_0016.js
 class_properties/migrated_0021.js
 class_properties/migrated_0026.js
 decorators/migrated_0003.js
-decorators/migrated_0007.js
 private_class_properties/multiple.js
 private_class_properties/super.js
-types/annotations/migrated_0001.js
-types/annotations_in_comments_invalid/migrated_0003.js
-types/annotations/void_is_reserved_param.js
+private_class_properties/getter_and_field.js
+private_class_properties/getter_duplicate.js
+private_class_properties/setter_and_field.js
+private_class_properties/setter_duplicate.js
 types/member/reserved_words.js
-types/parameter_defaults/migrated_0032.js
-types/typecasts_invalid/migrated_0001.js
 class_method_kinds/polymorphic_getter.js
-numbers/underscored_bin.js
-numbers/underscored_float.js
-numbers/underscored_float_whole.js
-numbers/underscored_hex.js
-numbers/underscored_number.js
-numbers/underscored_oct.js
+ES6/modules/migrated_0020.js
+export_import_reserved_words/migrated_0003.js
+export_statements/export_trailing_comma.js
diff --git a/scripts/tests/flow/run_babel_parser_flow_tests.js b/scripts/tests/flow/run_babel_parser_flow_tests.js
index 5595262e6abf..f087fb6614e3 100644
--- a/scripts/tests/flow/run_babel_parser_flow_tests.js
+++ b/scripts/tests/flow/run_babel_parser_flow_tests.js
@@ -98,7 +98,7 @@ function update_whitelist(summary) {
       );
     });
 
-  const newLines = disallowed
+  const newLines = summary.disallowed.failure
     .map(({ test }) => test.file)
     .filter(test => oldLines.indexOf(test) === -1);
 
@@ -109,13 +109,15 @@ function update_whitelist(summary) {
 
 const options = {
   plugins: [
-    "asyncGenerators",
     "dynamicImport",
     ["flow", { all: true }],
     "flowComments",
     "jsx",
-    "objectRestSpread",
+    "classProperties",
     "classPrivateProperties",
+    "classPrivateMethods",
+    "bigInt",
+    "numericSeparator",
   ],
   sourceType: "module",
   ranges: true,
@@ -129,6 +131,7 @@ const flowOptionsMapping = {
   esproposal_nullish_coalescing: "nullishCoalescingOperator",
   esproposal_optional_chaining: "optionalChaining",
   types: "flowComments",
+  intern_comments: false,
 };
 
 const summary = {
@@ -171,10 +174,12 @@ tests.forEach(section => {
           }
           return;
         }
-        if (!flowOptionsMapping[option]) {
+        if (!(option in flowOptionsMapping)) {
           throw new Error("Parser options not mapped " + option);
         }
-        babelParserOptions.plugins.push(flowOptionsMapping[option]);
+        if (flowOptionsMapping[option]) {
+          babelParserOptions.plugins.push(flowOptionsMapping[option]);
+        }
       });
     }
 
diff --git a/scripts/tests/test262/run_babel_parser_test262.js b/scripts/tests/test262/run_babel_parser_test262.js
index 1589901d6e69..acd0c5122606 100644
--- a/scripts/tests/test262/run_babel_parser_test262.js
+++ b/scripts/tests/test262/run_babel_parser_test262.js
@@ -105,6 +105,20 @@ Promise.all([utils.getTests(testDir), utils.getWhitelist(whitelistFile)])
     } else {
       process.exitCode = summary.passed ? 0 : 1;
     }
+
+    const unmappedFeatures = utils.getUnmappedFeatures();
+
+    if (unmappedFeatures.size) {
+      console.log("");
+      console.log(
+        "The following Features are not currently mapped or ignored:"
+      );
+      console.log(
+        Array.from(unmappedFeatures)
+          .join("\n")
+          .replace(/^/gm, "   ")
+      );
+    }
   })
   .catch(function(err) {
     console.error(err);
diff --git a/scripts/tests/test262/run_babel_parser_test262_utils.js b/scripts/tests/test262/run_babel_parser_test262_utils.js
index 705147210672..974e4a88e795 100644
--- a/scripts/tests/test262/run_babel_parser_test262_utils.js
+++ b/scripts/tests/test262/run_babel_parser_test262_utils.js
@@ -12,21 +12,136 @@ const pfs = {
 
 const parse = require("../../../packages/babel-parser").parse;
 
+const ignoredFeatures = [
+  "Array.prototype.flat",
+  "Array.prototype.flatMap",
+  "Array.prototype.values",
+  "ArrayBuffer",
+  "async-functions",
+  "async-iteration",
+  "arrow-function",
+  "Atomics",
+  "caller",
+  "class",
+  "computed-property-names",
+  "const",
+  "cross-realm",
+  "DataView",
+  "DataView.prototype.getFloat32",
+  "DataView.prototype.getFloat64",
+  "DataView.prototype.getInt8",
+  "DataView.prototype.getInt16",
+  "DataView.prototype.getInt32",
+  "DataView.prototype.getUint16",
+  "DataView.prototype.getUint32",
+  "DataView.prototype.setUint8",
+  "default-parameters",
+  "destructuring-assignment",
+  "destructuring-binding",
+  "Float32Array",
+  "Float64Array",
+  "for-of",
+  "generators",
+  "globalThis",
+  "hashbang",
+  "Int8Array",
+  "Int32Array",
+  "Intl.ListFormat",
+  "Intl.Locale",
+  "Intl.NumberFormat-unified",
+  "Intl.RelativeTimeFormat",
+  "Intl.Segmenter",
+  "IsHTMLDDA",
+  "json-superset",
+  "let",
+  "Map",
+  "new.target",
+  "Object.fromEntries",
+  "Object.is",
+  "object-rest",
+  "object-spread",
+  "optional-catch-binding",
+  "Promise.prototype.finally",
+  "Proxy",
+  "Reflect",
+  "Reflect.construct",
+  "Reflect.set",
+  "Reflect.setPrototypeOf",
+  "regexp-dotall",
+  "regexp-lookbehind",
+  "regexp-named-groups",
+  "regexp-unicode-property-escapes",
+  "SharedArrayBuffer",
+  "Set",
+  "String.fromCodePoint",
+  "String.prototype.endsWith",
+  "String.prototype.includes",
+  "String.prototype.matchAll",
+  "String.prototype.trimEnd",
+  "String.prototype.trimStart",
+  "string-trimming",
+  "super",
+  "Symbol",
+  "Symbol.asyncIterator",
+  "Symbol.hasInstance",
+  "Symbol.isConcatSpreadable",
+  "Symbol.iterator",
+  "Symbol.match",
+  "Symbol.matchAll",
+  "Symbol.prototype.description",
+  "Symbol.replace",
+  "Symbol.search",
+  "Symbol.split",
+  "Symbol.species",
+  "Symbol.toPrimitive",
+  "Symbol.toStringTag",
+  "Symbol.unscopables",
+  "tail-call-optimization",
+  "template",
+  "TypedArray",
+  "u180e",
+  "Uint8Array",
+  "Uint8ClampedArray",
+  "Uint16Array",
+  "WeakMap",
+  "WeakSet",
+  "well-formed-json-stringify",
+];
+
 const featuresToPlugins = {
   BigInt: "bigInt",
-  "class-fields-public": "classProperties",
   "class-fields-private": "classPrivateProperties",
-  "async-iteration": "asyncGenerators",
-  "object-rest": "objectRestSpread",
-  "object-spread": "objectRestSpread",
-  "optional-catch-binding": "optionalCatchBinding",
+  "class-fields-public": "classProperties",
+  "class-methods-private": "classPrivateMethods",
+  "class-static-fields-public": "classProperties",
+  "class-static-fields-private": "classPrivateProperties",
+  "class-static-methods-private": "classPrivateMethods",
+  "dynamic-import": "dynamicImport",
+  "export-star-as-namespace-from-module": "exportNamespaceFrom",
+  "import.meta": "importMeta",
   "numeric-separator-literal": "numericSeparator",
 };
 
 function getPlugins(features) {
-  return features && features.map(f => featuresToPlugins[f]).filter(Boolean);
+  return (
+    features &&
+    features
+      .map(f => {
+        if (!featuresToPlugins[f] && !ignoredFeatures.includes(f)) {
+          unmappedFeatures.add(f);
+        }
+        return featuresToPlugins[f];
+      })
+      .filter(Boolean)
+  );
 }
 
+const unmappedFeatures = new Set();
+
+exports.getUnmappedFeatures = function() {
+  return unmappedFeatures;
+};
+
 exports.getTests = function(testDir) {
   const stream = new TestStream(testDir, {
     omitRuntime: true,
@@ -95,7 +210,8 @@ exports.updateWhitelist = function(filename, summary) {
       .concat(summary.disallowed.failure)
       .map(function(test) {
         return test.id;
-      });
+      })
+      .concat(summary.unrecognized);
     const toAdd = summary.disallowed.falsePositive
       .concat(summary.disallowed.falseNegative)
       .map(function(test) {
@@ -113,9 +229,10 @@ exports.updateWhitelist = function(filename, summary) {
         return line;
       })
       .filter(function(line) {
-        return line !== null;
+        return line !== null && line !== "";
       })
       .concat(toAdd)
+      .sort()
       .join("\n");
 
     return pfs.writeFile(filename, newContents, "utf-8");
diff --git a/scripts/tests/test262/test262_whitelist.txt b/scripts/tests/test262/test262_whitelist.txt
index ec84454aec05..b832b67af6ab 100644
--- a/scripts/tests/test262/test262_whitelist.txt
+++ b/scripts/tests/test262/test262_whitelist.txt
@@ -1,396 +1,407 @@
-
-annexB/language/function-code/if-decl-else-decl-a-func-block-scoping.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-existing-block-fn-no-init.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-existing-block-fn-update.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-existing-fn-no-init.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-existing-fn-update.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-existing-var-no-init.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-existing-var-update.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-init.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-no-skip-try.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-dft-param.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-early-err-block.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-early-err-for-in.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-early-err-for-of.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-early-err-for.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-early-err-switch.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-early-err-try.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-early-err.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-skip-param.js(default)
-annexB/language/function-code/if-decl-else-decl-a-func-update.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-block-scoping.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-existing-block-fn-no-init.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-existing-block-fn-update.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-existing-fn-no-init.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-existing-fn-update.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-existing-var-no-init.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-existing-var-update.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-init.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-no-skip-try.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-dft-param.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-early-err-block.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-early-err-for-in.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-early-err-for-of.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-early-err-for.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-early-err-switch.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-early-err-try.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-early-err.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-skip-param.js(default)
-annexB/language/function-code/if-decl-else-decl-b-func-update.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-block-scoping.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-existing-block-fn-no-init.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-existing-block-fn-update.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-existing-fn-no-init.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-existing-fn-update.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-existing-var-no-init.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-existing-var-update.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-init.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-no-skip-try.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-dft-param.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-early-err-block.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-early-err-for-in.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-early-err-for-of.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-early-err-for.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-early-err-switch.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-early-err-try.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-early-err.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-skip-param.js(default)
-annexB/language/function-code/if-decl-else-stmt-func-update.js(default)
-annexB/language/function-code/if-decl-no-else-func-block-scoping.js(default)
-annexB/language/function-code/if-decl-no-else-func-existing-block-fn-no-init.js(default)
-annexB/language/function-code/if-decl-no-else-func-existing-block-fn-update.js(default)
-annexB/language/function-code/if-decl-no-else-func-existing-fn-no-init.js(default)
-annexB/language/function-code/if-decl-no-else-func-existing-fn-update.js(default)
-annexB/language/function-code/if-decl-no-else-func-existing-var-no-init.js(default)
-annexB/language/function-code/if-decl-no-else-func-existing-var-update.js(default)
-annexB/language/function-code/if-decl-no-else-func-init.js(default)
-annexB/language/function-code/if-decl-no-else-func-no-skip-try.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-dft-param.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-early-err-block.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-early-err-for-in.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-early-err-for-of.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-early-err-for.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-early-err-switch.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-early-err-try.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-early-err.js(default)
-annexB/language/function-code/if-decl-no-else-func-skip-param.js(default)
-annexB/language/function-code/if-decl-no-else-func-update.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-block-scoping.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-existing-block-fn-no-init.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-existing-block-fn-update.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-existing-fn-no-init.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-existing-fn-update.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-existing-var-no-init.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-existing-var-update.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-init.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-no-skip-try.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-dft-param.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-early-err-block.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-early-err-for-in.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-early-err-for-of.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-early-err-for.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-early-err-switch.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-early-err-try.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-early-err.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-skip-param.js(default)
-annexB/language/function-code/if-stmt-else-decl-func-update.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-block-scoping.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-existing-block-fn-no-init.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-existing-block-fn-update.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-existing-fn-no-init.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-existing-fn-update.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-existing-var-no-init.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-existing-var-update.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-init.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-no-skip-try.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-skip-early-err-block.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-skip-early-err-for-in.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-skip-early-err-for-of.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-skip-early-err-for.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-skip-early-err-switch.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-skip-early-err-try.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-skip-early-err.js(default)
-annexB/language/global-code/if-decl-else-decl-a-global-update.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-block-scoping.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-existing-block-fn-no-init.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-existing-block-fn-update.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-existing-fn-no-init.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-existing-fn-update.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-existing-var-no-init.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-existing-var-update.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-init.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-no-skip-try.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-skip-early-err-block.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-skip-early-err-for-in.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-skip-early-err-for-of.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-skip-early-err-for.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-skip-early-err-switch.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-skip-early-err-try.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-skip-early-err.js(default)
-annexB/language/global-code/if-decl-else-decl-b-global-update.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-block-scoping.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-existing-block-fn-no-init.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-existing-block-fn-update.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-existing-fn-no-init.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-existing-fn-update.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-existing-var-no-init.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-existing-var-update.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-init.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-no-skip-try.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-skip-early-err-block.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-skip-early-err-for-in.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-skip-early-err-for-of.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-skip-early-err-for.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-skip-early-err-switch.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-skip-early-err-try.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-skip-early-err.js(default)
-annexB/language/global-code/if-decl-else-stmt-global-update.js(default)
-annexB/language/global-code/if-decl-no-else-global-block-scoping.js(default)
-annexB/language/global-code/if-decl-no-else-global-existing-block-fn-no-init.js(default)
-annexB/language/global-code/if-decl-no-else-global-existing-block-fn-update.js(default)
-annexB/language/global-code/if-decl-no-else-global-existing-fn-no-init.js(default)
-annexB/language/global-code/if-decl-no-else-global-existing-fn-update.js(default)
-annexB/language/global-code/if-decl-no-else-global-existing-var-no-init.js(default)
-annexB/language/global-code/if-decl-no-else-global-existing-var-update.js(default)
-annexB/language/global-code/if-decl-no-else-global-init.js(default)
-annexB/language/global-code/if-decl-no-else-global-no-skip-try.js(default)
-annexB/language/global-code/if-decl-no-else-global-skip-early-err-block.js(default)
-annexB/language/global-code/if-decl-no-else-global-skip-early-err-for-in.js(default)
-annexB/language/global-code/if-decl-no-else-global-skip-early-err-for-of.js(default)
-annexB/language/global-code/if-decl-no-else-global-skip-early-err-for.js(default)
-annexB/language/global-code/if-decl-no-else-global-skip-early-err-switch.js(default)
-annexB/language/global-code/if-decl-no-else-global-skip-early-err-try.js(default)
-annexB/language/global-code/if-decl-no-else-global-skip-early-err.js(default)
-annexB/language/global-code/if-decl-no-else-global-update.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-block-scoping.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-existing-block-fn-no-init.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-existing-block-fn-update.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-existing-fn-no-init.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-existing-fn-update.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-existing-var-no-init.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-existing-var-update.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-init.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-no-skip-try.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-skip-early-err-block.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-skip-early-err-for-in.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-skip-early-err-for-of.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-skip-early-err-for.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-skip-early-err-switch.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-skip-early-err-try.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-skip-early-err.js(default)
-annexB/language/global-code/if-stmt-else-decl-global-update.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F-negated.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_F.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid-negated.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Invalid.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N-negated.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_N.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No-negated.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_No.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T-negated.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_T.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y-negated.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Y.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes-negated.js(strict mode)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js(default)
+built-ins/RegExp/property-escapes/binary-property-with-value-ASCII_-_Yes.js(strict mode)
+built-ins/RegExp/property-escapes/character-class-range-end.js(default)
+built-ins/RegExp/property-escapes/character-class-range-end.js(strict mode)
+built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js(default)
+built-ins/RegExp/property-escapes/character-class-range-no-dash-end.js(strict mode)
+built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js(default)
+built-ins/RegExp/property-escapes/character-class-range-no-dash-start.js(strict mode)
+built-ins/RegExp/property-escapes/character-class-range-start.js(default)
+built-ins/RegExp/property-escapes/character-class-range-start.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Block-implicit.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-implicit.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-In-prefix-Script.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-Is-prefix-Script.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-circumflex-negation.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-empty-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-empty.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-empty.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-invalid-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-invalid.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-invalid.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces-value-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces-value.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-no-braces.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-separator-and-value-only.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-separator-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-separator-only-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-separator-only.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-separator-only.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-separator.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-separator.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-unclosed-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-unclosed.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-unclosed.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-unopened-negated.js(strict mode)
+built-ins/RegExp/property-escapes/grammar-extension-unopened.js(default)
+built-ins/RegExp/property-escapes/grammar-extension-unopened.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-01-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-01-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-01.js(default)
+built-ins/RegExp/property-escapes/loose-matching-01.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-02-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-02-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-02.js(default)
+built-ins/RegExp/property-escapes/loose-matching-02.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-03-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-03-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-03.js(default)
+built-ins/RegExp/property-escapes/loose-matching-03.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-04-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-04-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-04.js(default)
+built-ins/RegExp/property-escapes/loose-matching-04.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-05-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-05-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-05.js(default)
+built-ins/RegExp/property-escapes/loose-matching-05.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-06-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-06-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-06.js(default)
+built-ins/RegExp/property-escapes/loose-matching-06.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-07-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-07-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-07.js(default)
+built-ins/RegExp/property-escapes/loose-matching-07.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-08-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-08-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-08.js(default)
+built-ins/RegExp/property-escapes/loose-matching-08.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-09-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-09-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-09.js(default)
+built-ins/RegExp/property-escapes/loose-matching-09.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-10-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-10-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-10.js(default)
+built-ins/RegExp/property-escapes/loose-matching-10.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-11-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-11-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-11.js(default)
+built-ins/RegExp/property-escapes/loose-matching-11.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-12-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-12-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-12.js(default)
+built-ins/RegExp/property-escapes/loose-matching-12.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-13-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-13-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-13.js(default)
+built-ins/RegExp/property-escapes/loose-matching-13.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-14-negated.js(default)
+built-ins/RegExp/property-escapes/loose-matching-14-negated.js(strict mode)
+built-ins/RegExp/property-escapes/loose-matching-14.js(default)
+built-ins/RegExp/property-escapes/loose-matching-14.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-equals.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-General_Category.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-equals.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-equals.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js(default)
+built-ins/RegExp/property-escapes/non-binary-property-without-value-Script_Extensions.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js(default)
+built-ins/RegExp/property-escapes/non-existent-binary-property-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-binary-property.js(default)
+built-ins/RegExp/property-escapes/non-existent-binary-property.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-and-value-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-and-value.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-and-value.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-existing-value-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-existing-value.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-existing-value.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-value-General_Category-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions-negated.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-value-Script_Extensions.js(strict mode)
+built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js(default)
+built-ins/RegExp/property-escapes/non-existent-property-value-general-category.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Composition_Exclusion.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFC.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFD.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKC.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Expands_On_NFKD.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-FC_NFKC_Closure.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Full_Composition_Exclusion.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Grapheme_Link.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Hyphen.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Alphabetic.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Default_Ignorable_Code_Point.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Grapheme_Extend.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Continue.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_ID_Start.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Lowercase.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Math.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Other_Uppercase.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js(default)
+built-ins/RegExp/property-escapes/unsupported-binary-property-Prepended_Concatenation_Mark.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-Block-with-value-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-Block-with-value.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-FC_NFKC_Closure.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value-negated.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break-with-value.js(strict mode)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js(default)
+built-ins/RegExp/property-escapes/unsupported-property-Line_Break.js(strict mode)
+language/comments/hashbang/escaped-bang-041.js(default)
+language/comments/hashbang/escaped-bang-u0021.js(default)
+language/comments/hashbang/escaped-bang-u21.js(default)
+language/comments/hashbang/escaped-bang-x21.js(default)
+language/comments/hashbang/escaped-hash-043.js(default)
+language/comments/hashbang/escaped-hash-u0023.js(default)
+language/comments/hashbang/escaped-hash-u23.js(default)
+language/comments/hashbang/escaped-hash-x23.js(default)
+language/comments/hashbang/escaped-hashbang.js(default)
+language/comments/hashbang/multi-line-comment.js(default)
+language/comments/hashbang/preceding-directive-prologue-sc.js(default)
+language/comments/hashbang/preceding-directive-prologue.js(default)
+language/comments/hashbang/preceding-empty-statement.js(default)
+language/comments/hashbang/preceding-hashbang.js(default)
+language/comments/hashbang/preceding-line-comment.js(default)
+language/comments/hashbang/preceding-multi-line-comment.js(default)
+language/comments/hashbang/preceding-whitespace.js(default)
 language/expressions/assignment/destructuring/obj-prop-__proto__dup.js(default)
 language/expressions/assignment/destructuring/obj-prop-__proto__dup.js(strict mode)
-language/expressions/assignment/dstr-obj-id-identifier-yield-ident-valid.js(default)
-language/expressions/object/let-non-strict-access.js(default)
-language/expressions/object/let-non-strict-syntax.js(default)
-language/expressions/object/yield-non-strict-access.js(default)
-language/expressions/object/yield-non-strict-syntax.js(default)
-language/statements/for/head-lhs-let.js(default)
-language/statements/for/let-block-with-newline.js(default)
-language/statements/for/let-identifier-with-newline.js(default)
-language/statements/for-await-of/let-block-with-newline.js(default)
-language/statements/for-await-of/let-identifier-with-newline.js(default)
-language/statements/for-in/head-lhs-let.js(default)
-language/statements/for-in/head-var-bound-names-let.js(default)
-language/statements/for-in/identifier-let-allowed-as-lefthandside-expression-not-strict.js(default)
-language/statements/for-in/let-block-with-newline.js(default)
-language/statements/for-in/let-identifier-with-newline.js(default)
-language/statements/for-of/dstr-obj-id-identifier-yield-ident-valid.js(default)
-language/statements/for-of/head-var-bound-names-let.js(default)
-language/statements/for-of/let-block-with-newline.js(default)
-language/statements/for-of/let-identifier-with-newline.js(default)
-language/statements/if/let-block-with-newline.js(default)
-language/statements/if/let-identifier-with-newline.js(default)
-language/statements/labeled/let-block-with-newline.js(default)
-language/statements/labeled/let-identifier-with-newline.js(default)
-language/statements/labeled/value-yield-non-strict-escaped.js(default)
-language/statements/labeled/value-yield-non-strict.js(default)
-language/statements/let/syntax/escaped-let.js(default)
-language/statements/while/let-block-with-newline.js(default)
-language/statements/while/let-identifier-with-newline.js(default)
-language/statements/with/let-block-with-newline.js(default)
-language/statements/with/let-identifier-with-newline.js(default)
-annexB/language/statements/for-in/bare-initializer.js(default)
-annexB/language/statements/for-in/bare-initializer.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/expressions/assignment/dstr-array-rest-before-elision.js(default)
-language/expressions/assignment/dstr-array-rest-before-elision.js(strict mode)
-language/expressions/assignment/dstr-array-rest-elision-invalid.js(default)
-language/expressions/assignment/dstr-array-rest-elision-invalid.js(strict mode)
+language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js(default)
+language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js(strict mode)
+language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js(default)
+language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js(strict mode)
+language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js(default)
+language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js(strict mode)
 language/expressions/async-arrow-function/early-errors-arrow-await-in-formals-default.js(default)
 language/expressions/async-arrow-function/early-errors-arrow-await-in-formals-default.js(strict mode)
 language/expressions/async-arrow-function/early-errors-arrow-await-in-formals.js(default)
 language/expressions/async-arrow-function/early-errors-arrow-await-in-formals.js(strict mode)
-language/expressions/async-arrow-function/early-errors-arrow-formals-body-duplicate.js(default)
-language/expressions/async-arrow-function/early-errors-arrow-formals-body-duplicate.js(strict mode)
-language/expressions/async-function/early-errors-expression-formals-body-duplicate.js(default)
-language/expressions/async-function/early-errors-expression-formals-body-duplicate.js(strict mode)
-language/expressions/async-function/named-dflt-params-duplicates.js(default)
-language/expressions/async-function/nameless-dflt-params-duplicates.js(default)
-language/expressions/async-generator/dflt-params-duplicates.js(default)
-language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js(default)
-language/expressions/async-generator/early-errors-expression-await-as-function-binding-identifier.js(strict mode)
-language/expressions/async-generator/early-errors-expression-formals-body-duplicate-const.js(default)
-language/expressions/async-generator/early-errors-expression-formals-body-duplicate-const.js(strict mode)
-language/expressions/async-generator/early-errors-expression-formals-body-duplicate-let.js(default)
-language/expressions/async-generator/early-errors-expression-formals-body-duplicate-let.js(strict mode)
-language/expressions/async-generator/early-errors-expression-formals-contains-await.js(default)
-language/expressions/async-generator/early-errors-expression-formals-contains-await.js(strict mode)
-language/expressions/async-generator/named-dflt-params-duplicates.js(default)
-language/expressions/function/dflt-params-duplicates.js(default)
-language/expressions/generators/dflt-params-duplicates.js(default)
-language/expressions/object/method-definition/async-gen-meth-dflt-params-duplicates.js(default)
-language/expressions/object/method-definition/async-meth-dflt-params-duplicates.js(default)
-language/expressions/object/method-definition/early-errors-object-method-async-lineterminator.js(default)
-language/expressions/object/method-definition/early-errors-object-method-async-lineterminator.js(strict mode)
-language/expressions/object/method-definition/early-errors-object-method-await-in-formals-default.js(default)
-language/expressions/object/method-definition/early-errors-object-method-await-in-formals-default.js(strict mode)
-language/expressions/object/method-definition/early-errors-object-method-await-in-formals.js(default)
-language/expressions/object/method-definition/early-errors-object-method-await-in-formals.js(strict mode)
-language/expressions/object/method-definition/early-errors-object-method-duplicate-parameters.js(default)
-language/expressions/object/method-definition/gen-meth-dflt-params-duplicates.js(default)
-language/expressions/object/method-definition/generator-param-redecl-const.js(default)
-language/expressions/object/method-definition/generator-param-redecl-const.js(strict mode)
-language/expressions/object/method-definition/generator-param-redecl-let.js(default)
-language/expressions/object/method-definition/generator-param-redecl-let.js(strict mode)
-language/expressions/object/method-definition/meth-dflt-params-duplicates.js(default)
-language/expressions/object/method-definition/name-param-redecl.js(default)
-language/expressions/object/method-definition/name-param-redecl.js(strict mode)
-language/expressions/template-literal/invalid-legacy-octal-escape-sequence.js(default)
-language/expressions/template-literal/invalid-legacy-octal-escape-sequence.js(strict mode)
-language/expressions/yield/in-iteration-stmt.js(default)
-language/expressions/yield/in-iteration-stmt.js(strict mode)
-language/expressions/yield/star-in-iteration-stmt.js(default)
-language/expressions/yield/star-in-iteration-stmt.js(strict mode)
-language/global-code/new.target-arrow.js(default)
-language/global-code/new.target-arrow.js(strict mode)
-language/import/dup-bound-names.js(default)
-language/import/dup-bound-names.js(strict mode)
+language/expressions/class/elements/fields-duplicate-privatenames.js(default)
+language/expressions/class/elements/fields-duplicate-privatenames.js(strict mode)
+language/expressions/class/elements/fields-literal-name-static-propname-constructor.js(default)
+language/expressions/class/elements/fields-literal-name-static-propname-constructor.js(strict mode)
+language/expressions/class/elements/fields-string-name-static-propname-constructor.js(default)
+language/expressions/class/elements/fields-string-name-static-propname-constructor.js(strict mode)
+language/expressions/class/elements/private-methods/prod-private-method-initialize-order.js(default)
+language/expressions/class/elements/private-methods/prod-private-method-initialize-order.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-private-field-on-object-destructuring.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-private-field-on-object-destructuring.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js(default)
+language/expressions/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-call-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-call-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-call-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-call-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-member-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-member-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-member-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-member-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-bad-reference.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-bad-reference.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-this.js(default)
+language/expressions/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-this.js(strict mode)
+language/expressions/class/elements/syntax/early-errors/super-private-access-invalid.js(default)
+language/expressions/class/elements/syntax/early-errors/super-private-access-invalid.js(strict mode)
+language/expressions/object/method-definition/private-name-early-error-async-gen-inside-class.js(default)
+language/expressions/object/method-definition/private-name-early-error-async-gen-inside-class.js(strict mode)
+language/expressions/object/method-definition/private-name-early-error-gen-inside-class.js(default)
+language/expressions/object/method-definition/private-name-early-error-gen-inside-class.js(strict mode)
+language/expressions/object/method-definition/private-name-early-error-method-inside-class.js(default)
+language/expressions/object/method-definition/private-name-early-error-method-inside-class.js(strict mode)
+language/expressions/template-literal/unicode-escape-nls-err.js(default)
+language/expressions/template-literal/unicode-escape-nls-err.js(strict mode)
+language/identifiers/unicode-escape-nls-err.js(default)
+language/identifiers/unicode-escape-nls-err.js(strict mode)
+language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js(default)
 language/literals/regexp/early-err-pattern.js(default)
 language/literals/regexp/early-err-pattern.js(strict mode)
 language/literals/regexp/invalid-braced-quantifier-exact.js(default)
@@ -399,6 +410,126 @@ language/literals/regexp/invalid-braced-quantifier-lower.js(default)
 language/literals/regexp/invalid-braced-quantifier-lower.js(strict mode)
 language/literals/regexp/invalid-braced-quantifier-range.js(default)
 language/literals/regexp/invalid-braced-quantifier-range.js(strict mode)
+language/literals/regexp/invalid-optional-lookbehind.js(default)
+language/literals/regexp/invalid-optional-lookbehind.js(strict mode)
+language/literals/regexp/invalid-optional-negative-lookbehind.js(default)
+language/literals/regexp/invalid-optional-negative-lookbehind.js(strict mode)
+language/literals/regexp/invalid-range-lookbehind.js(default)
+language/literals/regexp/invalid-range-lookbehind.js(strict mode)
+language/literals/regexp/invalid-range-negative-lookbehind.js(default)
+language/literals/regexp/invalid-range-negative-lookbehind.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-2-u.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-2-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-2.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-2.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-3-u.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-3-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-3.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-3.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-4-u.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-4-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-4.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-4.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-5.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-5.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-u.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname-without-group-u.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname-without-group-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-dangling-groupname.js(default)
+language/literals/regexp/named-groups/invalid-dangling-groupname.js(strict mode)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier-2-u.js(default)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier-2-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier-2.js(default)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier-2.js(strict mode)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier-u.js(default)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-duplicate-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-empty-groupspecifier-u.js(default)
+language/literals/regexp/named-groups/invalid-empty-groupspecifier-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-empty-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-empty-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-identity-escape-in-capture-u.js(default)
+language/literals/regexp/named-groups/invalid-identity-escape-in-capture-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-2-u.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-2-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-2.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-2.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-3-u.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-3-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-3.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-3.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-4.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-4.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-5.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-5.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-6.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-6.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-u.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-without-group-2-u.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-without-group-2-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-without-group-3-u.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-without-group-3-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-without-group-u.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname-without-group-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-incomplete-groupname.js(default)
+language/literals/regexp/named-groups/invalid-incomplete-groupname.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-continue-groupspecifier-4-u.js(default)
+language/literals/regexp/named-groups/invalid-non-id-continue-groupspecifier-4-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-continue-groupspecifier-4.js(default)
+language/literals/regexp/named-groups/invalid-non-id-continue-groupspecifier-4.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-continue-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-non-id-continue-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-2-u.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-2-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-2.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-2.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-3.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-3.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-4-u.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-4-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-4.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-4.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-5-u.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-5-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-5.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-5.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-6.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-6.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-7.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-7.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-8-u.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-8-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-8.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-8.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-9-u.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-9-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-u.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-non-id-start-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-numeric-groupspecifier-u.js(default)
+language/literals/regexp/named-groups/invalid-numeric-groupspecifier-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-numeric-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-numeric-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-punctuator-starting-groupspecifier-u.js(default)
+language/literals/regexp/named-groups/invalid-punctuator-starting-groupspecifier-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-punctuator-starting-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-punctuator-starting-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-punctuator-within-groupspecifier-u.js(default)
+language/literals/regexp/named-groups/invalid-punctuator-within-groupspecifier-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-punctuator-within-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-punctuator-within-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-u-escape-in-groupspecifier-2.js(default)
+language/literals/regexp/named-groups/invalid-u-escape-in-groupspecifier-2.js(strict mode)
+language/literals/regexp/named-groups/invalid-u-escape-in-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-u-escape-in-groupspecifier.js(strict mode)
+language/literals/regexp/named-groups/invalid-unterminated-groupspecifier-u.js(default)
+language/literals/regexp/named-groups/invalid-unterminated-groupspecifier-u.js(strict mode)
+language/literals/regexp/named-groups/invalid-unterminated-groupspecifier.js(default)
+language/literals/regexp/named-groups/invalid-unterminated-groupspecifier.js(strict mode)
 language/literals/regexp/u-dec-esc.js(default)
 language/literals/regexp/u-dec-esc.js(strict mode)
 language/literals/regexp/u-invalid-class-escape.js(default)
@@ -419,332 +550,6 @@ language/literals/regexp/u-invalid-non-empty-class-ranges.js(default)
 language/literals/regexp/u-invalid-non-empty-class-ranges.js(strict mode)
 language/literals/regexp/u-invalid-oob-decimal-escape.js(default)
 language/literals/regexp/u-invalid-oob-decimal-escape.js(strict mode)
-language/literals/regexp/u-unicode-esc-bounds.js(default)
-language/literals/regexp/u-unicode-esc-bounds.js(strict mode)
-language/literals/regexp/u-unicode-esc-non-hex.js(default)
-language/literals/regexp/u-unicode-esc-non-hex.js(strict mode)
-language/literals/regexp/unicode-escape-nls-err.js(default)
-language/literals/regexp/unicode-escape-nls-err.js(strict mode)
-language/literals/string/legacy-non-octal-escape-sequence-strict.js(strict mode)
-language/module-code/early-export-global.js(default)
-language/module-code/early-export-global.js(strict mode)
-language/module-code/early-export-unresolvable.js(default)
-language/module-code/early-export-unresolvable.js(strict mode)
-language/module-code/early-lex-and-var.js(default)
-language/module-code/early-lex-and-var.js(strict mode)
-language/module-code/parse-err-hoist-lex-fun.js(default)
-language/module-code/parse-err-hoist-lex-fun.js(strict mode)
-language/module-code/parse-err-hoist-lex-gen.js(default)
-language/module-code/parse-err-hoist-lex-gen.js(strict mode)
-language/statements/async-function/dflt-params-duplicates.js(default)
-language/statements/async-function/early-errors-declaration-await-in-formals-default.js(default)
-language/statements/async-function/early-errors-declaration-await-in-formals-default.js(strict mode)
-language/statements/async-function/early-errors-declaration-await-in-formals.js(default)
-language/statements/async-function/early-errors-declaration-await-in-formals.js(strict mode)
-language/statements/async-function/early-errors-declaration-formals-body-duplicate.js(default)
-language/statements/async-function/early-errors-declaration-formals-body-duplicate.js(strict mode)
-language/statements/async-generator/dflt-params-duplicates.js(default)
-language/statements/class/async-gen-meth-escaped-async.js(default)
-language/statements/class/async-gen-meth-escaped-async.js(strict mode)
-language/statements/class/async-meth-escaped-async.js(default)
-language/statements/class/async-meth-escaped-async.js(strict mode)
-language/statements/class/definition/early-errors-class-method-await-in-formals-default.js(default)
-language/statements/class/definition/early-errors-class-method-await-in-formals-default.js(strict mode)
-language/statements/class/definition/early-errors-class-method-await-in-formals.js(default)
-language/statements/class/definition/early-errors-class-method-await-in-formals.js(strict mode)
-language/statements/class/strict-mode/with.js(default)
-language/statements/class/syntax/early-errors/class-body-has-direct-super-missing-class-heritage.js(default)
-language/statements/class/syntax/early-errors/class-body-has-direct-super-missing-class-heritage.js(strict mode)
-language/statements/class/syntax/early-errors/class-definition-evaluation-block-duplicate-binding.js(default)
-language/statements/class/syntax/early-errors/class-definition-evaluation-block-duplicate-binding.js(strict mode)
-language/statements/class/syntax/early-errors/class-definition-evaluation-scriptbody-duplicate-binding.js(default)
-language/statements/class/syntax/early-errors/class-definition-evaluation-scriptbody-duplicate-binding.js(strict mode)
-language/statements/const/redeclaration-error-from-within-strict-mode-function-const.js(default)
-language/statements/do-while/decl-async-fun.js(default)
-language/statements/do-while/decl-async-fun.js(strict mode)
-language/statements/do-while/decl-async-gen.js(default)
-language/statements/do-while/decl-async-gen.js(strict mode)
-language/statements/do-while/labelled-fn-stmt.js(default)
-language/statements/for/decl-async-fun.js(default)
-language/statements/for/decl-async-fun.js(strict mode)
-language/statements/for/decl-async-gen.js(default)
-language/statements/for/decl-async-gen.js(strict mode)
-language/statements/for/head-let-bound-names-in-stmt.js(default)
-language/statements/for/head-let-bound-names-in-stmt.js(strict mode)
-language/statements/for/labelled-fn-stmt-expr.js(default)
-language/statements/for/labelled-fn-stmt-let.js(default)
-language/statements/for/labelled-fn-stmt-var.js(default)
-language/statements/for-in/decl-async-fun.js(default)
-language/statements/for-in/decl-async-fun.js(strict mode)
-language/statements/for-in/decl-async-gen.js(default)
-language/statements/for-in/decl-async-gen.js(strict mode)
-language/statements/for-in/dstr-array-rest-before-elision.js(default)
-language/statements/for-in/dstr-array-rest-before-elision.js(strict mode)
-language/statements/for-in/dstr-array-rest-elision-invalid.js(default)
-language/statements/for-in/dstr-array-rest-elision-invalid.js(strict mode)
-language/statements/for-in/head-const-bound-names-dup.js(default)
-language/statements/for-in/head-const-bound-names-dup.js(strict mode)
-language/statements/for-in/head-const-bound-names-in-stmt.js(default)
-language/statements/for-in/head-const-bound-names-in-stmt.js(strict mode)
-language/statements/for-in/head-let-bound-names-dup.js(default)
-language/statements/for-in/head-let-bound-names-dup.js(strict mode)
-language/statements/for-in/head-let-bound-names-in-stmt.js(default)
-language/statements/for-in/head-let-bound-names-in-stmt.js(strict mode)
-language/statements/for-in/labelled-fn-stmt-const.js(default)
-language/statements/for-in/labelled-fn-stmt-let.js(default)
-language/statements/for-in/labelled-fn-stmt-lhs.js(default)
-language/statements/for-in/labelled-fn-stmt-var.js(default)
-language/statements/for-of/decl-async-fun.js(default)
-language/statements/for-of/decl-async-fun.js(strict mode)
-language/statements/for-of/decl-async-gen.js(default)
-language/statements/for-of/decl-async-gen.js(strict mode)
-language/statements/for-of/dstr-array-rest-before-elision.js(default)
-language/statements/for-of/dstr-array-rest-before-elision.js(strict mode)
-language/statements/for-of/dstr-array-rest-elision-invalid.js(default)
-language/statements/for-of/dstr-array-rest-elision-invalid.js(strict mode)
-language/statements/for-of/head-const-bound-names-dup.js(default)
-language/statements/for-of/head-const-bound-names-dup.js(strict mode)
-language/statements/for-of/head-const-bound-names-in-stmt.js(default)
-language/statements/for-of/head-const-bound-names-in-stmt.js(strict mode)
-language/statements/for-of/head-decl-no-expr.js(default)
-language/statements/for-of/head-decl-no-expr.js(strict mode)
-language/statements/for-of/head-expr-no-expr.js(default)
-language/statements/for-of/head-expr-no-expr.js(strict mode)
-language/statements/for-of/head-let-bound-names-dup.js(default)
-language/statements/for-of/head-let-bound-names-dup.js(strict mode)
-language/statements/for-of/head-let-bound-names-in-stmt.js(default)
-language/statements/for-of/head-let-bound-names-in-stmt.js(strict mode)
-language/statements/for-of/head-var-no-expr.js(default)
-language/statements/for-of/head-var-no-expr.js(strict mode)
-language/statements/for-of/labelled-fn-stmt-const.js(default)
-language/statements/for-of/labelled-fn-stmt-let.js(default)
-language/statements/for-of/labelled-fn-stmt-lhs.js(default)
-language/statements/for-of/labelled-fn-stmt-var.js(default)
-language/statements/function/dflt-params-duplicates.js(default)
-language/statements/generators/dflt-params-duplicates.js(default)
-language/statements/if/if-async-fun-else-async-fun.js(default)
-language/statements/if/if-async-fun-else-async-fun.js(strict mode)
-language/statements/if/if-async-fun-else-stmt.js(default)
-language/statements/if/if-async-fun-else-stmt.js(strict mode)
-language/statements/if/if-async-fun-no-else.js(default)
-language/statements/if/if-async-fun-no-else.js(strict mode)
-language/statements/if/if-async-gen-else-async-gen.js(default)
-language/statements/if/if-async-gen-else-async-gen.js(strict mode)
-language/statements/if/if-async-gen-else-stmt.js(default)
-language/statements/if/if-async-gen-else-stmt.js(strict mode)
-language/statements/if/if-async-gen-no-else.js(default)
-language/statements/if/if-async-gen-no-else.js(strict mode)
-language/statements/if/if-stmt-else-async-fun.js(default)
-language/statements/if/if-stmt-else-async-fun.js(strict mode)
-language/statements/if/if-stmt-else-async-gen.js(default)
-language/statements/if/if-stmt-else-async-gen.js(strict mode)
-language/statements/if/labelled-fn-stmt-first.js(default)
-language/statements/if/labelled-fn-stmt-lone.js(default)
-language/statements/if/labelled-fn-stmt-second.js(default)
-language/statements/let/redeclaration-error-from-within-strict-mode-function.js(default)
-language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js(default)
-language/statements/let/syntax/attempt-to-redeclare-let-binding-with-function-declaration.js(strict mode)
-language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js(default)
-language/statements/let/syntax/attempt-to-redeclare-let-binding-with-var.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js(default)
-language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js(default)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js(default)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js(default)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js(default)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js(strict mode)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js(default)
-language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js(strict mode)
-language/statements/try/early-catch-lex.js(default)
-language/statements/try/early-catch-lex.js(strict mode)
-language/statements/try/early-catch-var.js(default)
-language/statements/try/early-catch-var.js(strict mode)
-language/statements/while/decl-async-fun.js(default)
-language/statements/while/decl-async-fun.js(strict mode)
-language/statements/while/decl-async-gen.js(default)
-language/statements/while/decl-async-gen.js(strict mode)
-language/statements/while/labelled-fn-stmt.js(default)
-language/statements/with/decl-async-fun.js(default)
-language/statements/with/decl-async-gen.js(default)
-language/statements/with/labelled-fn-stmt.js(default)
-
-language/identifiers/unicode-escape-nls-err.js(default)
-language/identifiers/unicode-escape-nls-err.js(strict mode)
-language/module-code/privatename-not-valid-earlyerr-module-1.js(default)
-language/module-code/privatename-not-valid-earlyerr-module-1.js(strict mode)
-language/module-code/privatename-not-valid-earlyerr-module-2.js(default)
-language/module-code/privatename-not-valid-earlyerr-module-2.js(strict mode)
-language/module-code/privatename-not-valid-earlyerr-module-3.js(default)
-language/module-code/privatename-not-valid-earlyerr-module-3.js(strict mode)
-language/module-code/privatename-not-valid-earlyerr-module-4.js(default)
-language/module-code/privatename-not-valid-earlyerr-module-4.js(strict mode)
-language/expressions/class/fields-duplicate-privatenames.js(default)
-language/expressions/class/fields-duplicate-privatenames.js(strict mode)
-language/expressions/class/fields-initializer-static-private-fields-forbidden.js(default)
-language/expressions/class/fields-initializer-static-private-fields-forbidden.js(strict mode)
-language/expressions/class/fields-initializer-static-public-fields-forbidden.js(default)
-language/expressions/class/fields-initializer-static-public-fields-forbidden.js(strict mode)
-language/expressions/class/fields-literal-name-static-private-fields-forbidden.js(default)
-language/expressions/class/fields-literal-name-static-private-fields-forbidden.js(strict mode)
-language/expressions/class/fields-literal-name-static-public-fields-forbidden.js(default)
-language/expressions/class/fields-literal-name-static-public-fields-forbidden.js(strict mode)
-language/expressions/template-literal/unicode-escape-nls-err.js(default)
-language/expressions/template-literal/unicode-escape-nls-err.js(strict mode)
-language/literals/numeric/numeric-separator-literal-nzd-nsl-dds-leading-zero-err.js(default)
-language/literals/string/unicode-escape-nls-err-double.js(default)
-language/literals/string/unicode-escape-nls-err-double.js(strict mode)
-language/literals/string/unicode-escape-nls-err-single.js(default)
-language/literals/string/unicode-escape-nls-err-single.js(strict mode)
-language/statements/class/fields-duplicate-privatenames.js(default)
-language/statements/class/fields-duplicate-privatenames.js(strict mode)
-language/statements/class/fields-initializer-static-private-fields-forbidden.js(default)
-language/statements/class/fields-initializer-static-private-fields-forbidden.js(strict mode)
-language/statements/class/fields-initializer-static-public-fields-forbidden.js(default)
-language/statements/class/fields-initializer-static-public-fields-forbidden.js(strict mode)
-language/statements/class/fields-literal-name-static-private-fields-forbidden.js(default)
-language/statements/class/fields-literal-name-static-private-fields-forbidden.js(strict mode)
-language/statements/class/fields-literal-name-static-public-fields-forbidden.js(default)
-language/statements/class/fields-literal-name-static-public-fields-forbidden.js(strict mode)
-language/statements/class/privatename-not-valid-earlyerr-script-1.js(default)
-language/statements/class/privatename-not-valid-earlyerr-script-1.js(strict mode)
-language/statements/class/privatename-not-valid-earlyerr-script-2.js(default)
-language/statements/class/privatename-not-valid-earlyerr-script-2.js(strict mode)
-language/statements/class/privatename-not-valid-earlyerr-script-3.js(default)
-language/statements/class/privatename-not-valid-earlyerr-script-3.js(strict mode)
-language/statements/class/privatename-not-valid-earlyerr-script-4.js(default)
-language/statements/class/privatename-not-valid-earlyerr-script-4.js(strict mode)
-language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js(default)
-language/expressions/async-arrow-function/await-as-param-ident-nested-arrow-parameter-position.js(strict mode)
-language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js(default)
-language/expressions/async-arrow-function/await-as-param-nested-arrow-parameter-position.js(strict mode)
-language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js(default)
-language/expressions/async-arrow-function/await-as-param-rest-nested-arrow-parameter-position.js(strict mode)
-language/expressions/class/class-name-ident-static-escaped.js(default)
-language/expressions/class/class-name-ident-static.js(default)
-language/literals/regexp/invalid-optional-lookbehind.js(default)
-language/literals/regexp/invalid-optional-lookbehind.js(strict mode)
-language/literals/regexp/invalid-optional-negative-lookbehind.js(default)
-language/literals/regexp/invalid-optional-negative-lookbehind.js(strict mode)
-language/literals/regexp/invalid-range-lookbehind.js(default)
-language/literals/regexp/invalid-range-lookbehind.js(strict mode)
-language/literals/regexp/invalid-range-negative-lookbehind.js(default)
-language/literals/regexp/invalid-range-negative-lookbehind.js(strict mode)
 language/literals/regexp/u-invalid-optional-lookahead.js(default)
 language/literals/regexp/u-invalid-optional-lookahead.js(strict mode)
 language/literals/regexp/u-invalid-optional-lookbehind.js(default)
@@ -761,17 +566,117 @@ language/literals/regexp/u-invalid-range-negative-lookahead.js(default)
 language/literals/regexp/u-invalid-range-negative-lookahead.js(strict mode)
 language/literals/regexp/u-invalid-range-negative-lookbehind.js(default)
 language/literals/regexp/u-invalid-range-negative-lookbehind.js(strict mode)
-language/statements/class/class-name-ident-static-escaped.js(default)
-language/statements/class/class-name-ident-static.js(default)
-language/statements/try/early-catch-function.js(default)
-language/statements/try/early-catch-function.js(strict mode)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration-nested-in-function.js(default)
-language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration-nested-in-function.js(strict mode)
-language/literals/string/line-separator.js(default)
-language/literals/string/line-separator.js(strict mode)
-language/literals/string/paragraph-separator.js(default)
-language/literals/string/paragraph-separator.js(strict mode)
-built-ins/Function/prototype/toString/proxy-async-generator-function.js(default)
-built-ins/Function/prototype/toString/proxy-async-generator-function.js(strict mode)
-built-ins/Function/prototype/toString/proxy-async-generator-method-definition.js(default)
-built-ins/Function/prototype/toString/proxy-async-generator-method-definition.js(strict mode)
+language/literals/regexp/u-unicode-esc-bounds.js(default)
+language/literals/regexp/u-unicode-esc-bounds.js(strict mode)
+language/literals/regexp/u-unicode-esc-non-hex.js(default)
+language/literals/regexp/u-unicode-esc-non-hex.js(strict mode)
+language/literals/regexp/unicode-escape-nls-err.js(default)
+language/literals/regexp/unicode-escape-nls-err.js(strict mode)
+language/literals/string/unicode-escape-nls-err-double.js(default)
+language/literals/string/unicode-escape-nls-err-double.js(strict mode)
+language/literals/string/unicode-escape-nls-err-single.js(default)
+language/literals/string/unicode-escape-nls-err-single.js(strict mode)
+language/module-code/privatename-not-valid-earlyerr-module-1.js(default)
+language/module-code/privatename-not-valid-earlyerr-module-1.js(strict mode)
+language/module-code/privatename-not-valid-earlyerr-module-2.js(default)
+language/module-code/privatename-not-valid-earlyerr-module-2.js(strict mode)
+language/module-code/privatename-not-valid-earlyerr-module-3.js(default)
+language/module-code/privatename-not-valid-earlyerr-module-3.js(strict mode)
+language/module-code/privatename-not-valid-earlyerr-module-4.js(default)
+language/module-code/privatename-not-valid-earlyerr-module-4.js(strict mode)
+language/statements/class/elements/fields-duplicate-privatenames.js(default)
+language/statements/class/elements/fields-duplicate-privatenames.js(strict mode)
+language/statements/class/elements/fields-literal-name-static-propname-constructor.js(default)
+language/statements/class/elements/fields-literal-name-static-propname-constructor.js(strict mode)
+language/statements/class/elements/fields-string-name-static-propname-constructor.js(default)
+language/statements/class/elements/fields-string-name-static-propname-constructor.js(strict mode)
+language/statements/class/elements/private-methods/prod-private-method-initialize-order.js(default)
+language/statements/class/elements/private-methods/prod-private-method-initialize-order.js(strict mode)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-1.js(default)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-1.js(strict mode)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-2.js(default)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-2.js(strict mode)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-3.js(default)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-3.js(strict mode)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-4.js(default)
+language/statements/class/elements/privatename-not-valid-earlyerr-script-4.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-private-field-on-object-destructuring.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-private-field-on-object-destructuring.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-field.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-get-get.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-field.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-get.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-meth.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-set.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticfield.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-meth-staticmeth.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-field.js(strict mode)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js(default)
+language/statements/class/elements/syntax/early-errors/grammar-privatemeth-duplicate-set-set.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-call-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-call-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-fn-member-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/field-init-member-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-call-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-call-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-call-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-call-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-call-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-fn-member-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-call-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-heritage-member-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-member-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-member-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-member-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-member-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-call-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-bad-reference.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-bad-reference.js(strict mode)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-this.js(default)
+language/statements/class/elements/syntax/early-errors/invalid-names/method-outter-member-expression-this.js(strict mode)
+language/statements/class/elements/syntax/early-errors/super-private-access-invalid.js(default)
+language/statements/class/elements/syntax/early-errors/super-private-access-invalid.js(strict mode)
+language/statements/for-in/dstr/array-rest-before-elision.js(default)
+language/statements/for-in/dstr/array-rest-before-elision.js(strict mode)
+language/statements/for-in/dstr/array-rest-elision-invalid.js(default)
+language/statements/for-in/dstr/array-rest-elision-invalid.js(strict mode)
+language/statements/for-of/dstr/array-rest-before-elision.js(default)
+language/statements/for-of/dstr/array-rest-before-elision.js(strict mode)
+language/statements/for-of/dstr/array-rest-elision-invalid.js(default)
+language/statements/for-of/dstr/array-rest-elision-invalid.js(strict mode)
\ No newline at end of file
diff --git a/packages/babel-types/scripts/utils/formatCode.js b/scripts/utils/formatCode.js
similarity index 78%
rename from packages/babel-types/scripts/utils/formatCode.js
rename to scripts/utils/formatCode.js
index 9d279e6e49ec..9801d4acf002 100644
--- a/packages/babel-types/scripts/utils/formatCode.js
+++ b/scripts/utils/formatCode.js
@@ -4,6 +4,8 @@ const prettier = require("prettier");
 module.exports = function formatCode(code, filename) {
   filename = filename || __filename;
   const prettierConfig = prettier.resolveConfig.sync(filename);
+  prettierConfig.filepath = filename;
+  prettierConfig.parser = "babel";
 
   return prettier.format(code, prettierConfig);
 };
diff --git a/scripts/utils/writeFileAndMkDir.js b/scripts/utils/writeFileAndMkDir.js
new file mode 100644
index 000000000000..01da612fe575
--- /dev/null
+++ b/scripts/utils/writeFileAndMkDir.js
@@ -0,0 +1,14 @@
+const fs = require("fs");
+const path = require("path");
+
+module.exports = function writeFileAndMkDir(file, content) {
+  try {
+    fs.mkdirSync(path.dirname(file));
+  } catch (error) {
+    if (error.code !== "EEXIST") {
+      throw error;
+    }
+  }
+
+  fs.writeFileSync(file, content);
+};
diff --git a/yarn.lock b/yarn.lock
index 2e2e491bf9bf..b9d237c25ec1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,710 +2,1708 @@
 # yarn lockfile v1
 
 
-"@babel/cli@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.0.0.tgz#108b395fd43fff6681d36fb41274df4d8ffeb12e"
+"@babel/cli@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.4.4.tgz#5454bb7112f29026a4069d8e6f0e1794e651966c"
+  integrity sha512-XGr5YjQSjgTa6OzQZY57FAJsdeVSAKR/u/KA5exWIz66IKtv/zXtHy+fIZcMry/EgYegwuHE7vzGnrFhjdIAsQ==
   dependencies:
     commander "^2.8.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mkdirp "^0.5.1"
     output-file-sync "^2.0.0"
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
-    chokidar "^2.0.3"
-
-"@babel/code-frame@7.0.0-beta.40", "@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6"
-  dependencies:
-    "@babel/highlight" "7.0.0-beta.40"
+    chokidar "^2.0.4"
 
 "@babel/code-frame@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0.tgz#0cb0c0fd2e78a0a2bec97698f549ae9ce0b99515"
+"@babel/core@^7.1.0", "@babel/core@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a"
+  integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
-    "@babel/helpers" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/generator" "^7.4.4"
+    "@babel/helpers" "^7.4.4"
+    "@babel/parser" "^7.4.5"
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.5"
+    "@babel/types" "^7.4.4"
     convert-source-map "^1.1.0"
-    debug "^3.1.0"
-    json5 "^0.5.0"
-    lodash "^4.17.10"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.11"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@7.0.0-beta.40":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.40.tgz#ab61f9556f4f71dbd1138949c795bb9a21e302ea"
-  dependencies:
-    "@babel/types" "7.0.0-beta.40"
-    jsesc "^2.5.1"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
+"@babel/eslint-plugin-development@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin-development/-/eslint-plugin-development-1.0.1.tgz#1f5206ae95795db09b65e7dbc2b158d66497a44c"
+  integrity sha512-ioEhN8HgKr4Yx8ef+XryNpKN4FimSFceb0qVVxvoUzpFn3xyq17MlY5AquEqtXObE7Nu7WKq7QL9INzjCrugyw==
 
-"@babel/generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
+"@babel/generator@^7.0.0", "@babel/generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.4.tgz#174a215eb843fc392c7edcaabeaa873de6e8f041"
+  integrity sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.4"
     jsesc "^2.5.1"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
+  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0.tgz#ba26336beb2abb547d58b6eba5b84d77975a39eb"
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.0.0"
+    "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-call-delegate@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0.tgz#e036956bb33d76e59c07a04a1fff144e9f62ab78"
+"@babel/helper-call-delegate@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
+  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
-"@babel/helper-define-map@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0.tgz#a5684dd2adf30f0137cf9b0bde436f8c2db17225"
+"@babel/helper-create-class-features-plugin@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz#fc3d690af6554cc9efc607364a82d48f58736dba"
+  integrity sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==
   dependencies:
-    "@babel/helper-function-name" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.4.4"
+    "@babel/helper-split-export-declaration" "^7.4.4"
 
-"@babel/helper-explode-assignable-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0.tgz#fdfa4c88603ae3e954d0fc3244d5ca82fb468497"
+"@babel/helper-define-map@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz#6969d1f570b46bdc900d1eba8e5d59c48ba2c12a"
+  integrity sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==
   dependencies:
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/types" "^7.4.4"
+    lodash "^4.17.11"
 
-"@babel/helper-function-name@7.0.0-beta.40":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.40.tgz#9d033341ab16517f40d43a73f2d81fc431ccd7b6"
+"@babel/helper-explode-assignable-expression@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.40"
-    "@babel/template" "7.0.0-beta.40"
-    "@babel/types" "7.0.0-beta.40"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@babel/helper-function-name@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0.tgz#a68cc8d04420ccc663dd258f9cc41b8261efa2d4"
+"@babel/helper-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
   dependencies:
     "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.0.0"
+    "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-get-function-arity@7.0.0-beta.40":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.40.tgz#ac0419cf067b0ec16453e1274f03878195791c6e"
-  dependencies:
-    "@babel/types" "7.0.0-beta.40"
-
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-hoist-variables@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+"@babel/helper-hoist-variables@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
+  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.4"
 
 "@babel/helper-member-expression-to-functions@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+  integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-module-imports@7.0.0-beta.35":
-  version "7.0.0-beta.35"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.35.tgz#308e350e731752cdb4d0f058df1d704925c64e0a"
-  dependencies:
-    "@babel/types" "7.0.0-beta.35"
-    lodash "^4.2.0"
-
 "@babel/helper-module-imports@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-module-transforms@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0.tgz#b01ee7d543e81e8c3fc404b19c9f26acb6e4cf4c"
+"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz#96115ea42a2f139e619e98ed46df6019b94414b8"
+  integrity sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.0.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    lodash "^4.17.10"
+    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/template" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    lodash "^4.17.11"
 
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
-"@babel/helper-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.4.tgz#a47e02bc91fb259d2e6727c2a30013e3ac13c4a2"
+  integrity sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==
   dependencies:
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/helper-remap-async-to-generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0.tgz#6512273c2feb91587822335cf913fdf680c26901"
+"@babel/helper-remap-async-to-generator@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
+    "@babel/helper-wrap-function" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-replace-supers@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0.tgz#b6f21237280e0be54f591f63a464b66627ced707"
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz#aee41783ebe4f2d3ab3ae775e1cc6f1a90cefa27"
+  integrity sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.0.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
-"@babel/helper-simple-access@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0.tgz#ff36a27983ae4c27122da2f7f294dced80ecbd08"
-  dependencies:
-    "@babel/template" "^7.0.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+"@babel/helper-simple-access@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
   dependencies:
+    "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-wrap-function@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0.tgz#1c8e42a2cfb0808e3140189dfe9490782a6fa740"
+"@babel/helper-split-export-declaration@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
+  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
   dependencies:
-    "@babel/helper-function-name" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.4.4"
 
-"@babel/helpers@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0.tgz#7213388341eeb07417f44710fd7e1d00acfa6ac0"
+"@babel/helper-wrap-function@^7.1.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
+  integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==
   dependencies:
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.2.0"
 
-"@babel/highlight@7.0.0-beta.40":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.40.tgz#b43d67d76bf46e1d10d227f68cddcd263786b255"
+"@babel/helpers@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
+  integrity sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==
   dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
+    "@babel/template" "^7.4.4"
+    "@babel/traverse" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0.tgz#697655183394facffb063437ddf52c0277698775"
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.4", "@babel/parser@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.5.tgz#04af8d5d5a2b044a2a1bffacc1e5e6673544e872"
+  integrity sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==
 
-"@babel/plugin-proposal-async-generator-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0.tgz#5d1eb6b44fd388b97f964350007ab9da090b1d70"
+"@babel/plugin-proposal-async-generator-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
+  integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.0.0"
-    "@babel/plugin-syntax-async-generators" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-class-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.0.0.tgz#a16b5c076ba6c3d87df64d2480a380e979543731"
+"@babel/plugin-proposal-class-properties@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce"
+  integrity sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==
   dependencies:
-    "@babel/helper-function-name" "^7.0.0"
-    "@babel/helper-member-expression-to-functions" "^7.0.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-create-class-features-plugin" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.0.0"
-    "@babel/plugin-syntax-class-properties" "^7.0.0"
 
-"@babel/plugin-proposal-export-namespace-from@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.0.0.tgz#ce847cc62c3626547107a1b835592b8ee494af51"
+"@babel/plugin-proposal-export-namespace-from@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.2.0.tgz#308fd4d04ff257fc3e4be090550840eeabad5dd9"
+  integrity sha512-DZUxbHYxQ5fUFIkMEnh75ogEdBLPfL+mQUqrO2hNY2LGm+tqFnxE924+mhAcCOh/8za8AaZsWHbq6bBoS3TAzA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-export-namespace-from" "^7.0.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.2.0"
 
-"@babel/plugin-proposal-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e"
+"@babel/plugin-proposal-json-strings@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
+  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.0.0"
+    "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.0.0.tgz#08aa02ce62481a84bfd0d9ce7a718adaaaa773dd"
+"@babel/plugin-proposal-numeric-separator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz#646854daf4cd22fd6733f6076013a936310443ac"
+  integrity sha512-DohMOGDrZiMKS7LthjUZNNcWl8TAf5BZDwZAH4wpm55FuJTHgfqPGdibg7rZDmont/8Yg0zA03IgT6XLeP+4sg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.0.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e"
+"@babel/plugin-proposal-object-rest-spread@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005"
+  integrity sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425"
+"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
+  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33"
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
+  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.2.0"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.5.4"
 
-"@babel/plugin-syntax-async-generators@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c"
+"@babel/plugin-syntax-async-generators@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
+  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-class-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz#e051af5d300cbfbcec4a7476e37a803489881634"
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-export-namespace-from@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.0.0.tgz#17a7389a1d2571ac4d9b77ea2defa74a930edf5d"
+"@babel/plugin-syntax-export-namespace-from@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz#8d257838c6b3b779db52c0224443459bd27fb039"
+  integrity sha512-1zGA3UNch6A+A11nIzBVEaE3DDJbjfB+eLIcf0GGOh/BJr/8NxL3546MGhV/r0RhH4xADFIEso39TKCfEMlsGA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-flow@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.0.0.tgz#70638aeaad9ee426bc532e51523cff8ff02f6f17"
+"@babel/plugin-syntax-flow@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c"
+  integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-json-strings@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd"
+"@babel/plugin-syntax-json-strings@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
+  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.0.0.tgz#9594c7ce6ce8089a14d732cb9f6b1eeb047413ba"
+"@babel/plugin-syntax-numeric-separator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz#7470fe070c2944469a756752a69a6963135018be"
+  integrity sha512-DroeVNkO/BnGpL2R7+ZNZqW+E24aR/4YWxP3Qb15d6lPU8KDzF8HlIUIRCOJRn4X77/oyW4mJY+7FHfY82NLtQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b"
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475"
+"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
+  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-arrow-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749"
+"@babel/plugin-transform-arrow-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
+  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-async-to-generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0.tgz#feaf18f4bfeaf2236eea4b2d4879da83006cc8f5"
+"@babel/plugin-transform-async-to-generator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz#a3f1d01f2f21cadab20b33a82133116f14fb5894"
+  integrity sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.1.0"
 
-"@babel/plugin-transform-block-scoped-functions@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07"
+"@babel/plugin-transform-block-scoped-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
+  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoping@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc"
+"@babel/plugin-transform-block-scoping@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz#c13279fabf6b916661531841a23c4b7dae29646d"
+  integrity sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/plugin-transform-classes@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0.tgz#9e65ca401747dde99e344baea90ab50dccb4c468"
+"@babel/plugin-transform-classes@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz#0ce4094cdafd709721076d3b9c38ad31ca715eb6"
+  integrity sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.0.0"
-    "@babel/helper-function-name" "^7.0.0"
+    "@babel/helper-define-map" "^7.4.4"
+    "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-optimise-call-expression" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.0.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.4.4"
+    "@babel/helper-split-export-declaration" "^7.4.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31"
+"@babel/plugin-transform-computed-properties@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
+  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0.tgz#68e911e1935dda2f06b6ccbbf184ffb024e9d43a"
+"@babel/plugin-transform-destructuring@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz#9d964717829cc9e4b601fc82a26a71a4d8faf20f"
+  integrity sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-dotall-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58"
+"@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
+  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.5.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86"
+"@babel/plugin-transform-duplicate-keys@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz#d952c4930f312a4dbfff18f0b2914e60c35530b3"
+  integrity sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-exponentiation-operator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0.tgz#c51b45e090a01876f64d32b5b46c0799c85ea56c"
+"@babel/plugin-transform-exponentiation-operator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
+  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.0.0"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-flow-strip-types@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01"
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7"
+  integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.2.0"
 
-"@babel/plugin-transform-for-of@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39"
+"@babel/plugin-transform-for-of@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
+  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0.tgz#eeda18dc22584e13c3581a68f6be4822bb1d1d81"
+"@babel/plugin-transform-function-name@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
+  integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
   dependencies:
-    "@babel/helper-function-name" "^7.0.0"
+    "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86"
+"@babel/plugin-transform-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
+  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-amd@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0.tgz#2430ab73db9960c4ca89966f425b803f5d0d0468"
+"@babel/plugin-transform-member-expression-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
+  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0.tgz#20b906e5ab130dd8e456b694a94d9575da0fd41f"
+"@babel/plugin-transform-modules-amd@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
+  integrity sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.0.0"
+    "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.0.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0.tgz#8873d876d4fee23209decc4d1feab8f198cf2df4"
+"@babel/plugin-transform-modules-commonjs@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e"
+  integrity sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/helper-module-transforms" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
 
-"@babel/plugin-transform-modules-umd@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0.tgz#e7bb4f2a6cd199668964241951a25013450349be"
+"@babel/plugin-transform-modules-systemjs@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz#dc83c5665b07d6c2a7b224c00ac63659ea36a405"
+  integrity sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.0.0"
+    "@babel/helper-hoist-variables" "^7.4.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-new-target@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
+"@babel/plugin-transform-modules-umd@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
+  integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
   dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-object-super@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0.tgz#b8587d511309b3a0e96e9e38169908b3e392041e"
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
+  integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
+  dependencies:
+    regexp-tree "^0.1.6"
+
+"@babel/plugin-transform-new-target@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
+  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.0.0"
 
-"@babel/plugin-transform-parameters@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0.tgz#da864efa111816a6df161d492f33de10e74b1949"
+"@babel/plugin-transform-object-super@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz#b35d4c10f56bab5d650047dad0f1d8e8814b6598"
+  integrity sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
+
+"@babel/plugin-transform-parameters@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
+  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
   dependencies:
-    "@babel/helper-call-delegate" "^7.0.0"
+    "@babel/helper-call-delegate" "^7.4.4"
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-regenerator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
+"@babel/plugin-transform-property-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
+  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
   dependencies:
-    regenerator-transform "^0.13.3"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-runtime@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.0.0.tgz#0f1443c07bac16dba8efa939e0c61d6922740062"
+"@babel/plugin-transform-regenerator@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
+  integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
+  dependencies:
+    regenerator-transform "^0.14.0"
+
+"@babel/plugin-transform-reserved-words@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
+  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-runtime@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz#a50f5d16e9c3a4ac18a1a9f9803c107c380bce08"
+  integrity sha512-aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
     resolve "^1.8.1"
+    semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
+"@babel/plugin-transform-shorthand-properties@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
+  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-spread@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b"
+"@babel/plugin-transform-spread@^7.2.0":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
+  integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-sticky-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366"
+"@babel/plugin-transform-sticky-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
+  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65"
+"@babel/plugin-transform-template-literals@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
+  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9"
+"@babel/plugin-transform-typeof-symbol@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
+  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-unicode-regex@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc"
+"@babel/plugin-transform-unicode-regex@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
+  integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-    regexpu-core "^4.1.3"
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.5.4"
 
-"@babel/preset-env@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.0.0.tgz#f450f200c14e713f98cb14d113bf0c2cfbb89ca9"
+"@babel/preset-env@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58"
+  integrity sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.0.0"
-    "@babel/plugin-proposal-json-strings" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.0.0"
-    "@babel/plugin-syntax-async-generators" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.0.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-dotall-regex" "^7.0.0"
-    "@babel/plugin-transform-duplicate-keys" "^7.0.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.0.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-amd" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.0.0"
-    "@babel/plugin-transform-modules-umd" "^7.0.0"
-    "@babel/plugin-transform-new-target" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    "@babel/plugin-transform-typeof-symbol" "^7.0.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    browserslist "^4.1.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+    "@babel/plugin-proposal-json-strings" "^7.2.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.4.4"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-syntax-async-generators" "^7.2.0"
+    "@babel/plugin-syntax-json-strings" "^7.2.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-transform-arrow-functions" "^7.2.0"
+    "@babel/plugin-transform-async-to-generator" "^7.4.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
+    "@babel/plugin-transform-block-scoping" "^7.4.4"
+    "@babel/plugin-transform-classes" "^7.4.4"
+    "@babel/plugin-transform-computed-properties" "^7.2.0"
+    "@babel/plugin-transform-destructuring" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.2.0"
+    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
+    "@babel/plugin-transform-for-of" "^7.4.4"
+    "@babel/plugin-transform-function-name" "^7.4.4"
+    "@babel/plugin-transform-literals" "^7.2.0"
+    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
+    "@babel/plugin-transform-modules-amd" "^7.2.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.4.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.4.4"
+    "@babel/plugin-transform-modules-umd" "^7.2.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
+    "@babel/plugin-transform-new-target" "^7.4.4"
+    "@babel/plugin-transform-object-super" "^7.2.0"
+    "@babel/plugin-transform-parameters" "^7.4.4"
+    "@babel/plugin-transform-property-literals" "^7.2.0"
+    "@babel/plugin-transform-regenerator" "^7.4.5"
+    "@babel/plugin-transform-reserved-words" "^7.2.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
+    "@babel/plugin-transform-spread" "^7.2.0"
+    "@babel/plugin-transform-sticky-regex" "^7.2.0"
+    "@babel/plugin-transform-template-literals" "^7.4.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
+    "@babel/plugin-transform-unicode-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    browserslist "^4.6.0"
+    core-js-compat "^3.1.1"
     invariant "^2.2.2"
     js-levenshtein "^1.1.3"
-    semver "^5.3.0"
+    semver "^5.5.0"
 
 "@babel/preset-flow@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
+  integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-flow-strip-types" "^7.0.0"
 
-"@babel/register@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0.tgz#fa634bae1bfa429f60615b754fc1f1d745edd827"
+"@babel/register@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.4.4.tgz#370a68ba36f08f015a8b35d4864176c6b65d7a23"
+  integrity sha512-sn51H88GRa00+ZoMqCVgOphmswG4b7mhf9VOB0LUBAieykq2GnRFerlN+JQkO/ntT7wz4jaHNSRPg9IdMPEUkA==
   dependencies:
-    core-js "^2.5.7"
-    find-cache-dir "^1.0.0"
-    home-or-tmp "^3.0.0"
-    lodash "^4.17.10"
+    core-js "^3.0.0"
+    find-cache-dir "^2.0.0"
+    lodash "^4.17.11"
     mkdirp "^0.5.1"
     pirates "^4.0.0"
     source-map-support "^0.5.9"
 
-"@babel/runtime@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/template@7.0.0-beta.40":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.40.tgz#034988c6424eb5c3268fe6a608626de1f4410fc8"
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
+  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.40"
-    "@babel/types" "7.0.0-beta.40"
-    babylon "7.0.0-beta.40"
-    lodash "^4.2.0"
+    regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0.tgz#c2bc9870405959c89a9c814376a2ecb247838c80"
+"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
+  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.4.4"
+    "@babel/types" "^7.4.4"
 
-"@babel/traverse@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0.tgz#b1fe9b6567fdf3ab542cfad6f3b31f854d799a61"
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.5.tgz#4e92d1728fd2f1897dafdd321efbff92156c3216"
+  integrity sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
-    "@babel/helper-function-name" "^7.0.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    debug "^3.1.0"
+    "@babel/generator" "^7.4.4"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.4.4"
+    "@babel/parser" "^7.4.5"
+    "@babel/types" "^7.4.4"
+    debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
 
-"@babel/traverse@^7.0.0-beta.31":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.40.tgz#d140e449b2e093ef9fe1a2eecc28421ffb4e521e"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.40"
-    "@babel/generator" "7.0.0-beta.40"
-    "@babel/helper-function-name" "7.0.0-beta.40"
-    "@babel/types" "7.0.0-beta.40"
-    babylon "7.0.0-beta.40"
-    debug "^3.0.1"
-    globals "^11.1.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-"@babel/types@7.0.0-beta.35":
-  version "7.0.0-beta.35"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.35.tgz#cf933a9a9a38484ca724b335b88d83726d5ab960"
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.4.tgz#8db9e9a629bb7c29370009b4b779ed93fe57d5f0"
+  integrity sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==
   dependencies:
     esutils "^2.0.2"
-    lodash "^4.2.0"
+    lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
-"@babel/types@7.0.0-beta.40":
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.40.tgz#25c3d7aae14126abe05fcb098c65a66b6d6b8c14"
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
+  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
 
-"@babel/types@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
+"@evocateur/libnpmaccess@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.0.tgz#e546ee4e4bedca54ed9303948ec54c985cec33e4"
+  integrity sha512-bfrqZ0v+Il5TJBsgF2oyepeJg34K2pBItapzP+UT1QMIGpUh/Zc1pQql4jrafamZTqP3ZvdJxaElat8B5K3ICA==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.10"
-    to-fast-properties "^2.0.0"
+    "@evocateur/npm-registry-fetch" "^3.9.1"
+    aproba "^2.0.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.1.0"
+
+"@evocateur/libnpmpublish@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@evocateur/libnpmpublish/-/libnpmpublish-1.2.0.tgz#3e0d79fdc0a75f212adabb7c7e341b017effeac2"
+  integrity sha512-sezhX9FSnPIyrBBvxVocVJVO1uIWPczf6rOmUZSntCWfQMraO8pWTFlDJbroFqPbEqFFHf3eyw8NQ0Eb7OLd1g==
+  dependencies:
+    "@evocateur/npm-registry-fetch" "^3.9.1"
+    aproba "^2.0.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    lodash.clonedeep "^4.5.0"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    semver "^5.5.1"
+    ssri "^6.0.1"
+
+"@evocateur/npm-registry-fetch@^3.9.1":
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/@evocateur/npm-registry-fetch/-/npm-registry-fetch-3.9.1.tgz#75b3917320e559f6c91e26af17e62b085ec457a2"
+  integrity sha512-6v1bHbcAypQ+te/1RGSNL4JkK6mcMtcZrUusqo5iKRtYSAig9UJXlOaCcBR+eLywt2DQMNpEwAj24jwWDX5G/w==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    npm-package-arg "^6.1.0"
+    safe-buffer "^5.1.2"
+
+"@evocateur/pacote@^9.6.0":
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/@evocateur/pacote/-/pacote-9.6.0.tgz#3f0d08fb81c572289a2dfa981e7f97b6dd83cef2"
+  integrity sha512-nKx8EPxXhzqNfePbqC6603z7Kkf6GBS2q+SNGtBS/bCgS5Q+p3OVR6MXKOkpvC3WHse98W2WLu8QaV9axtfxyw==
+  dependencies:
+    "@evocateur/npm-registry-fetch" "^3.9.1"
+    bluebird "^3.5.3"
+    cacache "^11.3.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
+"@jest/console@^24.7.1":
+  version "24.7.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
+  integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==
+  dependencies:
+    "@jest/source-map" "^24.3.0"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
+"@jest/core@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz#fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b"
+  integrity sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/reporters" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-changed-files "^24.8.0"
+    jest-config "^24.8.0"
+    jest-haste-map "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve-dependencies "^24.8.0"
+    jest-runner "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-snapshot "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    jest-watcher "^24.8.0"
+    micromatch "^3.1.10"
+    p-each-series "^1.0.0"
+    pirates "^4.0.1"
+    realpath-native "^1.1.0"
+    rimraf "^2.5.4"
+    strip-ansi "^5.0.0"
+
+"@jest/environment@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz#0342261383c776bdd652168f68065ef144af0eac"
+  integrity sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==
+  dependencies:
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    jest-mock "^24.8.0"
+
+"@jest/fake-timers@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz#2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"
+  integrity sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-mock "^24.8.0"
+
+"@jest/reporters@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz#075169cd029bddec54b8f2c0fc489fd0b9e05729"
+  integrity sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==
+  dependencies:
+    "@jest/environment" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    istanbul-lib-coverage "^2.0.2"
+    istanbul-lib-instrument "^3.0.1"
+    istanbul-lib-report "^2.0.4"
+    istanbul-lib-source-maps "^3.0.1"
+    istanbul-reports "^2.1.1"
+    jest-haste-map "^24.8.0"
+    jest-resolve "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-util "^24.8.0"
+    jest-worker "^24.6.0"
+    node-notifier "^5.2.1"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+    string-length "^2.0.0"
+
+"@jest/source-map@^24.3.0":
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28"
+  integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.1.15"
+    source-map "^0.6.0"
+
+"@jest/test-result@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3"
+  integrity sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/types" "^24.8.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+
+"@jest/test-sequencer@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz#2f993bcf6ef5eb4e65e8233a95a3320248cf994b"
+  integrity sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==
+  dependencies:
+    "@jest/test-result" "^24.8.0"
+    jest-haste-map "^24.8.0"
+    jest-runner "^24.8.0"
+    jest-runtime "^24.8.0"
+
+"@jest/transform@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5"
+  integrity sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^24.8.0"
+    babel-plugin-istanbul "^5.1.0"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.15"
+    jest-haste-map "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-util "^24.8.0"
+    micromatch "^3.1.10"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "2.4.1"
+
+"@jest/types@^24.8.0":
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
+  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^12.0.9"
+
+"@lerna/add@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.15.0.tgz#10be562f43cde59b60f299083d54ac39520ec60a"
+  integrity sha512-+KrG4GFy/6FISZ+DwWf5Fj5YB4ESa4VTnSn/ujf3VEda6dxngHPN629j+TcPbsdOxUYVah+HuZbC/B8NnkrKpQ==
+  dependencies:
+    "@evocateur/pacote" "^9.6.0"
+    "@lerna/bootstrap" "3.15.0"
+    "@lerna/command" "3.15.0"
+    "@lerna/filter-options" "3.14.2"
+    "@lerna/npm-conf" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+    dedent "^0.7.0"
+    npm-package-arg "^6.1.0"
+    p-map "^1.2.0"
+    semver "^5.5.0"
+
+"@lerna/batch-packages@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.14.0.tgz#0208663bab3ddbf57956b370aaec4c9ebee6c800"
+  integrity sha512-RlBkQVNTqk1qvn6PFWiWNiskllUHh6tXbTVm43mZRNd+vhAyvrQC8RWJxH0ECVvnFAt9rSNGRIVbEJ31WnNQLg==
+  dependencies:
+    "@lerna/package-graph" "3.14.0"
+    npmlog "^4.1.2"
+
+"@lerna/bootstrap@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.15.0.tgz#f53e0bbbbfb8367e609a06378409bfc673ff2930"
+  integrity sha512-4AxsPKKbgj2Ju03qDddQTpOHvpqnwd0yaiEU/aCcWv/4tDTe79NqUne2Z3+P2WZY0Zzb8+nUKcskwYBMTeq+Mw==
+  dependencies:
+    "@lerna/batch-packages" "3.14.0"
+    "@lerna/command" "3.15.0"
+    "@lerna/filter-options" "3.14.2"
+    "@lerna/has-npm-version" "3.14.2"
+    "@lerna/npm-install" "3.14.2"
+    "@lerna/package-graph" "3.14.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/rimraf-dir" "3.14.2"
+    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/run-parallel-batches" "3.13.0"
+    "@lerna/symlink-binary" "3.14.2"
+    "@lerna/symlink-dependencies" "3.14.2"
+    "@lerna/validation-error" "3.13.0"
+    dedent "^0.7.0"
+    get-port "^3.2.0"
+    multimatch "^2.1.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+    read-package-tree "^5.1.6"
+    semver "^5.5.0"
+
+"@lerna/changed@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.15.0.tgz#20db9d992d697e4288c260aa38b989dcb93f4b40"
+  integrity sha512-Hns1ssI9T9xOTGVc7PT2jUaqzsSkxV3hV/Y7iFO0uKTk+fduyTwGTHU9A/ybQ/xi/9iaJbvaXyjxKiGoEnzmhg==
+  dependencies:
+    "@lerna/collect-updates" "3.14.2"
+    "@lerna/command" "3.15.0"
+    "@lerna/listable" "3.14.0"
+    "@lerna/output" "3.13.0"
+    "@lerna/version" "3.15.0"
+
+"@lerna/check-working-tree@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.14.2.tgz#5ce007722180a69643a8456766ed8a91fc7e9ae1"
+  integrity sha512-7safqxM/MYoAoxZxulUDtIJIbnBIgo0PB/FHytueG+9VaX7GMnDte2Bt1EKa0dz2sAyQdmQ3Q8ZXpf/6JDjaeg==
+  dependencies:
+    "@lerna/collect-uncommitted" "3.14.2"
+    "@lerna/describe-ref" "3.14.2"
+    "@lerna/validation-error" "3.13.0"
+
+"@lerna/child-process@3.14.2", "@lerna/child-process@^3.3.0":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.14.2.tgz#950240cba83f7dfe25247cfa6c9cebf30b7d94f6"
+  integrity sha512-xnq+W5yQb6RkwI0p16ZQnrn6HkloH/MWTw4lGE1nKsBLAUbmSU5oTE93W1nrG0X3IMF/xWc9UYvNdUGMWvZZ4w==
+  dependencies:
+    chalk "^2.3.1"
+    execa "^1.0.0"
+    strong-log-transformer "^2.0.0"
+
+"@lerna/clean@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.15.0.tgz#a94da50908a80ba443a0a682706aca79ac2ecf27"
+  integrity sha512-D1BN7BnJk6YjrSR7E7RiCmWiFVWDo3L+OSe6zDq6rNNYexPBtSi2JOCeF/Dibi3jd2luVu0zkVpUtuEEdPiD+A==
+  dependencies:
+    "@lerna/command" "3.15.0"
+    "@lerna/filter-options" "3.14.2"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/rimraf-dir" "3.14.2"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+    p-waterfall "^1.0.0"
+
+"@lerna/cli@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-3.13.0.tgz#3d7b357fdd7818423e9681a7b7f2abd106c8a266"
+  integrity sha512-HgFGlyCZbYaYrjOr3w/EsY18PdvtsTmDfpUQe8HwDjXlPeCCUgliZjXLOVBxSjiOvPeOSwvopwIHKWQmYbwywg==
+  dependencies:
+    "@lerna/global-options" "3.13.0"
+    dedent "^0.7.0"
+    npmlog "^4.1.2"
+    yargs "^12.0.1"
+
+"@lerna/collect-uncommitted@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-3.14.2.tgz#b5ed00d800bea26bb0d18404432b051eee8d030e"
+  integrity sha512-4EkQu4jIOdNL2BMzy/N0ydHB8+Z6syu6xiiKXOoFl0WoWU9H1jEJCX4TH7CmVxXL1+jcs8FIS2pfQz4oew99Eg==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    chalk "^2.3.1"
+    figgy-pudding "^3.5.1"
+    npmlog "^4.1.2"
+
+"@lerna/collect-updates@3.14.2", "@lerna/collect-updates@https://github.com/babel/lerna.git#babel-collect-updates":
+  version "3.14.2"
+  resolved "https://github.com/babel/lerna.git#89eab830be040fbaabc31ad7206c5efab878c6c3"
+  dependencies:
+    "@lerna/child-process" "^3.3.0"
+    "@lerna/describe-ref" "^3.6.0"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    slash "^1.0.0"
+
+"@lerna/command@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.15.0.tgz#e1dc1319054f1cf0b135aa0c5730f3335641a0ca"
+  integrity sha512-dZqr4rKFN+veuXakIQ1DcGUpzBgcWKaYFNN4O6/skOdVQaEfGefzo1sZET+q7k/BkypxkhXHXpv5UqqSuL/EHQ==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@lerna/package-graph" "3.14.0"
+    "@lerna/project" "3.15.0"
+    "@lerna/validation-error" "3.13.0"
+    "@lerna/write-log-file" "3.13.0"
+    dedent "^0.7.0"
+    execa "^1.0.0"
+    is-ci "^1.0.10"
+    lodash "^4.17.5"
+    npmlog "^4.1.2"
+
+"@lerna/conventional-commits@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.14.0.tgz#24f643550dc29d4f1249cc26d0eb453d7a1c513d"
+  integrity sha512-hGZ2qQZ9uEGf2eeIiIpEodSs9Qkkf/2uYEtNT7QN1RYISPUh6/lKGBssc5dpbCF64aEuxmemWLdlDf1ogG6++w==
+  dependencies:
+    "@lerna/validation-error" "3.13.0"
+    conventional-changelog-angular "^5.0.3"
+    conventional-changelog-core "^3.1.6"
+    conventional-recommended-bump "^4.0.4"
+    fs-extra "^7.0.0"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    pify "^3.0.0"
+    semver "^5.5.0"
+
+"@lerna/create-symlink@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.14.0.tgz#f40ae06e8cebe70c694368ebf9a4af5ab380fbea"
+  integrity sha512-Kw51HYOOi6UfCKncqkgEU1k/SYueSBXgkNL91FR8HAZH7EPSRTEtp9mnJo568g0+Hog5C+3cOaWySwhHpRG29A==
+  dependencies:
+    cmd-shim "^2.0.2"
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+
+"@lerna/create@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.15.0.tgz#27bfadcbdf71d34226aa82432293f5290f7ab1aa"
+  integrity sha512-doXGt0HTwTQl8GkC2tOrraA/5OWbz35hJqi7Dsl3Fl0bAxiv9XmF3LykHFJ+YTDHfGpdoJ8tKu66f/VKP16G0w==
+  dependencies:
+    "@evocateur/pacote" "^9.6.0"
+    "@lerna/child-process" "3.14.2"
+    "@lerna/command" "3.15.0"
+    "@lerna/npm-conf" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+    camelcase "^5.0.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    globby "^8.0.1"
+    init-package-json "^1.10.3"
+    npm-package-arg "^6.1.0"
+    p-reduce "^1.0.0"
+    pify "^3.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    validate-npm-package-license "^3.0.3"
+    validate-npm-package-name "^3.0.0"
+    whatwg-url "^7.0.0"
+
+"@lerna/describe-ref@3.14.2", "@lerna/describe-ref@^3.6.0":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.14.2.tgz#edc3c973f5ca9728d23358c4f4d3b55a21f65be5"
+  integrity sha512-qa5pzDRK2oBQXNjyRmRnN7E8a78NMYfQjjlRFB0KNHMsT6mCiL9+8kIS39sSE2NqT8p7xVNo2r2KAS8R/m3CoQ==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    npmlog "^4.1.2"
+
+"@lerna/diff@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.15.0.tgz#573d6f58f6809d16752dcfab74c5e286b6678371"
+  integrity sha512-N1Pr0M554Bt+DlVoD+DXWGh92gcq6G9icn8sH5GSqfwi0XCpPNJ2i1BNEZpUQ6ulLWOMa1YHR4PypPxecRGBjA==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@lerna/command" "3.15.0"
+    "@lerna/validation-error" "3.13.0"
+    npmlog "^4.1.2"
+
+"@lerna/exec@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.15.0.tgz#b31510f47255367eb0d3e4a4f7b6ef8f7e41b985"
+  integrity sha512-YuXPd64TNG9wbb3lRvyMARQbdlbMZ1bJZ+GCm0enivnIWUyg0qtBDcfPY2dWpIgOif04zx+K/gmOX4lCaGM4UQ==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@lerna/command" "3.15.0"
+    "@lerna/filter-options" "3.14.2"
+    "@lerna/run-topologically" "3.14.0"
+    "@lerna/validation-error" "3.13.0"
+    p-map "^1.2.0"
+
+"@lerna/filter-options@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.14.2.tgz#7ba91cb54ff3fd9f4650ad8d7c40bc1075e44c2d"
+  integrity sha512-Ct8oYvRttbYB9JalngHhirb8o9ZVyLm5a9MpXNevXoHiu6j0vNhI19BQCwNnrL6wZvEHJnzPuUl/jO23tWxemg==
+  dependencies:
+    "@lerna/collect-updates" "3.14.2"
+    "@lerna/filter-packages" "3.13.0"
+    dedent "^0.7.0"
+
+"@lerna/filter-packages@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.13.0.tgz#f5371249e7e1a15928e5e88c544a242e0162c21c"
+  integrity sha512-RWiZWyGy3Mp7GRVBn//CacSnE3Kw82PxE4+H6bQ3pDUw/9atXn7NRX+gkBVQIYeKamh7HyumJtyOKq3Pp9BADQ==
+  dependencies:
+    "@lerna/validation-error" "3.13.0"
+    multimatch "^2.1.0"
+    npmlog "^4.1.2"
+
+"@lerna/get-npm-exec-opts@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-3.13.0.tgz#d1b552cb0088199fc3e7e126f914e39a08df9ea5"
+  integrity sha512-Y0xWL0rg3boVyJk6An/vurKzubyJKtrxYv2sj4bB8Mc5zZ3tqtv0ccbOkmkXKqbzvNNF7VeUt1OJ3DRgtC/QZw==
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/get-packed@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.13.0.tgz#335e40d77f3c1855aa248587d3e0b2d8f4b06e16"
+  integrity sha512-EgSim24sjIjqQDC57bgXD9l22/HCS93uQBbGpkzEOzxAVzEgpZVm7Fm1t8BVlRcT2P2zwGnRadIvxTbpQuDPTg==
+  dependencies:
+    fs-extra "^7.0.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+
+"@lerna/github-client@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.14.2.tgz#a743792b51cd9bdfb785186e429568827a6372eb"
+  integrity sha512-+2Xh7t4qVmXiXE2utPnh5T7YwSltG74JP7c+EiooRY5+3zjh9MpPOcTKxVY3xKclzpsyXMohk2KpTF4tzA5rrg==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@octokit/plugin-enterprise-rest" "^2.1.1"
+    "@octokit/rest" "^16.16.0"
+    git-url-parse "^11.1.2"
+    npmlog "^4.1.2"
+
+"@lerna/gitlab-client@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz#91f4ec8c697b5ac57f7f25bd50fe659d24aa96a6"
+  integrity sha512-OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q==
+  dependencies:
+    node-fetch "^2.5.0"
+    npmlog "^4.1.2"
+    whatwg-url "^7.0.0"
+
+"@lerna/global-options@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1"
+  integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ==
+
+"@lerna/has-npm-version@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.14.2.tgz#ac17f7c68e92114b8332b95ae6cffec9c0d67a7b"
+  integrity sha512-cG+z5bB8JPd5f+nT2eLN2LmKg06O11AxlnUxgw2W7cLyc7cnsmMSp/rxt2JBMwW2r4Yn+CLLJIRwJZ2Es8jFSw==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    semver "^5.5.0"
+
+"@lerna/import@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.15.0.tgz#47f2da52059a96bb08a4c09e18d985258fce9ce1"
+  integrity sha512-4GKQgeTXBTwMbZNkYyPdQIVA41HIISD7D6XRNrDaG0falUfvoPsknijQPCBmGqeh66u1Fcn2+4lkL3OCTj2FMg==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@lerna/command" "3.15.0"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+    dedent "^0.7.0"
+    fs-extra "^7.0.0"
+    p-map-series "^1.0.0"
+
+"@lerna/init@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.15.0.tgz#bda36de44c365972f87cbd287fe85b6fb7bb1070"
+  integrity sha512-VOqH6kFbFtfUbXxhSqXKY6bjnVp9nLuLRI6x9tVHOANX2LmSlXm17OUGBnNt+eM4uJLuiUsAR8nTlpCiz//lPQ==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@lerna/command" "3.15.0"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+    write-json-file "^2.3.0"
+
+"@lerna/link@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.15.0.tgz#718b4116a8eacb3fc73414ae8d97f8fdaf8125da"
+  integrity sha512-yKHuifADINobvDOLljBGkVGpVwy6J3mg5p9lQXBdOLXBoIKC8o/UKBR9JvZMFvT/Iy6zn6FPy1v5lz9iU1Ib0Q==
+  dependencies:
+    "@lerna/command" "3.15.0"
+    "@lerna/package-graph" "3.14.0"
+    "@lerna/symlink-dependencies" "3.14.2"
+    p-map "^1.2.0"
+    slash "^1.0.0"
+
+"@lerna/list@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.15.0.tgz#4e401c1ad990bb12bd38298cb61d21136420ff68"
+  integrity sha512-8SvxnlfAnbEzQDf2NL0IxWyUuqWTykF9cHt5/f5TOzgESClpaOkDtqwh/UlE8nVTzWMnxnQUPQi3UTKyJD3i3g==
+  dependencies:
+    "@lerna/command" "3.15.0"
+    "@lerna/filter-options" "3.14.2"
+    "@lerna/listable" "3.14.0"
+    "@lerna/output" "3.13.0"
+
+"@lerna/listable@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.14.0.tgz#08f4c78e0466568e8e8a57d4ad09537f2bb7bbb9"
+  integrity sha512-ZK44Mo8xf/N97eQZ236SPSq0ek6+gk4HqHIx05foEMZVV1iIDH4a/nblLsJNjGQVsIdMYFPaqNJ0z+ZQfiJazQ==
+  dependencies:
+    "@lerna/query-graph" "3.14.0"
+    chalk "^2.3.1"
+    columnify "^1.5.4"
+
+"@lerna/log-packed@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.13.0.tgz#497b5f692a8d0e3f669125da97b0dadfd9e480f3"
+  integrity sha512-Rmjrcz+6aM6AEcEVWmurbo8+AnHOvYtDpoeMMJh9IZ9SmZr2ClXzmD7wSvjTQc8BwOaiWjjC/ukcT0UYA2m7wg==
+  dependencies:
+    byte-size "^4.0.3"
+    columnify "^1.5.4"
+    has-unicode "^2.0.1"
+    npmlog "^4.1.2"
+
+"@lerna/npm-conf@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.13.0.tgz#6b434ed75ff757e8c14381b9bbfe5d5ddec134a7"
+  integrity sha512-Jg2kANsGnhg+fbPEzE0X9nX5oviEAvWj0nYyOkcE+cgWuT7W0zpnPXC4hA4C5IPQGhwhhh0IxhWNNHtjTuw53g==
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
+
+"@lerna/npm-dist-tag@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.15.0.tgz#262dd1e67a4cf82ae78fadfe02622ebce4add078"
+  integrity sha512-lnbdwc4Ebs7/EI9fTIgbH3dxXnP+SuCcGhG7P5ZjOqo67SY09sRZGcygEzabpvIwXvKpBF8vCd4xxzjnF2u+PA==
+  dependencies:
+    "@evocateur/npm-registry-fetch" "^3.9.1"
+    "@lerna/otplease" "3.14.0"
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+
+"@lerna/npm-install@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.14.2.tgz#fd22ff432f8b7cbe05bedfd36b0506482f1a4732"
+  integrity sha512-JYJJRtLETrGpcQZa8Rj16vbye399RqnaXmJlZuZ2twjJ2DYVYtwkfsGEOdvdaKw5KVOEpWcAxBA9OMmKQtCLQw==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@lerna/get-npm-exec-opts" "3.13.0"
+    fs-extra "^7.0.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    signal-exit "^3.0.2"
+    write-pkg "^3.1.0"
+
+"@lerna/npm-publish@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.15.0.tgz#89126d74ec97186475767b852954a5f55b732a71"
+  integrity sha512-G7rcNcSGjG0La8eHPXDvCvoNXbwNnP6XJ+GPh3CH5xiR/nikfLOa+Bfm4ytdjVWWxnKfCT4qyMTCoV1rROlqQQ==
+  dependencies:
+    "@evocateur/libnpmpublish" "^1.2.0"
+    "@lerna/otplease" "3.14.0"
+    "@lerna/run-lifecycle" "3.14.0"
+    figgy-pudding "^3.5.1"
+    fs-extra "^7.0.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    pify "^3.0.0"
+    read-package-json "^2.0.13"
+
+"@lerna/npm-run-script@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.14.2.tgz#8c518ea9d241a641273e77aad6f6fddc16779c3f"
+  integrity sha512-LbVFv+nvAoRTYLMrJlJ8RiakHXrLslL7Jp/m1R18vYrB8LYWA3ey+nz5Tel2OELzmjUiemAKZsD9h6i+Re5egg==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    "@lerna/get-npm-exec-opts" "3.13.0"
+    npmlog "^4.1.2"
+
+"@lerna/otplease@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-3.14.0.tgz#b539fd3e7a08452fc0db3b10010ca3cf0e4a73e7"
+  integrity sha512-rYAWzaYZ81bwnrmTkYWGgcc13bl/6DlG7pjWQWNGAJNLzO5zzj0xmXN5sMFJnNvDpSiS/ZS1sIuPvb4xnwLUkg==
+  dependencies:
+    "@lerna/prompt" "3.13.0"
+    figgy-pudding "^3.5.1"
+
+"@lerna/output@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989"
+  integrity sha512-7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg==
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/pack-directory@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.14.2.tgz#577b8ebf867c9b636a2e4659a27552ee24d83b9d"
+  integrity sha512-b3LnJEmIml3sDj94TQT8R+kVyrDlmE7Su0WwcBYZDySXPMSZ38WA2/2Xjy/EWhXlFxp/nUJKyUG78nDrZ/00Uw==
+  dependencies:
+    "@lerna/get-packed" "3.13.0"
+    "@lerna/package" "3.14.2"
+    "@lerna/run-lifecycle" "3.14.0"
+    figgy-pudding "^3.5.1"
+    npm-packlist "^1.4.1"
+    npmlog "^4.1.2"
+    tar "^4.4.8"
+    temp-write "^3.4.0"
+
+"@lerna/package-graph@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.14.0.tgz#4ccdf446dccedfbbeb4efff3eb720cb6fcb109fc"
+  integrity sha512-dNpA/64STD5YXhaSlg4gT6Z474WPJVCHoX1ibsVIFu0fVgH609Y69bsdmbvTRdI7r6Dcu4ZfGxdR636RTrH+Eg==
+  dependencies:
+    "@lerna/prerelease-id-from-version" "3.14.0"
+    "@lerna/validation-error" "3.13.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    semver "^5.5.0"
+
+"@lerna/package@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.14.2.tgz#f893cb42e26c869df272dafbe1dd5a3473b0bd4d"
+  integrity sha512-YR/+CzYdufJYfsUlrfuhTjA35iSZpXK7mVOZmeR9iRWhSaqesm4kq2zfxm9vCpZV2oAQQZOwi4eo5h0rQBtdiw==
+  dependencies:
+    load-json-file "^4.0.0"
+    npm-package-arg "^6.1.0"
+    write-pkg "^3.1.0"
+
+"@lerna/prerelease-id-from-version@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.14.0.tgz#d5da9c26ac4a0d0ecde09018f06e41ca4dd444c2"
+  integrity sha512-Ap3Z/dNhqQuSrKmK+JmzYvQYI2vowxHvUVxZJiDVilW8dyNnxkCsYFmkuZytk5sxVz4VeGLNPS2RSsU5eeSS+Q==
+  dependencies:
+    semver "^5.5.0"
+
+"@lerna/project@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.15.0.tgz#733b0993a849dcf5b68fcd0ec11d8f7de38a6999"
+  integrity sha512-eNGUWiMbQ9kh9kGkomtMnsLypS0rfLqxKgZP2+VnNVtIXjnLv4paeTm+1lkL+naNJUwhnpMk2NSLEeoxT/20QA==
+  dependencies:
+    "@lerna/package" "3.14.2"
+    "@lerna/validation-error" "3.13.0"
+    cosmiconfig "^5.1.0"
+    dedent "^0.7.0"
+    dot-prop "^4.2.0"
+    glob-parent "^3.1.0"
+    globby "^8.0.1"
+    load-json-file "^4.0.0"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+    resolve-from "^4.0.0"
+    write-json-file "^2.3.0"
+
+"@lerna/prompt@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-3.13.0.tgz#53571462bb3f5399cc1ca6d335a411fe093426a5"
+  integrity sha512-P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA==
+  dependencies:
+    inquirer "^6.2.0"
+    npmlog "^4.1.2"
+
+"@lerna/publish@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.15.0.tgz#54f93f8f0820d2d419d0b65df1eb55d8277090c9"
+  integrity sha512-6tRRBJ8olLSXfrUsR4f7vSfx0cT1oPi6/v06yI3afDSsUX6eQ3ooZh7gMY4RWmd+nM/IJHTUzhlKF6WhTvo+9g==
+  dependencies:
+    "@evocateur/libnpmaccess" "^3.1.0"
+    "@evocateur/npm-registry-fetch" "^3.9.1"
+    "@evocateur/pacote" "^9.6.0"
+    "@lerna/check-working-tree" "3.14.2"
+    "@lerna/child-process" "3.14.2"
+    "@lerna/collect-updates" "3.14.2"
+    "@lerna/command" "3.15.0"
+    "@lerna/describe-ref" "3.14.2"
+    "@lerna/log-packed" "3.13.0"
+    "@lerna/npm-conf" "3.13.0"
+    "@lerna/npm-dist-tag" "3.15.0"
+    "@lerna/npm-publish" "3.15.0"
+    "@lerna/output" "3.13.0"
+    "@lerna/pack-directory" "3.14.2"
+    "@lerna/prerelease-id-from-version" "3.14.0"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/pulse-till-done" "3.13.0"
+    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/run-topologically" "3.14.0"
+    "@lerna/validation-error" "3.13.0"
+    "@lerna/version" "3.15.0"
+    figgy-pudding "^3.5.1"
+    fs-extra "^7.0.0"
+    npm-package-arg "^6.1.0"
+    npmlog "^4.1.2"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    semver "^5.5.0"
+
+"@lerna/pulse-till-done@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-3.13.0.tgz#c8e9ce5bafaf10d930a67d7ed0ccb5d958fe0110"
+  integrity sha512-1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA==
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/query-graph@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-3.14.0.tgz#2abb36f445bd924d0f85ac7aec1445e9ef1e2c6c"
+  integrity sha512-6YTh3vDMW2hUxHdKeRvx4bosc9lZClKaN+DzC1XKTkwDbWrsjmEzLcemKL6QnyyeuryN2f/eto7P9iSe3z3pQQ==
+  dependencies:
+    "@lerna/package-graph" "3.14.0"
+    figgy-pudding "^3.5.1"
+
+"@lerna/resolve-symlink@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.13.0.tgz#3e6809ef53b63fe914814bfa071cd68012e22fbb"
+  integrity sha512-Lc0USSFxwDxUs5JvIisS8JegjA6SHSAWJCMvi2osZx6wVRkEDlWG2B1JAfXUzCMNfHoZX0/XX9iYZ+4JIpjAtg==
+  dependencies:
+    fs-extra "^7.0.0"
+    npmlog "^4.1.2"
+    read-cmd-shim "^1.0.1"
+
+"@lerna/rimraf-dir@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.14.2.tgz#103a49882abd85d42285d05cc76869b89f21ffd2"
+  integrity sha512-eFNkZsy44Bu9v1Hrj5Zk6omzg8O9h/7W6QYK1TTUHeyrjTEwytaNQlqF0lrTLmEvq55sviV42NC/8P3M2cvq8Q==
+  dependencies:
+    "@lerna/child-process" "3.14.2"
+    npmlog "^4.1.2"
+    path-exists "^3.0.0"
+    rimraf "^2.6.2"
+
+"@lerna/run-lifecycle@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.14.0.tgz#0499eca0e7f393faf4e24e6c8737302a9059c22b"
+  integrity sha512-GUM3L9MzGRSW0WQ8wbLW1+SYStU1OFjW0GBzShhBnFrO4nGRrU7VchsLpcLu0hk2uCzyhsrDKzifEdOdUyMoEQ==
+  dependencies:
+    "@lerna/npm-conf" "3.13.0"
+    figgy-pudding "^3.5.1"
+    npm-lifecycle "^2.1.1"
+    npmlog "^4.1.2"
+
+"@lerna/run-parallel-batches@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.13.0.tgz#0276bb4e7cd0995297db82d134ca2bd08d63e311"
+  integrity sha512-bICFBR+cYVF1FFW+Tlm0EhWDioTUTM6dOiVziDEGE1UZha1dFkMYqzqdSf4bQzfLS31UW/KBd/2z8jy2OIjEjg==
+  dependencies:
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/run-topologically@3.14.0":
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-3.14.0.tgz#2a560cb657f0ef1565c680b6001b4b01b872dc07"
+  integrity sha512-y+KBpC1YExFzGynovt9MY4O/bc3RrJaKeuXieiPfKGKxrdtmZe/r33oj/xePTXZq65jnw3SaU3H8S5CrrdkwDg==
+  dependencies:
+    "@lerna/query-graph" "3.14.0"
+    figgy-pudding "^3.5.1"
+    p-queue "^4.0.0"
+
+"@lerna/run@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.15.0.tgz#465028b5b561a050bd760924e4a0749de3f43172"
+  integrity sha512-KQBkzZYoEKmzILKjbjsm1KKVWFBXwAdwzqJWj/lfxxd3V5LRF8STASk8aiw8bSpB0bUL9TU/pbXakRxiNzjDwQ==
+  dependencies:
+    "@lerna/command" "3.15.0"
+    "@lerna/filter-options" "3.14.2"
+    "@lerna/npm-run-script" "3.14.2"
+    "@lerna/output" "3.13.0"
+    "@lerna/run-topologically" "3.14.0"
+    "@lerna/timer" "3.13.0"
+    "@lerna/validation-error" "3.13.0"
+    p-map "^1.2.0"
+
+"@lerna/symlink-binary@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.14.2.tgz#a832fdc6c4b1e5aaf9e6ac9c7e6c322746965eb0"
+  integrity sha512-tqMwuWi6z1da0AFFbleWyu3H9fqayiV50rjj4anFTfayel9jSjlA1xPG+56sGIP6zUUNuUSc9kLh7oRRmlauoA==
+  dependencies:
+    "@lerna/create-symlink" "3.14.0"
+    "@lerna/package" "3.14.2"
+    fs-extra "^7.0.0"
+    p-map "^1.2.0"
+
+"@lerna/symlink-dependencies@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.14.2.tgz#e6b2a9544ff26addc1f4324734595e2f71dfc795"
+  integrity sha512-Ox7WKXnHZ7IwWlejcCq3n0Hd/yMLv8AwIryhvWxM/RauAge+ML4wg578SsdCyKob8ecgm/R0ytHiU06j81iL1w==
+  dependencies:
+    "@lerna/create-symlink" "3.14.0"
+    "@lerna/resolve-symlink" "3.13.0"
+    "@lerna/symlink-binary" "3.14.2"
+    fs-extra "^7.0.0"
+    p-finally "^1.0.0"
+    p-map "^1.2.0"
+    p-map-series "^1.0.0"
+
+"@lerna/timer@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-3.13.0.tgz#bcd0904551db16e08364d6c18e5e2160fc870781"
+  integrity sha512-RHWrDl8U4XNPqY5MQHkToWS9jHPnkLZEt5VD+uunCKTfzlxGnRCr3/zVr8VGy/uENMYpVP3wJa4RKGY6M0vkRw==
+
+"@lerna/validation-error@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-3.13.0.tgz#c86b8f07c5ab9539f775bd8a54976e926f3759c3"
+  integrity sha512-SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA==
+  dependencies:
+    npmlog "^4.1.2"
+
+"@lerna/version@3.15.0":
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.15.0.tgz#3c65d223d94f211312995266abb07ee6606d5f73"
+  integrity sha512-vReYX1NMXZ9PwzTZm97wAl/k3bmRnRZhnQi3mq/m49xTnDavq7p4sbUdFpvu8cVZNKnYS02pNIVGHrQw+K8ZCw==
+  dependencies:
+    "@lerna/check-working-tree" "3.14.2"
+    "@lerna/child-process" "3.14.2"
+    "@lerna/collect-updates" "3.14.2"
+    "@lerna/command" "3.15.0"
+    "@lerna/conventional-commits" "3.14.0"
+    "@lerna/github-client" "3.14.2"
+    "@lerna/gitlab-client" "3.15.0"
+    "@lerna/output" "3.13.0"
+    "@lerna/prerelease-id-from-version" "3.14.0"
+    "@lerna/prompt" "3.13.0"
+    "@lerna/run-lifecycle" "3.14.0"
+    "@lerna/run-topologically" "3.14.0"
+    "@lerna/validation-error" "3.13.0"
+    chalk "^2.3.1"
+    dedent "^0.7.0"
+    minimatch "^3.0.4"
+    npmlog "^4.1.2"
+    p-map "^1.2.0"
+    p-pipe "^1.2.0"
+    p-reduce "^1.0.0"
+    p-waterfall "^1.0.0"
+    semver "^5.5.0"
+    slash "^1.0.0"
+    temp-write "^3.4.0"
+
+"@lerna/write-log-file@3.13.0":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-3.13.0.tgz#b78d9e4cfc1349a8be64d91324c4c8199e822a26"
+  integrity sha512-RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A==
+  dependencies:
+    npmlog "^4.1.2"
+    write-file-atomic "^2.3.0"
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+
+"@octokit/endpoint@^5.1.0":
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.1.2.tgz#45fd879e33a25ee10fa4cffc4d098ee04135afe6"
+  integrity sha512-bBGGmcRFq1x0jrB29G/9KjYmO3cdHfk3476B2JOHRvLsNw1Pn3l+ZvbiqtcO9qAS4Ti+zFedLB84ziHZRZclQA==
+  dependencies:
+    deepmerge "3.2.0"
+    is-plain-object "^3.0.0"
+    universal-user-agent "^2.1.0"
+    url-template "^2.0.8"
+
+"@octokit/plugin-enterprise-rest@^2.1.1":
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.2.tgz#c0e22067a043e19f96ff9c7832e2a3019f9be75c"
+  integrity sha512-CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw==
+
+"@octokit/request@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-3.0.3.tgz#ace63b5ea196cc00ad27f3fbe5c13a9698681ec8"
+  integrity sha512-M7pUfsiaiiUMEP4/SMysTeWxyGrkoQg6FBPEtCBIFgeDnzHaPboTpUZGTh6u1GQXdrlzMfPVn/vQs98js1QtwQ==
+  dependencies:
+    "@octokit/endpoint" "^5.1.0"
+    deprecation "^1.0.1"
+    is-plain-object "^3.0.0"
+    node-fetch "^2.3.0"
+    once "^1.4.0"
+    universal-user-agent "^2.0.1"
+
+"@octokit/rest@^16.16.0":
+  version "16.25.5"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.25.5.tgz#9268afad252f72a1e39553cf87e1aa0493e355de"
+  integrity sha512-xemNMkhjSBPnPR7gzGNDelRJvAOu1T9oVABUADyQ2gE9E788qgVOr/xnBPusVLlYfhX7FhGhvGiVrgho/D4pfw==
+  dependencies:
+    "@octokit/request" "3.0.3"
+    atob-lite "^2.0.0"
+    before-after-hook "^1.4.0"
+    btoa-lite "^1.0.0"
+    deprecation "^2.0.0"
+    lodash.get "^4.4.2"
+    lodash.set "^4.3.2"
+    lodash.uniq "^4.5.0"
+    octokit-pagination-methods "^1.1.0"
+    once "^1.4.0"
+    universal-user-agent "^2.0.0"
+    url-template "^2.0.8"
+
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  dependencies:
+    any-observable "^0.3.0"
 
 "@types/acorn@^4.0.2":
   version "4.0.3"
@@ -713,6 +1711,39 @@
   dependencies:
     "@types/estree" "*"
 
+"@types/babel__core@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.0.tgz#710f2487dda4dcfd010ca6abb2b4dc7394365c51"
+  integrity sha512-wJTeJRt7BToFx3USrCDs2BhEi4ijBInTQjOIukj6a/5tEkwpFMVZ+1ppgmE+Q/FQyc5P/VWUbx7I9NELrKruHA==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
+  integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2"
+  integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/cheerio@^0.22.1":
   version "0.22.7"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.7.tgz#4a92eafedfb2b9f4437d3a4410006d81114c66ce"
@@ -732,30 +1763,69 @@
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/@types/escape-string-regexp/-/escape-string-regexp-0.0.30.tgz#8cfaf0b5d2e46943d6efd77d3f4d18bfa1c9f225"
 
-"@types/estree@*":
-  version "0.0.38"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
+"@types/estree@*", "@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/estree@0.0.35":
   version "0.0.35"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.35.tgz#8999974b34028686a8d61a719e61c138d3755107"
 
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
+  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+
+"@types/istanbul-lib-report@*":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
+  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
+  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+    "@types/istanbul-lib-report" "*"
+
 "@types/lodash@^4.14.67":
   version "4.14.104"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80"
 
-"@types/node@*":
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e"
+"@types/node@*", "@types/node@^12.0.2":
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.2.tgz#3452a24edf9fea138b48fad4a0a028a683da1e40"
+  integrity sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==
 
 "@types/node@^8.0.0":
   version "8.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.4.tgz#dfd327582a06c114eb6e0441fa3d6fab35edad48"
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/semver@^5.3.32":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
 
+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
 "@types/tapable@*":
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-0.2.4.tgz#8181a228da46185439300e600c5ae3b3b3982585"
@@ -775,9 +1845,14 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-JSONStream@^1.0.3, JSONStream@^1.0.4:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+"@types/yargs@^12.0.2", "@types/yargs@^12.0.9":
+  version "12.0.9"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
+  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
+
+JSONStream@^1.0.3, JSONStream@^1.0.4, JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -796,11 +1871,9 @@ acorn-dynamic-import@^2.0.0:
   dependencies:
     acorn "^4.0.3"
 
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  dependencies:
-    acorn "^5.0.0"
+acorn-dynamic-import@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
 
 acorn-globals@^4.1.0:
   version "4.1.0"
@@ -808,83 +1881,61 @@ acorn-globals@^4.1.0:
   dependencies:
     acorn "^5.0.0"
 
-acorn-jsx@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e"
-  dependencies:
-    acorn "^5.0.3"
+acorn-jsx@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
 
-acorn-node@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b"
+acorn-node@^1.2.0, acorn-node@^1.3.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.6.2.tgz#b7d7ceca6f22e6417af933a62cad4de01048d5d2"
   dependencies:
-    acorn "^5.4.1"
+    acorn "^6.0.2"
+    acorn-dynamic-import "^4.0.0"
+    acorn-walk "^6.1.0"
     xtend "^4.0.1"
 
-acorn-node@^1.3.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.5.2.tgz#2ca723df19d997b05824b69f6c7fb091fc42c322"
-  dependencies:
-    acorn "^5.7.1"
-    acorn-dynamic-import "^3.0.0"
-    xtend "^4.0.1"
+acorn-walk@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
 
 acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.0.3, acorn@^5.3.0, acorn@^5.4.1:
+acorn@^5.0.0, acorn@^5.0.3, acorn@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298"
 
-acorn@^5.6.0, acorn@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
+acorn@^6.0.2, acorn@^6.0.7, acorn@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
 
-add-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  dependencies:
+    es6-promisify "^5.0.0"
 
-ajv-keywords@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+agentkeepalive@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  dependencies:
+    humanize-ms "^1.2.1"
 
 ajv-keywords@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be"
 
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.0.1, ajv@^6.5.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
+ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.9.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.2.tgz#4927adb83e7f48e5a32b45729744c71ec39c9c7b"
+  integrity sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
-    uri-js "^4.2.1"
-
-ajv@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671"
-  dependencies:
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
+    uri-js "^4.2.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -898,7 +1949,7 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-ansi-colors@^1.0.1:
+ansi-colors@1.1.0, ansi-colors@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
   dependencies:
@@ -910,13 +1961,10 @@ ansi-cyan@^0.1.1:
   dependencies:
     ansi-wrap "0.1.0"
 
-ansi-escapes@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-
-ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-gray@^0.1.1:
   version "0.1.1"
@@ -938,6 +1986,10 @@ ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
+ansi-regex@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -952,9 +2004,9 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
-any-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
 
 anymatch@^1.3.0:
   version "1.3.2"
@@ -970,26 +2022,20 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-root-path@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46"
-
 append-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
   dependencies:
     buffer-equal "^1.0.0"
 
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  dependencies:
-    default-require-extensions "^2.0.0"
-
-aproba@^1.0.3:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
+aproba@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
@@ -1072,6 +2118,14 @@ array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
 
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
 array-initial@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795"
@@ -1115,7 +2169,7 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
-array-uniq@^1.0.1, array-uniq@^1.0.2:
+array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
@@ -1131,6 +2185,10 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
+asap@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -1147,10 +2205,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
 assert@^1.1.1, assert@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -1184,9 +2238,10 @@ async-done@^1.2.0, async-done@^1.2.2:
     process-nextick-args "^1.0.7"
     stream-exhaust "^1.0.1"
 
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-limiter@~1.0.0:
   version "1.0.0"
@@ -1198,215 +2253,93 @@ async-settle@^1.0.0:
   dependencies:
     async-done "^1.2.2"
 
-async@^1.4.0, async@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-async@^2.1.2, async@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+async@^2.1.2, async@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
-    lodash "^4.14.0"
+    lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob-lite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
+  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
+
 atob@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
 
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-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-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@^6.0.0, babel-core@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.7"
-    slash "^1.0.0"
-    source-map "^0.5.6"
-
-babel-core@^7.0.0-0:
-  version "7.0.0-bridge.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-babel-eslint@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220"
+babel-eslint@^11.0.0-beta.0:
+  version "11.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-11.0.0-beta.0.tgz#3645b9b84d848e070e0afadc95d0c8ff96f4c63a"
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
     eslint-scope "3.7.1"
     eslint-visitor-keys "^1.0.0"
+    semver "^5.6.0"
+
+babel-jest@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"
+  integrity sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==
+  dependencies:
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/babel__core" "^7.1.0"
+    babel-plugin-istanbul "^5.1.0"
+    babel-preset-jest "^24.6.0"
+    chalk "^2.4.2"
+    slash "^2.0.0"
 
-babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
-
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-jest@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.4.0.tgz#22c34c392e2176f6a4c367992a7fcff69d2e8557"
-  dependencies:
-    babel-plugin-istanbul "^4.1.6"
-    babel-preset-jest "^23.2.0"
-
-babel-loader@8.0.0-beta.4:
-  version "8.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.0-beta.4.tgz#c3fab00696c385c70c04dbe486391f0eb996f345"
+babel-loader@^8.0.6:
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
+  integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
   dependencies:
-    find-cache-dir "^1.0.0"
+    find-cache-dir "^2.0.0"
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
-    util.promisify "^1.0.0"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-istanbul@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-    find-up "^2.1.0"
-    istanbul-lib-instrument "^1.10.1"
-    test-exclude "^4.2.1"
-
-babel-plugin-jest-hoist@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
-
-babel-plugin-syntax-object-rest-spread@^6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-
-babel-plugin-transform-charcodes@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-charcodes/-/babel-plugin-transform-charcodes-0.1.0.tgz#c71b301019c90615b940faf0f15f275ec5c81a3d"
-  dependencies:
-    "@babel/traverse" "^7.0.0-beta.31"
-    babylon "^7.0.0-beta.31"
-
-babel-preset-jest@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
-  dependencies:
-    babel-plugin-jest-hoist "^23.2.0"
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-
-babel-register@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  dependencies:
-    babel-core "^6.26.0"
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.17.4"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.15"
+    pify "^4.0.1"
 
-babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+babel-plugin-istanbul@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.0.tgz#6892f529eff65a3e2d33d87dc5888ffa2ecd4a30"
   dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
+    find-up "^3.0.0"
+    istanbul-lib-instrument "^3.0.0"
+    test-exclude "^5.0.0"
 
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+babel-plugin-jest-hoist@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"
+  integrity sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==
   dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
+    "@types/babel__traverse" "^7.0.6"
 
-babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+babel-plugin-transform-charcodes@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-charcodes/-/babel-plugin-transform-charcodes-0.2.0.tgz#c17307cc852c979103ceafd97e1799ef10916941"
   dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
+    "@babel/parser" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
 
-babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+babel-preset-jest@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984"
+  integrity sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==
   dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babylon@7.0.0-beta.40, babylon@^7.0.0-beta.31:
-  version "7.0.0-beta.40"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.40.tgz#91fc8cd56d5eb98b28e6fde41045f2957779940a"
-
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    babel-plugin-jest-hoist "^24.6.0"
 
 bach@^1.0.0:
   version "1.2.0"
@@ -1448,9 +2381,10 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
+before-after-hook@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.4.0.tgz#2b6bf23dca4f32e628fd2747c10a37c74a4b484d"
+  integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==
 
 big.js@^3.1.3:
   version "3.2.0"
@@ -1460,17 +2394,9 @@ binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
 
-bl@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
-  dependencies:
-    readable-stream "^2.0.5"
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
+bluebird@^3.5.1, bluebird@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -1480,24 +2406,6 @@ boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1513,17 +2421,16 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-braces@^2.3.0, braces@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
-    define-property "^1.0.0"
     extend-shallow "^2.0.1"
     fill-range "^4.0.0"
     isobject "^3.0.1"
-    kind-of "^6.0.2"
     repeat-element "^1.1.2"
     snapdragon "^0.8.1"
     snapdragon-node "^2.0.1"
@@ -1559,15 +2466,10 @@ browser-process-hrtime@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
 
-browser-resolve@^1.11.0, browser-resolve@^1.7.0:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
-  dependencies:
-    resolve "1.1.7"
-
-browser-resolve@^1.11.3:
+browser-resolve@^1.11.0, browser-resolve@^1.11.3, browser-resolve@^1.7.0:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
   dependencies:
     resolve "1.1.7"
 
@@ -1632,9 +2534,9 @@ browserify-zlib@^0.2.0, browserify-zlib@~0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserify@^16.2.2:
-  version "16.2.2"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.2.tgz#4b1f66ba0e54fa39dbc5aa4be9629142143d91b0"
+browserify@^16.2.3:
+  version "16.2.3"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.3.tgz#7ee6e654ba4f92bce6ab3599c3485b1cc7a0ad0b"
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
@@ -1685,13 +2587,14 @@ browserify@^16.2.2:
     vm-browserify "^1.0.0"
     xtend "^4.0.0"
 
-browserslist@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.0.tgz#81cbb8e52dfa09918f93c6e051d779cb7360785d"
+browserslist@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.0.tgz#5274028c26f4d933d5b1323307c1d1da5084c9ff"
+  integrity sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==
   dependencies:
-    caniuse-lite "^1.0.30000878"
-    electron-to-chromium "^1.3.61"
-    node-releases "^1.0.0-alpha.11"
+    caniuse-lite "^1.0.30000967"
+    electron-to-chromium "^1.3.133"
+    node-releases "^1.1.19"
 
 bser@^2.0.0:
   version "2.0.0"
@@ -1699,6 +2602,11 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
+btoa-lite@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
+  integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
+
 buffer-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
@@ -1726,14 +2634,19 @@ buffer@^5.0.2:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+builtin-modules@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
+  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+
 bundle-collapser@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/bundle-collapser/-/bundle-collapser-1.3.0.tgz#f4b4ff58b2f22ee7701b20fa76306e23f53a3fb6"
@@ -1749,6 +2662,30 @@ byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
 
+byte-size@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.4.tgz#29d381709f41aae0d89c631f1c81aec88cd40b23"
+
+cacache@^11.0.1, cacache@^11.3.2:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+  dependencies:
+    bluebird "^3.5.3"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1767,20 +2704,30 @@ cached-path-relative@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
   dependencies:
-    callsites "^0.2.0"
+    callsites "^2.0.0"
 
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  dependencies:
+    caller-callsite "^2.0.0"
 
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
 
+callsites@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
+
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -1819,13 +2766,20 @@ camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
-caniuse-lite@^1.0.30000878:
-  version "1.0.30000883"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000883.tgz#597c1eabfb379bd9fbeaa778632762eb574706ac"
+camelcase@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+
+caniuse-lite@^1.0.30000967:
+  version "1.0.30000967"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"
+  integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==
 
-capture-stack-trace@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  dependencies:
+    rsvp "^3.3.3"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -1838,7 +2792,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1848,21 +2802,22 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-charcodes@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.1.0.tgz#61f8c244fc7f94f186fe74f31078901a3ed7928e"
+charcodes@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
 
-chardet@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
 
 cheerio@^1.0.0-rc.1:
   version "1.0.0-rc.2"
@@ -1875,50 +2830,37 @@ cheerio@^1.0.0-rc.1:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^2.0.0, chokidar@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
-    glob-parent "^3.1.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^2.1.1"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.0"
-  optionalDependencies:
-    fsevents "^1.1.2"
-
-chokidar@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7"
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
   dependencies:
     anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
     glob-parent "^3.1.0"
-    inherits "^2.0.1"
+    inherits "^2.0.3"
     is-binary-path "^1.0.0"
     is-glob "^4.0.0"
-    normalize-path "^2.1.1"
+    normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
   optionalDependencies:
-    fsevents "^1.0.0"
+    fsevents "^1.2.7"
 
-chownr@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+chownr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
 
 ci-info@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
 
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -1926,10 +2868,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -1945,22 +2883,12 @@ clean-css@4.1.x:
   dependencies:
     source-map "0.5.x"
 
-cli-cursor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.1.0:
+cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-spinners@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
-
 cli-truncate@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
@@ -2102,17 +3030,13 @@ combine-source-map@~0.8.0:
     lodash.memoize "~3.0.3"
     source-map "~0.5.3"
 
-combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   dependencies:
     delayed-stream "~1.0.0"
 
-command-join@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/command-join/-/command-join-2.0.0.tgz#52e8b984f4872d952ff1bdc8b98397d27c7144cf"
-
-commander@2.14.x, commander@^2.11.0, commander@^2.8.1, commander@^2.9.0, commander@~2.14.1:
+commander@2.14.x, commander@^2.14.1, commander@^2.8.1, commander@^2.9.0, commander@~2.14.1:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
 
@@ -2127,10 +3051,6 @@ compare-func@^1.3.1:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
 
-compare-versions@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3"
-
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -2139,10 +3059,11 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.4.10, concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.6.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
+concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@~1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
+    buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
@@ -2155,14 +3076,12 @@ concat-stream@~1.5.1:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@~1.6.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+config-chain@^1.1.11:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
   dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
+    ini "^1.3.4"
+    proto-list "~1.2.1"
 
 console-browserify@^1.1.0:
   version "1.1.0"
@@ -2178,178 +3097,95 @@ constants-browserify@^1.0.0, constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+
 content-type-parser@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
 
-conventional-changelog-angular@^1.6.6:
-  version "1.6.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+conventional-changelog-angular@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0"
+  integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
 
-conventional-changelog-atom@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-cli@^1.3.13:
-  version "1.3.22"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz#13570fe1728f56f013ff7a88878ff49d5162a405"
-  dependencies:
-    add-stream "^1.0.0"
-    conventional-changelog "^1.1.24"
-    lodash "^4.2.1"
-    meow "^4.0.0"
-    tempfile "^1.1.1"
-
-conventional-changelog-codemirror@^0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-core@^2.0.11:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
+conventional-changelog-core@^3.1.6:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+  integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
   dependencies:
-    conventional-changelog-writer "^3.0.9"
-    conventional-commits-parser "^2.1.7"
+    conventional-changelog-writer "^4.0.5"
+    conventional-commits-parser "^3.0.2"
     dateformat "^3.0.0"
     get-pkg-repo "^1.0.0"
-    git-raw-commits "^1.3.6"
+    git-raw-commits "2.0.0"
     git-remote-origin-url "^2.0.0"
-    git-semver-tags "^1.3.6"
+    git-semver-tags "^2.0.2"
     lodash "^4.2.1"
     normalize-package-data "^2.3.5"
     q "^1.5.1"
-    read-pkg "^1.1.0"
-    read-pkg-up "^1.0.1"
-    through2 "^2.0.0"
-
-conventional-changelog-ember@^0.3.12:
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-eslint@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-express@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
-  dependencies:
-    q "^1.5.1"
-
-conventional-changelog-jquery@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jscs@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
-  dependencies:
-    q "^1.4.1"
-
-conventional-changelog-jshint@^0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
-  dependencies:
-    compare-func "^1.3.1"
-    q "^1.5.1"
+    read-pkg "^3.0.0"
+    read-pkg-up "^3.0.0"
+    through2 "^3.0.0"
 
-conventional-changelog-preset-loader@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
+conventional-changelog-preset-loader@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.2.tgz#81d1a07523913f3d17da3a49f0091f967ad345b0"
 
-conventional-changelog-writer@^3.0.9:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
+conventional-changelog-writer@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.5.tgz#fb9e384bb294e8e8a9f2568a3f4d1e11953d8641"
+  integrity sha512-g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q==
   dependencies:
     compare-func "^1.3.1"
-    conventional-commits-filter "^1.1.6"
+    conventional-commits-filter "^2.0.2"
     dateformat "^3.0.0"
-    handlebars "^4.0.2"
+    handlebars "^4.1.0"
     json-stringify-safe "^5.0.1"
     lodash "^4.2.1"
     meow "^4.0.0"
     semver "^5.5.0"
     split "^1.0.0"
-    through2 "^2.0.0"
-
-conventional-changelog@^1.1.24:
-  version "1.1.24"
-  resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
-  dependencies:
-    conventional-changelog-angular "^1.6.6"
-    conventional-changelog-atom "^0.2.8"
-    conventional-changelog-codemirror "^0.3.8"
-    conventional-changelog-core "^2.0.11"
-    conventional-changelog-ember "^0.3.12"
-    conventional-changelog-eslint "^1.0.9"
-    conventional-changelog-express "^0.3.6"
-    conventional-changelog-jquery "^0.1.0"
-    conventional-changelog-jscs "^0.1.0"
-    conventional-changelog-jshint "^0.3.8"
-    conventional-changelog-preset-loader "^1.1.8"
-
-conventional-commits-filter@^1.1.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz#77aac065e3de9c1a74b801e8e25c9affb3184f65"
-  dependencies:
-    is-subset "^0.1.1"
-    modify-values "^1.0.0"
+    through2 "^3.0.0"
 
-conventional-commits-filter@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
+conventional-commits-filter@^2.0.1, conventional-commits-filter@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+  integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
   dependencies:
-    is-subset "^0.1.1"
+    lodash.ismatch "^4.4.0"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^2.1.1:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz#9ac3a4ab221c0c3c9e9dd2c09ae01e6d1e1dabe0"
+conventional-commits-parser@^3.0.1, conventional-commits-parser@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz#1295590dd195f64f53d6f8eb7c41114bb9a60742"
+  integrity sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
     lodash "^4.2.1"
     meow "^4.0.0"
     split2 "^2.0.0"
-    through2 "^2.0.0"
+    through2 "^3.0.0"
     trim-off-newlines "^1.0.0"
 
-conventional-commits-parser@^2.1.7:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
+conventional-recommended-bump@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.0.4.tgz#05540584641d3da758c8863c09788fcaeb586872"
   dependencies:
-    JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
-    lodash "^4.2.1"
+    concat-stream "^1.6.0"
+    conventional-changelog-preset-loader "^2.0.2"
+    conventional-commits-filter "^2.0.1"
+    conventional-commits-parser "^3.0.1"
+    git-raw-commits "2.0.0"
+    git-semver-tags "^2.0.2"
     meow "^4.0.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-    trim-off-newlines "^1.0.0"
-
-conventional-recommended-bump@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-1.2.1.tgz#1b7137efb5091f99fe009e2fe9ddb7cc490e9375"
-  dependencies:
-    concat-stream "^1.4.10"
-    conventional-commits-filter "^1.1.1"
-    conventional-commits-parser "^2.1.1"
-    git-raw-commits "^1.3.0"
-    git-semver-tags "^1.3.0"
-    meow "^3.3.0"
-    object-assign "^4.0.1"
+    q "^1.5.1"
 
 convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.1"
@@ -2359,6 +3195,17 @@ convert-source-map@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
 
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -2370,26 +3217,38 @@ copy-props@^2.0.1:
     each-props "^1.3.0"
     is-plain-object "^2.0.1"
 
-core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+core-js-compat@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.1.tgz#a1ae7edd5b791066d6eaa969c1b62986b844fd42"
+  integrity sha512-RH3kv8NFovFRMdeTEUgu8nMquEWKEVttOY3JFi8mN75sg72zygPqWbpWNTUw4JYEU43562tlzhdWsWqXmdFAnQ==
+  dependencies:
+    browserslist "^4.6.0"
+    core-js-pure "3.1.1"
+    semver "^6.0.0"
+
+core-js-pure@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.1.tgz#92494ab7bae22f156ae93973a5e2738814efa7f8"
+  integrity sha512-jH3ZJ0CJ0wwDvWY0olbOComLo6tbWg4kE2x0j4+wlqYnofwF9mYm98YvADuENUzGw69IddmWFCF1FQ2S0jP96A==
 
-core-js@^2.5.7:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+core-js@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
+  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+cosmiconfig@^5.1.0, cosmiconfig@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
+    import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
+    js-yaml "^3.13.1"
     parse-json "^4.0.0"
-    require-from-string "^2.0.1"
 
 create-ecdh@^4.0.0:
   version "4.0.0"
@@ -2398,12 +3257,6 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-error-class@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
@@ -2432,7 +3285,7 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
@@ -2442,18 +3295,6 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2499,6 +3340,10 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
@@ -2525,25 +3370,31 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+debug@3.1.0, debug@^3.0.0, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
+debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.0.1, debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   dependencies:
-    ms "2.0.0"
+    ms "^2.1.1"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
@@ -2552,7 +3403,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
@@ -2568,26 +3419,21 @@ deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+deepmerge@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
+  integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
+
 default-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
   dependencies:
     kind-of "^5.0.2"
 
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  dependencies:
-    strip-bom "^3.0.0"
-
 default-resolution@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
@@ -2628,16 +3474,15 @@ defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
   dependencies:
-    globby "^5.0.0"
+    globby "^6.1.0"
     is-path-cwd "^1.0.0"
     is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
     rimraf "^2.2.8"
 
 delayed-stream@~1.0.0:
@@ -2648,6 +3493,16 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
+deprecation@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711"
+  integrity sha512-ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg==
+
+deprecation@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.0.0.tgz#dd0427cd920c78bc575ec39dab2f22e7c304fb9d"
+  integrity sha512-lbQN037mB3VfA2JFuguM5GCJ+zPinMeCrFe+AfSZ6eqrnJA/Fs+EYMnd6Nb2mn9lf2jO9xwEd9o9lic+D4vkcw==
+
 deps-sort@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
@@ -2678,12 +3533,6 @@ detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
 
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
 detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
@@ -2704,9 +3553,17 @@ detective@^5.0.2:
     defined "^1.0.0"
     minimist "^1.1.1"
 
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+diff-sequences@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975"
+  integrity sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==
 
 diffie-hellman@^5.0.0:
   version "5.0.2"
@@ -2716,9 +3573,25 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
     esutils "^2.0.2"
 
@@ -2753,31 +3626,24 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1:
+domutils@1.5.1, domutils@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
   dependencies:
     is-obj "^1.0.0"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+dot-prop@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
   dependencies:
-    readable-stream "~1.1.9"
+    is-obj "^1.0.0"
 
 duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   version "0.1.4"
@@ -2785,23 +3651,29 @@ duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
-duplexify@^3.5.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+duplicate-package-checker-webpack-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/duplicate-package-checker-webpack-plugin/-/duplicate-package-checker-webpack-plugin-2.1.0.tgz#6723ee32d89947997470778973c10788cb69e496"
+  integrity sha512-Blok+Cb8zDavYQyeTtSkmNp/aiyRn5+JV/4EhDDH5VJChnyIzPhq+S5MyWnFpqpv8jNKmD3cXmXFEVU509pzXQ==
+  dependencies:
+    chalk "^2.3.0"
+    find-root "^1.0.0"
+    lodash "^4.17.4"
+    semver "^5.4.1"
+
 each-props@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.1.tgz#fc138f51e3a2774286d4858e02d6e7de462de158"
@@ -2815,9 +3687,10 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-electron-to-chromium@^1.3.61:
-  version "1.3.62"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.62.tgz#2e8e2dc070c800ec8ce23ff9dfcceb585d6f9ed8"
+electron-to-chromium@^1.3.133:
+  version "1.3.134"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.134.tgz#550222bddac43c6bd6c445c3543a0fe8a615021d"
+  integrity sha512-C3uK2SrtWg/gSWaluLHWSHjyebVZCe4ZC0NVgTAoTq8tCR9FareRK5T7R7AS/nPZShtlEcjVMX1kQ8wi4nU68w==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -2835,6 +3708,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -2864,6 +3742,10 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+
 errno@^0.1.3:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -2876,33 +3758,26 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.10.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-abstract@^1.4.3, es-abstract@^1.5.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
   dependencies:
-    es-to-primitive "^1.1.1"
+    es-to-primitive "^1.2.0"
     function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
+    has "^1.0.3"
+    is-callable "^1.1.4"
     is-regex "^1.0.4"
+    object-keys "^1.0.12"
 
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+es-to-primitive@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
   dependencies:
-    is-callable "^1.1.1"
+    is-callable "^1.1.4"
     is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
+    is-symbol "^1.0.2"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
   version "0.10.39"
@@ -2930,6 +3805,16 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
+es6-promise@^4.0.3:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  dependencies:
+    es6-promise "^4.0.3"
+
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -2963,7 +3848,7 @@ es6-weak-map@^2.0.1:
     es6-iterator "^2.0.1"
     es6-symbol "^3.1.1"
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -2987,26 +3872,57 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-babel@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-babel/-/eslint-config-babel-8.0.0.tgz#4f7398ed2772a24a36467d05f25262ab8121e714"
+eslint-config-babel@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-babel/-/eslint-config-babel-9.0.0.tgz#bcfb9e9a1892aff29b8773cb9d2c76639de83c07"
+  integrity sha512-J7l2KdDKi2y9QifMqXdSIkghrVXr6fcpxegj+803C+4xBfpp0h2LcY9X5N+ivJMBoX6G2PJ/TBTM1Kro0MELBA==
 
-eslint-plugin-flowtype@^2.50.0:
-  version "2.50.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.50.0.tgz#953e262fa9b5d0fa76e178604892cf60dfb916da"
+eslint-import-resolver-node@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
   dependencies:
-    lodash "^4.17.10"
+    debug "^2.6.9"
+    resolve "^1.5.0"
 
-eslint-plugin-local-rules@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-local-rules/-/eslint-plugin-local-rules-0.1.0.tgz#6808bb4c1b9a432f6e54ff4dfb290073e1cdf700"
+eslint-module-utils@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
+  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
+  dependencies:
+    debug "^2.6.8"
+    pkg-dir "^2.0.0"
+
+eslint-plugin-flowtype@^3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.8.2.tgz#8e1ecaae570d149ba3ba2c73964ebac5582e8ff9"
+  integrity sha512-3fBLnSQ4WEVKtd+PWuqL9qhciYrJWjLuOGilEIN3LzEYnPtvDcnjQPHP2OFhzTCRlpojSv2EEqoPW+Sol0vn2A==
+  dependencies:
+    lodash "^4.17.11"
+
+eslint-plugin-import@^2.17.2:
+  version "2.17.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb"
+  integrity sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g==
+  dependencies:
+    array-includes "^3.0.3"
+    contains-path "^0.1.0"
+    debug "^2.6.9"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.2"
+    eslint-module-utils "^2.4.0"
+    has "^1.0.3"
+    lodash "^4.17.11"
+    minimatch "^3.0.4"
+    read-pkg-up "^2.0.0"
+    resolve "^1.10.0"
 
-eslint-plugin-prettier@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz#71998c60aedfa2141f7bfcbf9d1c459bf98b4fad"
+eslint-plugin-prettier@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d"
+  integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==
   dependencies:
-    fast-diff "^1.1.1"
-    jest-docblock "^21.0.0"
+    prettier-linter-helpers "^1.0.0"
 
 eslint-scope@3.7.1:
   version "3.7.1"
@@ -3015,9 +3931,10 @@ eslint-scope@3.7.1:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3030,56 +3947,56 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8"
+eslint@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
   dependencies:
-    ajv "^6.5.0"
-    babel-code-frame "^6.26.0"
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.9.1"
     chalk "^2.1.0"
     cross-spawn "^6.0.5"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^4.0.0"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^4.0.3"
     eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^4.0.0"
+    espree "^5.0.1"
     esquery "^1.0.1"
     esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
+    file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
     glob "^7.1.2"
     globals "^11.7.0"
-    ignore "^4.0.2"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^5.2.0"
-    is-resolvable "^1.1.0"
-    js-yaml "^3.11.0"
+    inquirer "^6.2.2"
+    js-yaml "^3.13.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.5"
+    lodash "^4.17.11"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
     path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^2.0.0"
-    require-uncached "^1.0.3"
-    semver "^5.5.0"
-    string.prototype.matchall "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^5.5.1"
     strip-ansi "^4.0.0"
     strip-json-comments "^2.0.1"
-    table "^4.0.3"
+    table "^5.2.3"
     text-table "^0.2.0"
 
-espree@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634"
+espree@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
   dependencies:
-    acorn "^5.6.0"
-    acorn-jsx "^4.1.1"
+    acorn "^6.0.7"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
 
 esprima@^3.1.3, esprima@~3.1.0:
   version "3.1.3"
@@ -3105,9 +4022,10 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
-estree-walker@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+estree-walker@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
+  integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==
 
 esutils@^2.0.2:
   version "2.0.2"
@@ -3120,6 +4038,11 @@ event-emitter@~0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+eventemitter3@^3.1.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+  integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
+
 events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
@@ -3135,11 +4058,22 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-exec-sh@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+exec-sh@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
+  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
   dependencies:
-    merge "^1.1.3"
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
 execa@^0.7.0:
   version "0.7.0"
@@ -3153,22 +4087,18 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
   dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
     is-stream "^1.1.0"
     npm-run-path "^2.0.0"
     p-finally "^1.0.0"
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -3203,16 +4133,17 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.4.0.tgz#6da4ecc99c1471253e7288338983ad1ebadb60c3"
+expect@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d"
+  integrity sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==
   dependencies:
+    "@jest/types" "^24.8.0"
     ansi-styles "^3.2.0"
-    jest-diff "^23.2.0"
-    jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
+    jest-get-type "^24.8.0"
+    jest-matcher-utils "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-regex-util "^24.3.0"
 
 extend-shallow@^1.1.2:
   version "1.1.4"
@@ -3233,24 +4164,16 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
-  dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
-    tmp "^0.0.33"
+extend@^3.0.0, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
-external-editor@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+external-editor@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
 extglob@^0.3.1:
@@ -3272,14 +4195,10 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.3.0:
+extsprintf@1.3.0, extsprintf@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
 
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
 falafel@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
@@ -3289,7 +4208,7 @@ falafel@^2.1.0:
     isarray "0.0.1"
     object-keys "^1.0.6"
 
-fancy-log@^1.1.0, fancy-log@^1.3.2:
+fancy-log@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
   dependencies:
@@ -3297,17 +4216,33 @@ fancy-log@^1.1.0, fancy-log@^1.3.2:
     color-support "^1.1.3"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+fancy-log@^1.3.2, fancy-log@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  dependencies:
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    parse-node-version "^1.0.0"
+    time-stamp "^1.0.0"
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
-fast-diff@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
+fast-diff@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+
+fast-glob@^2.0.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.4.tgz#e54f4b66d378040e0e4d6a68ec36bbc5b04363c0"
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -3327,6 +4262,10 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
+figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+
 figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
@@ -3340,24 +4279,17 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
   dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
+    flat-cache "^2.0.1"
 
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
-fileset@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -3377,18 +4309,23 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+find-cache-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
+    pkg-dir "^3.0.0"
 
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
 
+find-root@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3402,6 +4339,12 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
+
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -3411,6 +4354,16 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+findup-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
 fined@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.0.tgz#b37dc844b76a2f5e7081e884f7c0ae344f153476"
@@ -3431,26 +4384,37 @@ flagged-respawn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
 
-flat-cache@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
   dependencies:
-    circular-json "^0.3.1"
-    del "^2.0.2"
-    graceful-fs "^4.1.2"
-    write "^0.2.1"
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
+flatted@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
+  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
 
-flow-bin@^0.80.0:
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.80.0.tgz#04cc1ee626a6f50786f78170c92ebe1745235403"
+flow-bin@^0.94.0:
+  version "0.94.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.94.0.tgz#b5d58fe7559705b73a18229f97edfc3ab6ffffcb"
+  integrity sha512-DYF7r9CJ/AksfmmB4+q+TyLMoeQPRnqtF1Pk7KY3zgfkB/nVuA3nXyzqgsIPIvnMSiFEXQcFK4z+iPxSLckZhQ==
 
-flush-write-stream@^1.0.2:
+flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+fn-name@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
+  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3475,20 +4439,12 @@ forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 fragment-cache@^0.2.1:
@@ -3497,9 +4453,16 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-fs-extra@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -3522,40 +4485,26 @@ fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
 
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.0.0, fsevents@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fsevents@^1.1.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.2.tgz#4f598f0f69b273188ef4a62ca4e9e08ace314bbf"
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.9.0"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
   dependencies:
     graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fsevents@^1.2.7:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  dependencies:
+    nan "^2.12.1"
+    node-pre-gyp "^0.12.0"
 
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
@@ -3565,6 +4514,14 @@ functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
 
+g-status@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz#270fd32119e8fc9496f066fe5fe88e0a6bc78b97"
+  dependencies:
+    arrify "^1.0.1"
+    matcher "^1.0.0"
+    simple-git "^1.85.0"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -3578,6 +4535,10 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -3604,10 +4565,21 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
+get-stdin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+  integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-stream@^4.0.0, get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -3618,19 +4590,9 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-raw-commits@^1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.4.tgz#442c3df5985b4f5689e9e43597f5194736aac001"
-  dependencies:
-    dargs "^4.0.1"
-    lodash.template "^4.0.2"
-    meow "^4.0.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-
-git-raw-commits@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
+git-raw-commits@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -3645,19 +4607,27 @@ git-remote-origin-url@^2.0.0:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
 
-git-semver-tags@^1.3.0:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.4.tgz#2ceb2a355c6d7514c123c35e297067d08caf3a92"
+git-semver-tags@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3"
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
 
-git-semver-tags@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
+git-up@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
+  integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw==
   dependencies:
-    meow "^4.0.0"
-    semver "^5.5.0"
+    is-ssh "^1.3.0"
+    parse-url "^5.0.0"
+
+git-url-parse@^11.1.2:
+  version "11.1.2"
+  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
+  integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
+  dependencies:
+    git-up "^4.0.0"
 
 gitconfiglocal@^1.0.0:
   version "1.0.0"
@@ -3700,18 +4670,26 @@ glob-stream@^6.1.0:
     to-absolute-glob "^2.0.0"
     unique-stream "^2.0.2"
 
-glob-watcher@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.1.tgz#239aaa621b6bd843b288fdf6b155f50963c7d7ea"
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+
+glob-watcher@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.3.tgz#88a8abf1c4d131eb93928994bc4a593c2e5dd626"
+  integrity sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==
   dependencies:
+    anymatch "^2.0.0"
     async-done "^1.2.0"
     chokidar "^2.0.0"
+    is-negated-glob "^1.0.0"
     just-debounce "^1.0.0"
     object.defaults "^1.1.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3738,28 +4716,10 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-globals@^11.1.0:
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
-
-globals@^11.7.0:
-  version "11.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+globals@^11.1.0, globals@^11.7.0:
+  version "11.11.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
+  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
 
 globby@^6.1.0:
   version "6.1.0"
@@ -3771,48 +4731,46 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 glogg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
   dependencies:
     sparkles "^1.0.0"
 
-got@^6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-gulp-babel@^8.0.0-beta.2:
-  version "8.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gulp-babel/-/gulp-babel-8.0.0-beta.2.tgz#0ceed820eeece53da75bbb466b56db336c4136dd"
+gulp-babel@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-babel/-/gulp-babel-8.0.0.tgz#e0da96f4f2ec4a88dd3a3030f476e38ab2126d87"
   dependencies:
     plugin-error "^1.0.1"
     replace-ext "^1.0.0"
     through2 "^2.0.0"
     vinyl-sourcemaps-apply "^0.2.0"
 
-gulp-cli@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.0.1.tgz#7847e220cb3662f2be8a6d572bf14e17be5a994b"
+gulp-cli@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc"
+  integrity sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==
   dependencies:
     ansi-colors "^1.0.1"
     archy "^1.0.0"
@@ -3824,7 +4782,7 @@ gulp-cli@^2.0.0:
     gulplog "^1.0.0"
     interpret "^1.1.0"
     isobject "^3.0.1"
-    liftoff "^2.5.0"
+    liftoff "^3.1.0"
     matchdep "^2.0.0"
     mute-stdout "^1.0.0"
     pretty-hrtime "^1.0.0"
@@ -3849,76 +4807,60 @@ gulp-newer@^1.0.0:
     kew "^0.7.0"
     plugin-error "^0.1.2"
 
-gulp-plumber@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-plumber/-/gulp-plumber-1.2.0.tgz#18ea03912c9ee483f8a5499973b5954cd90f6ad8"
+gulp-plumber@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/gulp-plumber/-/gulp-plumber-1.2.1.tgz#d38700755a300b9d372318e4ffb5ff7ced0b2c84"
   dependencies:
     chalk "^1.1.3"
     fancy-log "^1.3.2"
     plugin-error "^0.1.2"
     through2 "^2.0.3"
 
-gulp-rename@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817"
+gulp-rename@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
 
-gulp-uglify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-3.0.0.tgz#0df0331d72a0d302e3e37e109485dddf33c6d1ca"
+gulp-uglify@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-3.0.2.tgz#5f5b2e8337f879ca9dec971feb1b82a5a87850b0"
+  integrity sha512-gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg==
   dependencies:
+    array-each "^1.0.1"
+    extend-shallow "^3.0.2"
     gulplog "^1.0.0"
     has-gulplog "^0.1.0"
-    lodash "^4.13.1"
+    isobject "^3.0.1"
     make-error-cause "^1.1.1"
+    safe-buffer "^5.1.2"
     through2 "^2.0.0"
     uglify-js "^3.0.5"
     vinyl-sourcemaps-apply "^0.2.0"
 
-gulp-util@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulp-watch@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-watch/-/gulp-watch-5.0.0.tgz#6fb03ab1735972e0d2866475b568555836dfd0eb"
+gulp-watch@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/gulp-watch/-/gulp-watch-5.0.1.tgz#83d378752f5bfb46da023e73c17ed1da7066215d"
   dependencies:
+    ansi-colors "1.1.0"
     anymatch "^1.3.0"
     chokidar "^2.0.0"
+    fancy-log "1.3.2"
     glob-parent "^3.0.1"
-    gulp-util "^3.0.7"
     object-assign "^4.1.0"
     path-is-absolute "^1.0.1"
+    plugin-error "1.0.1"
     readable-stream "^2.2.2"
     slash "^1.0.0"
     vinyl "^2.1.0"
     vinyl-file "^2.0.0"
 
-gulp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.0.tgz#95766c601dade4a77ed3e7b2b6dc03881b596366"
+gulp@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
+  integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
   dependencies:
-    glob-watcher "^5.0.0"
-    gulp-cli "^2.0.0"
-    undertaker "^1.0.0"
+    glob-watcher "^5.0.3"
+    gulp-cli "^2.2.0"
+    undertaker "^1.2.1"
     vinyl-fs "^3.0.0"
 
 gulplog@^1.0.0:
@@ -3927,36 +4869,26 @@ gulplog@^1.0.0:
   dependencies:
     glogg "^1.0.0"
 
-handlebars@^4.0.2, handlebars@^4.0.3:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+handlebars@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a"
+  integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==
   dependencies:
-    async "^1.4.0"
+    async "^2.5.0"
     optimist "^0.6.1"
-    source-map "^0.4.4"
+    source-map "^0.6.1"
   optionalDependencies:
-    uglify-js "^2.6"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+    uglify-js "^3.1.4"
 
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+har-validator@~5.1.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   dependencies:
-    ajv "^5.1.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
@@ -3965,10 +4897,6 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -3987,7 +4915,7 @@ has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
 
-has-unicode@^2.0.0:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
@@ -4018,11 +4946,12 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.0, has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
-    function-bind "^1.0.2"
+    function-bind "^1.1.1"
 
 hash-base@^2.0.0:
   version "2.0.2"
@@ -4044,24 +4973,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
-hawk@3.1.3, hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 he@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -4074,38 +4985,15 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hoek@4.x.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
-home-or-tmp@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"
-
 homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
-
-hosted-git-info@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
 
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
@@ -4151,13 +5039,16 @@ htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+http-cache-semantics@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
   dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    agent-base "4"
+    debug "3.1.0"
 
 http-signature@~1.2.0:
   version "1.2.0"
@@ -4171,38 +5062,81 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
-husky@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
   dependencies:
-    is-ci "^1.0.10"
-    normalize-path "^1.0.0"
-    strip-indent "^2.0.0"
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  dependencies:
+    ms "^2.0.0"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+husky@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-2.3.0.tgz#8b78ed24d763042df7fd899991985d65a976dd13"
+  integrity sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==
+  dependencies:
+    cosmiconfig "^5.2.0"
+    execa "^1.0.0"
+    find-up "^3.0.0"
+    get-stdin "^7.0.0"
+    is-ci "^2.0.0"
+    pkg-dir "^4.1.0"
+    please-upgrade-node "^3.1.1"
+    read-pkg "^5.1.1"
+    run-node "^1.0.0"
+    slash "^3.0.0"
+
+iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@^0.4.4:
-  version "0.4.21"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
+iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
-    safer-buffer "^2.1.0"
+    safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^4.0.2:
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+
+ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
+import-fresh@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-local@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
@@ -4210,6 +5144,13 @@ import-local@^1.0.0:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
 
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4235,7 +5176,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -4247,6 +5188,19 @@ ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
+init-package-json@^1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
+  dependencies:
+    glob "^7.1.1"
+    npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0"
+    promzard "^0.3.0"
+    read "~1.0.1"
+    read-package-json "1 || 2"
+    semver "2.x || 3.x || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+    validate-npm-package-name "^3.0.0"
+
 inline-source-map@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.5.0.tgz#4a4c5dd8e4fb5e9b3cda60c822dfadcaee66e0af"
@@ -4259,41 +5213,23 @@ inline-source-map@~0.6.0:
   dependencies:
     source-map "~0.5.3"
 
-inquirer@^3.2.2:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
-inquirer@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
+inquirer@^6.2.0, inquirer@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
+  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^2.1.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.3.0"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^5.5.2"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    strip-ansi "^5.0.0"
     through "^2.3.6"
 
 insert-module-globals@^7.0.0:
@@ -4313,9 +5249,9 @@ interpret@^1.0.0, interpret@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.2.0, invariant@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688"
+invariant@^2.2.2, invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
     loose-envify "^1.0.0"
 
@@ -4323,6 +5259,14 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -4356,15 +5300,10 @@ is-buffer@^1.1.0, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
 is-ci@^1.0.10:
   version "1.1.0"
@@ -4372,6 +5311,12 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.0.0"
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  dependencies:
+    ci-info "^2.0.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4452,9 +5397,9 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
-is-generator-fn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+is-generator-fn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.0.0.tgz#038c31b774709641bda678b1f06a4e3227c10b3e"
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
@@ -4502,11 +5447,11 @@ is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
-is-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
   dependencies:
-    symbol-observable "^0.2.2"
+    symbol-observable "^1.1.0"
 
 is-odd@^2.0.0:
   version "2.0.0"
@@ -4540,6 +5485,13 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
+  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
+  dependencies:
+    isobject "^4.0.0"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -4552,10 +5504,6 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -4572,25 +5520,23 @@ is-relative@^1.0.0:
   dependencies:
     is-unc-path "^1.0.0"
 
-is-resolvable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-
-is-retry-allowed@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+is-ssh@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
+  integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==
+  dependencies:
+    protocols "^1.1.0"
 
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
-is-subset@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  dependencies:
+    has-symbols "^1.0.0"
 
 is-text-path@^1.0.0:
   version "1.0.1"
@@ -4642,384 +5588,413 @@ isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
+isobject@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
+  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
-  dependencies:
-    async "^2.1.4"
-    compare-versions "^3.1.0"
-    fileset "^2.0.2"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-hook "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-report "^1.1.4"
-    istanbul-lib-source-maps "^1.2.4"
-    istanbul-reports "^1.3.0"
-    js-yaml "^3.7.0"
-    mkdirp "^0.5.1"
-    once "^1.4.0"
-
-istanbul-lib-coverage@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
-
-istanbul-lib-hook@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805"
-  dependencies:
-    append-transform "^1.0.0"
-
-istanbul-lib-instrument@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
-  dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.2.0"
-    semver "^5.3.0"
-
-istanbul-lib-report@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
-  dependencies:
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
+istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#0b891e5ad42312c2b9488554f603795f9a2211ba"
 
-istanbul-lib-source-maps@^1.2.4:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
+istanbul-lib-instrument@^3.0.0, istanbul-lib-instrument@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.1.0.tgz#a2b5484a7d445f1f311e93190813fa56dfb62971"
   dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
+    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    istanbul-lib-coverage "^2.0.3"
+    semver "^5.5.0"
 
-istanbul-reports@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
+istanbul-lib-report@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.4.tgz#bfd324ee0c04f59119cb4f07dab157d09f24d7e4"
   dependencies:
-    handlebars "^4.0.3"
+    istanbul-lib-coverage "^2.0.3"
+    make-dir "^1.3.0"
+    supports-color "^6.0.0"
 
-jest-changed-files@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.0.tgz#f1b304f98c235af5d9a31ec524262c5e4de3c6ff"
+istanbul-lib-source-maps@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.2.tgz#f1e817229a9146e8424a28e5d69ba220fda34156"
   dependencies:
-    throat "^4.0.0"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.3"
+    make-dir "^1.3.0"
+    rimraf "^2.6.2"
+    source-map "^0.6.1"
 
-jest-cli@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.4.1.tgz#c1ffd33254caee376990aa2abe2963e0de4ca76b"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    import-local "^1.0.0"
-    is-ci "^1.0.10"
-    istanbul-api "^1.3.1"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-source-maps "^1.2.4"
-    jest-changed-files "^23.4.0"
-    jest-config "^23.4.1"
-    jest-environment-jsdom "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-haste-map "^23.4.1"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve-dependencies "^23.4.1"
-    jest-runner "^23.4.1"
-    jest-runtime "^23.4.1"
-    jest-snapshot "^23.4.1"
-    jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    jest-watcher "^23.4.0"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    node-notifier "^5.2.1"
-    prompts "^0.1.9"
-    realpath-native "^1.0.0"
-    rimraf "^2.5.4"
-    slash "^1.0.0"
-    string-length "^2.0.0"
-    strip-ansi "^4.0.0"
-    which "^1.2.12"
-    yargs "^11.0.0"
+istanbul-reports@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.1.1.tgz#72ef16b4ecb9a4a7bd0e2001e00f95d1eec8afa9"
+  integrity sha512-FzNahnidyEPBCI0HcufJoSEoKykesRlFcSzQqjH9x0+LC8tnnE/p/90PBLu8iZTxr8yYZNyTtiAujUqyN+CIxw==
+  dependencies:
+    handlebars "^4.1.0"
+
+jest-changed-files@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz#7e7eb21cf687587a85e50f3d249d1327e15b157b"
+  integrity sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==
+  dependencies:
+    "@jest/types" "^24.8.0"
+    execa "^1.0.0"
+    throat "^4.0.0"
 
-jest-config@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.4.1.tgz#3172fa21f0507d7f8a088ed1dbe4157057f201e9"
+jest-cli@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989"
+  integrity sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==
   dependencies:
-    babel-core "^6.0.0"
-    babel-jest "^23.4.0"
+    "@jest/core" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    import-local "^2.0.0"
+    is-ci "^2.0.0"
+    jest-config "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    prompts "^2.0.1"
+    realpath-native "^1.1.0"
+    yargs "^12.0.2"
+
+jest-config@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz#77db3d265a6f726294687cbbccc36f8a76ee0f4f"
+  integrity sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/test-sequencer" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    babel-jest "^24.8.0"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^23.4.0"
-    jest-environment-node "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.4.1"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
-    jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    pretty-format "^23.2.0"
-
-jest-diff@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.2.0.tgz#9f2cf4b51e12c791550200abc16b47130af1062a"
+    jest-environment-jsdom "^24.8.0"
+    jest-environment-node "^24.8.0"
+    jest-get-type "^24.8.0"
+    jest-jasmine2 "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    micromatch "^3.1.10"
+    pretty-format "^24.8.0"
+    realpath-native "^1.1.0"
+
+jest-diff@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172"
+  integrity sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==
   dependencies:
     chalk "^2.0.1"
-    diff "^3.2.0"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
-
-jest-docblock@^21.0.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
+    diff-sequences "^24.3.0"
+    jest-get-type "^24.8.0"
+    pretty-format "^24.8.0"
 
-jest-docblock@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
+jest-docblock@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd"
+  integrity sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.4.0.tgz#2fa9edd89daa1a4edc9ff9bf6062a36b71345143"
+jest-each@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz#a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"
+  integrity sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==
   dependencies:
+    "@jest/types" "^24.8.0"
     chalk "^2.0.1"
-    pretty-format "^23.2.0"
-
-jest-environment-jsdom@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
-  dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
+    jest-get-type "^24.8.0"
+    jest-util "^24.8.0"
+    pretty-format "^24.8.0"
+
+jest-environment-jsdom@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz#300f6949a146cabe1c9357ad9e9ecf9f43f38857"
+  integrity sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==
+  dependencies:
+    "@jest/environment" "^24.8.0"
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    jest-mock "^24.8.0"
+    jest-util "^24.8.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+jest-environment-node@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz#d3f726ba8bc53087a60e7a84ca08883a4c892231"
+  integrity sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==
   dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
+    "@jest/environment" "^24.8.0"
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    jest-mock "^24.8.0"
+    jest-util "^24.8.0"
 
-jest-get-type@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23"
+jest-get-type@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc"
+  integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==
 
-jest-get-type@^22.1.0:
-  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.1.0.tgz#4e90af298ed6181edc85d2da500dbd2753e0d5a9"
-
-jest-haste-map@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.4.1.tgz#43a174ba7ac079ae1dd74eaf5a5fe78989474dd2"
+jest-haste-map@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800"
+  integrity sha512-ZBPRGHdPt1rHajWelXdqygIDpJx8u3xOoLyUBWRW28r3tagrgoepPrzAozW7kW9HrQfhvmiv1tncsxqHJO1onQ==
   dependencies:
+    "@jest/types" "^24.8.0"
+    anymatch "^2.0.0"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.1.11"
-    jest-docblock "^23.2.0"
-    jest-serializer "^23.0.1"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    sane "^2.0.0"
+    graceful-fs "^4.1.15"
+    invariant "^2.2.4"
+    jest-serializer "^24.4.0"
+    jest-util "^24.8.0"
+    jest-worker "^24.6.0"
+    micromatch "^3.1.10"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^1.2.7"
 
-jest-jasmine2@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.4.1.tgz#fa192262430d418e827636e4a98423e5e7ff0fce"
+jest-jasmine2@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898"
+  integrity sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==
   dependencies:
+    "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.4.0"
-    is-generator-fn "^1.0.0"
-    jest-diff "^23.2.0"
-    jest-each "^23.4.0"
-    jest-matcher-utils "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-snapshot "^23.4.1"
-    jest-util "^23.4.0"
-    pretty-format "^23.2.0"
-
-jest-leak-detector@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz#c289d961dc638f14357d4ef96e0431ecc1aa377d"
-  dependencies:
-    pretty-format "^23.2.0"
-
-jest-matcher-utils@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz#4d4981f23213e939e3cedf23dc34c747b5ae1913"
+    expect "^24.8.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^24.8.0"
+    jest-matcher-utils "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-snapshot "^24.8.0"
+    jest-util "^24.8.0"
+    pretty-format "^24.8.0"
+    throat "^4.0.0"
+
+jest-leak-detector@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz#c0086384e1f650c2d8348095df769f29b48e6980"
+  integrity sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==
+  dependencies:
+    pretty-format "^24.8.0"
+
+jest-matcher-utils@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495"
+  integrity sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
+    jest-diff "^24.8.0"
+    jest-get-type "^24.8.0"
+    pretty-format "^24.8.0"
 
-jest-message-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
+jest-message-util@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b"
+  integrity sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==
   dependencies:
-    "@babel/code-frame" "^7.0.0-beta.35"
+    "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/stack-utils" "^1.0.1"
     chalk "^2.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
+    micromatch "^3.1.10"
+    slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
+jest-mock@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"
+  integrity sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==
+  dependencies:
+    "@jest/types" "^24.8.0"
+
+jest-pnp-resolver@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
+  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
 
-jest-regex-util@^23.3.0:
-  version "23.3.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
+jest-regex-util@^24.3.0:
+  version "24.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
+  integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
 
-jest-resolve-dependencies@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.4.1.tgz#a1d85247e2963f8b3859f6b0ec61b741b359378e"
+jest-resolve-dependencies@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0"
+  integrity sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==
   dependencies:
-    jest-regex-util "^23.3.0"
-    jest-snapshot "^23.4.1"
+    "@jest/types" "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-snapshot "^24.8.0"
 
-jest-resolve@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.4.1.tgz#7f3c17104732a2c0c940a01256025ed745814982"
+jest-resolve@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f"
+  integrity sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==
   dependencies:
+    "@jest/types" "^24.8.0"
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
-    realpath-native "^1.0.0"
-
-jest-runner@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.4.1.tgz#d41fd1459b95d35d6df685f1468c09e617c8c260"
-  dependencies:
+    jest-pnp-resolver "^1.2.1"
+    realpath-native "^1.1.0"
+
+jest-runner@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz#4f9ae07b767db27b740d7deffad0cf67ccb4c5bb"
+  integrity sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.8.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    chalk "^2.4.2"
     exit "^0.1.2"
-    graceful-fs "^4.1.11"
-    jest-config "^23.4.1"
-    jest-docblock "^23.2.0"
-    jest-haste-map "^23.4.1"
-    jest-jasmine2 "^23.4.1"
-    jest-leak-detector "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-runtime "^23.4.1"
-    jest-util "^23.4.0"
-    jest-worker "^23.2.0"
+    graceful-fs "^4.1.15"
+    jest-config "^24.8.0"
+    jest-docblock "^24.3.0"
+    jest-haste-map "^24.8.0"
+    jest-jasmine2 "^24.8.0"
+    jest-leak-detector "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-resolve "^24.8.0"
+    jest-runtime "^24.8.0"
+    jest-util "^24.8.0"
+    jest-worker "^24.6.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.4.1.tgz#c1822eba5eb19294debe6b25b2760d0a8c532fd1"
-  dependencies:
-    babel-core "^6.0.0"
-    babel-plugin-istanbul "^4.1.6"
+jest-runtime@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz#05f94d5b05c21f6dc54e427cd2e4980923350620"
+  integrity sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.8.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/transform" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/yargs" "^12.0.2"
     chalk "^2.0.1"
-    convert-source-map "^1.4.0"
     exit "^0.1.2"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.11"
-    jest-config "^23.4.1"
-    jest-haste-map "^23.4.1"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
-    jest-snapshot "^23.4.1"
-    jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    micromatch "^2.3.11"
-    realpath-native "^1.0.0"
-    slash "^1.0.0"
-    strip-bom "3.0.0"
-    write-file-atomic "^2.1.0"
-    yargs "^11.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    jest-config "^24.8.0"
+    jest-haste-map "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-mock "^24.8.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.8.0"
+    jest-snapshot "^24.8.0"
+    jest-util "^24.8.0"
+    jest-validate "^24.8.0"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    strip-bom "^3.0.0"
+    yargs "^12.0.2"
 
-jest-serializer@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+jest-serializer@^24.4.0:
+  version "24.4.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
+  integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
 
-jest-snapshot@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.4.1.tgz#090de9acae927f6a3af3005bda40d912b83e9c96"
+jest-snapshot@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"
+  integrity sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==
   dependencies:
-    babel-traverse "^6.0.0"
-    babel-types "^6.0.0"
+    "@babel/types" "^7.0.0"
+    "@jest/types" "^24.8.0"
     chalk "^2.0.1"
-    jest-diff "^23.2.0"
-    jest-matcher-utils "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-resolve "^23.4.1"
+    expect "^24.8.0"
+    jest-diff "^24.8.0"
+    jest-matcher-utils "^24.8.0"
+    jest-message-util "^24.8.0"
+    jest-resolve "^24.8.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^23.2.0"
+    pretty-format "^24.8.0"
     semver "^5.5.0"
 
-jest-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
-  dependencies:
-    callsites "^2.0.0"
+jest-util@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1"
+  integrity sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/fake-timers" "^24.8.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    callsites "^3.0.0"
     chalk "^2.0.1"
-    graceful-fs "^4.1.11"
-    is-ci "^1.0.10"
-    jest-message-util "^23.4.0"
+    graceful-fs "^4.1.15"
+    is-ci "^2.0.0"
     mkdirp "^0.5.1"
-    slash "^1.0.0"
+    slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-validate@^21.1.0:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.1.tgz#cc0cbca653cd54937ba4f2a111796774530dd3c7"
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^21.2.0"
-    leven "^2.1.0"
-    pretty-format "^21.2.1"
-
-jest-validate@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.4.0.tgz#d96eede01ef03ac909c009e9c8e455197d48c201"
+jest-validate@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849"
+  integrity sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==
   dependencies:
+    "@jest/types" "^24.8.0"
+    camelcase "^5.0.0"
     chalk "^2.0.1"
-    jest-get-type "^22.1.0"
+    jest-get-type "^24.8.0"
     leven "^2.1.0"
-    pretty-format "^23.2.0"
+    pretty-format "^24.8.0"
 
-jest-watcher@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
+jest-watcher@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz#58d49915ceddd2de85e238f6213cef1c93715de4"
+  integrity sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==
   dependencies:
+    "@jest/test-result" "^24.8.0"
+    "@jest/types" "^24.8.0"
+    "@types/yargs" "^12.0.9"
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
+    jest-util "^24.8.0"
     string-length "^2.0.0"
 
-jest-worker@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+jest-worker@^24.6.0:
+  version "24.6.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
+  integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
   dependencies:
     merge-stream "^1.0.1"
+    supports-color "^6.1.0"
 
-jest@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.4.1.tgz#39550c72f3237f63ae1b434d8d122cdf6fa007b6"
+jest@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081"
+  integrity sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==
   dependencies:
-    import-local "^1.0.0"
-    jest-cli "^23.4.1"
+    import-local "^2.0.0"
+    jest-cli "^24.8.0"
 
 js-levenshtein@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.3.tgz#3ef627df48ec8cf24bacf05c0f184ff30ef413c5"
 
-js-tokens@^3.0.0, js-tokens@^3.0.2:
+js-tokens@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
@@ -5027,16 +6002,10 @@ js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.2.1, js-yaml@^3.7.0, js-yaml@^3.9.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.2.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5076,10 +6045,6 @@ jsdom@^11.5.1:
     ws "^4.0.0"
     xml-name-validator "^3.0.0"
 
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
@@ -5092,13 +6057,9 @@ json-loader@^0.5.4:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
-json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -5112,7 +6073,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
 
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+json-stable-stringify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
@@ -5132,6 +6093,12 @@ json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
+json5@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -5193,9 +6160,9 @@ klaw@^2.1.0:
   dependencies:
     graceful-fs "^4.1.9"
 
-kleur@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-1.0.2.tgz#637f126d3cda40a423b1297da88cf753bd04ebdd"
+kleur@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.1.tgz#4f5b313f5fa315432a400f19a24db78d451ede62"
 
 labeled-stream-splicer@^2.0.0:
   version "2.0.0"
@@ -5234,6 +6201,12 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  dependencies:
+    invert-kv "^2.0.0"
+
 lead@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
@@ -5256,49 +6229,28 @@ lerna-changelog@^0.5.0:
     string.prototype.padend "^3.0.0"
     yargs "^6.6.0"
 
-lerna@^2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-2.11.0.tgz#89b5681e286d388dda5bbbdbbf6b84c8094eff65"
-  dependencies:
-    async "^1.5.0"
-    chalk "^2.1.0"
-    cmd-shim "^2.0.2"
-    columnify "^1.5.4"
-    command-join "^2.0.0"
-    conventional-changelog-cli "^1.3.13"
-    conventional-recommended-bump "^1.2.1"
-    dedent "^0.7.0"
-    execa "^0.8.0"
-    find-up "^2.1.0"
-    fs-extra "^4.0.1"
-    get-port "^3.2.0"
-    glob "^7.1.2"
-    glob-parent "^3.1.0"
-    globby "^6.1.0"
-    graceful-fs "^4.1.11"
-    hosted-git-info "^2.5.0"
-    inquirer "^3.2.2"
-    is-ci "^1.0.10"
-    load-json-file "^4.0.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
+lerna@^3.14.2:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.15.0.tgz#b044dba8138d7a1a8dd48ac1d80e7541bdde0d1f"
+  integrity sha512-kRIQ3bgzkmew5/WZQ0C9WjH0IUf3ZmTNnBwTHfXgLkVY7td0lbwMQFD7zehflUn0zG4ou54o/gn+IfjF0ti/5A==
+  dependencies:
+    "@lerna/add" "3.15.0"
+    "@lerna/bootstrap" "3.15.0"
+    "@lerna/changed" "3.15.0"
+    "@lerna/clean" "3.15.0"
+    "@lerna/cli" "3.13.0"
+    "@lerna/create" "3.15.0"
+    "@lerna/diff" "3.15.0"
+    "@lerna/exec" "3.15.0"
+    "@lerna/import" "3.15.0"
+    "@lerna/init" "3.15.0"
+    "@lerna/link" "3.15.0"
+    "@lerna/list" "3.15.0"
+    "@lerna/publish" "3.15.0"
+    "@lerna/run" "3.15.0"
+    "@lerna/version" "3.15.0"
+    import-local "^1.0.0"
     npmlog "^4.1.2"
-    p-finally "^1.0.0"
-    package-json "^4.0.1"
-    path-exists "^3.0.0"
-    read-cmd-shim "^1.0.1"
-    read-pkg "^3.0.0"
-    rimraf "^2.6.1"
-    safe-buffer "^5.1.1"
-    semver "^5.4.1"
-    signal-exit "^3.0.2"
-    slash "^1.0.0"
-    strong-log-transformer "^1.0.6"
-    temp-write "^3.3.0"
-    write-file-atomic "^2.3.0"
-    write-json-file "^2.2.0"
-    write-pkg "^3.1.0"
-    yargs "^8.0.2"
 
 leven@^2.1.0:
   version "2.1.0"
@@ -5317,12 +6269,13 @@ lexical-scope@^1.2.0:
   dependencies:
     astw "^2.0.0"
 
-liftoff@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
+liftoff@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
+  integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
   dependencies:
     extend "^3.0.0"
-    findup-sync "^2.0.0"
+    findup-sync "^3.0.0"
     fined "^1.0.1"
     flagged-respawn "^1.0.0"
     is-plain-object "^2.0.4"
@@ -5330,38 +6283,44 @@ liftoff@^2.5.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-lint-staged@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.1.1.tgz#cd08c4d9b8ccc2d37198d1c47ce77d22be6cf324"
+lint-staged@^8.1.7:
+  version "8.1.7"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.7.tgz#a8988bc83bdffa97d04adb09dbc0b1f3a58fa6fc"
+  integrity sha512-egT0goFhIFoOGk6rasPngTFh2qDqxZddM0PwI58oi66RxCDcn5uDwxmiasWIF0qGnchHSYVJ8HPRD5LrFo7TKA==
   dependencies:
-    app-root-path "^2.0.0"
-    chalk "^2.1.0"
-    commander "^2.11.0"
-    cosmiconfig "^4.0.0"
+    chalk "^2.3.1"
+    commander "^2.14.1"
+    cosmiconfig "^5.2.0"
     debug "^3.1.0"
     dedent "^0.7.0"
-    execa "^0.8.0"
+    del "^3.0.0"
+    execa "^1.0.0"
     find-parent-dir "^0.3.0"
+    g-status "^2.0.2"
     is-glob "^4.0.0"
-    jest-validate "^21.1.0"
-    listr "^0.13.0"
-    lodash "^4.17.4"
-    log-symbols "^2.0.0"
-    minimatch "^3.0.0"
+    is-windows "^1.0.2"
+    listr "^0.14.2"
+    listr-update-renderer "^0.5.0"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    micromatch "^3.1.8"
     npm-which "^3.0.1"
     p-map "^1.1.1"
     path-is-inside "^1.0.2"
     pify "^3.0.0"
-    staged-git-files "1.0.0"
-    stringify-object "^3.2.0"
+    please-upgrade-node "^3.0.2"
+    staged-git-files "1.1.2"
+    string-argv "^0.0.2"
+    stringify-object "^3.2.2"
+    yup "^0.27.0"
 
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
 
-listr-update-renderer@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7"
+listr-update-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
   dependencies:
     chalk "^1.1.3"
     cli-truncate "^0.2.1"
@@ -5369,39 +6328,31 @@ listr-update-renderer@^0.4.0:
     figures "^1.7.0"
     indent-string "^3.0.0"
     log-symbols "^1.0.2"
-    log-update "^1.0.2"
+    log-update "^2.3.0"
     strip-ansi "^3.0.1"
 
-listr-verbose-renderer@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
+listr-verbose-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
   dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
+    chalk "^2.4.1"
+    cli-cursor "^2.1.0"
     date-fns "^1.27.2"
-    figures "^1.7.0"
+    figures "^2.0.0"
 
-listr@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
+listr@^0.14.2:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
   dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    figures "^1.7.0"
-    indent-string "^2.1.0"
-    is-observable "^0.2.0"
+    "@samverschueren/stream-to-observable" "^0.3.0"
+    is-observable "^1.1.0"
     is-promise "^2.1.0"
     is-stream "^1.1.0"
     listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.4.0"
-    listr-verbose-renderer "^0.4.0"
-    log-symbols "^1.0.2"
-    log-update "^1.0.2"
-    ora "^0.2.3"
-    p-map "^1.1.1"
-    rxjs "^5.4.2"
-    stream-to-observable "^0.2.0"
-    strip-ansi "^3.0.1"
+    listr-update-renderer "^0.5.0"
+    listr-verbose-renderer "^0.5.0"
+    p-map "^2.0.0"
+    rxjs "^6.3.3"
 
 load-json-file@^1.0.0:
   version "1.1.0"
@@ -5450,75 +6401,44 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-
-lodash._reevaluate@^3.0.0:
+locate-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
 
-lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
+lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash.clone@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
 
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
+lodash.ismatch@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
 
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
 
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+lodash.set@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
+  integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
 
 lodash.some@^4.2.2:
   version "4.6.0"
@@ -5528,47 +6448,30 @@ lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
 lodash.template@^4.0.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  dependencies:
-    lodash._reinterpolate "~3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
   dependencies:
     lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
+    lodash.templatesettings "^4.0.0"
 
 lodash.templatesettings@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
 
-lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.10, lodash@^4.17.5:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1:
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
+  integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==
 
 log-symbols@^1.0.2:
   version "1.0.2"
@@ -5576,18 +6479,19 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
-log-symbols@^2.0.0:
+log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   dependencies:
     chalk "^2.0.1"
 
-log-update@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
+log-update@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
   dependencies:
-    ansi-escapes "^1.0.0"
-    cli-cursor "^1.0.2"
+    ansi-escapes "^3.0.0"
+    cli-cursor "^2.0.0"
+    wrap-ansi "^3.0.1"
 
 longest@^1.0.1:
   version "1.0.1"
@@ -5610,20 +6514,37 @@ lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lowercase-keys@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-
-lru-cache@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-make-dir@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b"
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+macos-release@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
+  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
+
+magic-string@^0.25.2:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+make-dir@^1.0.0, make-dir@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
@@ -5637,6 +6558,22 @@ make-error@^1.2.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"
 
+make-fetch-happen@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.0.1"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
 make-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.0.tgz#57bef5dc85d23923ba23767324d8e8f8f3d9694b"
@@ -5649,6 +6586,12 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -5676,6 +6619,12 @@ matchdep@^2.0.0:
     resolve "^1.4.0"
     stack-trace "0.0.10"
 
+matcher@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2"
+  dependencies:
+    escape-string-regexp "^1.0.4"
+
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
@@ -5689,6 +6638,14 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+mem@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^1.0.0"
+    p-is-promise "^1.1.0"
+
 memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -5731,11 +6688,11 @@ merge-stream@^1.0.1:
   dependencies:
     readable-stream "^2.0.1"
 
-merge@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+merge2@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
 
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.1.5:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -5753,27 +6710,10 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.0.4, micromatch@^3.1.4:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-micromatch@^3.1.8:
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5796,15 +6736,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@~1.33.0:
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.7:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
   dependencies:
-    mime-db "~1.33.0"
+    mime-db "~1.38.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -5818,7 +6760,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@^3.0.0, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -5831,35 +6773,42 @@ minimist-options@^3.0.1:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
-
 minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-minipass@^2.2.1, minipass@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.4.tgz#03c824d84551ec38a8d1bb5bc350a5a30a354a40"
+minipass@^2.2.1, minipass@^2.3.4, minipass@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   dependencies:
-    safe-buffer "^5.1.1"
+    safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+minizlib@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
   dependencies:
     minipass "^2.2.1"
 
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -5867,7 +6816,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -5897,15 +6846,26 @@ module-deps@^6.0.0:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-moment@^2.6.0:
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-multimatch@^2.0.0:
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
+multimatch@^2.0.0, multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
   dependencies:
@@ -5914,27 +6874,18 @@ multimatch@^2.0.0:
     arrify "^1.0.0"
     minimatch "^3.0.0"
 
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  dependencies:
-    duplexer2 "0.0.2"
-
 mute-stdout@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.0.tgz#5b32ea07eb43c9ded6130434cf926f46b2a7fd4d"
 
-mute-stream@0.0.7:
+mute-stream@0.0.7, mute-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.3.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
-
-nan@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+nan@^2.12.1:
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
 nanomatch@^1.2.9:
   version "1.2.9"
@@ -5963,9 +6914,9 @@ ncname@1.0.x:
   dependencies:
     xml-char-classes "^1.0.0"
 
-needle@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.0.tgz#f14efc69cee1024b72c8b21c7bdf94a731dc12fa"
+needle@^2.2.1:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -5985,6 +6936,14 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
 node-fetch@^1.7.0:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -5992,6 +6951,28 @@ node-fetch@^1.7.0:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-fetch@^2.3.0, node-fetch@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
+node-gyp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz#972654af4e5dd0cd2a19081b4b46fe0442ba6f45"
+  integrity sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==
+  dependencies:
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^4.4.8"
+    which "1"
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -6037,43 +7018,35 @@ node-notifier@^5.2.1:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
-  dependencies:
-    detect-libc "^1.0.2"
-    hawk "3.1.3"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "2.81.0"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
-node-pre-gyp@^0.9.0:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
+node-pre-gyp@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
-    needle "^2.2.0"
+    needle "^2.2.1"
     nopt "^4.0.1"
     npm-packlist "^1.1.6"
     npmlog "^4.0.2"
-    rc "^1.1.7"
+    rc "^1.2.7"
     rimraf "^2.6.1"
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.11:
-  version "1.0.0-alpha.11"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a"
+node-releases@^1.1.19:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.19.tgz#c492d1e381fea0350b338b646c27867e88e91b3d"
+  integrity sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA==
   dependencies:
     semver "^5.3.0"
 
+"nopt@2 || 3":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  dependencies:
+    abbrev "1"
+
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -6081,25 +7054,32 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
+    resolve "^1.10.0"
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-url@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
+
 now-and-later@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.0.tgz#bc61cbb456d79cb32207ce47ca05136ff2e7d6ee"
@@ -6110,9 +7090,33 @@ npm-bundled@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
 
-npm-packlist@^1.1.6:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+npm-lifecycle@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.1.tgz#0027c09646f0fd346c5c93377bdaba59c6748fdf"
+  integrity sha512-+Vg6I60Z75V/09pdcH5iUo/99Q/vop35PaI99elvxk56azSVVsdsSsS/sXqKDNwbRRNN1qSxkcO45ZOu0yOWew==
+  dependencies:
+    byline "^5.0.0"
+    graceful-fs "^4.1.15"
+    node-gyp "^4.0.0"
+    resolve-from "^4.0.0"
+    slide "^1.1.6"
+    uid-number "0.0.6"
+    umask "^1.1.0"
+    which "^1.3.1"
+
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.12, npm-packlist@^1.1.6, npm-packlist@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
+  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -6123,6 +7127,14 @@ npm-path@^2.0.2:
   dependencies:
     which "^1.2.10"
 
+npm-pick-manifest@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  dependencies:
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6137,7 +7149,7 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-npmlog@^4.0.2, npmlog@^4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -6160,13 +7172,9 @@ nwmatcher@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
@@ -6180,9 +7188,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.6, object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.0.8:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
@@ -6242,16 +7251,17 @@ object.reduce@^1.0.0:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
 
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0:
+octokit-pagination-methods@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
+  integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
+
+once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -6276,15 +7286,6 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-ora@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
-  dependencies:
-    chalk "^1.1.1"
-    cli-cursor "^1.0.2"
-    cli-spinners "^0.1.2"
-    object-assign "^4.0.1"
-
 ordered-read-streams@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
@@ -6313,11 +7314,27 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+os-locale@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  dependencies:
+    execa "^0.10.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
+os-name@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
+  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
+  dependencies:
+    macos-release "^2.2.0"
+    windows-release "^3.1.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@^0.1.4:
+osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
@@ -6332,49 +7349,115 @@ output-file-sync@^2.0.0:
     is-plain-obj "^1.1.0"
     mkdirp "^0.5.1"
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+
+p-each-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+
 p-limit@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
   dependencies:
     p-try "^1.0.0"
 
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   dependencies:
     p-limit "^1.1.0"
 
-p-map@^1.1.1:
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  dependencies:
+    p-limit "^2.0.0"
+
+p-map-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
+  dependencies:
+    p-reduce "^1.0.0"
+
+p-map@^1.1.1, p-map@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
 
+p-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
+
+p-pipe@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
+
+p-queue@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346"
+  integrity sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==
+  dependencies:
+    eventemitter3 "^3.1.0"
+
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
-package-json@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
+p-waterfall@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00"
   dependencies:
-    got "^6.7.1"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
+    p-reduce "^1.0.0"
 
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
 
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
 param-case@2.1.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   dependencies:
     no-case "^2.2.0"
 
+parent-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5"
+  dependencies:
+    callsites "^3.0.0"
+
 parents@^1.0.0, parents@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
@@ -6425,10 +7508,32 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-node-version@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
+parse-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"
+  integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA==
+  dependencies:
+    is-ssh "^1.3.0"
+    protocols "^1.4.0"
+
+parse-url@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
+  integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg==
+  dependencies:
+    is-ssh "^1.3.0"
+    normalize-url "^3.3.0"
+    parse-path "^4.0.0"
+    protocols "^1.4.0"
+
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -6473,9 +7578,9 @@ path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
 
 path-platform@~0.11.15:
   version "0.11.15"
@@ -6521,10 +7626,6 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -6537,6 +7638,11 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -6547,9 +7653,10 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pirates@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.0.tgz#850b18781b4ac6ec58a43c9ed9ec5fe6796addbd"
+pirates@^4.0.0, pirates@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
   dependencies:
     node-modules-regexp "^1.0.0"
 
@@ -6559,17 +7666,26 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
   dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
+    find-up "^3.0.0"
 
-plugin-error@^1.0.1:
+pkg-dir@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.1.0.tgz#aaeb91c0d3b9c4f74a44ad849f4de34781ae01de"
+  integrity sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==
+  dependencies:
+    find-up "^3.0.0"
+
+please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
+  dependencies:
+    semver-compare "^1.0.0"
+
+plugin-error@1.0.1, plugin-error@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
   dependencies:
@@ -6578,9 +7694,15 @@ plugin-error@^1.0.1:
     arr-union "^3.1.0"
     extend-shallow "^3.0.2"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+plugin-error@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
+  dependencies:
+    ansi-cyan "^0.1.1"
+    ansi-red "^0.1.1"
+    arr-diff "^1.0.1"
+    arr-union "^2.0.1"
+    extend-shallow "^1.1.2"
 
 pn@^1.1.0:
   version "1.1.0"
@@ -6594,37 +7716,36 @@ prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
-prepend-http@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.13.7:
-  version "1.13.7"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
-
-pretty-format@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36"
+prettier-linter-helpers@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
   dependencies:
-    ansi-regex "^3.0.0"
-    ansi-styles "^3.2.0"
+    fast-diff "^1.1.2"
 
-pretty-format@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.2.0.tgz#3b0aaa63c018a53583373c1cb3a5d96cc5e83017"
+prettier@^1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"
+  integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==
+
+pretty-format@^24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
+  integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
   dependencies:
-    ansi-regex "^3.0.0"
+    "@jest/types" "^24.8.0"
+    ansi-regex "^4.0.0"
     ansi-styles "^3.2.0"
+    react-is "^16.8.4"
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
 
-private@^0.1.6, private@^0.1.7, private@~0.1.5:
+private@^0.1.6, private@~0.1.5:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
 
@@ -6648,12 +7769,49 @@ progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
 
-prompts@^0.1.9:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.12.tgz#39dc42de7d2f0ec3e2af76bf40713fcb8726090d"
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
+prompts@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.0.1.tgz#201b3718b4276fb407f037db48c0029d6465245c"
+  dependencies:
+    kleur "^3.0.0"
+    sisteransi "^1.0.0"
+
+promzard@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  dependencies:
+    read "1"
+
+property-expr@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
+  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+
+protocols@^1.1.0, protocols@^1.4.0:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32"
+  integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==
+
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
   dependencies:
-    kleur "^1.0.0"
-    sisteransi "^0.1.1"
+    genfun "^5.0.0"
 
 prr@~1.0.1:
   version "1.0.1"
@@ -6663,6 +7821,10 @@ pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+psl@^1.1.24:
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+
 public-encrypt@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
@@ -6673,25 +7835,25 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-pump@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.5:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb"
+pumpify@^1.3.3, pumpify@^1.3.5:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   dependencies:
-    duplexify "^3.5.3"
+    duplexify "^3.6.0"
     inherits "^2.0.3"
     pump "^2.0.0"
 
@@ -6704,20 +7866,16 @@ punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 punycode@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
 
-q@^1.4.1, q@^1.5.1:
+q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
 querystring-es3@^0.2.0, querystring-es3@~0.2.0:
   version "0.2.1"
@@ -6751,7 +7909,7 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-rc@^1.0.1, rc@^1.1.6:
+rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   dependencies:
@@ -6760,14 +7918,10 @@ rc@^1.0.1, rc@^1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-rc@^1.1.7:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
+react-is@^16.8.4:
+  version "16.8.4"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
+  integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
 
 read-cmd-shim@^1.0.1:
   version "1.0.1"
@@ -6781,6 +7935,27 @@ read-only-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
+"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@^5.1.6:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6802,7 +7977,14 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^1.0.0, read-pkg@^1.1.0:
+read-pkg-up@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^3.0.0"
+
+read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   dependencies:
@@ -6826,16 +8008,23 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@>=1.1.13-1 <1.2.0-0", readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+read-pkg@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+  integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^4.0.0"
+    type-fest "^0.4.1"
+
+read@1, read@~1.0.1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
+  dependencies:
+    mute-stream "~0.0.4"
 
-readable-stream@^2.0.0, readable-stream@^2.0.4:
+"readable-stream@1 || 2", "readable-stream@2 || 3", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -6847,17 +8036,14 @@ readable-stream@^2.0.0, readable-stream@^2.0.4:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+"readable-stream@>=1.1.13-1 <1.2.0-0":
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
     core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
 
 readable-stream@~2.0.0:
   version "2.0.6"
@@ -6870,18 +8056,28 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
   dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
     graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
+    once "^1.3.0"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
     readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
 
-realpath-native@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.0.tgz#7885721a83b43bd5327609f0ddecb2482305fdf0"
+realpath-native@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
   dependencies:
     util.promisify "^1.0.0"
 
@@ -6914,37 +8110,26 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-regenerate-unicode-properties@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-5.1.3.tgz#54f5891543468f36f2274b67c6bc4c033c27b308"
-  dependencies:
-    regenerate "^1.3.3"
-
-regenerate-unicode-properties@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
+regenerate-unicode-properties@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"
+  integrity sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==
   dependencies:
     regenerate "^1.4.0"
 
-regenerate@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
-
 regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
-regenerator-runtime@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.0.tgz#8052ac952d85b10f3425192cd0c53f45cf65c6cb"
-
-regenerator-transform@^0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
+regenerator-transform@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
+  integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
   dependencies:
     private "^0.1.6"
 
@@ -6961,68 +8146,34 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
-  dependencies:
-    define-properties "^1.1.2"
-
-regexpp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
+regexp-tree@^0.1.6:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.10.tgz#d837816a039c7af8a8d64d7a7c3cf6a1d93450bc"
+  integrity sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==
 
-regexpu-core@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.1.3.tgz#fb81616dbbc2a917a7419b33f8379144f51eb8d0"
-  dependencies:
-    regenerate "^1.3.3"
-    regenerate-unicode-properties "^5.1.1"
-    regjsgen "^0.3.0"
-    regjsparser "^0.2.1"
-    unicode-match-property-ecmascript "^1.0.3"
-    unicode-match-property-value-ecmascript "^1.0.1"
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
 
-regexpu-core@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d"
+regexpu-core@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
+  integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^7.0.0"
-    regjsgen "^0.4.0"
-    regjsparser "^0.3.0"
+    regenerate-unicode-properties "^8.0.2"
+    regjsgen "^0.5.0"
+    regjsparser "^0.6.0"
     unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.0.2"
-
-registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
-
-registry-url@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  dependencies:
-    rc "^1.0.1"
-
-regjsgen@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.3.0.tgz#0ee4a3e9276430cda25f1e789ea6c15b87b0cb43"
-
-regjsgen@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
+    unicode-match-property-value-ecmascript "^1.1.0"
 
-regjsparser@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.2.1.tgz#c3787553faf04e775c302102ef346d995000ec1c"
-  dependencies:
-    jsesc "~0.5.0"
+regjsgen@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
 
-regjsparser@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
+regjsparser@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
   dependencies:
     jsesc "~0.5.0"
 
@@ -7093,79 +8244,39 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@^2.83.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+request@^2.83.0, request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   dependencies:
     aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
+    aws4 "^1.8.0"
     caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
     performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
     tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
+    uuid "^3.3.2"
 
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-from-string@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff"
-
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -7179,14 +8290,14 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+
 resolve-options@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
@@ -7200,31 +8311,14 @@ resolve-url@^0.2.1:
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@^1.4.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  dependencies:
-    path-parse "^1.0.5"
-
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18"
+  integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==
   dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
+    path-parse "^1.0.6"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
@@ -7237,17 +8331,21 @@ ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
 
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   dependencies:
-    glob "^7.0.5"
+    glob "^7.1.3"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"
@@ -7256,37 +8354,53 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-babel@^4.0.0-beta.0:
-  version "4.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.0.0-beta.2.tgz#abc05af4644aa52180e3fa2452f909b39b4ef145"
+rollup-plugin-babel@^4.0.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.3.2.tgz#8c0e1bd7aa9826e90769cf76895007098ffd1413"
+  integrity sha512-KfnizE258L/4enADKX61ozfwGHoqYauvoofghFJBhFnpH9Sb9dNPpWg8QHOaAfVASUYV8w0mCx430i9z0LJoJg==
   dependencies:
-    "@babel/helper-module-imports" "7.0.0-beta.35"
-    rollup-pluginutils "^2.0.1"
+    "@babel/helper-module-imports" "^7.0.0"
+    rollup-pluginutils "^2.3.0"
 
-rollup-plugin-node-resolve@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.3.tgz#8f57b253edd00e5b0ad0aed7b7e9cf5982e98fa4"
+rollup-plugin-node-resolve@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.0.0.tgz#754abf4841ed4bab2241551cba0a11d04c57f290"
+  integrity sha512-JUFr7DkFps3div9DYwpSg0O+s8zuSSRASUZUVNx6h6zhw2m8vcpToeS68JDPsFbmisMVSMYK0IxftngCRv7M9Q==
   dependencies:
-    builtin-modules "^1.1.0"
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
     is-module "^1.0.0"
-    resolve "^1.1.6"
+    resolve "^1.10.1"
+    rollup-pluginutils "^2.7.0"
 
-rollup-pluginutils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+rollup-plugin-replace@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3"
+  integrity sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==
+  dependencies:
+    magic-string "^0.25.2"
+    rollup-pluginutils "^2.6.0"
+
+rollup-pluginutils@^2.3.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.7.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.7.1.tgz#a7915ce8b12c177364784bf38a1590cc6c2c8250"
+  integrity sha512-3nRf3buQGR9qz/IsSzhZAJyoK663kzseps8itkYHr+Z7ESuaffEPfgRinxbCRA0pf0gzLqkNKkSb8aNVTq75NA==
   dependencies:
-    estree-walker "^0.3.0"
-    micromatch "^2.3.11"
+    estree-walker "^0.6.0"
+    micromatch "^3.1.10"
 
-rollup-stream@^1.24.1:
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/rollup-stream/-/rollup-stream-1.24.1.tgz#9bc002afba51c517e6daa3e17f9559580a460f89"
+rollup@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.12.0.tgz#3e07e7d178bf61fe12325660a037ae0041219d8c"
+  integrity sha512-DFqgTupu9dkoS80AZ4xMgeLCeC96pGRCu1MLlOwRAjJ3qGItw+j4YWcL3/uWbgQO2mnmrAZphxAdjSXYsG5pWA==
   dependencies:
-    rollup "^0.49.2"
+    "@types/estree" "0.0.39"
+    "@types/node" "^12.0.2"
+    acorn "^6.1.1"
 
-rollup@^0.49.2:
-  version "0.49.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.49.3.tgz#4cce32643dd8cf2154c69ff0e43470067db0adbf"
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
 
 run-async@^2.2.0:
   version "2.3.0"
@@ -7294,31 +8408,26 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+run-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
 
-rxjs@^5.4.2:
-  version "5.5.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
   dependencies:
-    symbol-observable "1.0.1"
+    aproba "^1.1.1"
 
-rxjs@^5.5.2:
-  version "5.5.11"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
+rxjs@^6.3.3, rxjs@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
-    symbol-observable "1.0.1"
+    tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
 safe-regex@^1.1.0:
   version "1.1.0"
@@ -7326,37 +8435,51 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sane@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.4.1.tgz#29f991208cf28636720efdc584293e7fd66663a5"
+sane@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.3.tgz#e878c3f19e25cc57fbb734602f48f8a97818b181"
+  integrity sha512-hSLkC+cPHiBQs7LSyXkotC3UUtyn8C4FMn50TNaacRyvBlI+3ebcxMpqckmTdtXVtel87YS7GXN3UIOj7NiGVQ==
   dependencies:
-    anymatch "^1.3.0"
-    exec-sh "^0.2.0"
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
     fb-watchman "^2.0.0"
-    minimatch "^3.0.2"
+    micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.18.0"
-  optionalDependencies:
-    fsevents "^1.1.1"
 
 sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+
 semver-greatest-satisfied-range@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
   dependencies:
     sver-compat "^1.5.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+
+semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
+semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -7368,10 +8491,6 @@ set-getter@^0.1.0:
   dependencies:
     to-object-path "^0.3.0"
 
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -7435,9 +8554,15 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sisteransi@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
+simple-git@^1.85.0:
+  version "1.107.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz#12cffaf261c14d6f450f7fdb86c21ccee968b383"
+  dependencies:
+    debug "^4.0.1"
+
+sisteransi@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
 
 slash@^1.0.0:
   version "1.0.0"
@@ -7447,16 +8572,32 @@ slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-slice-ansi@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
   dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+slide@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+smart-buffer@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -7484,17 +8625,19 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^2.0.0"
 
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+socks-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
   dependencies:
-    hoek "2.x.x"
+    agent-base "~4.2.0"
+    socks "~2.2.0"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+socks@~2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.2.tgz#f061219fc2d4d332afb4af93e865c84d3fa26e2b"
   dependencies:
-    hoek "4.x.x"
+    ip "^1.1.5"
+    smart-buffer "^4.0.1"
 
 sort-keys@^2.0.0:
   version "2.0.0"
@@ -7516,20 +8659,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.15:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  dependencies:
-    source-map "^0.5.6"
-
-source-map-support@^0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.9:
+source-map-support@^0.5.6, source-map-support@^0.5.9:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
   dependencies:
@@ -7540,19 +8670,24 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
-source-map@^0.4.4, source-map@~0.4.0, source-map@~0.4.2:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+source-map@~0.4.0, source-map@~0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+sourcemap-codec@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
+  integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
 sparkles@^1.0.0:
   version "1.0.0"
@@ -7616,6 +8751,12 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+ssri@^6.0.0, ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  dependencies:
+    figgy-pudding "^3.5.1"
+
 stack-trace@0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
@@ -7624,9 +8765,9 @@ stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
-staged-git-files@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.0.0.tgz#cdb847837c1fcc52c08a872d4883cc0877668a80"
+staged-git-files@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
 
 static-extend@^0.1.1:
   version "0.1.2"
@@ -7653,6 +8794,13 @@ stream-combiner2@^1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
 stream-exhaust@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
@@ -7678,18 +8826,16 @@ stream-splicer@^2.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-stream-to-observable@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
-  dependencies:
-    any-observable "^0.2.0"
-
 streamfilter@^1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.7.tgz#ae3e64522aa5a35c061fd17f67620c7653c643c9"
   dependencies:
     readable-stream "^2.0.2"
 
+string-argv@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
+
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
@@ -7712,15 +8858,14 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string.prototype.matchall@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
+string-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz#5a1690a57cc78211fffd9bf24bbe24d090604eb1"
+  integrity sha512-rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.10.0"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    regexp.prototype.flags "^1.2.0"
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.0.0"
 
 string.prototype.padend@^3.0.0:
   version "3.0.0"
@@ -7730,13 +8875,7 @@ string.prototype.padend@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0, string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@^1.1.1, string_decoder@~1.1.1:
+string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   dependencies:
@@ -7746,7 +8885,7 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-stringify-object@^3.2.0:
+stringify-object@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
   dependencies:
@@ -7754,10 +8893,6 @@ stringify-object@^3.2.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -7770,6 +8905,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  dependencies:
+    ansi-regex "^4.0.0"
+
 strip-bom-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
@@ -7777,16 +8918,16 @@ strip-bom-stream@^2.0.0:
     first-chunk-stream "^2.0.0"
     strip-bom "^2.0.0"
 
-strip-bom@3.0.0, strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -7805,14 +8946,12 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-strong-log-transformer@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3"
+strong-log-transformer@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
   dependencies:
-    byline "^5.0.0"
     duplexer "^0.1.1"
-    minimist "^0.1.0"
-    moment "^2.6.0"
+    minimist "^1.2.0"
     through "^2.3.4"
 
 subarg@^1.0.0:
@@ -7825,12 +8964,6 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.2:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -7843,6 +8976,12 @@ supports-color@^5.2.0, supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.0.0, supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  dependencies:
+    has-flag "^3.0.0"
+
 sver-compat@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
@@ -7850,77 +8989,56 @@ sver-compat@^1.5.0:
     es6-iterator "^2.0.1"
     es6-symbol "^3.1.1"
 
-symbol-observable@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-
-symbol-observable@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
+symbol-observable@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
 
 symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
+synchronous-promise@^2.0.6:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.8.tgz#01fd026fffdbf2d3d39ec06ee1a7c971578136f7"
+  integrity sha512-xYavZtFC1vKgJu0AOSYdrLeikNCsNwmUeZaV1XF9cMqEhBVVxLq6rEbYzOGrF1MV2MNPkhsJqqiXuQ4a76CEUg==
+
 syntax-error@^1.1.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c"
   dependencies:
     acorn-node "^1.2.0"
 
-table@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
+table@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2"
+  integrity sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==
   dependencies:
-    ajv "^6.0.1"
-    ajv-keywords "^3.0.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
+    ajv "^6.9.1"
+    lodash "^4.17.11"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
 
 tapable@^0.2.7:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
 
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-tar@^4:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.1.tgz#b25d5a8470c976fd7a9a8a350f42c59e9fa81749"
+tar@^4, tar@^4.4.8:
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
   dependencies:
-    chownr "^1.0.1"
+    chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.2.4"
-    minizlib "^1.1.0"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
     mkdirp "^0.5.0"
-    safe-buffer "^5.1.1"
+    safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
 temp-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
 
-temp-write@^3.3.0:
+temp-write@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492"
   dependencies:
@@ -7931,21 +9049,13 @@ temp-write@^3.3.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-tempfile@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
-  dependencies:
-    os-tmpdir "^1.0.0"
-    uuid "^2.0.1"
-
-test-exclude@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
+test-exclude@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.0.0.tgz#cdce7cece785e0e829cd5c2b27baf18bc583cfb7"
   dependencies:
     arrify "^1.0.1"
-    micromatch "^3.1.8"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
+    minimatch "^3.0.4"
+    read-pkg-up "^4.0.0"
     require-main-filename "^1.0.1"
 
 test262-parser@^2.0.7:
@@ -7989,12 +9099,19 @@ through2@^1.0.0:
     xtend ">=4.0.0 <4.1.0-0"
 
 through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   dependencies:
-    readable-stream "^2.1.5"
+    readable-stream "~2.3.6"
     xtend "~4.0.1"
 
+through2@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -8003,10 +9120,6 @@ time-stamp@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
 
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-
 timers-browserify@^1.0.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
@@ -8040,10 +9153,6 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -8076,13 +9185,19 @@ to-through@^2.0.0:
   dependencies:
     through2 "^2.0.3"
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
   dependencies:
+    psl "^1.1.24"
     punycode "^1.4.1"
 
-tr46@^1.0.0:
+tr46@^1.0.0, tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   dependencies:
@@ -8104,6 +9219,10 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -8128,18 +9247,23 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+  integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
+
 typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-uglify-js@3.3.x, uglify-js@^3.0.5:
+uglify-js@3.3.x, uglify-js@^3.0.5, uglify-js@^3.1.4:
   version "3.3.13"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.13.tgz#8a1a89eeb16e2d6a66b0db2b04cb871af3c669cf"
   dependencies:
     commander "~2.14.1"
     source-map "~0.6.1"
 
-uglify-js@^2.4.16, uglify-js@^2.6, uglify-js@^2.8.29:
+uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -8160,10 +9284,14 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-uid-number@^0.0.6:
+uid-number@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
+umask@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+
 umd@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
@@ -8176,9 +9304,10 @@ undertaker-registry@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
 
-undertaker@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.0.tgz#339da4646252d082dc378e708067299750e11b49"
+undertaker@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.1.tgz#701662ff8ce358715324dfd492a4f036055dfe4b"
+  integrity sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==
   dependencies:
     arr-flatten "^1.0.1"
     arr-map "^2.0.0"
@@ -8190,21 +9319,10 @@ undertaker@^1.0.0:
     object.reduce "^1.0.0"
     undertaker-registry "^1.0.0"
 
-unicode-canonical-property-names-ecmascript@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.3.tgz#f6119f417467593c0086357c85546b6ad5abc583"
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
 
-unicode-match-property-ecmascript@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.3.tgz#db9b1cb4ffc67e0c5583780b1b59370e4cbe97b9"
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.2"
-    unicode-property-aliases-ecmascript "^1.0.3"
-
 unicode-match-property-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
@@ -8212,17 +9330,10 @@ unicode-match-property-ecmascript@^1.0.4:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
 
-unicode-match-property-value-ecmascript@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.1.tgz#fea059120a016f403afd3bf586162b4db03e0604"
-
-unicode-match-property-value-ecmascript@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
-
-unicode-property-aliases-ecmascript@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.3.tgz#ac3522583b9e630580f916635333e00c5ead690d"
+unicode-match-property-value-ecmascript@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
+  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
 
 unicode-property-aliases-ecmascript@^1.0.4:
   version "1.0.4"
@@ -8237,6 +9348,18 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  dependencies:
+    imurmurhash "^0.1.4"
+
 unique-stream@^2.0.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
@@ -8244,6 +9367,13 @@ unique-stream@^2.0.2:
     json-stable-stringify "^1.0.0"
     through2-filter "^2.0.0"
 
+universal-user-agent@^2.0.0, universal-user-agent@^2.0.1, universal-user-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.1.0.tgz#5abfbcc036a1ba490cb941f8fd68c46d3669e8e4"
+  integrity sha512-8itiX7G05Tu3mGDTdNY2fB4KJ8MgZLS54RdG6PkkfwMAavrXu1mV/lls/GABx9O3Rw4PnTtasxrvbMQoBYY92Q==
+  dependencies:
+    os-name "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
@@ -8255,19 +9385,16 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-
-upath@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
-uri-js@^4.2.1:
+uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
   dependencies:
@@ -8277,11 +9404,10 @@ urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  dependencies:
-    prepend-http "^1.0.1"
+url-template@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
+  integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE=
 
 url@^0.11.0, url@~0.11.0:
   version "0.11.0"
@@ -8315,13 +9441,10 @@ util@0.10.3, util@^0.10.3, util@~0.10.1:
   dependencies:
     inherits "2.0.1"
 
-uuid@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+uuid@^3.0.1, uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 v8flags@^3.0.1:
   version "3.0.2"
@@ -8329,13 +9452,20 @@ v8flags@^3.0.1:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  dependencies:
+    builtins "^1.0.3"
+
 value-or-function@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
@@ -8348,13 +9478,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vinyl-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vinyl-buffer/-/vinyl-buffer-1.0.1.tgz#96c1a3479b8c5392542c612029013b5b27f88bbf"
-  dependencies:
-    bl "^1.2.1"
-    through2 "^2.0.3"
-
 vinyl-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
@@ -8388,13 +9511,6 @@ vinyl-fs@^3.0.0:
     vinyl "^2.0.0"
     vinyl-sourcemap "^1.1.0"
 
-vinyl-source-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-2.0.0.tgz#f38a5afb9dd1e93b65d550469ac6182ac4f54b8e"
-  dependencies:
-    through2 "^2.0.3"
-    vinyl "^2.1.0"
-
 vinyl-sourcemap@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
@@ -8413,14 +9529,6 @@ vinyl-sourcemaps-apply@^0.2.0:
   dependencies:
     source-map "^0.5.1"
 
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
 vinyl@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
@@ -8456,18 +9564,16 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
-walker@~1.0.5:
+walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   dependencies:
     makeerror "1.0.x"
 
-watch@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
+warnings-to-errors-webpack-plugin@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/warnings-to-errors-webpack-plugin/-/warnings-to-errors-webpack-plugin-2.0.0.tgz#1ce862fa845c77a3c21bb68c839efaa7ebbdb9fb"
+  integrity sha512-0Girb3F5xc5U1TpYMiLDcie5oB+Ko2EuujOYyS3aXpKS4Yp264WkIuJ+0vF8wnmkDkmZAOBxahBedEL0mLjHQA==
 
 watchpack@^1.4.0:
   version "1.5.0"
@@ -8573,6 +9679,14 @@ whatwg-url@^6.4.0:
     tr46 "^1.0.0"
     webidl-conversions "^4.0.1"
 
+whatwg-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
@@ -8581,9 +9695,10 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+which@1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
@@ -8597,14 +9712,17 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2:
+windows-release@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
+  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
+  dependencies:
+    execa "^1.0.0"
+
+wordwrap@0.0.2, wordwrap@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -8616,19 +9734,27 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+write-file-atomic@2.4.1, write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
+  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-json-file@^2.2.0:
+write-json-file@^2.2.0, write-json-file@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f"
   dependencies:
@@ -8646,9 +9772,10 @@ write-pkg@^3.1.0:
     sort-keys "^2.0.0"
     write-json-file "^2.2.0"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
   dependencies:
     mkdirp "^0.5.1"
 
@@ -8675,6 +9802,10 @@ y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -8683,6 +9814,13 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
@@ -8701,28 +9839,22 @@ yargs-parser@^7.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs@^11.0.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+yargs@^12.0.1, yargs@^12.0.2:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.1.1"
-    find-up "^2.1.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
     get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
+    os-locale "^3.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
     string-width "^2.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^9.0.2"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
 
 yargs@^6.5.0, yargs@^6.6.0:
   version "6.6.0"
@@ -8786,3 +9918,15 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+
+yup@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz#f8cb198c8e7dd2124beddc2457571329096b06e7"
+  integrity sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    fn-name "~2.0.1"
+    lodash "^4.17.11"
+    property-expr "^1.5.0"
+    synchronous-promise "^2.0.6"
+    toposort "^2.0.2"